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 - x86
- ucrt - ucrt
steps: steps:
- uses: actions/checkout@v6
- name: Build - name: Build
run: nix run -L "${{ matrix.arch }}" run: nix run -L ".#${{ matrix.arch }}"
+12 -10
View File
@@ -32,14 +32,16 @@
perSystem = perSystem =
{ pkgs, self', ... }@inputs': { pkgs, self', ... }@inputs':
{ {
_module.args.pkgs = import inputs.nixpkgs { _module.args = {
inherit (inputs') system; pkgs = import inputs.nixpkgs {
overlays = [ inherit (inputs') system;
(_: p: { overlays = [
nghttp3 = p.nghttp3.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; }; (_: p: {
ngtcp2 = p.ngtcp2.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; }; nghttp3 = p.nghttp3.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; };
}) ngtcp2 = p.ngtcp2.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; };
]; })
];
};
}; };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
@@ -79,8 +81,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 = "3914"; rev = "3916";
hash = "sha256-yqZtUb86KILTYcshe/qim5+H57ktKlH3Uiic6KDKnrQ="; hash = "sha256-eucivqgAeNpcwsyn2Il0+eX1X6rJHJQo1jF+jzE3IxE=";
}; };
patches = [ ]; patches = [ ];
}).override }).override
+5 -8
View File
@@ -2,7 +2,7 @@
writeShellApplication, writeShellApplication,
gnugrep, gnugrep,
gnused, gnused,
nix-prefetch, nix-prefetch-svn,
subversion, subversion,
}: }:
writeShellApplication { writeShellApplication {
@@ -10,7 +10,7 @@ writeShellApplication {
runtimeInputs = [ runtimeInputs = [
gnugrep gnugrep
gnused gnused
nix-prefetch nix-prefetch-svn
subversion subversion
]; ];
@@ -25,12 +25,9 @@ writeShellApplication {
else else
echo "DO_UPDATE=1" echo "DO_UPDATE=1"
fi fi
hash="$(nix-prefetch \ hash="$(nix-prefetch-svn \
--check-store \ "$url" \
--option extra-experimental-features flakes \ "$new_rev" \
fetchsvn \
--url "$url" \
--rev "$new_rev" \
)" )"
echo "HASH=$hash" echo "HASH=$hash"
sed -i flake.nix \ sed -i flake.nix \