From 8d90023173c246daa0079a8682704e050c11b976 Mon Sep 17 00:00:00 2001 From: spacefrogg Date: Sun, 8 Oct 2023 20:36:40 +0200 Subject: [PATCH 1/5] goredo: 1.31.0 -> 2.1.0 --- .../tools/build-managers/goredo/default.nix | 4 +-- .../build-managers/goredo/fix-tests.diff | 33 +++++++++++++++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/build-managers/goredo/default.nix b/pkgs/development/tools/build-managers/goredo/default.nix index e1c2b402df69..41048f0dd142 100644 --- a/pkgs/development/tools/build-managers/goredo/default.nix +++ b/pkgs/development/tools/build-managers/goredo/default.nix @@ -9,11 +9,11 @@ buildGoModule rec { pname = "goredo"; - version = "1.31.0"; + version = "2.1.0"; src = fetchurl { url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst"; - hash = "sha256-z7u71VFMoq4VwHohMnYx/ahBSkRZHoI8MZet9gO+XVw="; + hash = "sha256-ithb4giKOA0egl3Cuz8Jz03BwJ7TSWun8O8oYVrrETc="; }; 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 index 3c4ce641ac56..22b9c8f74385 100644 --- a/pkgs/development/tools/build-managers/goredo/fix-tests.diff +++ b/pkgs/development/tools/build-managers/goredo/fix-tests.diff @@ -1,6 +1,27 @@ -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 +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 @@ -10,9 +31,9 @@ diff '--color=auto' -ru goredo-1.30.0/t/goredo-double-consideration.t goredo-1.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 +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 From 9870f4d6f5b50c55cfe77bd80b0588eb0d93903f Mon Sep 17 00:00:00 2001 From: spacefrogg Date: Tue, 10 Oct 2023 09:16:06 +0200 Subject: [PATCH 2/5] goredo: Move to pkgs/by-name --- .../tools/build-managers => by-name/go}/goredo/fix-tests.diff | 0 .../goredo/default.nix => by-name/go/goredo/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/tools/build-managers => by-name/go}/goredo/fix-tests.diff (100%) rename pkgs/{development/tools/build-managers/goredo/default.nix => by-name/go/goredo/package.nix} (100%) diff --git a/pkgs/development/tools/build-managers/goredo/fix-tests.diff b/pkgs/by-name/go/goredo/fix-tests.diff similarity index 100% rename from pkgs/development/tools/build-managers/goredo/fix-tests.diff rename to pkgs/by-name/go/goredo/fix-tests.diff diff --git a/pkgs/development/tools/build-managers/goredo/default.nix b/pkgs/by-name/go/goredo/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/goredo/default.nix rename to pkgs/by-name/go/goredo/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c527c613c979..9125ddc11acc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19514,8 +19514,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 { }; From 816cb8c50b8ccba83d7edde0511123a1d76c2fe4 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Fri, 10 Nov 2023 18:46:08 +0100 Subject: [PATCH 3/5] goredo: 2.1.0 -> 2.2.0 --- pkgs/by-name/go/goredo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/goredo/package.nix b/pkgs/by-name/go/goredo/package.nix index 41048f0dd142..6f6e77b2b986 100644 --- a/pkgs/by-name/go/goredo/package.nix +++ b/pkgs/by-name/go/goredo/package.nix @@ -9,11 +9,11 @@ buildGoModule rec { pname = "goredo"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst"; - hash = "sha256-ithb4giKOA0egl3Cuz8Jz03BwJ7TSWun8O8oYVrrETc="; + hash = "sha256-ifGcUt13hrQSShYbGAdCag3BPPLXMFU5V947zyUtmC8="; }; patches = [ ./fix-tests.diff ]; From aa91a9dfb7bcdcbd8bb8bd08ae8a905b9582c58d Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Sun, 12 Nov 2023 15:46:56 +0100 Subject: [PATCH 4/5] goredo: 2.2.0 -> 2.3.0 --- pkgs/by-name/go/goredo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/goredo/package.nix b/pkgs/by-name/go/goredo/package.nix index 6f6e77b2b986..59fe1201ab8b 100644 --- a/pkgs/by-name/go/goredo/package.nix +++ b/pkgs/by-name/go/goredo/package.nix @@ -9,11 +9,11 @@ buildGoModule rec { pname = "goredo"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst"; - hash = "sha256-ifGcUt13hrQSShYbGAdCag3BPPLXMFU5V947zyUtmC8="; + hash = "sha256-i43ivJ2DOSebh7qRpYWTfTyQo/PFtzSXJciYbOy8e4s="; }; patches = [ ./fix-tests.diff ]; From 5d94a9c49a48d8d937dc44dc779100eb6568360f Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Tue, 21 Nov 2023 14:44:40 +0100 Subject: [PATCH 5/5] goredo: 2.3.0 -> 2.4.0 --- pkgs/by-name/go/goredo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/goredo/package.nix b/pkgs/by-name/go/goredo/package.nix index 59fe1201ab8b..a81cb8ebd307 100644 --- a/pkgs/by-name/go/goredo/package.nix +++ b/pkgs/by-name/go/goredo/package.nix @@ -9,11 +9,11 @@ buildGoModule rec { pname = "goredo"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst"; - hash = "sha256-i43ivJ2DOSebh7qRpYWTfTyQo/PFtzSXJciYbOy8e4s="; + hash = "sha256-oUC/N6NLEVBrFC3tSEsWEXUBl5oyZNmqRTFWFbgL+zg="; }; patches = [ ./fix-tests.diff ];