Unverified Commit 6b32f5e4 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #220687 from spacefrogg/goredo-1.30 

goredo: 1.21.0 -> 1.30.0
parents f037eea1 f7191497

pkgs/development/libraries/sharness/default.nix

+9 −7
Original line number Diff line number Diff line
@@ -6,15 +6,15 @@ 
, perlPackages

, sharnessExtensions ? {} }:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "sharness";

  version = "1.1.0-dev";

  version = "1.2.0";



  src = fetchFromGitHub {

    owner = "chriscool";

    repo = pname;

    rev = "3f238a740156dd2082f4bd60ced205e05894d367"; # 2020-12-09

    sha256 = "FCYskpIqkrpNaWCi2LkhEkiow4/rXLe+lfEWNUthLUg=";

    owner = "felipec";

    repo = "sharness";

    rev = "v${finalAttrs.version}";

    hash = "sha256-C0HVWgTm9iXDSFyXcUVRfT0ip31YGaaZ6ZvxggK/x7o=";

  };



  # Used for testing
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec { 


  doCheck = true;



  passthru.SHARNESS_TEST_SRCDIR = finalAttrs.finalPackage + "/share/sharness";



  meta = with lib; {

    description = "Portable shell library to write, run and analyze automated tests adhering to Test Anything Protocol (TAP)";

    homepage = "https://github.com/chriscool/sharness";
@@ -48,4 +50,4 @@ stdenv.mkDerivation rec { 
    maintainers = [ maintainers.spacefrogg ];

    platforms = platforms.unix;

  };

}
 
})

pkgs/development/tools/build-managers/goredo/default.nix

+7 −6
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 


buildGoModule rec {

  pname = "goredo";

  version = "1.21.0";

  version = "1.30.0";



  src = fetchurl {

    url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst";

    hash = "sha256-h882pt+xZWlhFLQar1kfmSAzMscwMXAajT6ezZl9P8M=";

    hash = "sha256-glsg2q8jFd4z6CuKzlZ3afJx/S7Aw6LCxFAS/uHLlUg=";

  };



  patches = [ ./fix-tests.diff ];
@@ -22,12 +22,12 @@ buildGoModule rec { 


  nativeCheckInputs = lib.optionals doCheck [ python3 perl ];



  SHARNESS_TEST_SRCDIR = sharness + "/share/sharness";

  inherit (sharness) SHARNESS_TEST_SRCDIR;



  vendorSha256 = null;

  subPackages = [ "." ];



  preBuild = "cd src";

  modRoot = "./src";

  subPackages = [ "." ];



  postBuild = ''

    ( cd $GOPATH/bin; ./goredo -symlinks )
@@ -38,7 +38,7 @@ buildGoModule rec { 
  checkPhase = ''

    runHook preCheck

    export PATH=$GOPATH/bin:$PATH

    prove -f

    (cd t; prove -f .)

    runHook postCheck

  '';
@@ -50,6 +50,7 @@ buildGoModule rec { 
  outputs = [ "out" "info" ];



  meta = with lib; {

    outputsToInstall = [ "out" ];

    description = "djb's redo, a system for building files from source files. Written in Go";

    homepage = "https://www.goredo.cypherpunks.ru";

    license = licenses.gpl3;

pkgs/development/tools/build-managers/goredo/fix-tests.diff

+15 −30
Original line number Diff line number Diff line 
diff -ur goredo-1.4.1/t/apenwarr/105-sympath/all.do goredo-1.4.1.new/t/apenwarr/105-sympath/all.do

--- goredo-1.4.1/t/apenwarr/105-sympath/all.do	2021-04-29 14:03:11.000000000 +0200

+++ goredo-1.4.1.new/t/apenwarr/105-sympath/all.do	2021-05-10 15:04:46.912799930 +0200

@@ -11,12 +11,13 @@

 	(

 		cd y/x/x/x/x/x

 		IFS=$(printf '\n')

+		_wd=$(env pwd)

 		redo-ifchange static x/x/x/static $PWD/static \

-			$(/bin/pwd)/static /etc/passwd

+			$_wd/static /etc/passwd

 		# goredo: that symlink path is not resolving even at OS level

 		# redo-ifchange $PWD/../static 2>/dev/null && exit 35

 		redo-ifchange 1.dyn x/x/x/2.dyn $PWD/3.dyn \

-			 $PWD/../4.dyn $(/bin/pwd)/5.dyn

+			 $PWD/../4.dyn $_wd/5.dyn

 	)

 	[ -e y/1.dyn ] || exit $((iter + 1))

 	[ -e y/2.dyn ] || exit $((iter + 2))

diff -ur goredo-1.4.1/t/apenwarr/clean.do goredo-1.4.1.new/t/apenwarr/clean.do

--- goredo-1.4.1/t/apenwarr/clean.do	2021-04-29 14:03:11.000000000 +0200

+++ goredo-1.4.1.new/t/apenwarr/clean.do	2021-05-10 15:06:07.099591609 +0200

@@ -1,3 +1,3 @@

-/bin/ls [0-9s][0-9][0-9]*/clean.do |

+env ls [0-9s][0-9][0-9]*/clean.do |

 sed 's/\.do$//' |

 xargs redo

diff -ur goredo-1.4.1/t/redo-sh.tests/clean.do goredo-1.4.1.new/t/redo-sh.tests/clean.do

--- goredo-1.4.1/t/redo-sh.tests/clean.do	2021-04-29 14:03:11.000000000 +0200

+++ goredo-1.4.1.new/t/redo-sh.tests/clean.do	2021-05-10 15:02:41.607562802 +0200

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 <<EOF

-git rev-parse --short HEAD > "\$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