diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc')
8 files changed, 17 insertions, 123 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/complgen/default.nix b/nixpkgs/pkgs/development/tools/misc/complgen/default.nix index 81cf9c120edd..6c0cdb3c5bb1 100644 --- a/nixpkgs/pkgs/development/tools/misc/complgen/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/complgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "complgen"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; rev = "v${version}"; - hash = "sha256-FetiopX4k58JQP67zTh0ssy1HFJHmi0Op9h9vjH1pLE="; + hash = "sha256-B7ydYz9nui3B/IC3obVTiJZvzTD/lCQyf+tREwFJERg="; }; - cargoHash = "sha256-2EJuxoed+6LGpxxqkdFxbntilA2SihQScliUFYgjYmU="; + cargoHash = "sha256-CXvaGrE4sQlc7K6FVQqGU8EKPfHr8EIV5YFq+VMoBWg="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/nixpkgs/pkgs/development/tools/misc/cvise/default.nix b/nixpkgs/pkgs/development/tools/misc/cvise/default.nix index 56bd85b77218..f65b0386cfd8 100644 --- a/nixpkgs/pkgs/development/tools/misc/cvise/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cvise/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub +, fetchpatch , bash , cmake , colordiff @@ -29,6 +30,14 @@ buildPythonApplication rec { patches = [ # Refer to unifdef by absolute path. ./unifdef.patch + + # Refer to shell via /usr/bin/env: + # https://github.com/marxin/cvise/pull/121 + (fetchpatch { + name = "env-shell.patch"; + url = "https://github.com/marxin/cvise/commit/6a416eb590be978a2ad25c610974fdde84e88651.patch"; + hash = "sha256-Kn6+TXP+wJpMs6jrgsa9OwjXf6vmIgGzny8jg3dfKWA="; + }) ]; postPatch = '' @@ -37,10 +46,6 @@ buildPythonApplication rec { substituteInPlace CMakeLists.txt \ --replace " -Werror " " " - # 'cvise --command=...' generates a script with hardcoded shebang. - substituteInPlace cvise.py \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" - substituteInPlace cvise/utils/testing.py \ --replace "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \ --replace "'colordiff'" "'${colordiff}/bin/colordiff'" diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/crypt-passphrase-argon2-fix-output-len.patch b/nixpkgs/pkgs/development/tools/misc/hydra/crypt-passphrase-argon2-fix-output-len.patch deleted file mode 100644 index 0c8e6ae434d6..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/hydra/crypt-passphrase-argon2-fix-output-len.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6a5fb9efaea35ca29836371307f5083576f421ab Mon Sep 17 00:00:00 2001 -From: Stig Palmquist <git@stig.io> -Date: Fri, 20 Oct 2023 00:09:28 +0200 -Subject: [PATCH] Set output length of C::P::Argon2 hashes to 16 - -Since the default lengths in Crypt::Passphrase::Argon2 changed from 16 -to 32 in in 0.009, some tests that expected the passphrase to be -unchanged started failing. ---- - src/lib/Hydra/Schema/Result/Users.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/Hydra/Schema/Result/Users.pm b/src/lib/Hydra/Schema/Result/Users.pm -index b3de6543..c28ae931 100644 ---- a/src/lib/Hydra/Schema/Result/Users.pm -+++ b/src/lib/Hydra/Schema/Result/Users.pm -@@ -216,7 +216,7 @@ sub json_hint { - - sub _authenticator() { - my $authenticator = Crypt::Passphrase->new( -- encoder => 'Argon2', -+ encoder => { module => 'Argon2', output_size => 16 }, - validators => [ - (sub { - my ($password, $hash) = @_; --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix b/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix index 26102f36daf0..02774ac41058 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix +++ b/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix @@ -205,10 +205,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ - ./crypt-passphrase-argon2-fix-output-len.patch - ]; - postPatch = '' # Change 5s timeout for init to 30s substituteInPlace t/lib/HydraTestContext.pm \ diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix deleted file mode 100644 index a4faa31a4214..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ elk7Version -, enableUnfree ? true -, lib -, stdenv -, makeWrapper -, fetchurl -, nodejs_16 -, coreutils -, which -}: - -let - nodejs = nodejs_16; - inherit (builtins) elemAt; - info = lib.splitString "-" stdenv.hostPlatform.system; - arch = elemAt info 0; - plat = elemAt info 1; - hashes = - { - x86_64-linux = "sha512-09XokG5krjxGnk34DhxpLOGRLjb2jd82uZtwGfrzSuuqMpBhkEptK2oySGxuGdHF8uowwlR5p5YO2TvBwMsWkQ=="; - x86_64-darwin = "sha512-cqRJnvu730Jfkr6vwbHUFuZube1g522cmvnDwTzhGGK6VN/7+9XL3vavqtUPDVdTLTUk+DrNiIQK7MaJH3SHMg=="; - aarch64-linux = "sha512-zhtYThz5j4+w5gI1JWSnHv709Tk23eegVsrtYmdaYhZiTw2yvCTYI5uNAfBjBr8XPdp6CKF4e6Bh2wHKDYg1mg=="; - aarch64-darwin = "sha512-cqRJnvu730Jfkr6vwbHUFuZube1g522cmvnDwTzhGGK6VN/7+9XL3vavqtUPDVdTLTUk+DrNiIQK7MaJH3SHMg=="; - }; - -in stdenv.mkDerivation rec { - pname = "kibana"; - version = elk7Version; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz"; - hash = hashes.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); - }; - - patches = [ - # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. - # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just - # disable the version check. - ./disable-nodejs-version-check-7.patch - ]; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/libexec/kibana $out/bin - mv * $out/libexec/kibana/ - rm -r $out/libexec/kibana/node - makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}" - sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - ''; - - meta = with lib; { - description = "Visualize logs and time-stamped data"; - homepage = "http://www.elasticsearch.org/overview/kibana"; - license = licenses.elastic20; - maintainers = with maintainers; [ offline basvandijk ]; - platforms = with platforms; unix; - }; -} diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch b/nixpkgs/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch deleted file mode 100644 index ef4c207764c1..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/setup_node_env/node_version_validator.js b/src/setup_node_env/node_version_validator.js -index 3f611e5a..f5c60c85 100644 ---- a/src/setup_node_env/node_version_validator.js -+++ b/src/setup_node_env/node_version_validator.js -@@ -25,11 +25,11 @@ var pkg = require('../../package.json'); // Note: This is written in ES5 so we c - var currentVersion = process && process.version || null; - var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null; - var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion; --var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts. -+var isVersionValid = !!currentVersion && !!requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts. - - if (!isVersionValid) { - var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit. - - console.error(errorMessage); - process.exit(1); --} -\ No newline at end of file -+} diff --git a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix index 138765bb2280..47ae36c77ea9 100644 --- a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.6.0"; + version = "0.7.2"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-/H4QhkWsvq6UvrxuNhRPwlUi/spSYB78h8yUvdCJ2Ws="; + sha256 = "sha256-hup9FM2KEBXRx6NleDGR01C0whJgR1KYyIrcIv2UE80="; }; - cargoSha256 = "sha256-wFkVGKa00WQjk59KSBdOJ9Zfj8MwzC4XOhT9p4yvJM0="; + cargoSha256 = "sha256-Od1uaKZVAZaIDrsNheR1kYIjnmpnThlU7k3EIKdOjzM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix index 6899c590e95f..0929aa5286b0 100644 --- a/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.77.1"; + version = "0.78.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "sha256-9U6PTeU/LVFL9XzP9XSFjDx18CR3athThEz+h2+5qZ8="; + sha256 = "sha256-wuwZFTa8XGMN3dlpdaMYiKvyS3DJMUgqRgaDtj/s7vI="; }; nativeBuildInputs = [ cmake python3 ]; |