diff --git a/pkgs/by-name/go/goredo/fix-tests.diff b/pkgs/by-name/go/goredo/fix-tests.diff new file mode 100644 index 000000000000..22b9c8f74385 --- /dev/null +++ b/pkgs/by-name/go/goredo/fix-tests.diff @@ -0,0 +1,42 @@ +diff '--color=auto' -ru goredo-2.0.0/t/goredo-chmoding.t goredo-2.0.0.new/t/goredo-chmoding.t +--- goredo-2.0.0/t/goredo-chmoding.t 2023-10-08 18:50:45.000000000 +0200 ++++ goredo-2.0.0.new/t/goredo-chmoding.t 2023-10-08 20:23:54.862618888 +0200 +@@ -8,7 +8,7 @@ + echo echo ok > foo.do + redo foo + test_expect_success "foo is non executable" '[ ! -x foo ]' +-inode0=`stat -f %i foo` ++inode0=`stat -c %i foo` + + cat > foo.do < \$3 +@@ -16,7 +16,7 @@ + EOF + redo foo + test_expect_success "foo is executable" '[ -x foo ]' +-inode1=`stat -f %i foo` ++inode1=`stat -c %i foo` + test_expect_success "foo was not renamed" '[ $inode0 = $inode1 ]' + + test_done +diff '--color=auto' -ru goredo-2.0.0/t/goredo-double-consideration.t goredo-2.0.0.new/t/goredo-double-consideration.t +--- goredo-2.0.0/t/goredo-double-consideration.t 2023-10-08 18:50:45.000000000 +0200 ++++ goredo-2.0.0.new/t/goredo-double-consideration.t 2023-10-08 20:19:29.213465244 +0200 +@@ -17,7 +17,7 @@ + redo-stamp <"\$3" + EOF + cat > version.do < "\$3" ++echo 012345 > "\$3" + redo-always + redo-stamp <"\$3" + EOF +diff '--color=auto' -ru goredo-2.0.0/t/redo-sh.tests/clean.do goredo-2.0.0.new/t/redo-sh.tests/clean.do +--- goredo-2.0.0/t/redo-sh.tests/clean.do 2023-10-08 18:50:45.000000000 +0200 ++++ goredo-2.0.0.new/t/redo-sh.tests/clean.do 2023-10-08 20:19:29.213465244 +0200 +@@ -1,4 +1,4 @@ + for f in * ; do + [ -d $f ] || continue +- find $f ! -name test -delete ++ find $f ! -name test -delete || true + done diff --git a/pkgs/development/tools/build-managers/goredo/default.nix b/pkgs/by-name/go/goredo/package.nix similarity index 92% rename from pkgs/development/tools/build-managers/goredo/default.nix rename to pkgs/by-name/go/goredo/package.nix index e1c2b402df69..a81cb8ebd307 100644 --- a/pkgs/development/tools/build-managers/goredo/default.nix +++ b/pkgs/by-name/go/goredo/package.nix @@ -9,11 +9,11 @@ buildGoModule rec { pname = "goredo"; - version = "1.31.0"; + version = "2.4.0"; src = fetchurl { url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst"; - hash = "sha256-z7u71VFMoq4VwHohMnYx/ahBSkRZHoI8MZet9gO+XVw="; + hash = "sha256-oUC/N6NLEVBrFC3tSEsWEXUBl5oyZNmqRTFWFbgL+zg="; }; patches = [ ./fix-tests.diff ]; diff --git a/pkgs/development/tools/build-managers/goredo/fix-tests.diff b/pkgs/development/tools/build-managers/goredo/fix-tests.diff deleted file mode 100644 index 3c4ce641ac56..000000000000 --- a/pkgs/development/tools/build-managers/goredo/fix-tests.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff '--color=auto' -ru goredo-1.30.0/t/goredo-double-consideration.t goredo-1.30.0.new/t/goredo-double-consideration.t ---- goredo-1.30.0/t/goredo-double-consideration.t 2023-01-18 13:16:01.000000000 +0100 -+++ goredo-1.30.0.new/t/goredo-double-consideration.t 2023-03-11 16:15:19.434788789 +0100 -@@ -17,7 +17,7 @@ - redo-stamp <"\$3" - EOF - cat > version.do < "\$3" -+echo 012345 > "\$3" - redo-always - redo-stamp <"\$3" - EOF -diff '--color=auto' -ru goredo-1.30.0/t/redo-sh.tests/clean.do goredo-1.30.0.new/t/redo-sh.tests/clean.do ---- goredo-1.30.0/t/redo-sh.tests/clean.do 2023-01-18 13:16:01.000000000 +0100 -+++ goredo-1.30.0.new/t/redo-sh.tests/clean.do 2023-03-11 16:09:47.304372011 +0100 -@@ -1,4 +1,4 @@ - for f in * ; do - [ -d $f ] || continue -- find $f ! -name test -delete -+ find $f ! -name test -delete || true - done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba3d419e5802..23fa2b4b2440 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19293,8 +19293,6 @@ with pkgs; gopatch = callPackage ../development/tools/misc/gopatch { }; - goredo = callPackage ../development/tools/build-managers/goredo { }; - gotify-server = callPackage ../servers/gotify { }; gotty = callPackage ../servers/gotty { };