From 6c5f5b0de53640fd7cc091130a1c7a5b8506ac48 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 5 Aug 2026 09:11:03 -0500 Subject: [PATCH] r3916 update --- flake.nix | 22 ++++++++++++---------- update.nix | 13 +++++-------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index ce67f80..5a7348d 100644 --- a/flake.nix +++ b/flake.nix @@ -32,14 +32,16 @@ perSystem = { pkgs, self', ... }@inputs': { - _module.args.pkgs = import inputs.nixpkgs { - inherit (inputs') system; - overlays = [ - (_: p: { - nghttp3 = p.nghttp3.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; }; - ngtcp2 = p.ngtcp2.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; }; - }) - ]; + _module.args = { + pkgs = import inputs.nixpkgs { + inherit (inputs') system; + overlays = [ + (_: p: { + nghttp3 = p.nghttp3.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; }; + ngtcp2 = p.ngtcp2.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; }; + }) + ]; + }; }; devShells.default = pkgs.mkShell { @@ -79,8 +81,8 @@ (win.sword.overrideAttrs { src = pkgs.fetchsvn { url = "https://svn.crosswire.org/svn/sword/trunk"; - rev = "3914"; - hash = "sha256-yqZtUb86KILTYcshe/qim5+H57ktKlH3Uiic6KDKnrQ="; + rev = "3916"; + hash = "sha256-eucivqgAeNpcwsyn2Il0+eX1X6rJHJQo1jF+jzE3IxE="; }; patches = [ ]; }).override diff --git a/update.nix b/update.nix index df1d28a..00882ed 100644 --- a/update.nix +++ b/update.nix @@ -2,7 +2,7 @@ writeShellApplication, gnugrep, gnused, - nix-prefetch, + nix-prefetch-svn, subversion, }: writeShellApplication { @@ -10,7 +10,7 @@ writeShellApplication { runtimeInputs = [ gnugrep gnused - nix-prefetch + nix-prefetch-svn subversion ]; @@ -25,12 +25,9 @@ writeShellApplication { else echo "DO_UPDATE=1" fi - hash="$(nix-prefetch \ - --check-store \ - --option extra-experimental-features flakes \ - fetchsvn \ - --url "$url" \ - --rev "$new_rev" \ + hash="$(nix-prefetch-svn \ + "$url" \ + "$new_rev" \ )" echo "HASH=$hash" sed -i flake.nix \