diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-05 06:01:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-05 06:01:04 +0000 |
| commit | 0f22335f7dc84912837bc8bfdb7e649f35fea19b (patch) | |
| tree | e44a5683051e92620d003402ecea333708b78255 /pkgs/development | |
| parent | 9b62c8500482f03fc703198058a5d0f58e5ec4b8 (diff) | |
| parent | 0a254180b4cad6be45aa46dce896bdb8db5d2930 (diff) | |
| download | nixlib-0f22335f7dc84912837bc8bfdb7e649f35fea19b.tar nixlib-0f22335f7dc84912837bc8bfdb7e649f35fea19b.tar.gz nixlib-0f22335f7dc84912837bc8bfdb7e649f35fea19b.tar.bz2 nixlib-0f22335f7dc84912837bc8bfdb7e649f35fea19b.tar.lz nixlib-0f22335f7dc84912837bc8bfdb7e649f35fea19b.tar.xz nixlib-0f22335f7dc84912837bc8bfdb7e649f35fea19b.tar.zst nixlib-0f22335f7dc84912837bc8bfdb7e649f35fea19b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/zulu/17.nix | 30 | ||||
| -rw-r--r-- | pkgs/development/libraries/tecla/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/development/python-modules/scikit-hep-testdata/default.nix | 4 |
3 files changed, 17 insertions, 45 deletions
diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix index fcfe39af10ac..74e00df88c68 100644 --- a/pkgs/development/compilers/zulu/17.nix +++ b/pkgs/development/compilers/zulu/17.nix @@ -8,35 +8,35 @@ callPackage ./common.nix ({ # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "17.44.53"; - jdkVersion = "17.0.8.1"; + zuluVersion = "17.48.15"; + jdkVersion = "17.0.10"; hash = - if enableJavaFX then "sha256-R6VJcSjpKFfsO3l32+8s+wlcuAVoXcSsW5Dg2M/hjpI=" - else "sha256-uUgvIwShpophTfrN3PKVaacvD6wy5sdPg9wbmhV7g0A="; + if enableJavaFX then "sha256-YvuD/n84+DARPm+38TxIUB727SIhASFo+WX9+PtJqyw=" + else "sha256-VyhNob2G1Tq/WCKT0g0Y//f+JD2hWgj6QU9idfvUj+I="; }; aarch64-linux = { - zuluVersion = "17.44.53"; - jdkVersion = "17.0.8.1"; + zuluVersion = "17.48.15"; + jdkVersion = "17.0.10"; hash = if enableJavaFX then throw "JavaFX is not available for aarch64-linux" - else "sha256-ZTHO9h5BbVp7aRVVyM8r3/aJIBuKAB/0WrZ0AGK0QxM="; + else "sha256-9OZl8ruaLvjdpg42fC3IM5mC/9lmshCppNfUuz/Sf8E="; }; x86_64-darwin = { - zuluVersion = "17.44.53"; - jdkVersion = "17.0.8.1"; + zuluVersion = "17.48.15"; + jdkVersion = "17.0.10"; hash = - if enableJavaFX then "sha256-9U0XYZRA+LZTQ7eHrT5SWhgcxv43ajC9n9Tj3qPPLWA=" - else "sha256-ZART6K/o/+D7Tc60U1+1DbnCg8ZGZe67C6aLGeZfSx8="; + if enableJavaFX then "sha256-VOIcFtjQiYsA4AiP1TCa0Q76Ew5FdeJCICwsYGU+Dnw=" + else "sha256-huSKGvOnrEUAiE2MJbdHWtF2saeLGaQkZllXzDo8o+g="; }; aarch64-darwin = { - zuluVersion = "17.44.53"; - jdkVersion = "17.0.8.1"; + zuluVersion = "17.48.15"; + jdkVersion = "17.0.10"; hash = - if enableJavaFX then "sha256-udYW3nOADclWqVcVtS9dgjSY0w6xf2nsBpLzPmQCYlI=" - else "sha256-MUsEVo7Arps2ugPJy9Qq3J4SZfdGeJI7GSl9ZuuE3Mo="; + if enableJavaFX then "sha256-fxBDhHMeL5IP4eRw9ykXrRRh7Nl9DnvDB1YLaQwFHLg=" + else "sha256-kuEiHSkb4WFtPB3m0A968LPZw7Wl0sKquhbzDF8vQS8="; }; }; } // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix deleted file mode 100644 index 4c6ec8e01691..000000000000 --- a/pkgs/development/libraries/tecla/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "tecla"; - version = "1.6.3"; - - src = fetchurl { - url = "https://www.astro.caltech.edu/~mcs/tecla/libtecla-${version}.tar.gz"; - sha256 = "06pfq5wa8d25i9bdjkp4xhms5101dsrbg82riz7rz1a0a32pqxgj"; - }; - - postPatch = '' - substituteInPlace install-sh \ - --replace "stripprog=" "stripprog=\$STRIP # " - ''; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - meta = { - description = "Command-line editing library"; - homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; - license = "as-is"; - mainProgram = "enhance"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index aadcf0b6b577..fd4e5100c287 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.37"; + version = "0.4.38"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/zg6B1vBDaHXRSMo+Wy+CuQaBXP7v1hX2X2cK/7Djlk="; + hash = "sha256-/+1eENbpng/X1g108cEGiTZlIkdcqqnm9wyN9ECH5D4="; }; nativeBuildInputs = [ |