Compare commits

...
2 Commits
Author SHA1 Message Date
Greg Hellings 73b70b5bc7 Build target name fixing
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
build.yml / build (x86) (push) Successful in 14m44s
build.yml / build (ucrt) (push) Successful in 14m46s
2026-08-05 14:03:15 -05:00
Greg Hellings 6c5f5b0de5 r3916 update 2026-08-05 09:11:03 -05:00
3 changed files with 19 additions and 19 deletions
+2 -1
View File
@@ -16,5 +16,6 @@ jobs:
- x86
- ucrt
steps:
- uses: actions/checkout@v6
- name: Build
run: nix run -L "${{ matrix.arch }}"
run: nix run -L ".#${{ matrix.arch }}"
+12 -10
View File
@@ -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
+5 -8
View File
@@ -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 \