Update to r3912

This commit is contained in:
Greg Hellings
2025-08-06 20:14:45 -05:00
parent 9003b01246
commit 7be048a6c3
2 changed files with 24 additions and 3 deletions
Generated
+17
View File
@@ -1,5 +1,21 @@
{ {
"nodes": { "nodes": {
"aarch_fix": {
"locked": {
"lastModified": 1753636920,
"narHash": "sha256-BZq0xc6+3OVxUE+re+Rd+5+JqmGUARxa0M1waMkscyk=",
"owner": "greg-hellings",
"repo": "nixpkgs",
"rev": "54692b15811727c1cd367dbd82e6e22abd1bd057",
"type": "github"
},
"original": {
"owner": "greg-hellings",
"ref": "ucrt/zlib",
"repo": "nixpkgs",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -139,6 +155,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"aarch_fix": "aarch_fix",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-root": "flake-root", "flake-root": "flake-root",
"hooks": "hooks", "hooks": "hooks",
+7 -3
View File
@@ -14,6 +14,7 @@
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-root.url = "github:srid/flake-root"; flake-root.url = "github:srid/flake-root";
hooks.url = "github:cachix/git-hooks.nix"; hooks.url = "github:cachix/git-hooks.nix";
aarch_fix.url = "github:greg-hellings/nixpkgs/ucrt/zlib";
}; };
outputs = outputs =
@@ -31,6 +32,9 @@
]; ];
perSystem = perSystem =
{ pkgs, self', ... }@inputs': { pkgs, self', ... }@inputs':
let
arm = (import inputs.aarch_fix { inherit (inputs') system; });
in
{ {
_module.args.pkgs = import inputs.nixpkgs { _module.args.pkgs = import inputs.nixpkgs {
inherit (inputs') system; inherit (inputs') system;
@@ -73,8 +77,8 @@
win.sword.overrideAttrs { win.sword.overrideAttrs {
src = pkgs.fetchsvn { src = pkgs.fetchsvn {
url = "https://svn.crosswire.org/svn/sword/trunk"; url = "https://svn.crosswire.org/svn/sword/trunk";
rev = "3906"; rev = "3912";
hash = "sha256-n4wcDBzUjlVSIHYGw8BKWrl1pFGkdkDXLMnJqr754vI="; hash = "sha256-2VgoBdoJtbND++aQ2kDomr6LjYcUyyDwbgWNp5k07Uk=";
}; };
patches = [ ]; patches = [ ];
} }
@@ -100,7 +104,7 @@
default = tar mingwW64; default = tar mingwW64;
x86 = tar mingwW64; x86 = tar mingwW64;
ucrt = tar ucrt64; ucrt = tar ucrt64;
ucrtAarch = tar ucrtAarch64; ucrtAarch = tar arm.pkgsCross.ucrtAarch64;
}; };
}; };
}; };