From e4f6320205ecb26e7dcb56aa122cccb84806d709 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 5 Mar 2026 17:41:26 -0500 Subject: nix direnv 3.1.0, plus minor upkeep --- .envrc-nix | 4 ++-- flake.lock | 22 +++++++++++----------- flake.nix | 2 +- org/config_nix.org | 4 ++-- org/nix-develop-dlang-shared.org | 17 +++++++++++++++-- shell.nix | 2 +- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/.envrc-nix b/.envrc-nix index 770db1c..737111e 100755 --- a/.envrc-nix +++ b/.envrc-nix @@ -1,8 +1,8 @@ # -*- mode: nix -*- NIX_ENFORCE_PURITY=1 # - https://github.com/nix-community/nix-direnv -NixDirEnvVersion="3.0.7" -NixDirEnvSHA="sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc=" +NixDirEnvVersion="3.1.0" +NixDirEnvSHA="sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM=" if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}" fi diff --git a/flake.lock b/flake.lock index 335b44f..fee5572 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1754707636, - "narHash": "sha256-np3xPi0/PPEe4OWPPrTNV+eu8QIgSp83NaKMukE0hJE=", + "lastModified": 1772748350, + "narHash": "sha256-UwH0m6iqKHqFSbSc63UqjPNis2OprQ7K4h8C+OVUNtI=", "ref": "refs/heads/main", - "rev": "d393ad85676436fef1e37e712405d6d10593977d", - "revCount": 23, + "rev": "c08461dc2b99618171de1973dc2218d3d14e9fba", + "revCount": 28, "type": "git", "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake" }, @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761880412, - "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", + "lastModified": 1772674223, + "narHash": "sha256-/suKbHSaSmuC9UY7G0VRQ3aO+QKqxAQPQ19wG7QNkF8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", + "rev": "66d9241e3dc2296726dc522e62dbfe89c7b449f3", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1761924324, - "narHash": "sha256-mcMQQ+MC5L/d0fEbQ2jQB1eNE/oayWsIgOBEXhEC/Fg=", + "lastModified": 1772750174, + "narHash": "sha256-VydYoUNk1nJSs47UxuUftwqf8HC3tnEXbCNrWaIJ0y0=", "ref": "refs/heads/main", - "rev": "422a865a4f9359e11c10202035ffc3bf119e4bb0", - "revCount": 702, + "rev": "7bf3e40d005f21881240a0b9c2140b5244eecd3b", + "revCount": 709, "type": "git", "url": "git://git.sisudoc.org/software/sisudoc-spine" }, diff --git a/flake.nix b/flake.nix index ab38273..b07894a 100644 --- a/flake.nix +++ b/flake.nix @@ -153,7 +153,7 @@ dub gnumake sqlite - perl538Packages.Po4a + perlPackages.Po4a ]; inherit shellHook; }; diff --git a/org/config_nix.org b/org/config_nix.org index 42f11b1..b6a0a01 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -178,7 +178,7 @@ dub gnumake sqlite - perl538Packages.Po4a + perlPackages.Po4a ]; inherit shellHook; }; @@ -287,7 +287,7 @@ with pkgs; # koreader # foliate # ❯❯❯ i18n translation related - # perl538Packages.Po4a + # perlPackages.Po4a ]; shellHook = '' ''; diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org index b5b79a0..1b9129e 100644 --- a/org/nix-develop-dlang-shared.org +++ b/org/nix-develop-dlang-shared.org @@ -27,6 +27,7 @@ check for latest version: update direnv version and sha hash: - emacs org/nix-develop-dlang-shared.org +- direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/3.1.0/direnvrc re-tangle file: @@ -40,16 +41,28 @@ update flake.lock: #+NAME: direnv-version #+BEGIN_SRC org -<> +<> #+END_SRC #+NAME: direnv-hash #+BEGIN_SRC org -<> +<> #+END_SRC *** versions +**** 3.1.0 + +#+NAME: direnv_version_3_1_0 +#+BEGIN_SRC org +3.1.0 +#+END_SRC + +#+NAME: direnv_hash_3_1_0 +#+BEGIN_SRC org +sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM= +#+END_SRC + **** 3.0.7 #+NAME: direnv_version_3_0_7 diff --git a/shell.nix b/shell.nix index 03942a6..358db02 100755 --- a/shell.nix +++ b/shell.nix @@ -52,7 +52,7 @@ with pkgs; # koreader # foliate # ❯❯❯ i18n translation related - # perl538Packages.Po4a + # perlPackages.Po4a ]; shellHook = '' ''; -- cgit v1.2.3