diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/tools/misc')
59 files changed, 595 insertions, 171 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix index 3d11d25560dc..dc2a6d00b5f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abi-dumper"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "lvc"; repo = "abi-dumper"; rev = version; - sha256 = "1byhw132aj7a5a5zh5s3pnjlrhdk4cz6xd5irp1y08jl980qba5j"; + sha256 = "1i00rfnddrrb9lb1l6ib19g3a76pyasl9lb7rqz2p998gav1gjp2"; }; patchPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/act/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/act/default.nix index 9456335d72ad..4bb2d3d62456 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "act"; - version = "0.2.16"; + version = "0.2.17"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0zhn6av1adphkk9g13m5na63r8fqcjw8wibcja9v9mbw886zcc3p"; + sha256 = "0s7bgm2q7z9xpaj6kfvg63v12k35ckaxwmh6bbjh15xibaw58183"; }; vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/nektos/act"; changelog = "https://github.com/nektos/act/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix index fcddf1d0cacc..14ef09ee7ed0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchFromGitHub, php, flex }: +{ bison +, fetchFromGitHub +, flex +, php +, stdenv +}: # Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being # invoked and complains about it being an unknown toolset. We could use `makeWrapper`, but # then we’d need to still craft a script that does the `php libexec/arcanist/bin/...` dance # anyway... So just do everything at once. let makeArcWrapper = toolset: '' - cat << WRAPPER > $out/bin/${toolset} - #!$shell -e - export PATH='${php}/bin/'\''${PATH:+':'}\$PATH - exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@" - WRAPPER - chmod +x $out/bin/${toolset} + cat << WRAPPER > $out/bin/${toolset} + #!$shell -e + export PATH='${php}/bin/'\''${PATH:+':'}\$PATH + exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@" + WRAPPER + chmod +x $out/bin/${toolset} ''; in - stdenv.mkDerivation { pname = "arcanist"; version = "20200711"; @@ -25,7 +29,7 @@ stdenv.mkDerivation { rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe"; sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw"; }; - buildInputs = [ php flex ]; + buildInputs = [ bison flex php ]; postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' substituteInPlace support/xhpast/Makefile \ @@ -33,13 +37,15 @@ stdenv.mkDerivation { ''; buildPhase = '' + make cleanall -C support/xhpast make xhpast -C support/xhpast ''; installPhase = '' mkdir -p $out/bin $out/libexec make install -C support/xhpast - cp -R $src $out/libexec/arcanist + make cleanall -C support/xhpast + cp -R . $out/libexec/arcanist ${makeArcWrapper "arc"} ${makeArcWrapper "phage"} @@ -53,9 +59,9 @@ stdenv.mkDerivation { meta = { description = "Command line interface to Phabricator"; - homepage = "http://phabricator.org"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + homepage = "http://phabricator.org"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/argbash/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/argbash/default.nix index 0c0511ec7922..3efff5009439 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/argbash/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/argbash/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "matejak"; repo = "argbash"; - rev = "${version}"; + rev = version; sha256 = "1xdhpbnc0xjv6ydcm122hhdjcl77jhiqnccjfqjp3cd1lfmzvg8v"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/asls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/asls/default.nix index 5b53456deac6..0e08acdeb450 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/asls/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/asls/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "asls"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/saulecabrera/asls/releases/download/v${version}/bin.tar.gz"; - sha256 = "1h6r2lbf54aylzmbiy74ys42fhjv9q824bdrcp40gxx1v2yjc5h5"; + sha256 = "05kp44p4q4sdykfw0b4k9j3qdp0qvwgjbs48ncmnd0ass0xrmi3s"; }; buildInputs = [ erlangR22 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/autogen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/autogen/default.nix index 3e634bedfd19..23235499cfbd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/autogen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/autogen/default.nix @@ -42,13 +42,27 @@ stdenv.mkDerivation rec { guile libxml2 ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--with-libxml2=${libxml2.dev}" - "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2" - # the configure check for regcomp wants to run a host program - "libopts_cv_with_libregex=yes" - #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" - ]; + preConfigure = '' + export MAN_PAGE_DATE=$(date '+%Y-%m-%d' -d "@$SOURCE_DATE_EPOCH") + ''; + + configureFlags = + [ + # Make sure to use a static value for the timeout. If we do not set a value + # here autogen will select one based on the execution time of the configure + # phase which is not really reproducible. + # + # If you are curious about the number 78, it has been cargo-culted from + # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21 + "--enable-timeout=78" + ] + ++ (stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--with-libxml2=${libxml2.dev}" + "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2" + # the configure check for regcomp wants to run a host program + "libopts_cv_with_libregex=yes" + #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" + ]); #doCheck = true; # not reliable diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix index d6353fc0b9cf..58c559fcc566 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { - name = "automake-1.16.2"; + name = "automake-1.16.3"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c"; + sha256 = "0fmz2fhmzcpacnprl5msphvaflwiy0hvpgmqlgfny72ddijzfazz"; }; nativeBuildInputs = [ autoconf perl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch new file mode 100644 index 000000000000..874809863523 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch @@ -0,0 +1,29 @@ +@@ -, +, @@ +--- + bfd/elf32-arm.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) +--- a/bfd/elf32-arm.c ++++ a/bfd/elf32-arm.c +@@ -15398,7 +15398,11 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, + linker to copy the initial value out of the dynamic object and into + the runtime process image. We need to remember the offset into the + .rel(a).bss section we are going to use. */ +- if ((h->root.u.def.section->flags & SEC_READONLY) != 0) ++ if (info->nocopyreloc == 0 ++ && (h->root.u.def.section->flags & SEC_ALLOC) != 0 ++ /* PR 16177: A copy is only needed if the input section is readonly. */ ++ && (h->root.u.def.section->flags & SEC_READONLY) != 0 ++ && h->size != 0) + { + s = globals->root.sdynrelro; + srel = globals->root.sreldynrelro; +@@ -15410,6 +15414,8 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, + } + if (info->nocopyreloc == 0 + && (h->root.u.def.section->flags & SEC_ALLOC) != 0 ++ /* PR 16177: A copy is only needed if the input section is readonly. */ ++ && (h->root.u.def.section->flags & SEC_READONLY) != 0 + && h->size != 0) + { + elf32_arm_allocate_dynrelocs (info, srel, 1); + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index b352e63a27cc..978ec3f2f99f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -8,6 +8,7 @@ , bison ? null , flex , texinfo +, perl }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -21,7 +22,10 @@ let # Remove gold-symbol-visibility patch when updating, the proper fix # is now upstream. # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 - version = "2.31.1"; + version = "${minorVersion}${patchVersion}"; + minorVersion = if stdenv.targetPlatform.isOr1k then "2.34" else "2.31"; + patchVersion = if stdenv.targetPlatform.isOr1k then "" else ".1"; + basename = "binutils"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. @@ -33,33 +37,49 @@ let rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36"; sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63"; }; - # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM - normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { + + # binutils sources not part of the bootstrap. + non-boot-src = (fetchurl { url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; - sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; + sha256 = { + "2.31.1" = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; + "2.34" = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49"; + }.${version}; }); + + # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM + normal-src = stdenv.__bootPackages.binutils-unwrapped.src or non-boot-src; + + # Platforms where we directly use the final source. + # Generally for cross-compiled platforms, where the boot source won't compile. + skipBootSrc = stdenv.targetPlatform.isOr1k; + + # Select the specific source according to the platform in use. + src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src + else if skipBootSrc then non-boot-src + else normal-src; + + patchesDir = ./patches + "/${minorVersion}"; in stdenv.mkDerivation { pname = targetPrefix + basename; - inherit version; - - src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src else normal-src; + inherit src version; patches = [ # Make binutils output deterministic by default. - ./deterministic.patch + "${patchesDir}/deterministic.patch" # Bfd looks in BINDIR/../lib for some plugins that don't # exist. This is pointless (since users can't install plugins # there) and causes a cycle between the lib and bin outputs, so # get rid of it. - ./no-plugins.patch + "${patchesDir}/no-plugins.patch" # Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and # elf32-littlearm-vxworks in favor of the first. # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766 - ./disambiguate-arm-targets.patch + "${patchesDir}/disambiguate-arm-targets.patch" # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's # not clear why this behavior was decided upon but it has the unfortunate @@ -67,25 +87,38 @@ stdenv.mkDerivation { # shared objects when cross-compiling. Consequently, we are forced to # override this behavior, forcing ld to search DT_RPATH even when # cross-compiling. - ./always-search-rpath.patch - - ] ++ lib.optionals (!stdenv.targetPlatform.isVc4) - [ + "${patchesDir}/always-search-rpath.patch" + ] + # For version 2.31 exclusively + ++ lib.optionals (!stdenv.targetPlatform.isVc4 && minorVersion == "2.31") [ # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 - ./gold-symbol-visibility.patch + ./patches/2.31/gold-symbol-visibility.patch # https://sourceware.org/bugzilla/show_bug.cgi?id=23428 # un-break features so linking against musl doesn't produce crash-only binaries - ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch - ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch - ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch - ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; + ./patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch + ./patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch + ./patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch + ] + ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch + ++ # This patch was suggested by Nick Clifton to fix + # https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + # It can be removed when that 7-year-old bug is closed. + # This binutils bug causes GHC to emit broken binaries on armv7, and + # indeed GHC will refuse to compile with a binutils suffering from it. See + # this comment for more information: + # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 + lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch + ; outputs = [ "out" "info" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison + ] ++ lib.optionals (lib.versionAtLeast version "2.34") [ + perl + texinfo ] ++ (lib.optionals stdenv.targetPlatform.isiOS [ autoreconfHook ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ texinfo flex ]; @@ -149,7 +182,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; passthru = { - inherit targetPrefix; + inherit targetPrefix patchesDir; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch index 5a047b0f0703..5a047b0f0703 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch index ca50d9a57cd1..ca50d9a57cd1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch index 866d6db8ce24..866d6db8ce24 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/always-search-rpath.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/always-search-rpath.patch index 2e9956e6b6e4..2e9956e6b6e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/always-search-rpath.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/always-search-rpath.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/build-components-separately.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch index d3cd0d2131cc..d3cd0d2131cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/build-components-separately.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/deterministic.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/deterministic.patch index 736e0aca6ce1..736e0aca6ce1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/deterministic.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/deterministic.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/disambiguate-arm-targets.patch index abbfa73da05d..abbfa73da05d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/disambiguate-arm-targets.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch index 0fb05a482d1c..0fb05a482d1c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch index 9624b7976b70..9624b7976b70 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch new file mode 100644 index 000000000000..2e9956e6b6e4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch @@ -0,0 +1,14 @@ +diff --git a/ld/genscripts.sh b/ld/genscripts.sh +index b6940d376d..0feb1adfd0 100755 +--- a/ld/genscripts.sh ++++ b/ld/genscripts.sh +@@ -125,6 +125,9 @@ if test "x$NATIVE" = "xyes" ; then + USE_LIBPATH=yes + fi + ++# TODO: why is this needed? ++USE_LIBPATH=yes ++ + # Set the library search path, for libraries named by -lfoo. + # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used. + # Otherwise, the default is set here. diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch new file mode 100644 index 000000000000..38fa4934a28a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch @@ -0,0 +1,164 @@ +diff --git a/bfd/configure.ac b/bfd/configure.ac +index c5bfbd5d..45ad4c26 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -278,31 +278,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, + + LT_LIB_M + +-# When building a shared libbfd, link against the pic version of libiberty +-# so that apps that use libbfd won't need libiberty just to satisfy any +-# libbfd references. +-# We can't do that if a pic libiberty is unavailable since including non-pic +-# code would insert text relocations into libbfd. + SHARED_LIBADD= +-SHARED_LDFLAGS= ++SHARED_LDFLAGS=-liberty + if test "$enable_shared" = "yes"; then +-changequote(,)dnl +- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` +-changequote([,])dnl +- if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" +- fi +- + case "${host}" in + # More hacks to build DLLs on Windows. + *-*-cygwin*) + SHARED_LDFLAGS="-no-undefined" +- SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32" ++ SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32" + ;; + + # Use built-in libintl on macOS, since it is not provided by libc. + *-*-darwin*) +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" ++ SHARED_LIBADD="-liberty -lintl" + ;; + esac + +diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am +index 4f06074a..6836c589 100644 +--- a/opcodes/Makefile.am ++++ b/opcodes/Makefile.am +@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) + endif + + # This is where bfd.h lives. +-BFD_H = ../bfd/bfd.h ++BFD_H = $(BFDDIR)/bfd.h + + BUILD_LIBS = @BUILD_LIBS@ + BUILD_LIB_DEPS = @BUILD_LIB_DEPS@ +@@ -301,7 +301,7 @@ OFILES = @BFD_MACHINES@ + # development.sh is used to determine -Werror default. + CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh + +-AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ ++AM_CPPFLAGS = -I. -I$(srcdir) -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ + + disassemble.lo: disassemble.c + if am__fastdepCC +@@ -322,12 +322,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c + # old version of libbfd, or to pick up libbfd for the wrong architecture + # if host != build. So for building with shared libraries we use a + # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la. +-libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ ++libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libtool-soversion + libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@ +-libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@ ++libopcodes_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@ + # Allow dependency tracking to work on all the source files. + EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES) + ++libtool-soversion: ++ @echo "creating $@" ++ bfd_soversion="$(VERSION)" ;\ ++ . $(BFDDIR)/development.sh ;\ ++ if test "$$development" = true ; then \ ++ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ ++ fi ;\ ++ echo "$${bfd_soversion}" > $@ ++ + # libtool will build .libs/libopcodes.a. We create libopcodes.a in + # the build directory so that we don't have to convert all the + # programs that use libopcodes.a simultaneously. This is a hack which +diff --git a/opcodes/configure.ac b/opcodes/configure.ac +index 00be9c88..6e589ae4 100644 +--- a/opcodes/configure.ac ++++ b/opcodes/configure.ac +@@ -86,6 +86,7 @@ AC_PROG_INSTALL + + AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h) + ACX_HEADER_STRING ++GCC_HEADER_STDINT(bfd_stdint.h) + + AC_CHECK_DECLS([basename, stpcpy]) + +@@ -137,61 +138,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, + + LT_LIB_M + +-#Libs for generator progs +-if test "x$cross_compiling" = "xno"; then +- BUILD_LIBS=../libiberty/libiberty.a +- BUILD_LIB_DEPS=$BUILD_LIBS +-else +- # if cross-compiling, assume that the system provides -liberty +- # and that the version is compatible with new headers. +- BUILD_LIBS=-liberty +- BUILD_LIB_DEPS= +-fi +-BUILD_LIBS="$BUILD_LIBS $LIBINTL" +-BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP" ++BUILD_LIBS="-liberty $LIBINTL" ++BUILD_LIB_DEPS="$LIBINTL_DEP" + + AC_SUBST(BUILD_LIBS) + AC_SUBST(BUILD_LIB_DEPS) + + # Horrible hacks to build DLLs on Windows and a shared library elsewhere. + SHARED_LDFLAGS= +-SHARED_LIBADD= ++SHARED_LIBADD=-liberty + SHARED_DEPENDENCIES= + if test "$enable_shared" = "yes"; then +-# When building a shared libopcodes, link against the pic version of libiberty +-# so that apps that use libopcodes won't need libiberty just to satisfy any +-# libopcodes references. +-# We can't do that if a pic libiberty is unavailable since including non-pic +-# code would insert text relocations into libopcodes. + # Note that linking against libbfd as we do here, which is itself linked + # against libiberty, may not satisfy all the libopcodes libiberty references + # since libbfd may not pull in the entirety of libiberty. +-changequote(,)dnl +- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` +-changequote([,])dnl +- if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" +- fi +- + case "${host}" in + *-*-cygwin*) + SHARED_LDFLAGS="-no-undefined" +- SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin" ++ SHARED_LIBADD="-lbfd -liberty -lintl -lcygwin" + ;; +- *-*-darwin*) +- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}" +- SHARED_DEPENDENCIES="../bfd/libbfd.la" +- ;; + *) +- case "$host_vendor" in +- hp) +- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}" +- ;; +- *) +- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so ${SHARED_LIBADD}" +- ;; +- esac +- SHARED_DEPENDENCIES="../bfd/libbfd.la" ++ SHARED_LIBADD="-lbfd ${SHARED_LIBADD}" + ;; + esac + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch new file mode 100644 index 000000000000..736e0aca6ce1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch @@ -0,0 +1,12 @@ +diff -ur orig/binutils-2.23.1/ld/ldlang.c binutils-2.23.1/ld/ldlang.c +--- orig/ld/ldlang.c ++++ new/ld/ldlang.c +@@ -3095,6 +3095,8 @@ + ldfile_output_machine)) + einfo (_("%P%F:%s: can not set architecture: %E\n"), name); + ++ link_info.output_bfd->flags |= BFD_DETERMINISTIC_OUTPUT; ++ + link_info.hash = bfd_link_hash_table_create (link_info.output_bfd); + if (link_info.hash == NULL) + einfo (_("%P%F: can not create hash table: %E\n")); diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch new file mode 100644 index 000000000000..abbfa73da05d --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch @@ -0,0 +1,23 @@ +diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c +index 9f956d3..f5b61f1 100644 +--- a/bfd/elf32-arm.c ++++ b/bfd/elf32-arm.c +@@ -19585,7 +19585,10 @@ elf32_arm_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker) + #undef ELF_MAXPAGESIZE + #define ELF_MAXPAGESIZE 0x1000 + ++/* Prioritize elf32-*arm (priority 1) over elf32-*arm-vxworks (priority 2) */ ++#define elf_match_priority 2 + #include "elf32-target.h" ++#undef elf_match_priority + + + /* Merge backend specific data from an object file to the output +@@ -19974,4 +19977,7 @@ elf32_arm_symbian_plt_sym_val (bfd_vma i, const asection *plt, + #undef ELF_MAXPAGESIZE + #define ELF_MAXPAGESIZE 0x8000 + ++/* Prioritize elf32-*arm (priority 1) over elf32-*arm-symbian (priority 2) */ ++#define elf_match_priority 2 + #include "elf32-target.h" ++#undef elf_match_priority diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch new file mode 100644 index 000000000000..68cf51b7dd3c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch @@ -0,0 +1,21 @@ +diff --git a/bfd/plugin.c b/bfd/plugin.c +index 537ab60311..bfe7957f96 100644 +--- a/bfd/plugin.c ++++ b/bfd/plugin.c +@@ -386,6 +386,7 @@ load_plugin (bfd *abfd) + if (plugin_program_name == NULL) + return found; + ++#if 0 + /* Try not to search the same dir twice, by looking at st_dev and + st_ino for the dir. If we are on a file system that always sets + st_ino to zero or the actual st_ino is zero we might waste some +@@ -437,7 +438,7 @@ load_plugin (bfd *abfd) + if (found) + break; + } +- ++#endif + return found; + } + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 08496d9f5202..27e043a9ac49 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire-agent"; - version = "1.44.1"; + version = "1.44.2"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb"; - sha256 = "1p00flipm5x6r36gblfrfrd14byipilybrhfzv8rzpahz2b7r5hb"; + sha256 = "1bam4sb0yhxciykph7wn41zs8fa7c9iwnbihd5kza0cylbb7fbkb"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 5de2a05349a6..97b5f9ed82c5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,14 +14,15 @@ let soFile = { "7.3" = "blackfire-20180731"; "7.4" = "blackfire-20190902"; + "8.0" = "blackfire-20200930"; }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.41.0"; + version = "1.46.4"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "0vbl48bccswk9ygb4sshn24cl33fk0xg8d1bcg7ihvdc45any9ww"; + sha256 = "1p46zi1hh9calkcfgqz60c6rdi9i7i16ylj84iibi6k0pc690fjy"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index e0a6a8065b5a..f9254b2cf15e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -1,23 +1,46 @@ -{ stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoreconfHook, zlib, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, binutils +, asciidoc +, cmake +, perl +, zstd +, xcodebuild +, makeWrapper +}: let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "3.7.11"; + version = "4.1"; src = fetchFromGitHub { - owner = "ccache"; - repo = "ccache"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "03c6riz4vb0jipplk69c1j8arjjrjn676kglsrzqf8cidrh8j91c"; + sha256 = "1az11q3wmr8wc7alx9l70wq9am41cm0y17g5gsaqmahws3dxfi8m"; }; - nativeBuildInputs = [ asciidoc-full autoreconfHook gperf perl ]; + patches = lib.optional stdenv.isDarwin (substituteAll { + src = ./force-objdump-on-darwin.patch; + objdump = "${binutils.bintools}/bin/objdump"; + }); - buildInputs = [ zlib ]; + nativeBuildInputs = [ asciidoc cmake perl ]; + + buildInputs = [ zstd ]; outputs = [ "out" "man" ]; - doCheck = !stdenv.isDarwin; + doCheck = true; + checkInputs = lib.optional stdenv.isDarwin xcodebuild; + checkPhase = '' + export HOME=$(mktemp -d) + ctest --output-on-failure ${lib.optionalString stdenv.isDarwin '' + -E '^(test.nocpp2|test.modules)$' + ''} + ''; passthru = { # A derivation that provides gcc and g++ commands, but that @@ -63,9 +86,10 @@ let ccache = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiler cache for fast recompilation of C/C++ code"; - homepage = "https://ccache.dev/"; + homepage = "https://ccache.dev"; downloadPage = "https://ccache.dev/download.html"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ metadark r-burns ]; platforms = platforms.unix; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch new file mode 100644 index 000000000000..81a4f27ab736 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch @@ -0,0 +1,31 @@ +diff --git a/test/run b/test/run +index 9623e49d..3df1c5a8 100755 +--- a/test/run ++++ b/test/run +@@ -126,23 +126,17 @@ file_size() { + objdump_cmd() { + local file="$1" + +- if $HOST_OS_APPLE; then +- xcrun dwarfdump -r 0 "$file" +- elif $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then ++ if $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then + # For some reason objdump only shows the basename of the file, so fall + # back to brute force and ignorance. + strings "$1" + else +- objdump -W "$file" ++ @objdump@ -W "$file" + fi + } + + objdump_grep_cmd() { +- if $HOST_OS_APPLE; then +- fgrep -q "\"$1\"" +- else +- fgrep -q ": $1" +- fi ++ fgrep -q ": $1" + } + + expect_stat() { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index ba57ef561f3e..16365a462a94 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20190823.6"; + version = "0.20201025"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f"; + sha256 = "13v00q1bz8g0ckw1sv0zyicbc44irc00vhwxdv3vvwlvylm7s21p"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index b434358e1d20..ac8a4c8bb7c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.9454"; + version = "0.1.11508"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0ld7lb69wmhyrpqjaj1pddx93x529qk2fzyrwlipglwn3mbala5a"; + sha256 = "1m0jy7h9mksgj85r4jcpb5nabcs9vrfbrky31acwbibzjxxw9afg"; }; - vendorSha256 = "1zd95n9k2fags0qh3wvjinxv1ahygr958mmiax2kz117yipaz4rb"; + vendorSha256 = "15l9f87vgspdsxhwqdm56z3dvrspc8k1bbyvhhhnvqf3fkiki2bw"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cli11/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cli11/default.nix index 0d058ef1f881..25ec42eac8e0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cli11/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cli11/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "CLI11 is a command line parser for C++11"; + description = "Command line parser for C++11"; homepage = "https://github.com/CLIUtils/CLI11"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index 65f12bfbb098..1641df1562a8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200828T065654"; + version = "20201009T224414"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "1399xjcnnb7vazy1jv3h7lnh1dyn81yk2bwi6ai991a9fsinjnf2"; + sha256 = "1az87b4cq6yyibs4knd0ywd0qfgmfzai4bqry4b7h2ycnfhfxdpa"; }; dontUnpack = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cproto/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cproto/default.nix index ef0e2cab7771..e18196fe595f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cproto/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cproto/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "cproto"; - version = "4.7p"; + version = "4.7q"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # No version listings and apparently no versioned tarball over http(s). "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz" ]; - sha256 = "0vm1784yw8gax1r7bzgq0chjgfzwxvmkala2awghmd3zyi7k60nj"; + sha256 = "138n5j6lkanbbdcs63irzxny4nfgp0zk66z621xjbnybf920svpk"; }; # patch made by Joe Khoobyar copied from gentoo bugs diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/creduce/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/creduce/default.nix index 943adf0e469b..fc6f7156a81b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/creduce/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/creduce/default.nix @@ -3,7 +3,7 @@ , flex , zlib , perlPackages -, utillinux +, util-linux }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # so let's make sure it knows where to find it: postPatch = stdenv.lib.optionalString stdenv.isLinux '' substituteInPlace creduce/creduce_utils.pm --replace \ - lscpu ${utillinux}/bin/lscpu + lscpu ${util-linux}/bin/lscpu ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix index ecd40f20fd4c..9af9ddc0df7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dfu-util"; - version = "0.9"; + version = "0.10"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 ]; src = fetchurl { url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; - sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin"; + sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix index 3975ad3511fb..401bbdbee6ef 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; - rev = "${version}"; - sha256 = "09v8gqwcaay3bqbidparmg20dy0mvlrzh34591hanbrx3cwhrz3f"; + rev = version; + sha256 = "18gz94h2x1z6g6r7v9cdixkbcaigd7cl08af6smlkaa89j0aki32"; }; - vendorSha256 = "132blcdw3lywxhqslkcpwwvkzl4cpbbkhb7ba8mrvfgl5kvfm1q0"; + vendorSha256 = "1z4j8vm9mnhjhhmhlj0ycs8b1wpm7lhsfqjnk7w8gfapvj3yfk6h"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix index e15e48b0f2a9..e5cd2e0e2ddf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kost"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index a4806634432d..d9bac6e3c83c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -26,11 +26,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename; - version = "9.2"; + version = "10.1"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - sha256 = "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"; + sha256 = "1h32dckz1y8fnyxh22iyw8h3hnhxr79v1ng85px3ljn1xv71wbzq"; }; postPatch = if stdenv.isDarwin then '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix index 114a7530f271..0a3b0b1c7508 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { }; doCheck = true; + # attempts to open non-existent file + preCheck = '' + rm tests/test_conf_parser_save.sh + ''; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix index 6cd439a898b8..10ecd8174af4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix @@ -2,16 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "hydra-cli"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "nlewo"; repo = pname; rev = "v${version}"; - sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc"; + sha256 = "1fd3swdjx249971ak1bgndm5kh6rlzbfywmydn122lhfi6ry6a03"; }; - - cargoSha256 = "1sj80a99iakxxa698gggiszsrxwlwhr2sx4wmsni0cshx6z2x6za"; + cargoSha256 = "1fjzcgayyha270bdxl5p6c337nq8zj4h81rk4ih9czyz3yaxga3f"; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix index 4e9daab9bf1c..4af9fe045874 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix @@ -66,6 +66,7 @@ let TextDiff TextTable XMLSimple + YAML nix nix.perl-bindings git diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index a6b0383d54f7..7aa1e05a88e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -1,40 +1,17 @@ { fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }: { - # Package for phase-1 of the db migration for Hydra. - # https://github.com/NixOS/hydra/pull/711 - hydra-migration = callPackage ./common.nix { - version = "2020-02-10"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "hydra"; - rev = "add4f610ce6f206fb44702b5a894d877b3a30e3a"; - sha256 = "1d8hdgjx2ys0zmixi2ydmimdq7ml20h1ji4amwawcyw59kssh6l3"; - }; - nix = nixStable; - migration = true; - - tests = { - db-migration = nixosTests.hydra-db-migration.mig; - basic = nixosTests.hydra.hydra-migration; - }; - }; - - # Hydra from latest master branch. Contains breaking changes, - # so when having an older version, `pkgs.hydra-migration` should be deployed first. - hydra-unstable = callPackage ./common.nix { - version = "2020-09-02"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "e707990e2d6afab203c7ef1d769d49c564eff151"; - sha256 = "0iilf953f6s58szzyd1hzc9b2b2yw8lhbsb8xrb08szpfz7ifwqa"; + rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c"; + sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj"; }; nix = nixFlakes; tests = { - db-migration = nixosTests.hydra-db-migration.mig; basic = nixosTests.hydra.hydra-unstable; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/iozone/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/iozone/default.nix index e6beeca1d727..93e2673be63a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/iozone/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/iozone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnuplot }: +{ stdenv, lib, fetchurl, gnuplot }: let target = if stdenv.hostPlatform.system == "i686-linux" then @@ -13,11 +13,12 @@ let in stdenv.mkDerivation rec { - name = "iozone-3.471"; + pname = "iozone"; + version = "3.490"; src = fetchurl { - url = "http://www.iozone.org/src/current/iozone3_471.tar"; - sha256 = "0w63b3d4ws1sm52lpdd08sl7n4ay438dl3wy0q9la12iq81rglid"; + url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings ["."] ["_"] version}.tar"; + sha256 = "1vagmm2k2bzlpahl2a2arpfmk3cd5nzhxi842a8mdag2b8iv9bay"; }; license = fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix index 6fb256951115..a121cc670993 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ hh sb0 ]; }; -}
\ No newline at end of file +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/lsof/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/lsof/default.nix index 274577c4a4c5..e5988b1d5a9a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/lsof/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/lsof/default.nix @@ -4,7 +4,7 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system) stdenv.mkDerivation rec { pname = "lsof"; - version = "4.93.2"; + version = "4.94.0"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "lsof-org"; repo = "lsof"; rev = version; - sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv"; + sha256 = "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp"; }; patches = [ ./no-build-info.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix index 103c534dfa3d..5008175363cb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, makeWrapper, fetchFromGitHub, cctools }: stdenv.mkDerivation { pname = "macdylibbundler"; @@ -11,8 +11,15 @@ stdenv.mkDerivation { sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; }; + buildInputs = [ makeWrapper ]; + makeFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/dylibbundler \ + --prefix PATH ":" "${cctools}/bin" + ''; + meta = with stdenv.lib; { description = "Utility to ease bundling libraries into executables for OSX"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock index 04268d3306c2..0e5b7b016722 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -1,15 +1,24 @@ GEM remote: https://rubygems.org/ specs: - kramdown (1.17.0) - mdl (0.5.0) - kramdown (~> 1.12, >= 1.12.0) - mixlib-cli (~> 1.7, >= 1.7.0) - mixlib-config (~> 2.2, >= 2.2.1) - mixlib-cli (1.7.0) - mixlib-config (2.2.18) + chef-utils (16.7.61) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + mdl (0.11.0) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.1) + mixlib-cli (~> 2.1, >= 2.1.1) + mixlib-config (>= 2.2.1, < 4) + mixlib-shellout + mixlib-cli (2.1.8) + mixlib-config (3.0.9) tomlrb - tomlrb (1.2.8) + mixlib-shellout (3.2.2) + chef-utils + rexml (3.2.4) + tomlrb (2.0.0) PLATFORMS ruby diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix index 6d48be1cbcb0..f2d332a95bb8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix @@ -1,34 +1,56 @@ { + chef-utils = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14xd2md3cda42afl28hr5q4ng195zmqfn04w2bxr4s2fb0gglbrz"; + type = "gem"; + }; + version = "16.7.61"; + }; kramdown = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; + type = "gem"; + }; + version = "2.3.0"; + }; + kramdown-parser-gfm = { + dependencies = ["kramdown"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; type = "gem"; }; - version = "1.17.0"; + version = "1.1.0"; }; mdl = { - dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; + dependencies = ["kramdown" "kramdown-parser-gfm" "mixlib-cli" "mixlib-config" "mixlib-shellout"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; + sha256 = "0vgzq6v2scd8n4cmx8rrypqmchnhg4wccrhiakg2i8fzv7wxplqq"; type = "gem"; }; - version = "0.5.0"; + version = "0.11.0"; }; mixlib-cli = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; + sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6"; type = "gem"; }; - version = "1.7.0"; + version = "2.1.8"; }; mixlib-config = { dependencies = ["tomlrb"]; @@ -36,19 +58,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; + sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; + type = "gem"; + }; + version = "3.0.9"; + }; + mixlib-shellout = { + dependencies = ["chef-utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9"; + type = "gem"; + }; + version = "3.2.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; type = "gem"; }; - version = "2.2.18"; + version = "3.2.4"; }; tomlrb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; + sha256 = "0ssyvjcvaisv70f21arlmnw5a1ryzmxzz4538vdwfslz9xxl27sr"; type = "gem"; }; - version = "1.2.8"; + version = "2.0.0"; }; }
\ No newline at end of file diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix index ec4042a2a276..0f110ae0b082 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "mkcert"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; rev = "v${version}"; - sha256 = "0w1ji96hbd3anzsz82xjcafsqhgyz7c7n41rsq60yrllwbj5946f"; + sha256 = "0q0069ripnpb027krc4yk47552xl5rp0ymxf1j2mln9wdmfq65ba"; }; - vendorSha256 = "0b8ggdpbyxx5n2myhchhlwmm5nndwpykp1ylnzdyw12mdskfvn9h"; + vendorSha256 = "133vlx825g4zay88ppylsz93q4gnd9ari12x1h57qvk45rwxqx95"; doCheck = false; buildFlagsArray = '' - -ldflags=-X main.Version=v${version} + -ldflags=-s -w -X main.Version=v${version} ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix index eca2dc966624..7886c7c450ac 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nix-build-uncached"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-build-uncached"; rev = "v${version}"; - sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02"; + sha256 = "1v9xyv0hhvfw61k4pbgzrlgy7igl619cangi40fkh7gdvs01dxz4"; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix index 47212e9967d0..5c8e95f7fd4b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix @@ -1,18 +1,27 @@ -{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }: +{ stdenv +, lib +, fetchgit +, autoreconfHook +, pkg-config +, hidapi +, libftdi1 +, libusb1 +}: stdenv.mkDerivation rec { pname = "openocd"; - version = "2020-09-02"; + version = "unstable-2020-11-11"; src = fetchgit { url = "https://git.code.sf.net/p/openocd/code"; - rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3"; - sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9"; + rev = "06c7a53f1fff20bcc4be9e63f83ae98664777f34"; + sha256 = "0g0w7g94r88ylfpwswnhh8czlf5iqvd991ssn4gfcfd725lpdb01"; fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ libftdi1 libusb1 hidapi ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ hidapi libftdi1 libusb1 ]; configureFlags = [ "--enable-jtag_vpi" @@ -29,6 +38,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=cpp" + "-Wno-error=strict-prototypes" # fixes build failure with hidapi 0.10.0 ]; postInstall = lib.optionalString stdenv.isLinux '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix index de8a113d1011..fccee0ede2b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1xi5dfdy66qa6xvy60fk2lmp9gxyi0nfkyvybcazn8mrd99hfh6l"; + sha256 = "0n7hk3va25ym8sb900i1s1hjszgwrfl7gfsjbj1m330fidh3q6jc"; }; - vendorSha256 = "0cxi01jxg89lsk91dv782746i8g9ksanx8igmgafq9vq25lld7yg"; + vendorSha256 = "0xscirzi0gqww33ngwh29jiylarj0w5snn9kvv43wfrphb6c79s5"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/scc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/scc/default.nix index 8a6a1471d0a4..5fc23547615a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/scc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/scc/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/boyter/scc"; description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go"; - maintainers = with maintainers; [ sigma filalex77 ]; + maintainers = with maintainers; [ sigma Br1ght0ne ]; license = with licenses; [ unlicense /* or */ mit ]; platforms = platforms.unix; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stlink/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stlink/default.nix index 7793d9185e75..7595b84721cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stlink/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stlink/default.nix @@ -5,7 +5,7 @@ let libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; # IMPORTANT: You need permissions to access the stlink usb devices. -# Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix +# Add services.udev.packages = [ pkgs.stlink ] to your configuration.nix in stdenv.mkDerivation rec { pname = "stlink"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix index 80549d8848f3..9fe34aecade2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix @@ -1,7 +1,7 @@ { stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }: let - version = "5.6.1"; + version = "6.0.1"; desktopItem = makeDesktopItem { name = "stm32CubeMX"; exec = "stm32cubemx"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "1y4a340wcjl88kjw1f1x85ffp4b5g1psryn9mgkd717w2bfpf29l"; + sha256 = "15vxca1pgpgxgiz4wisrw0lylffdwnn4n46z9n0q37f8hmzlrk8f"; stripRoot= false; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { microcontrollers and microprocessors, as well as the generation of the corresponding initialization C code for the Arm® Cortex®-M core or a partial Linux® Device Tree for Arm® Cortex®-A core), through a - step-by-step process. + step-by-step process. ''; homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; license = licenses.unfree; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix index 75b0113b4977..853a240ffc35 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; + description = "An interface compiler that connects C/C++ code to higher-level languages"; homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix index 6ff0dd77aae2..47c9c15a0cc7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.8"; + version = "0.8.10"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "1lzf30vpa0blbkz4ngnhrn3hpbqflqd4sni4bly9yqh4fnc44nvi"; + sha256 = "005i66d2gkyixqh9sk452la7z86d5x9q3njngjf4z9slcbpgk7bl"; }; - vendorSha256 = "087448wkaw6jxv9d26hck4w3vdh06vcgywna6ydkqvxr0hp011b6"; + vendorSha256 = "02i1q11nivdlkhf9chpi03p8jpa0fx9wbf79j834qv4fqy7jqf6l"; subPackages = [ "." ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix index 731ac836412a..18926a85528c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, makeWrapper -, libusb1, tcl, utillinux, coreutils, bash }: +, libusb1, tcl, util-linux, coreutils, bash }: stdenv.mkDerivation rec { pname = "usb-modeswitch"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/usb_modeswitch_dispatcher \ - --set PATH ${lib.makeBinPath [ utillinux coreutils bash ]} + --set PATH ${lib.makeBinPath [ util-linux coreutils bash ]} ''; buildInputs = [ libusb1 tcl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix index 02298d93b8af..4bbff3ca33f8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation { sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost llvmPackages.libclang ] - ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames Cocoa ]; + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin Cocoa; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/yodl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/yodl/default.nix index 758bebb57df8..6bb7e1377af3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/yodl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/yodl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, perl, icmake, utillinux }: +{ stdenv, fetchFromGitLab, perl, icmake, util-linux }: stdenv.mkDerivation rec { pname = "yodl"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patchShebangs scripts/ substituteInPlace INSTALL.im --replace /usr $out substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl - substituteInPlace scripts/yodl2whatever.in --replace getopt ${utillinux}/bin/getopt + substituteInPlace scripts/yodl2whatever.in --replace getopt ${util-linux}/bin/getopt ''; # Set TERM because icmbuild calls tput. |