From a4dbffe80bbb4582c7920421bd6a795da79e68a8 Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 15 Jan 2024 21:48:28 +0100 Subject: [PATCH] chore: update inputs and add temporary fix for pcsclite --- flake.lock | 76 ++++++++++++++++++++--------------------- flake.nix | 3 +- hosts/kroma/default.nix | 3 ++ 3 files changed, 43 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index fc9230c..e108171 100644 --- a/flake.lock +++ b/flake.lock @@ -293,11 +293,11 @@ ] }, "locked": { - "lastModified": 1705240333, - "narHash": "sha256-s9h2h44fCi54sSIT9ktd3eDik9JDpQE9DeYuXcA44u4=", + "lastModified": 1705332421, + "narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=", "owner": "numtide", "repo": "devshell", - "rev": "ca1ff587c602b934afe830ea3cb26d0fbde4c395", + "rev": "83cb93d6d063ad290beee669f4badf9914cc16ec", "type": "github" }, "original": { @@ -335,11 +335,11 @@ ] }, "locked": { - "lastModified": 1705281959, - "narHash": "sha256-9NZiSMAduz4qbFu77Cg9RNFcrjgS9UOjriD+v8FeueY=", + "lastModified": 1705348229, + "narHash": "sha256-CssPema1sBxZkrT95KFuKCNNiqxNe1lnf2QNeXk88Xk=", "owner": "nix-community", "repo": "disko", - "rev": "2a561be6b5dd049182af1973bb7e28f7a0ac9be2", + "rev": "d0b4408eaf782a1ada0a9133bb1cecefdd59c696", "type": "github" }, "original": { @@ -603,11 +603,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -621,11 +621,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -762,11 +762,11 @@ ] }, "locked": { - "lastModified": 1705269478, - "narHash": "sha256-j7Rp8Y3ckBHOlIzqe0g2+/BVce9SU/dVtn4Eb0rMuY4=", + "lastModified": 1705347059, + "narHash": "sha256-MSdJZDeyBIjf1SAZ7OvA44b00zUGTrDxkAm9vVR+XRk=", "owner": "nix-community", "repo": "home-manager", - "rev": "846200eb574faa2af808ed02e653c2b8ed51fd71", + "rev": "8c3b2a0cab64a464de9e41a470eecf1318ccff57", "type": "github" }, "original": { @@ -817,11 +817,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1704629345, - "narHash": "sha256-cWrno5kSY2cCaWIl97Ae4/iZ9rnMLlm0VrwRqdzIESk=", + "lastModified": 1705320633, + "narHash": "sha256-ZFHqXr8f1zPAUJGLxB2qFapQCs7Dc8R75/mKIiw3sP0=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "3e408e7391e9d778f48861bb9da08ac54e01441a", + "rev": "b170b6a80de0a6df07d73594290dcd6d26ef7bbb", "type": "github" }, "original": { @@ -896,11 +896,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1705080892, + "lastModified": 1705242886, "narHash": "sha256-TLj334vRwFtSym3m+NnKcNCnKKPNoTC/TDZL40vmOso=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "69371f7bae49d5d55bcee9fd829585148215bedb", + "rev": "6b03a93296faf174b97546fd573c8b379f523a8d", "type": "github" }, "original": { @@ -1015,11 +1015,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1705187059, - "narHash": "sha256-dSj+iIYqLA+7/5rLXWfUxw9IXRm0w8Mrm39af8klUH0=", + "lastModified": 1705312285, + "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ef811636cc847355688804593282078bac7758d4", + "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", "type": "github" }, "original": { @@ -1051,27 +1051,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", - "owner": "NixOS", + "lastModified": 1705351535, + "narHash": "sha256-l6UP54vksO6IRhNRTcTEFmrIEWt86VPKA5XHZHGnpkk=", + "owner": "oddlama", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "6cfc951b5237de6d62e43e235e65690e063e09bc", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "oddlama", + "ref": "fix-kanidm-build", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1704588527, - "narHash": "sha256-YECXW8P0bqFM5e65Mu2fL4wZlonNWCuNEk7UQPsuJZ0=", + "lastModified": 1705193289, + "narHash": "sha256-oL5EAaZHiA3ABLdyKag/DgT+457vmELv8A+eaox2xsI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "be8e58791dcfa2b98b512c2a1bdf3bd94a38790b", + "rev": "da839f74dc77c9826fa333b1bc2c8258fd6ffcbe", "type": "github" }, "original": { @@ -1172,11 +1172,11 @@ ] }, "locked": { - "lastModified": 1705080950, - "narHash": "sha256-ltAQAwwE6UyUcVh6PIf+RYpuxvMSLgc7Dqwfox6HwPg=", + "lastModified": 1705323114, + "narHash": "sha256-VOrbI0RLWenZ4H70DcD1WxpFkY2IG/F/3gMZUujAZaM=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "8621ab0a5a9953c719aa21d3d078532613accdcb", + "rev": "25ea5dd63dab3d63f679071a30994ae711c906ba", "type": "github" }, "original": { @@ -1653,11 +1653,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1705141537, - "narHash": "sha256-CjcrCvhrtiQIozs7Ns6yWpcw5eOozjZ3XK1PU2pO/Y0=", + "lastModified": 1705313011, + "narHash": "sha256-ASZCgwE1rTnhlMfooTrcLIaxaQBdFKcpX7r8rYtrpE8=", "owner": "Toqozz", "repo": "wired-notify", - "rev": "f0bca119f7914142e3bef1e019511f8ea7681fd4", + "rev": "2857b543b2fc0d1471ceb5409c846fbaa4ed8062", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 639f5c2..8a2b02e 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # BUG: nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:oddlama/nixpkgs/fix-kanidm-build"; nixpkgs-wayland = { url = "github:nix-community/nixpkgs-wayland"; diff --git a/hosts/kroma/default.nix b/hosts/kroma/default.nix index f9c7014..b787bf7 100644 --- a/hosts/kroma/default.nix +++ b/hosts/kroma/default.nix @@ -61,4 +61,7 @@ nixpkgs.config.permittedInsecurePackages = lib.warnIf (pkgs.obsidian.version != "1.5.3") "REMOVE THIS obsidian electron override! in kroma.nix" [ "electron-25.9.0" ]; + + # BUG: remove when https://github.com/NixOS/nixpkgs/issues/280826 is merged + environment.systemPackages = lib.trace "remove pcsclite polkit override https://github.com/NixOS/nixpkgs/issues/280826" [pkgs.pcscliteWithPolkit.out]; }