diff options
-rw-r--r-- | flake.lock | 30 | ||||
-rw-r--r-- | home/packages-minimal.nix | 2 | ||||
-rw-r--r-- | home/packages.nix | 2 | ||||
-rw-r--r-- | home/unstable.nix | 1 | ||||
-rw-r--r-- | pkgs/overlay.nix | 18 |
5 files changed, 19 insertions, 34 deletions
@@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1694465129, - "narHash": "sha256-8BQiuobMrCfCbGM7w6Snx+OBYdtTIm0+cGVaKwQ5BFg=", + "lastModified": 1695108154, + "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", "owner": "nix-community", "repo": "home-manager", - "rev": "9787dffff5d315c9593d3f9fb0f9bf2097e1b57b", + "rev": "07682fff75d41f18327a871088d20af2710d4744", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694937365, - "narHash": "sha256-iHZSGrb9gVpZRR4B2ishUN/1LRKWtSHZNO37C8z1SmA=", + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d017a8822e0907fb96f7700a319f9fe2434de02", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "type": "github" }, "original": { @@ -252,11 +252,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1694948089, - "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=", + "lastModified": 1696009558, + "narHash": "sha256-/1nNL8lCF0gn38XaFyu2ufpWcBFwCDZyYUxdZkM6GxU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db", + "rev": "c182df2e68bd97deb32c7e4765adfbbbcaf75b60", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1695003086, - "narHash": "sha256-d1/ZKuBRpxifmUf7FaedCqhy0lyVbqj44Oc2s+P5bdA=", + "lastModified": 1696126582, + "narHash": "sha256-uo4cn/d2rHPy/fpKZKFBOaVO531zs/Doxz43imrpqZM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b87a14abea512d956f0b89d0d8a1e9b41f3e20ff", + "rev": "fc6fe50d9a4540a1111731baaa00f207301fdeb7", "type": "github" }, "original": { @@ -385,11 +385,11 @@ ] }, "locked": { - "lastModified": 1695057217, - "narHash": "sha256-xA7RVYauw4vnkceUl2aIDONfwuhnUbxVavbCvNS9ed4=", + "lastModified": 1695284550, + "narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4d284ca58ce5f48df79d99ab75b1ae3c3032b9ad", + "rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78", "type": "github" }, "original": { diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix index 17f4aa1..f24226b 100644 --- a/home/packages-minimal.nix +++ b/home/packages-minimal.nix @@ -14,7 +14,7 @@ # general cli utils tree dnsutils inetutils pijul bat age libsecret gping bottom dogdns cifs-utils jekyll fzf ripgrep fd sd bandwhich exa dive - ripgrep python39Packages.isort shellcheck graphviz + ripgrep shellcheck graphviz zip unzip acpi sfz viu glow yt-dlp weechat hexyl bottom lm_sensors usbutils diff --git a/home/packages.nix b/home/packages.nix index 4ed480e..f32c9a2 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -56,7 +56,7 @@ in nixfmt niv inputs.deploy-rs.defaultPackage.${system} haskellPackages.nix-serve-ng nix-doc nix-output-monitor # other things - mercurial + mercurial darcs # isabelle (isabelle.mkEnv "isabelle-env" "fish") isabat diff --git a/home/unstable.nix b/home/unstable.nix index deea5b3..c8cef87 100644 --- a/home/unstable.nix +++ b/home/unstable.nix @@ -16,6 +16,7 @@ with import inputs.nixpkgs-unstable {inherit system; }; }) gleam yazi + nixd ]; xdg.desktopEntries."Signal" = { diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index ebea1a0..1e357ed 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -103,21 +103,5 @@ in matrix-to = self.callPackage ./matrix-to.nix {}; - lean4 = unstable.lean4.overrideAttrs (old: rec { - version = "4.1.0-rc1"; - src = self.fetchFromGitHub { - owner = "leanprover"; - repo = "lean4"; - rev = "v${version}"; - hash = "sha256-OQ72uweFMSkOzJ9u92enNql48ReZ+NBlnXtnanH+ZVA="; - }; - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${src.rev}")' - - # Remove tests that fails in sandbox. - # It expects `sourceRoot` to be a git repository. - rm -rf src/lake/examples/git/ - ''; - }); + inherit (unstable) lean4; } |