From 96eb46c351d4a9b7c8d60a0deed8772d7a178e3e Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 1 Apr 2025 14:00:33 -0500 Subject: [PATCH] Sword 3900 and fix date bug Update Sword SVN to revision 3900 Set mtime on files to present instead of Unix 0 --- flake.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 451fab0..45f9327 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,7 @@ _module.args.pkgs = import inputs.nixpkgs { inherit (inputs') system; }; + devShells.default = pkgs.mkShell { # These will just be available packages = with pkgs; [ pre-commit ]; @@ -72,8 +73,8 @@ win.sword.overrideAttrs { src = pkgs.fetchsvn { url = "https://svn.crosswire.org/svn/sword/trunk"; - rev = "3895"; - hash = "sha256-ju6TsfiAUquXbost6PzStHDLfvOJTNON/iSIupi6IOc="; + rev = "3900"; + hash = "sha256-nNiv0YB7MM7kFplTfVM7x48SMLxHu3Js5Qn5ak583Zk="; }; } ); @@ -81,13 +82,15 @@ pkgs.writeShellApplication { name = "package-sword"; runtimeInputs = with pkgs; [ + coreutils gnutar xz ]; text = '' + set -x out=$(pwd) pushd ${svnSword} - tar cvhaf "$out/sword.tar.xz" ./* --transform "s+^\\./+sword/+" + tar --mtime="$(date +'%Y-%m-%d')" -cvhaf "$out/sword.tar.xz" ./* --transform "s+^\\./+sword/+" ''; }; in