diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-01-18 17:56:32 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-01-18 17:56:32 +0100 |
| commit | 8ae7c0e4333357288dc0ce3b6ae2c1685bf11fe0 (patch) | |
| tree | d4746d956ff5582ad756cd77e767ab0587155ec1 /pkgs/development/tools | |
| parent | d7221029b294691c9d939c4bc069bb979a9dcbaf (diff) | |
| parent | 6f16d3a51108ada6a96aae86820d50587925e46e (diff) | |
Merge #279139: staging-next-23.11 iteration 2
...into release-23.11
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/hotdoc/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/jq/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index 6758f1b44e9b2..4f58f961b9f84 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -100,7 +100,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace hotdoc/extensions/c/c_extension.py \ --replace "shutil.which('llvm-config')" 'True' \ - --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${llvmPackages.libclang.version}"' \ + --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${lib.versions.major llvmPackages.libclang.version}"' \ --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${llvmPackages.libclang.lib}"' \ --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${llvmPackages.libclang.lib}/lib"' ''; diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 4a57c0f5a0c3a..432fe6826bd73 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "jq"; - version = "1.7"; + version = "1.7.1"; # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages src = fetchurl { url = "https://github.com/jqlang/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; - hash = "sha256-QCoNaXXZRub05ITRqEMgQUoP+Ots9J0sEdFE1NNE22I="; + hash = "sha256-R4ycoSn9LjRD/icxS0VeIR4NjGC8j/ffcDhz3u7lgMI="; }; outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; |