diff options
Diffstat (limited to 'pkgs/development/tools/misc')
6 files changed, 39 insertions, 52 deletions
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 65c4f3174051..3e634bedfd19 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,34 +1,39 @@ -{ stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }: +{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkgconfig, perl, guile, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; - version = "5.18.12"; + version = "5.18.16"; src = fetchurl { url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz"; - sha256 = "1n5zq4872sakvz9c7ncsdcfp0z8rsybsxvbmhkpbd19ii0pacfxy"; + sha256 = "16mlbdys8q4ckxlvxyhwkdnh1ay9f6g0cyp1kylkpalgnik398gq"; }; - outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; - - patches = [ - # Temporary, so builds with a prefixed pkg-config (like cross builds) work. - # - # https://savannah.gnu.org/support/?109050 was supposed to fix this, but - # the generated configure script mysteriously still contained hard-coded - # pkg-config. I tried regenerating it, but that didn't help. Only - # https://git.savannah.gnu.org/cgit/autogen.git/commit/?h=5cbe233387d7f7b36752736338d1cd4f71287daa, - # in the next release, finally fixes this, by getting rid of some - # metaprogramming of the autoconf m4 metaprogram! There evidentally was - # some sort escaping error such that the `PKG_CONFIG` check got evaluated - # before `configure` was generated. - # - # Remove this when the version is bumped - ./pkg-config-use-var.patch + patches = let + dp = { ver ? "1%255.18.16-4", pname, name ? (pname + ".diff"), sha256 }: fetchurl { + url = "https://salsa.debian.org/debian/autogen/-/raw/debian/${ver}" + + "/debian/patches/${pname}.diff?inline=false"; + inherit name sha256; + }; + in [ + (dp { + pname = "20_no_Werror"; + sha256 = "08z4s2ifiqyaacjpd9pzr59w8m4j3548kkaq1bwvp2gjn29m680x"; + }) + (dp { + pname = "30_ag_macros.m4_syntax_error"; + sha256 = "1z8vmbwbkz3505wd33i2xx91mlf8rwsa7klndq37nw821skxwyh3"; + }) + (dp { + pname = "31_allow_overriding_AGexe_for_crossbuild"; + sha256 = "0h9wkc9bqb509knh8mymi43hg6n6sxg2lixvjlchcx7z0j7p8xkf"; + }) ]; + outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; + nativeBuildInputs = [ - which pkgconfig perl + which pkgconfig perl autoreconfHook/*patches applied*/ ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling buildPackages.buildPackages.autogen buildPackages.texinfo @@ -45,13 +50,7 @@ stdenv.mkDerivation rec { #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" ]; - postPatch = '' - # Fix a broken sed expression used for detecting the minor - # version of guile we are using - sed -i "s,sed '.*-I.*',sed 's/\\\(^\\\| \\\)-I/\\\1/g',g" configure - - substituteInPlace pkg/libopts/mklibsrc.sh --replace /tmp $TMPDIR - ''; + #doCheck = true; # not reliable postInstall = '' mkdir -p $dev/bin @@ -62,9 +61,14 @@ stdenv.mkDerivation rec { sed -e "s|$bin/bin|/no-such-autogen-bin-path|" -i $f sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f done - ''; - #doCheck = true; # 2 tests fail because of missing /dev/tty + '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + # remove /build/** from RPATHs + for f in "$bin"/bin/*; do + local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')" + patchelf --set-rpath "$nrp" "$f" + done + ''; meta = with stdenv.lib; { description = "Automated text and program generation tool"; diff --git a/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch b/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch deleted file mode 100644 index 69476f62c6db..000000000000 --- a/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index c3f761d1c3f..14b101f67c1 ---- a/configure -+++ b/configure -@@ -16683,7 +16683,7 @@ fi - - - -- ag_gv=`gdir=\`pkg-config --cflags-only-I \ -+ ag_gv=`gdir=\`${PKG_CONFIG} --cflags-only-I \ - guile-${GUILE_EFFECTIVE_VERSION} | \ - sed 's/\(^\| \)-I/\1/g'\` - for d in $gdir diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 7144c2bd0ae5..8c87e1642df3 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.7868"; + version = "0.1.7971"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1a9gnqrkvifrwr8wpv5f6zv8xs8myzbzlhn5w72xxzh2gxdaflwg"; + sha256 = "0nrmdql3h9jnfgmp8898c9v07f5h5r9dvabaqhk98r6a77g3rr98"; }; vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index f6a001e488c3..7702df423bb5 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -18,7 +18,7 @@ let basename = "gdb-${version}"; - version = "9.1"; + version = "9.2"; in assert pythonSupport -> python3 != null; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9"; + sha256 = "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"; }; postPatch = if stdenv.isDarwin then '' diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 4bf637c0eba8..fbe49dc68b2a 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -26,10 +26,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Don't run the native `strip' when cross-compiling. This breaks at least - # with `.a' files for MinGW. - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - meta = with stdenv.lib; { description = "GNU Libtool, a generic library support script"; longDescription = '' diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index 153257c85ae1..6fca02ad788b 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pkgconf"; - version = "1.7.0"; + version = "1.7.3"; nativeBuildInputs = [ removeReferencesTo ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0sb1a2lgiqaninv5s3zq09ilrkpsamcl68dyhqyz7yi9vsgb0vhy"; + sha256 = "1h7rf5cch0cbxp8nmjkkf272zrz2jgpqpr8a58ww75pn3jjswimq"; }; # Debian has outputs like these too: |