diff options
Diffstat (limited to 'pkgs/development')
157 files changed, 1529 insertions, 830 deletions
diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix index be79aef0c2446..c557012e8cdb8 100644 --- a/pkgs/development/compilers/corretto/17.nix +++ b/pkgs/development/compilers/corretto/17.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, fetchurl , gradle_7 , jdk17 , lib @@ -9,17 +10,25 @@ }: let - corretto = import ./mk-corretto.nix { + corretto = import ./mk-corretto.nix rec { inherit lib stdenv rsync runCommand testers; jdk = jdk17; gradle = gradle_7; - version = "17.0.8.8.1"; + version = "17.0.11.9.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-17"; - rev = "9a3cc984f76cb5f90598bdb43215bad20e0f7319"; - sha256 = "sha256-/VuB3ocD5VvDqCU7BoTG+fQ0aKvK1TejegRYmswInqQ="; + rev = version; + sha256 = "sha256-LxZSFILFfyh8oBiYEnuBQ0Og2i713qdK2jIiCBnrlj0="; }; }; in -corretto +corretto.overrideAttrs (final: prev: { + # HACK: Removes the FixNullPtrCast patch, as it fails to apply. Need to figure out what causes it to fail to apply. + patches = lib.remove + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; + sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; + }) + (prev.patches or [ ]); +}) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 7e5fd44916b5e..e61a42f4efebb 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3DlsqUBAKF3zgiS26YQY1MzymLg9GnVzH1HMpbYv5Dc="; + hash = "sha256-P0IHO/rO3uHpSfWX+GVuMGuzux1ObGiNsSCCVP+wv5k="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-KROGDBOsx1WTzv7IhJ3WWLJJ9zvrmZI5poJCr2tFcLY="; + cargoHash = "sha256-5KraSw/CtYZ4Al8VQszvuL/ubEVeQOppRRH5SQ8tsA0="; passthru.updateScript = nix-update-script { }; @@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "gleam"; homepage = "https://gleam.run/"; license = licenses.asl20; - maintainers = teams.beam.members; + maintainers = teams.beam.members ++ [ lib.maintainers.philtaken ]; }; } diff --git a/pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch b/pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch new file mode 100644 index 0000000000000..7b6fae2d5f03e --- /dev/null +++ b/pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch @@ -0,0 +1,21 @@ +--- a/packages/gtk/mkorder.awk ++++ b/packages/gtk/mkorder.awk +@@ -33,6 +33,9 @@ + paths[1] = "." + n_paths = 1 + n_prefixes = split(_prefixes, prefixes) ++ ++ ignored_files = [ "glib/gwin32.h" ] ++ + split(_libs, libs) + split(_files, files) + for (i = 1; (i in libs); i++) +@@ -60,7 +63,7 @@ + + function process_file(name, file) { + file = find_file(name) +- if (file in processed) ++ if ((name in ignored_files) or (file in processed)) + return + processed[file] = 1 + if (file == "") diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 1caf96c715cbb..c6d9109031208 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -25,6 +25,12 @@ in stdenv.mkDerivation rec { sha256 = "1k2ssrapfzhngc7bg1zrnd9n2vyxp9c9m70byvsma6wapbvib6l1"; }; + patches = [ + # The awk script incorrectly parsed `glib/glib.h` and was trying to find `glib/gwin32.h`, + # that isn't included since we're building only for linux. + ./0000-fix_mkorder.patch + ]; + # The dependencies and their justification are explained at # http://smalltalk.gnu.org/download nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index c0103090b3314..aad242c886069 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -37,6 +37,7 @@ let "riscv64" = "riscv64"; "s390x" = "s390x"; "x86_64" = "amd64"; + "wasm32" = "wasm"; }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, @@ -90,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ./go_no_vendor_checks-1.22.patch ]; - GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOOS = if stdenv.targetPlatform.isWasi then "wasip1" else stdenv.targetPlatform.parsed.kernel.name; GOARCH = goarch stdenv.targetPlatform; # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. # Go will nevertheless build a for host system that we will copy over in @@ -113,7 +114,8 @@ stdenv.mkDerivation (finalAttrs: { GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; + # Wasi does not support CGO + CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1; GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; @@ -184,7 +186,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux; + platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/hvm/default.nix b/pkgs/development/compilers/hvm/default.nix index b640d4e11c2de..b03b7eed2ea19 100644 --- a/pkgs/development/compilers/hvm/default.nix +++ b/pkgs/development/compilers/hvm/default.nix @@ -7,22 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "hvm"; - version = "2.0.12"; + version = "2.0.17"; src = fetchCrate { inherit pname version; - hash = "sha256-/55SK/5zBKXmucRQPoYt/8IHxisQlOxNEVMAZVMtCNI="; + hash = "sha256-UzPEupmUnph7SjCc/T4sBSGXj8yLVdQlw+X9iM16zD8="; }; - cargoHash = "sha256-9U8Y0KaQHIfOZnCKbl94VvjS/7Qmi6UnKMDZDTXcye0="; + cargoHash = "sha256-AchVbf+mn4qQtzWu84Dqek+btCm6BA9mcY+8iHWqdiw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit ]; - # enable nightly features - RUSTC_BOOTSTRAP = true; - meta = with lib; { description = "A massively parallel, optimal functional runtime in Rust"; mainProgram = "hvm"; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 1e6b86b17b8e4..76d4079baafbf 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -39,26 +39,26 @@ let in openjdk17.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef"; - javaVersion = "17.0.8"; - build = "1000.8"; + javaVersion = "17.0.11"; + build = "1207.24"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime # git reset --hard [revision] # git log --simplify-by-decoration --decorate=short --pretty=short | grep "jbr-" --color=never | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d "," - openjdkTag = "jbr-17.0.7+7"; + openjdkTag = "jbr-17.0.8+7"; version = "${javaVersion}-b${build}"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-PXS8wRF37D9vzeC4CvmB3szFMbt+NRqhQqtPZcbeAO8="; + hash = "sha256-a7cJF2iCW/1GK0/GmVbaY5pYcn3YtZy5ngFkyAGRhu0="; }; BOOT_JDK = openjdk17-bootstrap.home; # run `git log -1 --pretty=%ct` in jdk repo for new value on update - SOURCE_DATE_EPOCH = 1691119859; + SOURCE_DATE_EPOCH = 1715809405; patches = [ ]; diff --git a/pkgs/development/compilers/llvm/18/default.nix b/pkgs/development/compilers/llvm/18/default.nix index 3c0e551791e54..5b2b09bbb6ec2 100644 --- a/pkgs/development/compilers/llvm/18/default.nix +++ b/pkgs/development/compilers/llvm/18/default.nix @@ -25,7 +25,7 @@ # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; # } -, officialRelease ? { version = "18.1.5"; sha256 = "0n44chqn96xsa00ryhwk8g0vv3zx908xjakkgjsa14sjr9mcsq8q"; } +, officialRelease ? { version = "18.1.6"; sha256 = "sha256-q6avJyzzL6ZEhPmONH6/VTfwBfnXNOLBbuHi0gVy55I="; } # i.e.: # { # version = /* i.e. "15.0.0" */; diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index d2c71683c9bfe..1c9aee9af5e95 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -11,8 +11,8 @@ let version = { feature = "17"; - interim = ".0.7"; - build = "7"; + interim = ".0.11"; + build = "9"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -26,7 +26,7 @@ let owner = "openjdk"; repo = "jdk${version.feature}u"; rev = "jdk-${version.feature}${version.interim}+${version.build}"; - sha256 = "sha256-S6QOB4Tbi+K1yjvvywTfvwFI2eX8AiqIx5c3zfxcskc="; + sha256 = "sha256-aO4iSc9MklW/4q9U86WEfiiWnlq6iZSbxzq2fbsqd0A="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index c5d6c6aaa597e..fab6ca5e7df83 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -7,8 +7,8 @@ let major = "17"; - update = ".0.6"; - build = "+3"; + update = ".0.11"; + build = "-ga"; repover = "${major}${update}${build}"; gradle_ = (gradle_7.override { java = openjdk17_headless; @@ -31,7 +31,7 @@ let owner = "openjdk"; repo = "jfx${major}u"; rev = repover; - sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="; + sha256 = "sha256-WV8NHlYlt7buGbirLSorLnS2TnyBD17zUquFfwSL3xE="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; diff --git a/pkgs/development/compilers/semeru-bin/generate-sources.py b/pkgs/development/compilers/semeru-bin/generate-sources.py index da23559955d92..44ad583ab48f7 100755 --- a/pkgs/development/compilers/semeru-bin/generate-sources.py +++ b/pkgs/development/compilers/semeru-bin/generate-sources.py @@ -6,10 +6,10 @@ import re import requests import sys -feature_versions = (8, 11, 16, 17) +feature_versions = (8, 11, 16, 17, 21) oses = ("mac", "linux") types = ("jre", "jdk") -impls = ("openj9") +impls = ("openj9",) arch_to_nixos = { "x64": ("x86_64",), diff --git a/pkgs/development/compilers/semeru-bin/jdk-darwin.nix b/pkgs/development/compilers/semeru-bin/jdk-darwin.nix index f58fec3a84c0d..2e9bde029f2d9 100644 --- a/pkgs/development/compilers/semeru-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/semeru-bin/jdk-darwin.nix @@ -3,14 +3,18 @@ let sources = (lib.importJSON ./sources.json).openj9.mac; common = opts: callPackage (import ./jdk-darwin-base.nix opts) {}; + + EOL = [ "This JDK/JRE version has reached End of Life." ]; in { jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; - jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; - jre-16 = common { sourcePerArch = sources.jre.openjdk16; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; }; + jre-16 = common { sourcePerArch = sources.jre.openjdk16; knownVulnerabilities = EOL; }; jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; + jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; + jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; } diff --git a/pkgs/development/compilers/semeru-bin/jdk-linux.nix b/pkgs/development/compilers/semeru-bin/jdk-linux.nix index c80dd991bf042..59c6a4862d913 100644 --- a/pkgs/development/compilers/semeru-bin/jdk-linux.nix +++ b/pkgs/development/compilers/semeru-bin/jdk-linux.nix @@ -3,14 +3,18 @@ let sources = (lib.importJSON ./sources.json).openj9.linux; common = opts: callPackage (import ./jdk-linux-base.nix opts) {}; + + EOL = [ "This JDK/JRE version has reached End of Life." ]; in { jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; - jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; - jre-16 = common { sourcePerArch = sources.jre.openjdk16; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; }; + jre-16 = common { sourcePerArch = sources.jre.openjdk16; knownVulnerabilities = EOL; }; jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; + jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; + jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; } diff --git a/pkgs/development/compilers/semeru-bin/sources.json b/pkgs/development/compilers/semeru-bin/sources.json index 5e04fa90af748..ccca4a2ee7ad5 100644 --- a/pkgs/development/compilers/semeru-bin/sources.json +++ b/pkgs/development/compilers/semeru-bin/sources.json @@ -4,18 +4,18 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "488739171f84e3949df6ccb1c40eaf1b73541748b123d88780329648d6b383d0", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "23e280da1ce418692323f8aad94069ef34bae6566a98ffd349fc2cbb9fa285af", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jdk_aarch64_linux_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "eeca01d4e245a001d01663c5c20a8d50ef3d572b47a9b3689a5154f2a37bf005", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "033261124af247f944f820cad158df2b9db58945b4998750258c37d62fac99ff", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jdk_x64_linux_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" } }, "openjdk16": { @@ -36,52 +36,68 @@ }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "18d291411ee4a956018b4dcefe436971e73694128782617f1b44beca991956c5", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "cfdff21ce44ae6af494cba75c1f323bef83a982f2c11944988bab2125f85b906", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jdk_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "78ae15d9e01fce3a473f4d6a90c331fb766211b950931088c2a85590f178ad39", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "9b945e58f024108a20eb907015cca4a452332b7644e8dd8e051149a3ec62e3a3", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jdk_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + } + }, + "openjdk21": { + "aarch64": { + "build": "9", + "sha256": "718e465d1b22034d889445e8ae371fc58dfc733c454cf344fa5e10db0ab8a775", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jdk_aarch64_linux_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "9", + "sha256": "5cccb39dc7ca6c61a11bd7179c4c3c30b747f9f22129576feef921b59725af25", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jdk_x64_linux_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" } }, "openjdk8": { "aarch64": { - "build": "01", - "sha256": "6b89e648899709459b7c7dbe0a5b1ea480a88da84c6163f01255d638dbdd051b", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "2baa88e7ed0ea9f72310fb4adfe99ee06fdb514cc04517b0e0be3c0646493ea3", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jdk_aarch64_linux_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "01", - "sha256": "82c8232a5cb420246457d65a5014602feb8b288079cdae896e22a2eb6e390b58", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "85af2c57078aab240ce31ba3f7a8e86696ff5bdf4c30f3c37f107986f07b23a6", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jdk_x64_linux_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "49dc05a3e9f3f99c5f8fa466261aa3e33a753694c67cabfa7d3f682e5a2e3685", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "8613dc2b6c403f48d2a8e25da92ab9f8a7b5dd63cb81d1917e4cb070ae371557", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jre_aarch64_linux_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "ba09711193b8b8664478f3f949b5320232f65c1bdf61f32a885d84de73c02767", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "b9558416d6d773fce0d9b4d3f875fdfc5ffc1afd922570b0f7a6f7cbab7468ab", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jre_x64_linux_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" } }, "openjdk16": { @@ -102,34 +118,50 @@ }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "6c40c1e0d7ee0509c44465e9f26dd970904137a95fd751e6447b1d6a9ef5092a", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "9760aa27a5790a8c20a702ff5f036535f3df51d3fb291bb5254b5ae76e096bad", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jre_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "9", + "sha256": "1caf409f33f7738efe37742197525b5ae6244d6383b2017e7b8e925dc0b6a329", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jre_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + } + }, + "openjdk21": { + "aarch64": { + "build": "9", + "sha256": "0222dc3749e1c94bd1b047cdb02eb18310aefd9f7965b66196da06e4e3844b7a", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jre_aarch64_linux_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "b2c176f8aa8cc7138d4c22ce9298d8f49597e1d8e3fdd33125898e5ee0182c93", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "b831e8c418374ccec13c51f60c36f4c32266f3cc83cb31f32286f89c26d66e00", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jre_x64_linux_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" } }, "openjdk8": { "aarch64": { - "build": "01", - "sha256": "03caff41622e84a6e7fa66a225414a9b6eefb38dd215f830cae0bc4bbfc55b5c", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "08a41a48b79881590d65a09c62c56d8bcd9b8453f03420bcfd5dd3165bbba3c1", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jre_aarch64_linux_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "01", - "sha256": "0d4fe62716b9da2ccce324b5b46d57e8d47e5dfb5d128f87e16135ee9bc36cdc", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "ac5022b52b33b22c51d8370655f6157fd999e5e24c6525f91d1e778f34abcb8b", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jre_x64_linux_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" } } } @@ -138,18 +170,18 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "9881b292142a129f6f5c6b21608b090f8f94625052b4f7d0ce5bd982c054ca2e", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_mac_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "451336700a8b219d219e2e3b26b60154c44e8ab209056cc3466b0fcd4b15e53d", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jdk_aarch64_mac_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "8638735d2cae3efff212f898728685380355bb0a298076e9e46244d0bf3d4a64", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "6a225f3024d1919528107ece20256e8a8594523ea2204d93a041c012cbf1e2d2", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jdk_x64_mac_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" } }, "openjdk16": { @@ -164,46 +196,62 @@ }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "bf22628b54115dff9939b94751531544ab735b7cbbc8d6ddfe83d1b04df3a532", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_mac_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "5fed15250cb613a4024f2b2e75ccb54e6526ffa5ff78d955a6e2a11ae330f003", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jdk_aarch64_mac_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "a935f20564e347a9292955c04eb57e51efdb1853ae7f0b4fe759b22c9fe248be", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "585f48be83935a44ef980249aaab024119d4ea6ef0937a2cd2d97d0c77cda1c2", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jdk_x64_mac_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + } + }, + "openjdk21": { + "aarch64": { + "build": "9", + "sha256": "a95896a4ca7b69050a25b1557520f430abc66d098e9fd15cd394e20c4c93e5cf", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jdk_aarch64_mac_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "9", + "sha256": "95640346ef677fbdbf40efa0298cc61314cffed0c43d1b3bd329b84d445db869", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jdk_x64_mac_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" } }, "openjdk8": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "01", - "sha256": "c69086950c006b17484a70ef7bc85e92d121be15e69e282e1446fd238d42b6b4", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "4e8a34442fc0c1c1288ca4d251ecfe744c201ec6494103d8dafa52e785d3f8ae", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jdk_x64_mac_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "39802020896476342dc11486e3cbdf10f6311c172abeb4a1e2931b472da4417e", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_mac_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "be6ba7e6904e8ca2fab9dab38607af1e4d36f6a391584eb8c4de0804493f3626", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jre_aarch64_mac_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "92f87a3c2fb5fe60d3d51020ff95b9c234b2ae2677b79aebbe749dda717c9cdd", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "9f9505e9ee5082c070de965c790d51758a9969b7bb9ca49057d0d5afb5cfc99b", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jre_x64_mac_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" } }, "openjdk16": { @@ -218,28 +266,44 @@ }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "4057c94cd46b814cc5a4d683d5f0b95dbd0b9e13e8c2e11155561ad0d8bec85b", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_mac_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "fbd093ab7218c916aa4f49ac851635020dd1c8a98a98158fc44a6565e3d182ed", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jre_aarch64_mac_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "9", + "sha256": "f5781de29132c04f54341349e99954ec3cfbdbc65fdebdd00feff47c68793299", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jre_x64_mac_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + } + }, + "openjdk21": { + "aarch64": { + "build": "9", + "sha256": "55650c3825a22dc1caabf672ee8e2ef3ce4cee32df92e7317780d3eae18f17a5", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jre_aarch64_mac_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "8e957d2eb47eaca64516ac669272c6e5186155ed8ee4d6a77e0d4b7811cd7bb6", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "4b4d6da4da96dfa233d0c262bcaecb15b29162a81c802179f56e4084141c6fd8", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jre_x64_mac_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" } }, "openjdk8": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "01", - "sha256": "019e08dea8fbd54517dacbeac791d85717902800dd8bba77fbca1dfc6b0abd9e", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "baf7d026012acc234fb1c2e64adf544a84449c856ee25a130c5aec32fbe34e3a", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jre_x64_mac_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" } } } diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index 6a14e67844c8d..cc7d6973c4689 100644 --- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -7,10 +7,12 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ + { cases = [ (isGe "8.17") (isGe "1.0") ]; out = "0.7.1"; } { cases = [ (isGe "8.17") (range "0.6.6" "0.7.0") ]; out = "0.6.1"; } { cases = [ (range "8.17" "8.18") (range "0.6.0" "0.6.7") ]; out = "0.5.2"; } { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; } ] null; + release."0.7.1".sha256 = "sha256-/4Elb35SmscG6EjEcHYDo+AmWrpBUlygZL0WhaD+fcY="; release."0.6.1".sha256 = "sha256-tFB5lrwRPIlHkP+ebgcJwu03Cc9yVaOINOAo8Bf2LT4="; release."0.5.1".sha256 = "sha256-yBBl5l+V+dggsg5KM59Yo9CULKog/xxE8vrW+ZRnX7Y="; release."0.5.2".sha256 = "sha256-8WAnAV53c0pMTdwj8XcUDUkLZbpUgIQbEOgOb63uHQA="; diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index ee3f0503d994b..701c86200bd51 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -325,6 +325,14 @@ self: super: ({ libraryHaskellDepends = with self; [ base bytestring jsaddle-wkwebview reflex reflex-dom-core text ]; # cabal2nix doesn't add darwin-only deps }) super.reflex-dom; + # Remove a problematic assert, the length is sometimes 1 instead of 2 on darwin + di-core = overrideCabal (drv: { + preConfigure = '' + substituteInPlace test/Main.hs --replace \ + "2 @=? List.length (List.nub (List.sort (map Di.log_time logs)))" "" + ''; + }) super.di-core; + } // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin # https://github.com/fpco/unliftio/issues/87 diff --git a/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix b/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix deleted file mode 100644 index d311f3d61ebd4..0000000000000 --- a/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenvNoCC -}: - -stdenvNoCC.mkDerivation { - pname = "cbqn-bytecode"; - version = "unstable-2023-05-17"; - - src = fetchFromGitHub { - owner = "dzaima"; - repo = "cbqnBytecode"; - rev = "32db4dfbfc753835bf112f3d8ae2991d8aebbe3d"; - hash = "sha256-9uBPrEESn/rB9u0xXwKaQ7ABveQWPc8LRMPlnI/79kg="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - install -D $src/gen/{compiles,explain,formatter,runtime0,runtime1,runtime1x,src} -t $out/dev - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/dzaima/cbqnBytecode"; - description = "CBQN precompiled bytecode"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 6f5b889883910..f78eb807b4cfe 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -1,53 +1,36 @@ -{ callPackage -, lib -, stdenv -, stdenvNoCC +{ lib +, callPackage , fetchFromGitHub , fixDarwinDylibNames -, genBytecode ? false -, bqn-path ? null +, libffi , mbqn-source +, pkg-config +, stdenv +# Boolean flags , enableReplxx ? false , enableLibcbqn ? ((stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) && !enableReplxx) -, libffi -, pkg-config +, generateBytecode ? false +# "Configurable" options +, bqn-interpreter }: let - cbqn-bytecode-submodule = - callPackage ./cbqn-bytecode.nix { inherit lib fetchFromGitHub stdenvNoCC; }; - replxx-submodule = callPackage ./replxx.nix { inherit lib fetchFromGitHub stdenvNoCC; }; - singeli-submodule = callPackage ./singeli.nix { inherit lib fetchFromGitHub stdenvNoCC; }; + sources = callPackage ./sources.nix { }; in -assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); - stdenv.mkDerivation rec { - pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "dzaima"; - repo = "CBQN"; - rev = "v${version}"; - hash = "sha256-PCpePevWQ+aPG6Yx3WqBZ4yTeyJsCGkYMSY6kzGDL1U="; - }; + pname = "cbqn" + lib.optionalString (!generateBytecode) "-standalone"; + inherit (sources.cbqn) version src; nativeBuildInputs = [ pkg-config - ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; buildInputs = [ libffi ]; - dontConfigure = true; - doInstallCheck = true; - - postPatch = '' - sed -i '/SHELL =.*/ d' makefile - patchShebangs build/build - ''; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; @@ -64,19 +47,6 @@ stdenv.mkDerivation rec { "shared-o3" ]; - preBuild = '' - # Purity: avoids git downloading bytecode files - mkdir -p build/bytecodeLocal/gen - cp -r ${singeli-submodule}/dev/* build/singeliLocal/ - '' + (if genBytecode then '' - ${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/ - '' else '' - cp -r ${cbqn-bytecode-submodule}/dev/* build/bytecodeLocal/gen/ - '') - + lib.optionalString enableReplxx '' - cp -r ${replxx-submodule}/dev/* build/replxxLocal/ - ''; - outputs = [ "out" ] ++ lib.optionals enableLibcbqn [ @@ -84,6 +54,32 @@ stdenv.mkDerivation rec { "dev" ]; + dontConfigure = true; + + doInstallCheck = true; + + strictDeps = true; + + postPatch = '' + sed -i '/SHELL =.*/ d' makefile + patchShebangs build/build + ''; + + preBuild = '' + mkdir -p build/singeliLocal/ + cp -r ${sources.singeli.src}/* build/singeliLocal/ + '' + (if generateBytecode then '' + mkdir -p build/bytecodeLocal/gen + ${bqn-interpreter} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/ + '' else '' + mkdir -p build/bytecodeLocal/gen + cp -r ${sources.cbqn-bytecode.src}/* build/bytecodeLocal/ + '') + + lib.optionalString enableReplxx '' + mkdir -p build/replxxLocal/ + cp -r ${sources.replxx.src}/* build/replxxLocal/ + ''; + installPhase = '' runHook preInstall @@ -121,12 +117,26 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { homepage = "https://github.com/dzaima/CBQN/"; description = "BQN implementation in C"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ]; - platforms = platforms.all; + license = with lib.licenses; [ + # https://github.com/dzaima/CBQN?tab=readme-ov-file#licensing + asl20 + boost + gpl3Only + lgpl3Only + mit + mpl20 + ]; mainProgram = "cbqn"; + maintainers = with lib.maintainers; [ + AndersonTorres + detegr + shnarazk + sternenseemann + synthetica + ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/interpreters/bqn/cbqn/replxx.nix b/pkgs/development/interpreters/bqn/cbqn/replxx.nix deleted file mode 100644 index 71b479a4cda48..0000000000000 --- a/pkgs/development/interpreters/bqn/cbqn/replxx.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenvNoCC -}: - -stdenvNoCC.mkDerivation { - pname = "replxx"; - version = "unstable-2023-10-31"; - - src = fetchFromGitHub { - owner = "dzaima"; - repo = "replxx"; - rev = "13f7b60f4f79c2f14f352a76d94860bad0fc7ce9"; - hash = "sha256-xPuQ5YBDSqhZCwssbaN/FcTZlc3ampYl7nfl2bbsgBA="; - }; - - dontConfigure = true; - # The CBQN derivation will build replxx, here we just provide the source files. - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/dev - cp -r $src $out/dev - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/dzaima/replxx"; - description = "A replxx fork for CBQN"; - license = licenses.free; - maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/interpreters/bqn/cbqn/singeli.nix b/pkgs/development/interpreters/bqn/cbqn/singeli.nix deleted file mode 100644 index 212b96b6cb3f0..0000000000000 --- a/pkgs/development/interpreters/bqn/cbqn/singeli.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenvNoCC -}: - -stdenvNoCC.mkDerivation { - pname = "singeli"; - version = "unstable-2023-11-22"; - - src = fetchFromGitHub { - owner = "mlochbaum"; - repo = "Singeli"; - rev = "528faaf9e2a7f4f3434365bcd91d6c18c87c4f08"; - hash = "sha256-/z1KHqflCqPGC9JU80jtgqdk2mkX06eWSziuf4TU4TM="; - }; - - dontConfigure = true; - # The CBQN derivation will build Singeli, here we just provide the source files. - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/dev - cp -r $src $out/dev - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/mlochbaum/Singeli"; - description = "A metaprogramming DSL for SIMD"; - license = licenses.isc; - maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/interpreters/bqn/cbqn/sources.nix b/pkgs/development/interpreters/bqn/cbqn/sources.nix new file mode 100644 index 0000000000000..3b9ca78533e36 --- /dev/null +++ b/pkgs/development/interpreters/bqn/cbqn/sources.nix @@ -0,0 +1,60 @@ +# Sources required to build CBQN +# Update them all at the same time, or else misbuilds will happen! +# TODO: automate the update of this file + +{ + fetchFromGitHub, +}: + +{ + cbqn = let + self = { + pname = "cbqn"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "dzaima"; + repo = "CBQN"; + rev = "v${self.version}"; + hash = "sha256-TUK0HrJ1IyiVi9Y3S1IrK/d4/EZxdRdWyxsAwj79KEc="; + }; + }; + in + self; + + cbqn-bytecode = { + pname = "cbqn-bytecode"; + version = "0-unstable-2024-05-22"; + + src = fetchFromGitHub { + owner = "dzaima"; + repo = "cbqnBytecode"; + rev = "c5674783c11d7569e5a4d166600ffcde2409331d"; + hash = "sha256-y7gqHzUxVUUVryutlq3Upuso8r3ZRSyF7ydMg1OVlwA="; + }; + }; + + replxx = { + pname = "replxx"; + version = "0-unstable-2023-10-31"; + + src = fetchFromGitHub { + owner = "dzaima"; + repo = "replxx"; + rev = "13f7b60f4f79c2f14f352a76d94860bad0fc7ce9"; + hash = "sha256-xPuQ5YBDSqhZCwssbaN/FcTZlc3ampYl7nfl2bbsgBA="; + }; + }; + + singeli = { + pname = "singeli"; + version = "0-unstable-2024-02-26"; + + src = fetchFromGitHub { + owner = "mlochbaum"; + repo = "Singeli"; + rev = "ce6ef5d06d35777f0016bbfe0c6c1cf6a9c1b48e"; + hash = "sha256-dDoWoq4LYMD2CKyPxXDAwoeH2E+f0FDyvngtWPEr67w="; + }; + }; +} diff --git a/pkgs/development/interpreters/bqn/mlochbaum-bqn/001-libbqn-path.patch b/pkgs/development/interpreters/bqn/mlochbaum-bqn/001-libbqn-path.patch deleted file mode 100644 index b23c3de44af6d..0000000000000 --- a/pkgs/development/interpreters/bqn/mlochbaum-bqn/001-libbqn-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur source-old/bqn.js source-new/bqn.js ---- source-old/bqn.js 1969-12-31 21:00:01.000000000 -0300 -+++ source-new/bqn.js 2021-10-03 01:28:00.268998916 -0300 -@@ -4,7 +4,7 @@ - let path = require('path'); - let fs = require('fs'); - --let bqn = require("./docs/bqn.js"); -+let bqn = require("@libbqn@"); - module.exports = bqn; - let {fmt,fmtErr,sysvals,sysargs,makebqn,makerepl}=bqn; - let {has,list,str,unstr,dynsys,req1str,makens}=bqn.util; diff --git a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix deleted file mode 100644 index d217ec99ebe5a..0000000000000 --- a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, makeWrapper -, nodejs -}: - -stdenvNoCC.mkDerivation rec { - pname = "bqn"; - version = "unstable-2023-05-17"; - - src = fetchFromGitHub { - owner = "mlochbaum"; - repo = "BQN"; - rev = "070bd07dc10c291695215265218ec0ff856ce457"; - hash = "sha256-GRIIzJwlJ+JTBHXZjoX/9vLFbAC7zyeuqVcrA/Jm/NA="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ nodejs ]; - - patches = [ - # Creates a @libbqn@ substitution variable, to be filled in the fixupPhase - ./001-libbqn-path.patch - ]; - - dontConfigure = true; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/${pname} - cp bqn.js $out/share/${pname}/bqn.js - cp docs/bqn.js $out/share/${pname}/libbqn.js - - makeWrapper "${lib.getBin nodejs}/bin/node" "$out/bin/mbqn" \ - --add-flags "$out/share/${pname}/bqn.js" - - ln -s $out/bin/mbqn $out/bin/bqn - - runHook postInstall - ''; - - fixupPhase = '' - runHook preFixup - - substituteInPlace $out/share/${pname}/bqn.js \ - --subst-var-by "libbqn" "$out/share/${pname}/libbqn.js" - - runHook postFixup - ''; - - meta = with lib; { - homepage = "https://github.com/mlochbaum/BQN/"; - description = "The original BQN implementation in Javascript"; - license = licenses.isc; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; - }; -} -# TODO: install docs and other stuff diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 8019c6cc943f1..201ebb14a337e 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "assimp"; - version = "5.3.1"; + version = "5.4.1"; outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub { owner = "assimp"; repo = "assimp"; rev = "v${version}"; - hash = "sha256-/1A8n7oe9WsF3FpbLZxhifzrdj38t9l5Kc8Q5jfDoyY="; + hash = "sha256-F3aaEaHZyOLES6zOYqHRG0BtaKk9d/bAHCtal6FsIWc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index b6dcf908c4f92..f50b53d47e05c 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { "--with-berkeleydb=${db62.out}" "--with-xerces=${xercesc}" "--with-xqilla=${xqilla}" + # code uses register storage specifier + "CXXFLAGS=-std=c++14" ]; preConfigure = '' diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 4f891a24f1f0a..e3c9ba32f3921 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { }) ]; + configureFlags = [ (lib.enableFeature true "sigstop") ]; + nativeBuildInputs = [ autoreconfHook ]; outputs = [ "out" "dev" "man" "doc" ]; diff --git a/pkgs/development/libraries/geos/3.11.nix b/pkgs/development/libraries/geos/3.11.nix index 90bdfdb0d6058..dd18855508d13 100644 --- a/pkgs/development/libraries/geos/3.11.nix +++ b/pkgs/development/libraries/geos/3.11.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; + # https://github.com/libgeos/geos/issues/930 + cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" + ]; + doCheck = true; passthru.tests = { diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 740f7d94f1d99..43ce34ec2ed4f 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.50.1"; + version = "3.50.2"; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-Qu5D/R4pQrn/YQYlLM3INGAoFVCL96OlLAvf/6Vur0A="; + hash = "sha256-3xatl10TnGv8TrsuyLuDJyl6eR7yvwuXfHgHavX6qY4="; }; mesonFlags = [ diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index b94769af76f44..8cc7bdc71a646 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { gobject-introspection ] ++ lib.optionals enableDocumentation [ hotdoc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [ wayland # for wayland-scanner ]; @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { bluez ] ++ lib.optionals microdnsSupport [ libmicrodns - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [ libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland wayland-protocols @@ -305,6 +305,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!stdenv.isLinux) [ "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only "-Dnvcodec=disabled" # Linux-only + ] ++ lib.optionals (!stdenv.isLinux || !gst-plugins-base.waylandEnabled) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` ] ++ lib.optionals (!stdenv.isLinux || !guiSupport) [ "-Ddirectfb=disabled" @@ -322,8 +323,8 @@ stdenv.mkDerivation rec { "-Duvch264=disabled" # requires gudev "-Dv4l2codecs=disabled" # requires gudev "-Dladspa=disabled" # requires lrdf - ] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64) [ - "-Dqsv=disabled" # Linux (and Windows) x86 only + ] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64 || !gst-plugins-base.waylandEnabled) [ + "-Dqsv=disabled" # Linux (and Windows) x86 only, makes va required ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ "-Dgl=disabled" ] ++ lib.optionals (!gst-plugins-base.waylandEnabled || !guiSupport) [ diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index d1f1259635fa9..d4afb8ce7618a 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -29,6 +29,7 @@ , nix-update-script # specifies a limited subset of plugins to build (the default `null` means all plugins supported on the stdenv platform) , plugins ? null +, withGtkPlugins ? true # Checks meson.is_cross_build(), so even canExecute isn't enough. , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform && plugins == null , hotdoc @@ -114,7 +115,7 @@ let "reqwest" # tests hang on darwin "threadshare" # tests cannot bind to localhost on darwin "webp" # not supported on darwin (upstream crate issue) - ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ + ] ++ lib.optionals (!gst-plugins-base.glEnabled || !withGtkPlugins) [ # these require gstreamer-gl "gtk4" "livesync" diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 31bed4c108b46..d60f95c548391 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -45,13 +45,13 @@ , gsettings-desktop-schemas }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gvfs"; - version = "1.54.0"; + version = "1.54.1"; src = fetchurl { - url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz"; - hash = "sha256-9T2B34bC6GzdJRgsLYpmmiI3HoNiPe0bnVQW3Pxt42Y="; + url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz"; + hash = "sha256-rEo7zLf+FQIVjvD95cl5q0RxJVfQKKjk8wop8PvZ0Z8="; }; patches = [ @@ -137,13 +137,13 @@ stdenv.mkDerivation rec { ]; doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" - doInstallCheck = doCheck; + doInstallCheck = finalAttrs.doCheck; separateDebugInfo = true; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gvfs"; versionPolicy = "odd-unstable"; }; }; @@ -154,4 +154,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 1301f9fe923d9..7f7f93c37949d 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.5.0"; + version = "1.5.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; rev = finalAttrs.version; - hash = "sha256-uEaBI2jHlMdVprMGRZe/8HszO3nEBUJaJtvJjrMOjE4="; + hash = "sha256-dH0VPIt6SGTDcb1I72cKnNlyqZ3dptvKmMDjOd17BfA="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix index b9c3f82558a45..1858ca1e97e92 100644 --- a/pkgs/development/libraries/libcxxrt/default.nix +++ b/pkgs/development/libraries/libcxxrt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "4.0.10-unstable-2024-04-15"; + version = "4.0.10-unstable-2024-05-26"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; - rev = "25541e312f7094e9c90895000d435af520d42418"; - sha256 = "d5uhtlO+28uc2Xnf5trXsy43jgmzBHs2jZhCK57qRM4="; + rev = "c62fe9963148f283b2fbb7eb9888785cfb16d77c"; + sha256 = "XxXH6pE2v6WTh1ATJ7Fgd3SFw49L44YchtMlPKX4kYw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 9b160e6b29e89..021a7e3ad574d 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.7.2"; pname = "libgeotiff"; src = fetchFromGitHub { owner = "OSGeo"; repo = "libgeotiff"; rev = version; - hash = "sha256-bE6UAUKiorriTgYrqhxbMAN2NEtmV/8IIfF02RUghSI="; + hash = "sha256-PXMbOC3I1yrFrFUek9BMxFT3YW9KxwP3+xZUHs7xm7Y="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index ae49384835909..b7ad5c8bd241c 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -10,15 +10,15 @@ , deterministic-uname }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgtop"; - version = "2.41.2"; + version = "2.41.3"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-2QJs2KSNJ83/0zL41gqSdktWQk5SLEIM0ToB9A2vksM="; + url = "mirror://gnome/sources/libgtop/${lib.versions.majorMinor finalAttrs.version}/libgtop-${finalAttrs.version}.tar.xz"; + hash = "sha256-d1Z235WOLqJFL3Vo8osupYEGPTEnc91cC3Ykwbmy2ow="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libgtop"; versionPolicy = "odd-unstable"; }; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index cc6723162a085..d0e6e95ad0c7b 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch2 , gi-docgen , meson , ninja @@ -21,26 +20,18 @@ , gnome }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libshumate"; - version = "1.2.1"; + version = "1.2.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-EQXuB34hR/KgOc3fphb6XLlDiIPdlAQn4RaZ3NZUnBE="; + url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; + hash = "sha256-b1h1effy1gs40/RyfrGo0v6snL3AGOU/9fdyqGCPpEs="; }; - patches = [ - (fetchpatch2 { - # Fix tests https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/236 - url = "https://gitlab.gnome.org/GNOME/libshumate/-/commit/852615b0df2252ea67f4f82e9ace2fc2794467b3.patch"; - hash = "sha256-Ksye3zNNYmzP4O+QFDVODXUkFJOLDVMEZNfGXwbxWhs="; - }) - ]; - depsBuildBuild = [ # required to find native gi-docgen when cross compiling pkg-config @@ -95,7 +86,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libshumate"; }; }; @@ -107,4 +98,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index 3cbb78d83ce9b..1b8a4395ad2e9 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20230916"; + version = "20240524"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256-8mLXTvi4KbU4NiCPaJINTeFbnTAabGDg8ufpSHSqy0Y="; + sha256 = "sha256-LANwM0fhCsscXAdI/qGOmUWDzAhe3g9w3J68g4szDZQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index d2e614b331a1a..79fe8c9f52dac 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -4,7 +4,6 @@ , zlib , pkg-config , autoreconfHook -, xz , libintl , python , gettext @@ -37,6 +36,11 @@ stdenv.mkDerivation (finalAttrs: rec { hash = "sha256-JK54/xNjqXPm2L66lBp5RdoqwFbhm1OVautpJ/1s+1Y="; }; + # https://gitlab.gnome.org/GNOME/libxml2/-/issues/725 + postPatch = if stdenv.hostPlatform.isFreeBSD then '' + substituteInPlace ./configure.ac --replace-fail pthread_join pthread_create + '' else null; + strictDeps = true; nativeBuildInputs = [ @@ -52,11 +56,6 @@ stdenv.mkDerivation (finalAttrs: rec { ncurses ] ++ lib.optionals (stdenv.isDarwin && pythonSupport && python?isPy2 && python.isPy2) [ libintl - ] ++ lib.optionals stdenv.isFreeBSD [ - # Libxml2 has an optional dependency on liblzma. However, on impure - # platforms, it may end up using that from /usr/lib, and thus lack a - # RUNPATH for that, leading to undefined references for its users. - xz ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index 92d0098fc9840..8551510b476ca 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libXp libXau ]; - prePatch = lib.optionalString (!demoSupport) '' - sed '/^SUBDIRS =,^$/s/\<demos\>//' -i Makefile.{am,in} + postPatch = lib.optionalString (!demoSupport) '' + sed 's/\<demos\>//' -i Makefile.{am,in} ''; patches = [ @@ -38,6 +38,27 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/void-linux/void-packages/b9a1110dabb01c052dadc1abae1413bd4afe3652/srcpkgs/motif/patches/02-${name}"; sha256 = "13vzpf8yxvhf4gl7q0yzlr6ak1yzx382fsqsrv5lc8jbbg4nwrrq"; }) + (fetchpatch { + name = "missing-headers.patch"; + url = "https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4cedf181bcfe13e5d206554c51edb82cb17e7ad5.patch"; + extraPrefix = "lib/Xm/"; + stripLen = 2; + hash = "sha256-WlagHOgf2gZDxXN+SSEW6de1FuN4fbpd9zviMwo1+HI="; + }) + (fetchurl { + name = "noreturn.patch"; + url = "https://dev.gentoo.org/~ulm/distfiles/motif-2.3.8-patches-5.tar.xz"; + downloadToTemp = true; + postFetch = '' + tar -xOf $downloadedFile patch/12_all_noreturn.patch > $out + ''; + hash = "sha256-FyaBfqD/TuJVFFHZlp1/b1MyL8BJAfV43ktuusgxbfE="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/acc8c7cb2247d9892bf5a52eb92431a4c0c8e1cd/x11/openmotif/files/wcs-functions.patch"; + extraPrefix = ""; + hash = "sha256-w3zCUs/RbnRoUJ0sNCI00noEOkov/IGV/zIygakSQqc="; + }) ]; enableParallelBuilding = true; @@ -48,5 +69,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = with licenses; [ lgpl21Plus ]; maintainers = with maintainers; [ qyliss ]; + broken = demoSupport && stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16"; }; } diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 140eee9c06e84..adb6532bd6825 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -15,7 +15,7 @@ , enableContrib ? true , enableCuda ? config.cudaSupport -, cudaPackages ? { } +, cudaPackages , enableUnfree ? false , enableIpp ? false , enablePython ? false, pythonPackages ? null @@ -295,6 +295,8 @@ stdenv.mkDerivation { meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; + # OpenCV 3 won't build with CUDA 12+ + broken = enableCuda && cudaPackages.cudaAtLeast "12"; license = with licenses; if enableUnfree then unfree else bsd3; maintainers = with maintainers; [mdaiter basvandijk]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index ec4c327d784b4..f153d7f2f18b6 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.1.36"; + version = "1.1.37"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-Ki2tp8a67AjIMIGDpWWqCnpMmeZpJ8uPezKE2KWrOjA="; + sha256 = "sha256-J9IfhTFFSY+rK0DqFdXtINo7nlGUcy2Lljq81T417qc="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/protobuf/27.nix b/pkgs/development/libraries/protobuf/27.nix new file mode 100644 index 0000000000000..8b80ad681c1c2 --- /dev/null +++ b/pkgs/development/libraries/protobuf/27.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "27.0"; + hash = "sha256-QVgDGyNTCSYU/rXTMcHUefUGVjwkkjnpq0Kq+eXK/bo="; +} // args) diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index 39a8f1a4b6a6f..e1aaba5270546 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation rec { pname = "rnnoise-plugin"; - version = "1.03"; + version = "1.10"; src = fetchFromGitHub { owner = "werman"; repo = "noise-suppression-for-voice"; rev = "v${version}"; - sha256 = "sha256-1DgrpGYF7G5Zr9vbgtKm/Yv0HSdI7LrFYPSGKYNnNDQ="; + sha256 = "sha256-sfwHd5Fl2DIoGuPDjELrPp5KpApZJKzQikCJmCzhtY8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index ec95184707d02..7e14664847f48 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-0yFRDQ/f0oVbpZ4wev28xCTVkbXr58Tt0Czda3ppRWk="; + hash = "sha256-vmoBTFhSSYMzbjQIGTCvMvOvVv+2y23RZx589rMR5bs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tbb/2020_3.nix b/pkgs/development/libraries/tbb/2020_3.nix index 55bb9849d9190..aa526591eb9e8 100644 --- a/pkgs/development/libraries/tbb/2020_3.nix +++ b/pkgs/development/libraries/tbb/2020_3.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { ] ++ (lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (if stdenv.hostPlatform.isAarch64 then "arch=arm64" else if stdenv.hostPlatform.isx86_64 then "arch=intel64" + else if stdenv.hostPlatform.isi686 then "arch=ia32" else throw "Unsupported cross architecture")); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 89af6e847a887..1d93b6e6adecf 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -32,14 +32,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.76.1"; + version = "0.76.2"; outputs = [ "out" "dev" ] ++ lib.optional (gtkVersion != null) "devdoc"; src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-CE6D73ZXdCaaSynfl8oi7cNDuaHYFDPTALjLLQh6HsI="; + hash = "sha256-49xggtW9cPiq+qrSzfyvflHaa6AKkZsR3axu+gnHKEc="; }; patches = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index e28ea0da6b0a7..00af282c5277b 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -19,13 +19,13 @@ , webp-pixbuf-loader }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-gnome"; - version = "46.1"; + version = "46.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-fo2WI+nZaonAiXYWgnzUQdzygykn048TXHIlUrEXKqE="; + url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz"; + hash = "sha256-tcZeol6Eg1AtAzphO+bca3GIOsB/Gj5HStGAScR9FtY="; }; nativeBuildInputs = [ @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "xdg-desktop-portal-gnome"; }; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl21Plus; }; -} +}) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 0018a73341e31..ecb90117b6fe4 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -2,6 +2,7 @@ , stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , gtest , doCheck ? true @@ -27,11 +28,12 @@ let # This ensures xgboost gets the correct libstdc++ when # built with cuda support. This may be removed once # #226165 rewrites cudaStdenv - inherit (cudaPackages) backendStdenv; - stdenv = if cudaSupport then backendStdenv else inputs.stdenv; + effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; + # Ensures we don't use the stdenv value by accident. + stdenv = builtins.throw "Use effectiveStdenv instead of stdenv in xgboost derivation."; in -stdenv.mkDerivation rec { +effectiveStdenv.mkDerivation rec { pnameBase = "xgboost"; # prefix with r when building the R library # The R package build results in a special xgboost.so file @@ -56,8 +58,16 @@ stdenv.mkDerivation rec { hash = "sha256-LWco3A6zwdnAf8blU4qjW7PFEeZaTcJlVTwVrs7nwWM="; }; + patches = lib.optionals (cudaSupport && cudaPackages.cudaMajorMinorVersion == "12.4") [ + (fetchpatch { + name = "Fix compilation with the ctk 12.4."; + url = "https://github.com/dmlc/xgboost/pull/10123.patch"; + hash = "sha256-iP9mll9pg8T2ztCR7dBPnLP17/x3ImJFrr5G3e2dqHo="; + }) + ]; + nativeBuildInputs = [ cmake ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals effectiveStdenv.isDarwin [ llvmPackages.openmp ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ] ++ lib.optionals rLibrary [ R ]; @@ -75,13 +85,9 @@ stdenv.mkDerivation rec { "-DUSE_CUDA=ON" # Their CMakeLists.txt does not respect CUDA_HOST_COMPILER, instead using the CXX compiler. # https://github.com/dmlc/xgboost/blob/ccf43d4ba0a94e2f0a3cc5a526197539ae46f410/CMakeLists.txt#L145 - "-DCMAKE_C_COMPILER=${cudaPackages.backendStdenv.cc}/bin/gcc" - "-DCMAKE_CXX_COMPILER=${cudaPackages.backendStdenv.cc}/bin/g++" - ] ++ lib.optionals - (cudaSupport - && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") - [ "-DBUILD_WITH_CUDA_CUB=ON" ] - ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ] + "-DCMAKE_C_COMPILER=${effectiveStdenv.cc}/bin/gcc" + "-DCMAKE_CXX_COMPILER=${effectiveStdenv.cc}/bin/g++" + ] ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ] ++ lib.optionals rLibrary [ "-DR_LIB=ON" ]; preConfigure = lib.optionals rLibrary '' @@ -104,7 +110,7 @@ stdenv.mkDerivation rec { GTEST_FILTER = let # Upstream Issue: https://github.com/xtensor-stack/xsimd/issues/456 - filteredTests = lib.optionals stdenv.hostPlatform.isDarwin [ + filteredTests = lib.optionals effectiveStdenv.hostPlatform.isDarwin [ "ThreadGroup.TimerThread" "ThreadGroup.TimerThreadSimple" ]; @@ -112,8 +118,7 @@ stdenv.mkDerivation rec { "-${builtins.concatStringsSep ":" filteredTests}"; installPhase = - let libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; - in '' + '' runHook preInstall '' # the R library option builds a completely different binary xgboost.so instead of @@ -137,6 +142,7 @@ stdenv.mkDerivation rec { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; + broken = cudaSupport && cudaPackages.cudaOlder "11.4"; license = licenses.asl20; mainProgram = "xgboost"; platforms = platforms.unix; diff --git a/pkgs/development/ocaml-modules/bytestring/default.nix b/pkgs/development/ocaml-modules/bytestring/default.nix new file mode 100644 index 0000000000000..3714846ee6b5c --- /dev/null +++ b/pkgs/development/ocaml-modules/bytestring/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildDunePackage +, fetchurl +, ppxlib +, rio +, sedlex +, spices +, uutf +, qcheck +}: + +buildDunePackage rec { + pname = "bytestring"; + version = "0.0.8"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/riot-ml/riot/releases/download/${version}/riot-${version}.tbz"; + hash = "sha256-SsiDz53b9bMIT9Q3IwDdB3WKy98WSd9fiieU41qZpeE="; + }; + + propagatedBuildInputs = [ + ppxlib + sedlex + spices + rio + uutf + ]; + + checkInputs = [ + qcheck + ]; + + # Checks fail with OCaml 5.2 + doCheck = false; + + meta = { + description = "Efficient, immutable, pattern-matchable, UTF friendly byte strings"; + homepage = "https://github.com/riot-ml/riot"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/colors/default.nix b/pkgs/development/ocaml-modules/colors/default.nix new file mode 100644 index 0000000000000..0335d5e425ba4 --- /dev/null +++ b/pkgs/development/ocaml-modules/colors/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildDunePackage +, fetchurl +, mdx +}: + +buildDunePackage rec { + pname = "colors"; + version = "0.0.1"; + + minimalOCamlVersion = "4.13"; + + src = fetchurl { + url = "https://github.com/leostera/colors/releases/download/${version}/colors-${version}.tbz"; + hash = "sha256-fY1j9FODVnifwsI8qkKm0QSmssgWqYFXJ7y8o7/KmEY="; + }; + + doCheck = true; + + checkInputs = [ + mdx + ]; + + nativeCheckInputs = [ + mdx.bin + ]; + + meta = { + description = "A pure OCaml library for manipulating colors across color spaces"; + homepage = "https://github.com/leostera/colors"; + changelog = "https://github.com/leostera/colors/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/config/default.nix b/pkgs/development/ocaml-modules/config/default.nix new file mode 100644 index 0000000000000..43ad500602ee7 --- /dev/null +++ b/pkgs/development/ocaml-modules/config/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildDunePackage +, fetchurl +, ppxlib +, spices +}: + +buildDunePackage rec { + pname = "config"; + version = "0.0.3"; + + src = fetchurl { + url = "https://github.com/ocaml-sys/config.ml/releases/download/${version}/config-${version}.tbz"; + hash = "sha256-bcRCfLX2ro8vnQTJiX2aYGJC+eD26vkPynMYg817YFM="; + }; + + propagatedBuildInputs = [ + ppxlib + spices + ]; + + meta = { + description = "Ergonomic, lightweight conditional compilation through attributes"; + homepage = "https://github.com/ocaml-sys/config.ml"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix index d90b40d1fe2c8..60e09d35db7b1 100644 --- a/pkgs/development/ocaml-modules/eio/default.nix +++ b/pkgs/development/ocaml-modules/eio/default.nix @@ -1,6 +1,6 @@ { lib , ocaml -, version ? if lib.versionAtLeast ocaml.version "5.1" then "1.0" else "0.12" +, version ? if lib.versionAtLeast ocaml.version "5.1" then "1.1" else "0.12" , buildDunePackage , bigstringaf , cstruct @@ -24,9 +24,9 @@ let minimalOCamlVersion = "5.0"; hash = "sha256-2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA="; }; - "1.0" = { + "1.1" = { minimalOCamlVersion = "5.1"; - hash = "sha256-2iYNnaOLPd6fMWZSogsTomHPkLhaJJisZpt9Vk5hlC0="; + hash = "sha256-NGEEiEB38UCzV04drMwCISlgxu/reTyAPj5ri6/qD6s="; }; }."${version}"; in diff --git a/pkgs/development/ocaml-modules/gluon/default.nix b/pkgs/development/ocaml-modules/gluon/default.nix new file mode 100644 index 0000000000000..df700d933ebfc --- /dev/null +++ b/pkgs/development/ocaml-modules/gluon/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildDunePackage +, fetchurl +, bytestring +, config +, libc +, rio +, uri +}: + +buildDunePackage rec { + pname = "gluon"; + version = "0.0.9"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/riot-ml/gluon/releases/download/${version}/gluon-${version}.tbz"; + hash = "sha256-YWJCPokY1A7TGqCGoxJl14oKDVeMNybEEB7KiK92WSo="; + }; + + buildInputs = [ + config + ]; + + propagatedBuildInputs = [ + bytestring + libc + rio + uri + ]; + + meta = { + description = "A minimal, portable, and fast API on top of the operating-system's evented I/O API"; + homepage = "https://github.com/riot-ml/gluon"; + changelog = "https://github.com/riot-ml/gluon/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = [ ]; + }; +} + + diff --git a/pkgs/development/ocaml-modules/libc/default.nix b/pkgs/development/ocaml-modules/libc/default.nix new file mode 100644 index 0000000000000..13e0f04ddfc78 --- /dev/null +++ b/pkgs/development/ocaml-modules/libc/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildDunePackage +, fetchurl +, config +}: + +buildDunePackage rec { + pname = "libc"; + version = "0.0.1"; + + src = fetchurl { + url = "https://github.com/ocaml-sys/libc.ml/releases/download/${version}/libc-${version}.tbz"; + hash = "sha256-e5x5Yae7V6qOpq+aLZaV+6L9ldy9qDqd9Kc8nkAsENg="; + }; + + buildInputs = [ + config + ]; + + meta = { + description = "Raw definitions and bindings to platforms system libraries"; + homepage = "https://github.com/ocaml-sys/libc.ml"; + license = lib.licenses.mit; + }; +} + diff --git a/pkgs/development/ocaml-modules/minttea/default.nix b/pkgs/development/ocaml-modules/minttea/default.nix index 8d81317edd1f3..75ff04929f9b3 100644 --- a/pkgs/development/ocaml-modules/minttea/default.nix +++ b/pkgs/development/ocaml-modules/minttea/default.nix @@ -7,13 +7,13 @@ buildDunePackage rec { pname = "minttea"; - version = "0.0.1"; + version = "0.0.3"; minimalOCamlVersion = "5.1"; src = fetchurl { url = "https://github.com/leostera/minttea/releases/download/${version}/minttea-${version}.tbz"; - hash = "sha256-+4nVeYKx2A2i2nll/PbStcEa+Dvxd0T7e/KsdJqY4bI="; + hash = "sha256-WEaJVCCvsmKcF8+yzovljt8dGWaIv4UmAr74jq6Vo9M="; }; propagatedBuildInputs = [ @@ -21,8 +21,6 @@ buildDunePackage rec { tty ]; - doCheck = true; - meta = { description = "A fun, functional, and stateful way to build terminal apps in OCaml heavily inspired by Go's BubbleTea"; homepage = "https://github.com/leostera/minttea"; diff --git a/pkgs/development/ocaml-modules/rio/default.nix b/pkgs/development/ocaml-modules/rio/default.nix new file mode 100644 index 0000000000000..853670be35288 --- /dev/null +++ b/pkgs/development/ocaml-modules/rio/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildDunePackage +, fetchurl +, cstruct +}: + +buildDunePackage rec { + pname = "rio"; + version = "0.0.8"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/riot-ml/riot/releases/download/${version}/riot-${version}.tbz"; + hash = "sha256-SsiDz53b9bMIT9Q3IwDdB3WKy98WSd9fiieU41qZpeE="; + }; + + propagatedBuildInputs = [ + cstruct + ]; + + meta = { + description = "Ergonomic, composable, efficient read/write streams"; + homepage = "https://github.com/riot-ml/riot"; + changelog = "https://github.com/riot-ml/riot/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = [ ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix index a6f599639111f..4e88d0c8d0901 100644 --- a/pkgs/development/ocaml-modules/riot/default.nix +++ b/pkgs/development/ocaml-modules/riot/default.nix @@ -1,36 +1,34 @@ { lib , buildDunePackage -, cstruct , fetchurl -, mdx -, poll -, ptime +, mirage-crypto-rng +, mtime +, gluon +, randomconv +, rio , telemetry -, uri +, tls }: buildDunePackage rec { pname = "riot"; - version = "0.0.7"; + version = "0.0.8"; minimalOCamlVersion = "5.1"; src = fetchurl { url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz"; - hash = "sha256-t+PMBh4rZXi82dUljv3nLzZX5o1iagBbQ9FfGnr/dp4="; + hash = "sha256-SsiDz53b9bMIT9Q3IwDdB3WKy98WSd9fiieU41qZpeE="; }; propagatedBuildInputs = [ - cstruct - poll - ptime + gluon + mirage-crypto-rng + mtime + randomconv + rio telemetry - uri - ]; - - checkInputs = [ - mdx - mdx.bin + tls ]; doCheck = false; # fails on sandbox diff --git a/pkgs/development/ocaml-modules/spices/default.nix b/pkgs/development/ocaml-modules/spices/default.nix new file mode 100644 index 0000000000000..a1d6b06d156bb --- /dev/null +++ b/pkgs/development/ocaml-modules/spices/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildDunePackage +, fetchurl +, colors +, tty +}: + +buildDunePackage rec { + pname = "spices"; + version = "0.0.2"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/leostera/minttea/releases/download/${version}/minttea-${version}.tbz"; + hash = "sha256-0eB7OuxcPdv9bf2aIQEeir44mQfx5W2AJj7Vb4pGtLI="; + }; + + propagatedBuildInputs = [ + colors + tty + ]; + + doCheck = true; + + meta = { + description = "Declarative styles for TUI applications"; + homepage = "https://github.com/leostera/minttea"; + changelog = "https://github.com/leostera/minttea/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} + diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 8a1b224627d0a..f79a308a33ce7 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -16,13 +16,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-hog6bOKAhLwZMjrUD5yOJ607B1MLYaZJjq6CXIYPlH4="; + hash = "sha256-5HGQDgZZu+miPijJD/Y48WlUVfxjkeU9gA7hByzxb/o="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 9c3cf1171dca0..eb02220e50352 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -88,6 +88,7 @@ buildPythonPackage rec { ++ lib.optionals (pythonAtLeast "3.12") [ # RuntimeError: Dynamo is not supported on Python 3.12+ "test_convert_to_fp32" + "test_dynamo_extract_model" "test_send_to_device_compiles" ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix index 599745e19180d..1aeccdce9fe9c 100644 --- a/pkgs/development/python-modules/aioshutil/default.nix +++ b/pkgs/development/python-modules/aioshutil/default.nix @@ -10,18 +10,23 @@ buildPythonPackage rec { pname = "aioshutil"; - version = "1.3"; - format = "pyproject"; + version = "1.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kumaraditya303"; - repo = pname; - rev = "v${version}"; - hash = "sha256-XIGjiLjoyS/7vUDIyBPvHNMyHOBa0gsg/c/vGgrhZAg="; + repo = "aioshutil"; + rev = "refs/tags/v${version}"; + hash = "sha256-OGxD7GusRcHpz7FdUpa/dJ6/jIAVexbTvXfouVw0C+I="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail " --cov aioshutil --cov-report xml" "" + ''; + nativeBuildInputs = [ setuptools-scm ]; nativeCheckInputs = [ @@ -29,17 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov aioshutil --cov-report xml" "" - ''; - pythonImportsCheck = [ "aioshutil" ]; meta = with lib; { description = "Asynchronous version of function of shutil module"; homepage = "https://github.com/kumaraditya303/aioshutil"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index bd6b8df30a915..cfdde67b22dd6 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "3.4.2"; + version = "3.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UpwIzwOl1yKqK8KxFDXAWoZFkQ+1r1sUcDfx6AxRdNw="; + hash = "sha256-yKHSExtnO9m8Tc3BmCqV8tJs59ynKOqUmekaOatGRTc="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index 4fffb467ef73d..0a217c6f7832b 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -3,11 +3,10 @@ argcomplete, buildPythonPackage, fetchFromGitHub, + fetchpatch2, httpx, mock, pytestCheckHook, - pythonAtLeast, - pythonOlder, requests, responses, setuptools, @@ -20,9 +19,6 @@ buildPythonPackage rec { version = "1.9.8"; pyproject = true; - # Still uses distutils, https://github.com/tchellomello/python-amcrest/issues/234 - disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; - src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; @@ -30,6 +26,15 @@ buildPythonPackage rec { hash = "sha256-v0jWEZo06vltEq//suGrvJ/AeeDxUG5CCFhbf03q34w="; }; + patches = [ + (fetchpatch2 { + # https://github.com/tchellomello/python-amcrest/pull/235 + name = "replace-distutils.patch"; + url = "https://github.com/tchellomello/python-amcrest/commit/ec56049c0f5b49bc4c5bcf0acb7fea89ec1c1df4.patch"; + hash = "sha256-ym+Bn795y+JqhNMk4NPnOVr3DwO9DkUV0d9LEaz3CMo="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/apricot-select/default.nix b/pkgs/development/python-modules/apricot-select/default.nix index b50707e96e6fa..f05e9b8e5e95f 100644 --- a/pkgs/development/python-modules/apricot-select/default.nix +++ b/pkgs/development/python-modules/apricot-select/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + apricot-select, numba, numpy, pynose, @@ -37,15 +38,15 @@ buildPythonPackage rec { dependencies = [ numba numpy + scikit-learn scipy + torchvision tqdm ]; nativeCheckInputs = [ pynose pytestCheckHook - scikit-learn - torchvision ]; pythonImportsCheck = [ "apricot" ]; @@ -56,6 +57,21 @@ buildPythonPackage rec { "tests/test_optimizers/test_knapsack_feature_based.py" ]; + # NOTE: These tests seem to be flaky. + disabledTests = [ + "test_digits_modular" + "test_digits_modular_object" + "test_digits_modular_sparse" + "test_digits_sqrt_modular" + "test_digits_sqrt_modular_object" + "test_digits_sqrt_modular_sparse" + ]; + + # NOTE: Tests are disabled by default because they can run for hours and timeout on Hydra. + doCheck = false; + + passthru.tests.check = apricot-select.overridePythonAttrs { doCheck = true; }; + meta = with lib; { description = "Module for submodular optimization for the purpose of selecting subsets of massive data sets"; homepage = "https://github.com/jmschrei/apricot"; diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 938ff02ce7e81..cc8879e35df4e 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = "asyncwhois"; rev = "refs/tags/v${version}"; - hash = "sha256-ESVgK4Z26OAamdHPEVxysnlJ0rEUlr8KNd24fawHuEg="; + hash = "sha256-+FSf2H+IlLJlbZvzSH/Speyt+D2ZdXhQIKJpZYRfIyg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ax/default.nix b/pkgs/development/python-modules/ax/default.nix index ac6f96e48f2aa..dddcc6e1ebeb5 100644 --- a/pkgs/development/python-modules/ax/default.nix +++ b/pkgs/development/python-modules/ax/default.nix @@ -2,11 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, + ax, botorch, ipywidgets, jinja2, pandas, plotly, + python, setuptools, setuptools-scm, typeguard, @@ -79,6 +81,11 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "ax" ]; + # Many portions of the test suite fail under Python 3.12 + doCheck = lib.versions.majorMinor python.version != "3.12"; + + passthru.tests.check = ax.overridePythonAttrs { doCheck = true; }; + meta = with lib; { description = "Ax is an accessible, general-purpose platform for understanding, managing, deploying, and automating adaptive experiments"; homepage = "https://ax.dev/"; diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index d6f2cc38be6ed..18466cb31cb39 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.7.0"; + version = "4.7.1"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-+w0lI2goXYnfX2KB+DNFPXl6UCOhg5o17zggalyYXr8="; + hash = "sha256-mECP4X1KfzAKVlNUB6ZEi5hE2bUoxEUnkIho/DZG6HM="; }; propagatedBuildInputs = [ webob ]; diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix index e90989967b110..1d42c24609f8b 100644 --- a/pkgs/development/python-modules/cleanlab/default.nix +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -3,42 +3,45 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + numpy, scikit-learn, termcolor, tqdm, pandas, setuptools, # test dependencies + datasets, + fasttext, + hypothesis, + keras, + matplotlib, pytestCheckHook, pytest-lazy-fixture, + skorch, tensorflow, torch, - datasets, torchvision, - keras, - fasttext, - hypothesis, wget, - matplotlib, - skorch, }: buildPythonPackage rec { pname = "cleanlab"; - version = "2.6.1"; + version = "2.6.5"; pyproject = true; - disabled = pythonOlder "3.7"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cleanlab"; - repo = pname; + repo = "cleanlab"; rev = "refs/tags/v${version}"; - hash = "sha256-+uJtm/t6Ri25V/9N/2fcOgCOBaBy8PrsM/tO1uX7FEY="; + hash = "sha256-wehvGh27Ey1YK+eWTjT6jRwa7yqPpx3P0HUNePoljpw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + numpy scikit-learn termcolor tqdm @@ -53,18 +56,18 @@ buildPythonPackage rec { doCheck = true; nativeCheckInputs = [ + datasets + fasttext + hypothesis + keras + matplotlib pytestCheckHook pytest-lazy-fixture + skorch tensorflow torch - datasets torchvision - keras - fasttext - hypothesis wget - matplotlib - skorch ]; disabledTests = [ @@ -77,13 +80,15 @@ buildPythonPackage rec { "tests/test_dataset.py" # Requires the datasets we just prevented from downloading "tests/datalab/test_cleanvision_integration.py" + # Fails because of issues with the keras derivation + "tests/test_frameworks.py" ]; - meta = with lib; { + meta = { description = "The standard data-centric AI package for data quality and machine learning with messy, real-world data and labels."; homepage = "https://github.com/cleanlab/cleanlab"; changelog = "https://github.com/cleanlab/cleanlab/releases/tag/v${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index b23f1d170b290..8e1f92aca382e 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "clickgen"; - version = "2.2.2"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ful1e5"; repo = "clickgen"; rev = "refs/tags/v${version}"; - hash = "sha256-Lsb0FvJohwsXofpcq7OgWfhl/3qVxAqY0wdvum6ywSQ="; + hash = "sha256-hYorjqm/FCnff3ZTgIlicwmSLA9ZnHGDyPt1BcijBII="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index dc82f82718322..e16fd6e90cc30 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + click ordered-set orjson ]; diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index a57a770444eda..f9898a8d6f9eb 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.0.3"; + version = "4.0.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = "django-import-export"; rev = "refs/tags/${version}"; - hash = "sha256-ItJx9yJSy88/OvkpjGDWGBOMk5YlSquicSWi0tbKeWE="; + hash = "sha256-jH/f2eebVcvd96XpaN2eBh5Yx5n0DRbDeKPh7+AaTE8="; }; pythonRelaxDeps = [ "tablib" ]; diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index eb6458d6a96cd..be8cf7def52f7 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -11,7 +11,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.18.13"; + version = "0.19.0"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -21,7 +21,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-9tfB5/XMLnwn+AgaT9TkHtc3HcHiD4pme/+BW1uztIs="; + hash = "sha256-Ypz1C+Dx1v61A7LvIsW644qfFjNHQ7KXeKewQ5MAgi0="; }; # Remove all references to pytest-cov diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix index d8afa8317043f..4104ec2ac44b0 100644 --- a/pkgs/development/python-modules/dploot/default.nix +++ b/pkgs/development/python-modules/dploot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "dploot"; - version = "2.7.1"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vNL5xrZkfYO11i8ERqD9637vrMb3Gkmo3RjvQ1ONXbY="; + hash = "sha256-Vbaghcomf9gRso4DN/cpJ4j7t6AU2vg2OhucKbfS1hc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 27760df9b8e73..e36ec5eab06ce 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.13.1"; + version = "8.13.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jVi5yYPll7ej8lmDEbvcLCEdBbpMiZUi2n4AORre81E="; + hash = "sha256-rl8IoV8kt68AJSkPMDx3d9eB6+2yPBgFpGEU6g+RjQ4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 5c322bd8debde..5db308aa20cd5 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -1,32 +1,42 @@ { - lib, buildPythonPackage, fetchPypi, + lib, mock, pyopenssl, pytestCheckHook, pythonOlder, - service-identity, + setuptools, six, twisted, txi2p-tahoe, txtorcon, + versioneer, }: buildPythonPackage rec { pname = "foolscap"; version = "23.3.0"; - disabled = pythonOlder "3.7"; + pyproject = true; + build-system = [ + setuptools + versioneer + ]; - format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-Vu7oXC1brsgBwr2q59TAgx8j1AFRbi5mjRNIWZTbkUU="; }; - propagatedBuildInputs = [ + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + + dependencies = [ six twisted pyopenssl diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index feff5d186fead..ef2976a2694a3 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = "goodwe"; rev = "refs/tags/v${version}"; - hash = "sha256-xWVYxOc0PibttftZIrnmClPcu4EnJCQ1Zob8Pg+FTBE="; + hash = "sha256-Si2sdqaAhENF/PjaJeD3VdZATecJUsX7TtfX819800A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gophish/default.nix b/pkgs/development/python-modules/gophish/default.nix new file mode 100644 index 0000000000000..8a7d8c90d487c --- /dev/null +++ b/pkgs/development/python-modules/gophish/default.nix @@ -0,0 +1,65 @@ +{ + lib, + appdirs, + buildPythonPackage, + certifi, + chardet, + fetchFromGitHub, + idna, + packaging, + pyparsing, + python-dateutil, + pythonOlder, + pythonRelaxDepsHook, + requests, + setuptools, + six, + urllib3, +}: + +buildPythonPackage rec { + pname = "gophish"; + version = "0.5.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "gophish"; + repo = "api-client-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-ITwwU/Xixyi9JSWbYf606HB7S5E4jiI0lEYcOdNg3mo="; + }; + + pythonRelaxDeps = true; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ + appdirs + certifi + chardet + idna + packaging + pyparsing + python-dateutil + requests + six + urllib3 + ]; + + pythonImportsCheck = [ "gophish" ]; + + # Module has no test + doCheck = false; + + meta = with lib; { + description = "Module to interact with Gophish"; + homepage = "https://github.com/gophish/api-client-python"; + changelog = "https://github.com/gophish/api-client-python/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 843c8cbf1348b..78baf88849c7f 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "heatzypy"; - version = "2.5.4"; + version = "2.5.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = "heatzypy"; rev = "refs/tags/${version}"; - hash = "sha256-A01e3duNQmVv9vyOs6+gF/BdevLiYi/uXSq5bKmuRao="; + hash = "sha256-S1wIVeUTbtF5omImt38YNvZEutyCEYMGExccs0FIK44="; }; build-system = [ diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 993316e030f63..e72e987779fbe 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.23.1"; + version = "0.23.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-xMtCyYVstHLgX4++IlJ4ON/2vhMa6oafhMkdxk3+yGQ="; + hash = "sha256-BXuFX4Y7t3Y3I/W3MIlUJ1zwTZ1CHpJ1aoHNHhnuz0M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix index 4dc6d053154d3..3407aa277152c 100644 --- a/pkgs/development/python-modules/import-expression/default.nix +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, fetchpatch, pytestCheckHook, astunparse, @@ -9,25 +9,17 @@ }: buildPythonPackage rec { pname = "import-expression"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; - src = fetchFromGitHub { - owner = "ioistired"; - repo = "import-expression-parser"; - rev = "refs/tags/v${version}"; - hash = "sha256-mll2NePB7fthzltLOk6D9BgaDpH6GaW4psqcGun/0qM="; + src = fetchPypi { + inherit version; + pname = "import_expression"; + hash = "sha256-mVlYj8/I3LFEoHJRds/vbCjH2x/C1oNiUCXmh1FtQME="; }; - patches = [ - (fetchpatch { - url = "https://github.com/ioistired/import-expression-parser/commit/3daf968c3163b64685aa529740e132f0df5ab262.patch"; - hash = "sha256-2Ubv3onor2D26udZbDDMb3iNLopEIRnIcO/X6WUVmJU="; - }) - ]; - - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ astunparse ]; + build-system = [ setuptools ]; + dependencies = [ astunparse ]; nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests.py" ]; diff --git a/pkgs/development/python-modules/latex2pydata/default.nix b/pkgs/development/python-modules/latex2pydata/default.nix new file mode 100644 index 0000000000000..f6b9654aaad51 --- /dev/null +++ b/pkgs/development/python-modules/latex2pydata/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchPypi +, buildPythonPackage +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "latex2pydata"; + version = "0.2.0"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-lFYGBFox7fv/vlfqZN3xsh9UIRCQ+C5Cizq9j4RTcJ0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + homepage = "https://github.com/gpoore/latex2pydata"; + description = "Send data from LaTeX to Python using Python literal format"; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ romildo ]; + }; +} diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 093002f65433f..0a1f6841d3909 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.53"; + version = "0.1.54"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-j5FCQnp+MNrJ8zgYeLRuWF+Gdq0FwJeBYyJALb+H8So="; + hash = "sha256-Hn99ST6RnER6XI6+rqA3O9/aC+whYoTOzeoHGF/fFz4="; }; build-system = [ diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 068566ea139f7..d55ecbefaf0d7 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.37.16"; + version = "1.38.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-WOkblyzncIn1F67qlh8rTosCal6j4zlXsHHrWbwhJOo="; + hash = "sha256-JzSAdr238wRAl2HGd6RVEgbHC4b2xw1GsYRCHSVVaQk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 7122c4aba058d..eff0165238cc7 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.38"; + version = "0.10.39"; pyproject = true; disabled = pythonOlder "3.8"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-A5wOQE8WK8Mt7TvquSfgPorr39lap2n8AVQP7rr6y/Y="; + hash = "sha256-mSzVUTC6O/qf9EtA9UKmGKsv50SJp0tZwg+kmqFCGLE="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 723bca2ebc962..86a1567e55720 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.3.21"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-+bWJd1mntTH+Wi+mjDJl/TTDqGwihAFyKRlT4kR2sqo="; + hash = "sha256-Ypp1h4qfrY3q27Oohf/UXsl2Vlmuj78hPhlcAzXVMq4="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix index d68f9d5b92831..5845857ea1650 100644 --- a/pkgs/development/python-modules/okonomiyaki/default.nix +++ b/pkgs/development/python-modules/okonomiyaki/default.nix @@ -12,6 +12,7 @@ mock, packaging, testfixtures, + pythonAtLeast, }: buildPythonPackage rec { @@ -58,5 +59,6 @@ buildPythonPackage rec { description = "An experimental library aimed at consolidating a lot of low-level code used for Enthought's eggs"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.bsd3; + broken = pythonAtLeast "3.12"; # multiple tests are failing }; } diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index d14f7a7cca0dc..05786117dc9e1 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ome-zarr"; - version = "0.8.3"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ome"; repo = "ome-zarr-py"; rev = "refs/tags/v${version}"; - hash = "sha256-JuNXVse/n/lFbNaLwMcir8NBHiRxcbYvtbxePwI6YoY="; + hash = "sha256-YOG9+ONf2OnkSZBL/Vb8Inebx4XDSGJb2fqypaWebhY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 3bb388329b658..6b2c64de5d0c7 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "15.0.0"; + version = "15.1.0"; pyproject = true; src = fetchPypi { pname = "oslo.db"; inherit version; - hash = "sha256-6QJDUgX1xQtw7mNYY8i06lS9Hr4ABpXAZeMN1C2Xb/o="; + hash = "sha256-FqvjqOYf52zaLwPZx9xZEITRnvYU8xiHvylp7fsg6E4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 9f18906cb8758..882131c7c60b9 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.5.1"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-SEFIUSxdsqizXIPNmX6ZU3Vf2L+oqvbuDMjHrrdCkhA="; + hash = "sha256-ifDW+iy6goH4m1CKf+Sb+5far1XFJ4GH1FowaZceaH8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix index f18e1ad044bd7..d35bf4f2ad1b3 100644 --- a/pkgs/development/python-modules/pdfplumber/default.nix +++ b/pkgs/development/python-modules/pdfplumber/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + ghostscript, jupyterlab, nbexec, pandas, @@ -45,6 +46,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + ghostscript jupyterlab nbexec pandas @@ -66,8 +68,6 @@ buildPythonPackage rec { "tests/test_display.py" # Tests requires pypdfium2 "tests/test_issues.py" - # Tests require Ghostscript - "tests/test_repair.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index ff4baf1aa2be0..3c55be1d16698 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.10.8"; + version = "19.10.12"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-H9AJErjJC/zo5Fy1sZFLw6GCMm4YirMzwWbAhzXM7mg="; + hash = "sha256-9k6bFEZychZXr/vE5AznQ36hhm/JXgjByM9wSZmyzts="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plugp100/default.nix b/pkgs/development/python-modules/plugp100/default.nix new file mode 100644 index 0000000000000..cd2c09467ffd3 --- /dev/null +++ b/pkgs/development/python-modules/plugp100/default.nix @@ -0,0 +1,51 @@ +{ + stdenv, + pkgs, + lib, + buildPythonPackage, + fetchFromGitHub, + certifi, + scapy, + urllib3, + semantic-version, + aiohttp, + jsons, + requests, + # Test inputs + pytestCheckHook, + pyyaml, + pytest-asyncio, + async-timeout, + }: + +buildPythonPackage rec { + pname = "plugp100"; + version = "5.1.3"; + + src = fetchFromGitHub { + owner = "petretiandrea"; + repo = "plugp100"; + rev = version; + sha256 = "sha256-V+9cVBMN8H4oFU51T9BDrLF46xgQHqIsMj8nuPedUGA="; + }; + + propagatedBuildInputs = + [ certifi jsons requests aiohttp semantic-version scapy urllib3 pyyaml ]; + + nativeCheckInputs = [ pytestCheckHook pytest-asyncio async-timeout ]; + + disabledTestPaths = [ + "tests/integration/" + "tests/unit/hub_child/" + "tests/unit/test_plug_strip.py" + "tests/unit/test_hub.py " + "tests/unit/test_klap_protocol.py" + ]; + + meta = with lib; { + description = "Python library to control Tapo Plug P100 devices"; + homepage = "https://github.com/petretiandrea/plugp100"; + license = licenses.gpl3; + maintainers = with maintainers; [ pyle ]; + }; +} diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index eb9711c6ebd63..9c1aa683003b2 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.37.8"; + version = "0.37.9"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-Mh4BZ0Gnsy046I537R4SZ/rC9Jm7XjF0slAP/0e5Ov8="; + hash = "sha256-8o2cTGkoYLrHQsAWnTg7cj9bJ+Wv1/lbHJiZ50jjFxo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index fdacceff4ad35..b9ea300c15842 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.26"; + version = "3.0.27"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yPsUBlAtw0nZnFfq8G5xFvOy3qyU8C80K65ocIkJ90M="; + hash = "sha256-JLD9qUtz0cmaJ+b9DQi+by582nmi25lcfjx7ixJUutk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index a693890d45668..d9080684581f2 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240515"; + version = "0.10.0.20240525"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0BlbqefYDjYRIWv5UgjTRInD12l1wGp+nnwJBE5vbXs="; + hash = "sha256-uH+o+M/aFLEaGOgdusSXJN7PtHdwD6v3tlhkwRybTjY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index 609a3b0341801..b664fa6e0e5fc 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.2.7"; + version = "2.2.10"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pbs"; repo = "pycaption"; rev = "refs/tags/${version}"; - hash = "sha256-0rh8w4zQN5qAIPwnm7FO6VyPxMdutYFflpY+xWdEm3M="; + hash = "sha256-U4ooAKs0vy6jQdUake2R0RKs9lz+DNvS1f3/c2Mck5k="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 4178d616ae8f0..9e2e4f5c33718 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.18"; + version = "0.2.19"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-pwlS0304aTSrGZFIj5f+jstcFwcy/liqQBW8p7hUhKE="; + hash = "sha256-coxO3WQt60b6I2QfhViuTiOp+VuktUoddWjbMxUOx7E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymongo-inmemory/default.nix b/pkgs/development/python-modules/pymongo-inmemory/default.nix index 2b9d9b924369a..d90652a53726c 100644 --- a/pkgs/development/python-modules/pymongo-inmemory/default.nix +++ b/pkgs/development/python-modules/pymongo-inmemory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pymongo-inmemory"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "kaizendorks"; repo = "pymongo_inmemory"; rev = "refs/tags/v${version}"; - hash = "sha256-vYWVMSawk+03ie3PtqOyzd6wxiviq+IzyQ8bvEHNHfc="; + hash = "sha256-FDHHf9x62EqNcHjDF2vH8w8WG/15efEe+fDqGiiOe4A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index dc718777af700..77f2f3df334ed 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, deprecated, fetchFromGitHub, - importlib-metadata, ipython, lark, matplotlib-inline, @@ -12,7 +11,6 @@ numpy, packaging, poetry-core, - pydantic, pytest-asyncio, pytest-mock, pytestCheckHook, @@ -27,20 +25,21 @@ types-deprecated, types-python-dateutil, types-retry, + typing-extensions, }: buildPythonPackage rec { pname = "pyquil"; - version = "4.8.0"; + version = "4.9.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rigetti"; repo = "pyquil"; rev = "refs/tags/v${version}"; - hash = "sha256-MGI+R3oteqDWsXP+SlAGSRGiQiAj44YG6V7o90A4Krc="; + hash = "sha256-TxmQ9QXTTr4Xv37WmgArfK8Q5H1zAu8qx8wRsvK+vVM="; }; pythonRelaxDeps = [ @@ -61,7 +60,6 @@ buildPythonPackage rec { networkx numpy packaging - pydantic qcs-sdk-python rpcq scipy @@ -69,7 +67,8 @@ buildPythonPackage rec { types-deprecated types-python-dateutil types-retry - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + typing-extensions + ]; nativeCheckInputs = [ nest-asyncio diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index 07cd05cad5277..a448933fcc78f 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, pillow, xlib, six, @@ -15,19 +16,28 @@ buildPythonPackage rec { pname = "pystray"; - version = "0.19.2"; - format = "pyproject"; + version = "0.19.5"; + pyproject = true; src = fetchFromGitHub { owner = "moses-palmer"; repo = "pystray"; rev = "v${version}"; - hash = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs="; + hash = "sha256-CZhbaXwKFrRBEomzfFPMQdMkTOl5lbgI64etfDRiRu4="; }; + patches = [ + # fix test_menu_construct_from_none test case + # https://github.com/moses-palmer/pystray/pull/133 + (fetchpatch { + url = "https://github.com/moses-palmer/pystray/commit/813007e3034d950d93a2f3e5b029611c3c9c98ad.patch"; + hash = "sha256-m2LfZcWXSfgxb73dac21VDdMDVz3evzcCz5QjdnfM1U="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ - --replace "'sphinx >=1.3.1'" "" + --replace-fail "'sphinx >=1.3.1'" "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-testinfra/default.nix b/pkgs/development/python-modules/pytest-testinfra/default.nix index d9743ad803e69..888233166693c 100644 --- a/pkgs/development/python-modules/pytest-testinfra/default.nix +++ b/pkgs/development/python-modules/pytest-testinfra/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pytest-testinfra"; - version = "10.1.0"; + version = "10.1.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-93Qzm5R3Ws3zqMSjeTqOrS6N/HD/NLd4vhWquhQPoZ4="; + hash = "sha256-qHbxRToBtY2U2dk23VA0TCwBrHiAorQdFb3yM67Zzx8="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix new file mode 100644 index 0000000000000..01522c0f3c1fb --- /dev/null +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -0,0 +1,28 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "pytubefix"; + version = "5.6.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-qYNIQhwSZ3ZG3WMY6qCul1OEno1PWgMlfcFSxN3c6aw="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + pythonImportsCheck = [ "pytubefix" ]; + + meta = { + homepage = "https://github.com/JuanBindez/pytubefix"; + description = "A pytube fork with additional features and fixes"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ roshaen ]; + }; +} diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index b905ba64bead3..b6f0944cfa5ac 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -9,13 +9,14 @@ networkx, pandas, requests, - six, + setuptools, }: buildPythonPackage rec { pname = "pyxnat"; - version = "1.6"; - format = "setuptools"; + version = "1.6.2"; + pyproject = true; + disabled = pythonOlder "3.8"; # PyPI dist missing test configuration files: @@ -23,21 +24,19 @@ buildPythonPackage rec { owner = "pyxnat"; repo = "pyxnat"; rev = "refs/tags/${version}"; - hash = "sha256-QejYisvQFN7CsDOx9wAgTHmRZcSEqgIr8twG4XucfZ4="; + hash = "sha256-21nTIYbIYlFWNJTxqsuijamqRunpdc7/VBawvrWadWI="; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ lxml requests - six ]; - # future is not used, and pathlib is installed part of python38+ - # w/o an external package + # pathlib is installed part of python38+ w/o an external package prePatch = '' - substituteInPlace setup.py \ - --replace "pathlib>=1.0" "" \ - --replace "future>=0.16" "" + substituteInPlace setup.py --replace-fail "pathlib>=1.0" "" sed -i '/--cov/d' setup.cfg ''; @@ -52,15 +51,24 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ "pyxnat" ]; disabledTestPaths = [ - # try to access network even though PYXNAT_SKIP_NETWORK_TESTS is set: + # require a running local XNAT instance e.g. in a docker container: + "pyxnat/tests/attributes_test.py" + "pyxnat/tests/custom_variables_test.py" + "pyxnat/tests/interfaces_test.py" "pyxnat/tests/pipelines_test.py" + "pyxnat/tests/provenance_test.py" + "pyxnat/tests/prearchive_test.py" + "pyxnat/tests/repr_test.py" + "pyxnat/tests/resources_test.py" "pyxnat/tests/search_test.py" + "pyxnat/tests/sessionmirror_test.py" + "pyxnat/tests/test_resource_functions.py" "pyxnat/tests/user_and_project_management_test.py" ]; disabledTests = [ # try to access network even though PYXNAT_SKIP_NETWORK_TESTS is set: - "test_ashs_volumes" "test_inspector_structure" + "test_project_manager" ]; pythonImportsCheck = [ "pyxnat" ]; diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index c884dfe01e628..0847a10ce625c 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -24,16 +24,16 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.25.0"; + version = "0.25.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-dKjiicrPLRlaIwHwSqpY5dBMTzrZD4xfw3h54IN3rh0="; + hash = "sha256-GtHAV4BvBdexjJxlT1jcNklSogYor2aWoQI2QNs/dOQ="; }; patches = [ diff --git a/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock b/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock index 0c1265d5ac40c..fc65e87b236e6 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock +++ b/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock @@ -912,7 +912,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.2.5", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -1180,9 +1180,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1901,7 +1901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.5", + "indexmap 2.2.6", ] [[package]] @@ -2124,7 +2124,7 @@ dependencies = [ [[package]] name = "qcs" -version = "0.21.4" +version = "0.21.7" dependencies = [ "assert2", "async-trait", @@ -2136,7 +2136,7 @@ dependencies = [ "float-cmp", "futures", "hex", - "indexmap 1.9.3", + "indexmap 2.2.6", "insta", "itertools 0.11.0", "lazy_static", @@ -2260,7 +2260,7 @@ dependencies = [ [[package]] name = "qcs-sdk-python" -version = "0.17.4" +version = "0.17.7" dependencies = [ "async-trait", "numpy", @@ -2290,11 +2290,11 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quil-rs" -version = "0.23.0" -source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.7.0#3bb618124c2165b7329c58c0f217d8ee9d816e67" +version = "0.25.1" +source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.9.1#4179fb03feff6b83edfb7a0448b0b3967ed28212" dependencies = [ "approx", - "indexmap 2.2.5", + "indexmap 2.2.6", "itertools 0.12.1", "lexical", "ndarray", @@ -3381,7 +3381,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -3394,7 +3394,7 @@ version = "0.22.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix index d63eb97b9faa5..b47603e24a55e 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qcs-sdk-python"; - version = "0.17.4"; + version = "0.17.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,13 +24,13 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-sdk-rust"; rev = "python/v${version}"; - hash = "sha256-Z/NK+xnugFieJqAbvGaVvxUaz9RC1vpWb4ydZTVbZeU="; + hash = "sha256-6Rh5gQH+ObpWGR9rYJfkXnGfG1GjKLn+ckiR7RhKzoE="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "quil-rs-0.23.0" = "sha256-l9wj1j7PJ5L497dPlkEpJ4ctAfjUIada5Vbn2h5ioVE="; + "quil-rs-0.25.1" = "sha256-zC4DEjCN6y9XeZlzmXHSTbVTpFQ4Srozix89IHDhHXc="; }; }; diff --git a/pkgs/development/python-modules/quil/default.nix b/pkgs/development/python-modules/quil/default.nix index 1d77ff861e48a..a987561d08573 100644 --- a/pkgs/development/python-modules/quil/default.nix +++ b/pkgs/development/python-modules/quil/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "quil"; - version = "0.7.1"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,13 +22,13 @@ buildPythonPackage rec { owner = "rigetti"; repo = "quil-rs"; rev = "quil-py/v${version}"; - hash = "sha256-GFePbCJnVbzL4cpQ7fy1tk2l7NhAyTVW63lVYTv0/Oo="; + hash = "sha256-c9nFF74Mr6S2b7NthRVUnarwxFZ9s5RUaoxYruE6QvI="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-catUGCFbkvov1z52f6eyxogflu61VcjIItgEVEWzkpY="; + hash = "sha256-FNkXdBLfKnrD9aUe25uJHi+TtApgFSCryYCY1r8ebho="; }; buildAndTestSubdir = "quil-py"; diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index bbcb620123fc6..d33421f11a9e8 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resend"; - version = "1.1.0"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; rev = "refs/tags/v${version}"; - hash = "sha256-xLrqkOHdynlwuY3+9aHWgCz8TX9v4RiVCvvPtu6k14c="; + hash = "sha256-3dYs3U3UaD3eiLs5s71VfivSurp5R3BiA1r0L5Py7XY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index c1a9ba9abcab7..aa97c1b9bb7a5 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -1,7 +1,9 @@ { lib, buildPythonPackage, + fetchpatch, fetchPypi, + meson-python, numpy, python, }: @@ -9,14 +11,42 @@ buildPythonPackage rec { pname = "scikit-fmm"; version = "2023.4.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-14ccR/ggdyq6kvJWUe8U5NJ96M45PArjwCqzxuJCPAs="; }; - propagatedBuildInputs = [ numpy ]; + # TODO: Remove these patches after another stable release is made. + # For now, these allow us to build with Python 3.12+ by switching to Meson + # and off the deprecated distutils. + patches = [ + (fetchpatch { + name = "first-try-at-meson-build.patch"; + hash = "sha256-Kclg4YrQZL6ZSVsLh6X6DqdztPjDK35L5dp5PqYjzaY="; + url = "https://github.com/scikit-fmm/scikit-fmm/commit/a52c0eccb70077553607a5084152316d136b668b.patch"; + }) + (fetchpatch { + name = "work-in-progress-on-meson-build.patch"; + hash = "sha256-WvSwBz7exqe1H+CqdoMfT5jEoIHnyt/nbc/CryuEKiA="; + url = "https://github.com/scikit-fmm/scikit-fmm/commit/db0e7a5f51541745027c3d081d7841e74587793e.patch"; + }) + (fetchpatch { + name = "re-cythonize-the-heap-wrapper.patch"; + hash = "sha256-ro97+06R0szXQ9I8/sR4JAnFxoQwJeiImDcl1Yp9P0Y="; + url = "https://github.com/scikit-fmm/scikit-fmm/commit/4168323e209343facd5f6ba93a85893242e781a2.patch"; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "oldest-supported-numpy" "numpy" + ''; + + build-system = [ meson-python ]; + + dependencies = [ numpy ]; checkPhase = '' mkdir testdir; cd testdir diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 5d313334ae3a5..abf29ffaff97e 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -7,6 +7,7 @@ qt5, libxcrypt, llvmPackages_15, + pythonAtLeast, }: stdenv.mkDerivation { @@ -58,6 +59,6 @@ stdenv.mkDerivation { ]; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; - broken = stdenv.isDarwin; + broken = stdenv.isDarwin || pythonAtLeast "3.12"; }; } diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index ff64f0362fdc0..4efdf348ecc0e 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "9.7.0"; + version = "9.8.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-r2lHI795aM6hipVmQdzveG7B9y3oAicY+j7194aL1DA="; + hash = "sha256-YxYfynRstqgeIVi/YZUMy4118bcjHH9KyeBYF6q1hrQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 0325b42e111ed..88d08613850b7 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1154"; + version = "3.0.1156"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-rVNmNnLRtW7ZhJgNUoZvYlbU9dkiXXOv7/vBAvaQ18w="; + hash = "sha256-evhgB8MljJBru+6ovMaUMIwSRcVA+zG+EHYtubSVr7o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index bbfabbefd78a6..b4c489303dc42 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.10.3"; + version = "3.11.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = "teslajsonpy"; rev = "refs/tags/v${version}"; - hash = "sha256-g5csh014gXdYJ28cBn0Frk5g3zFuZ9ufrypcLcNPwg0="; + hash = "sha256-Hb/O4kdmJVN6yGhg/FQ6i0qUrtEuD1dZooJ6pbZ+qig="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 6cabdc3b89a5e..077a0980df0e0 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.31.0.20240406"; + version = "2.32.0.20240523"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-RCjfM8VQOUXHSz9C6CsYHobse3JGIEGaKWbi3mBM4aE="; + hash = "sha256-Jrim3jLZ9WEZK5lCtBwKstgBDfVnfKiqFGKJ0R1QX1c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/vnoise/default.nix b/pkgs/development/python-modules/vnoise/default.nix new file mode 100644 index 0000000000000..02f917bc17aca --- /dev/null +++ b/pkgs/development/python-modules/vnoise/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "vnoise"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "plottertools"; + repo = "vnoise"; + rev = version; + hash = "sha256-nflAh3vj48wneM0wy/+M+XD6GC63KZEIFb1x4SS46YI="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "vnoise" ]; + + meta = with lib; { + description = "Vectorized, pure-Python Perlin noise library"; + homepage = "https://github.com/plottertools/vnoise"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix index 5d9e1d4d48e1d..1e808d5875376 100644 --- a/pkgs/development/python-modules/xyzservices/default.nix +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xyzservices"; version = "2024.4.0"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -24,9 +24,9 @@ buildPythonPackage rec { setuptools-scm ]; - disabledTests = [ + pytestFlagsArray = [ # requires network connections - "test_free_providers" + "-m 'not request'" ]; pythonImportsCheck = [ "xyzservices.providers" ]; @@ -37,11 +37,11 @@ buildPythonPackage rec { requests ]; - meta = with lib; { + meta = { changelog = "https://github.com/geopandas/xyzservices/releases/tag/${version}"; description = "Source of XYZ tiles providers"; homepage = "https://github.com/geopandas/xyzservices"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; + license = lib.licenses.bsd3; + maintainers = lib.teams.geospatial.members; }; } diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index ae1b88bec239b..fb894f05c22af 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/pkgs/development/python-modules/yara-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "yara-python"; - version = "4.5.0"; + version = "4.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,18 +18,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-python"; - rev = "v${version}"; - hash = "sha256-RcrzzJQdzn+BXEp5M3ziGL6qSgfUN3wJ3JxwgjzVeuk="; + rev = "refs/tags/v${version}"; + hash = "sha256-P+OQljzp+ZwVOXAgJqK7GNrqBep40MyVtMKDtT4ZUr8="; }; # undefined symbol: yr_finalize # https://github.com/VirusTotal/yara-python/issues/7 postPatch = '' substituteInPlace setup.py \ - --replace "include_dirs=['yara/libyara/include', 'yara/libyara/', '.']" "libraries = ['yara']" + --replace-fail "include_dirs=['yara/libyara/include', 'yara/libyara/', '.']" "libraries = ['yara']" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ yara ]; @@ -44,7 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for YARA"; homepage = "https://github.com/VirusTotal/yara-python"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/VirusTotal/yara-python/releases/tag/v${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index edaae03db7cc6..a34b2e7f7e614 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-HMWb9NScT4rRMFsUXw6TW/T0P1eH0a46OegUZ0JceiE="; + hash = "sha256-mFjNtZdLpS1jfqF/KZ1p8H0pWUGsIdFDxhc4dZnv6HM="; }; build-system = [ diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 3fc0d7946757c..ee8eb919c3ebf 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -14,15 +14,14 @@ buildPythonPackage rec { pname = "zconfig"; - version = "4.0"; + version = "4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "ZConfig"; - inherit version; - hash = "sha256-+NZC+6a6mNCGMb4sH3GtGVfAUf70qj0/ufHgjcYdAVY="; + inherit pname version; + hash = "sha256-tqed2hV/NpjIdo0s7cJjIW6K8kDTz50JoCpkKREU6yA="; }; patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; diff --git a/pkgs/development/python-modules/zipfile2/default.nix b/pkgs/development/python-modules/zipfile2/default.nix index e16a0cc6b25b1..967497c009665 100644 --- a/pkgs/development/python-modules/zipfile2/default.nix +++ b/pkgs/development/python-modules/zipfile2/default.nix @@ -2,6 +2,7 @@ buildPythonPackage, fetchFromGitHub, lib, + pythonAtLeast, }: buildPythonPackage rec { @@ -25,5 +26,6 @@ buildPythonPackage rec { description = "A backwards-compatible improved zipfile class"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.psfl; + broken = pythonAtLeast "3.12"; # tests are failing because the signature of ZipInfo._decodeExtra changed }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 8d4004d7580f3..ce5f581be1bcf 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1498,6 +1498,43 @@ let buildInputs = [ cacert ] ++ attrs.buildInputs; }); + + immunotation = let + MHC41alleleList = fetchurl { + url = "https://services.healthtech.dtu.dk/services/NetMHCpan-4.1/allele.list"; + hash = "sha256-CRZ+0uHzcq5zK5eONucAChXIXO8tnq5sSEAS80Z7jhg="; + }; + + MHCII40alleleList = fetchurl { + url = "https://services.healthtech.dtu.dk/services/NetMHCIIpan-4.0/alleles_name.list"; + hash = "sha256-K4Ic2NUs3P4IkvOODwZ0c4Yh8caex5Ih0uO5jXRHp40="; + }; + + # List of valid countries, regions and ethnic groups + # The original page is changing a bit every day, but the relevant + # content does not. Use archive.org to get a stable snapshot. + # It can be updated from time to time, or when the package becomes + # deficient. This may be difficult to know. + # Update the snapshot date, and add id_ after it, as described here: + # https://web.archive.org/web/20130806040521/http://faq.web.archive.org/page-without-wayback-code/ + validGeographics = fetchurl { + url = "https://web.archive.org/web/20240418194005id_/http://www.allelefrequencies.net/hla6006a.asp"; + hash = "sha256-m7Wkmh/cPxeqn94LwoznIh+fcFXskmSGErUYj6kTqak="; + }; + in old.immunotation.overrideAttrs (attrs: { + patches = [ ./patches/immunotation.patch ]; + postPatch = '' + substituteInPlace "R/external_resources_input.R" --replace-fail \ + "nix-NetMHCpan-4.1-allele-list" ${MHC41alleleList} + + substituteInPlace "R/external_resources_input.R" --replace-fail \ + "nix-NETMHCIIpan-4.0-alleles-name-list" ${MHCII40alleleList} + + substituteInPlace "R/AFND_interface.R" --replace-fail \ + "nix-valid-geographics" ${validGeographics} + ''; + }); + rstan = old.rstan.overrideAttrs (attrs: { env = (attrs.env or { }) // { NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION"; diff --git a/pkgs/development/r-modules/patches/immunotation.patch b/pkgs/development/r-modules/patches/immunotation.patch new file mode 100644 index 0000000000000..2019e8e50a029 --- /dev/null +++ b/pkgs/development/r-modules/patches/immunotation.patch @@ -0,0 +1,47 @@ +diff --git a/R/AFND_interface.R b/R/AFND_interface.R +index b62e8e0..0f22d85 100644 +--- a/R/AFND_interface.R ++++ b/R/AFND_interface.R +@@ -244,9 +244,9 @@ check_population <- function(hla_population) { + #' @return list of valid countries, regions and ethnic origin + #' @keywords internal + get_valid_geographics <- function() { +- url <- "http://www.allelefrequencies.net/hla6006a.asp?" +- html_input <- getURL(url, read_method = "html") +- ++ # http://www.allelefrequencies.net/hla6006a.asp? ++ html_input <- xml2::read_html("nix-valid-geographics") ++ + rvest_tables <- rvest::html_table(html_input, fill = TRUE) + + # country +diff --git a/R/external_resources_input.R b/R/external_resources_input.R +index c4b1dc1..8fc5881 100644 +--- a/R/external_resources_input.R ++++ b/R/external_resources_input.R +@@ -74,16 +74,17 @@ getURL <- function(URL, N.TRIES=2L, + # MHC I + # netmhcI_input_template is an internal variable containing list of valid + # NetMHCpan input alleles +-netmhcI_input_template <- getURL( +- URL="https://services.healthtech.dtu.dk/services/NetMHCpan-4.1/allele.list", +- read_method = "delim", delim = "\t", +- col_names = c("netmhc_input", "hla_chain_name", "HLA_gene")) ++netmhcI_input_template <- readr::read_delim( ++ # https://services.healthtech.dtu.dk/services/NetMHCpan-4.1/allele.list ++ "nix-NetMHCpan-4.1-allele-list", ++ delim = "\t", ++ skip = 0, ++ col_names = c("netmhc_input", "hla_chain_name", "HLA_gene") ++ ) + + # MHC II +-lines <- getURL( +- URL = paste0("https://services.healthtech.dtu.dk/services/", +- "NetMHCIIpan-4.0/alleles_name.list"), +- read_method = "lines") ++# https://services.healthtech.dtu.dk/services/NetMHCIIpan-4.0/alleles_name.list ++lines <- readr::read_lines("nix-NETMHCIIpan-4.0-alleles-name-list") + lines_rep <- stringr::str_replace_all(lines, "\t+|\\s\\s+", "\t") + netmhcII_input_template <- suppressWarnings( + suppressMessages(read.delim(textConnection(lines_rep), sep = "\t"))) diff --git a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix index f94f49d00bd4c..58730f40817fe 100644 --- a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix @@ -7,7 +7,7 @@ , xxd , rocm-device-libs , rocm-thunk -, libelf +, elfutils , libdrm , numactl , valgrind @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ rocm-thunk - libelf + elfutils libdrm numactl valgrind diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix index f603b708265de..1e728fb73cf79 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix @@ -8,7 +8,7 @@ , xxd , rocm-device-libs , rocm-thunk -, libelf +, elfutils , libdrm , numactl , valgrind @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ rocm-thunk - libelf + elfutils libdrm numactl valgrind diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index 1f2456b8cc618..91a78a78fdce8 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.6.9"; + version = "1.6.10"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-I4aANk/FurYsT2e3YFxRgbfpl7nEXgBwNiQeA2LMdkw="; + hash = "sha256-hYr2T3BLoBJzcVcINNVdnK3T0Hvs+zwsDkk9iE/csTY="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 1565d7bdc546f..24b8e1715fc45 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.16.0"; + version = "10.17.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-0Hmg7WnLAGy9YOipW7Oe6KQDxRiRqZ5eI3bKQGU0aQQ="; + sha256 = "sha256-UcNNc4UgwTidcZmKmrDm2r4NfPJiFJ8+AacpRJYGLkI="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix index 5dd4429280606..5fa8efd23a1c6 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-google"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-9/JCpT7zwuT8Tf8Pa2cj/pVlowFbQ8kv2XPvwJf/b10="; + hash = "sha256-cflmuvILMJX7jsz6OKPcaN/KezvWiqiv20Sw4vJ/mUk="; }; - vendorHash = "sha256-mh8RXD+RD8juhSY2jWGsmwqAnnudIZIZmq8JjHh/eNQ="; + vendorHash = "sha256-xxSOjnzqESCOWtXsAGuTwVEoinvBNuJFaxDrIVc1O08="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix index 6b0a0d09eba23..030b02b1b5265 100644 --- a/pkgs/development/tools/bazel-gazelle/default.nix +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-gazelle"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-jT+h3ehaqA6LLg2Q5JdWeHPwUomRDIapNALwa7nFDJ4="; + hash = "sha256-YtgqhwPpkw+lPgsBDCDxkcNsSu1/ZoIhXMuQeZgLXNU="; }; vendorHash = null; diff --git a/pkgs/development/tools/build-managers/buck2/default.nix b/pkgs/development/tools/build-managers/buck2/default.nix index 3aad79ce1e581..c1e504a2da5db 100644 --- a/pkgs/development/tools/build-managers/buck2/default.nix +++ b/pkgs/development/tools/build-managers/buck2/default.nix @@ -38,7 +38,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # our version of buck2; this should be a git tag - version = "2024-03-15"; + version = "2024-05-15"; # the platform-specific, statically linked binary — which is also # zstd-compressed @@ -63,7 +63,7 @@ let # tooling prelude-src = let - prelude-hash = "c68a0e4b35928891e72df1738c890bfcb76a6174"; + prelude-hash = "4e9e6d50b8b461564a7e351ff60b87fe59d7e53b"; name = "buck2-prelude-${version}.tar.gz"; hash = buildHashes."_prelude"; url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz"; diff --git a/pkgs/development/tools/build-managers/buck2/hashes.json b/pkgs/development/tools/build-managers/buck2/hashes.json index 280228e6f4e8e..0aa1592ceb1fc 100644 --- a/pkgs/development/tools/build-managers/buck2/hashes.json +++ b/pkgs/development/tools/build-managers/buck2/hashes.json @@ -1,7 +1,7 @@ { "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh" -, "_prelude": "sha256-PTetJetdpFU3bKLU1WESMwIEZox86IcrczvCxmaQzoE=" -, "x86_64-linux": "sha256-2vaKYCFRu2fNA/Nsu3HHT5DWtNeMnEfE8FVl7bat1HQ=" -, "x86_64-darwin": "sha256-zzB3sPOCDGWAb4CQO0yjb7Bph+ioi3cJoMYO/2YzXfU=" -, "aarch64-linux": "sha256-sx8rcADlfdAECL/SSHeB7vzxoedqx6+yT7yJp1qLBgM=" -, "aarch64-darwin": "sha256-GKQ8Xfe9iRpgq5SrM6nyyIPBh9gC25uN/vzGRjViQdQ=" +, "_prelude": "sha256-r2opeCtXAFxF3PbqKDKK0+pcySe70hUEtMiX7QlWZCQ=" +, "x86_64-linux": "sha256-Ln2FkZDQRKlTLU+EvcEE0VNW0BdnaZRd9nNeY8YgGVA=" +, "x86_64-darwin": "sha256-qSO+eERWWBH7KKBft/cze3sV04QZl3itpFNud6AFrFM=" +, "aarch64-linux": "sha256-KNYsZv5io4NYa/45rxzx+5ta6L7LrxV/GnqNWT4Y5/k=" +, "aarch64-darwin": "sha256-YUMrU5WsRu9ZAMzUS3xS/FFuiXtfbByMtT49CRGQ8do=" } diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index aa8a580f45ac8..27db1b9db55e1 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.3.1", + "version": "1.3.2", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "04piwgd7jy7m4mx263lmlxfwh839q02b9jzycrr9bydqgfx7i0sk" + "sha256": "0xs60pnqsxxkamcq0n0am4jbnx4lgnr91ngcwxk0ccfpqf24jpk8" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "0f01ilxr7zc0p6jcmn034j16ynjv1r2miik25pqlhcafjhv9sp20" + "sha256": "1419s6dnwk703mkp209m5fxqphx8g65h0b2kam3zs9z9rii3mjvs" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1yj49fskajf1fffkxh5hyg3vcrxyhjgcha1hj61dw0iblazfa440" + "sha256": "0ms7yggldckkyayz8wksyg79kgk6xl13g47a2jc7q66syzr495yw" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1kr035l4vwv76041yy82347f01kvbl8n676jd3dayzw48xg6j5l2" + "sha256": "1jy5xz8n79ck8gxcmy14ldsaj7dfrwrqgdfhp5h39hzvgcs1mjvl" } } } diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index d1ba00dc616d6..e6c7f0a865ad0 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.35.4"; + version = "1.36.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-lcB23yU7Wn+aILGFLDBnFg30NRDQgJt3J61FmGuQtRo="; + hash = "sha256-Ttz1D/jFbxFfpbT2VAkcao2AFwFRD8PLrH8yDSYt3AI="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index df4522faf26ea..155f2939cf789 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -13,21 +13,21 @@ let channels = { stable = { - version = "2.10.2"; + version = "2.10.3"; hash = { - x86_64-linux = "sha256-U3qHEjIKq8JkpDp6TehMs6t5L3GpSGt4D10XSAQ9Ii0="; - x86_64-darwin = "sha256-ibfqqxRRD3IfIN2FqSxk5qd7d87RvBgKKFv9F0hACgo="; - aarch64-linux = "sha256-HdBVnLKen6W1crZfnc2hpA0cAYIYeYFHKvANwnLqkjY="; - aarch64-darwin = "sha256-3sHmR6PTRlBSIdD4rja4y8v0gOY4cbbyhW7qssgpqp8="; + x86_64-linux = "sha256-FjvGGJqo1/LskZ6RteaE2q+W6K1zi8mphAD+TzYp6K4="; + x86_64-darwin = "sha256-/Z8nOqeFzBfauGDGZtrBheSbSQhtWI3HuE36o0cPJ4Y="; + aarch64-linux = "sha256-RI6FqL5GXFCwvgZAO2/evPfZAsO8NatRfTRrkL7jYt0="; + aarch64-darwin = "sha256-x1Wf6tyZPUo1y2IdL15v8SjYgYWuiI0wL94oi9Uak6w="; }; }; mainline = { - version = "2.11.0"; + version = "2.11.2"; hash = { - x86_64-linux = "sha256-aJwL4WCJXxSBrfaUHEECQqedz2lKBOa8sdRItSBpxp4="; - x86_64-darwin = "sha256-4D4MoDrEJtawFeUBG9BiJ6HZ9uqx9uQDIHHNB7m2pp8="; - aarch64-linux = "sha256-2UlCxykSfnK50OPb61YC42MTTlPL1njf0vpwmqaUbI8="; - aarch64-darwin = "sha256-mh0Lr+SH4jZTx1xH7QoqfSLDma5nS61sv31QuOYAgQk="; + x86_64-linux = "sha256-kvQPrYGDkfzTOb3c9f3VNdg3oltKmm1Z4pXeHJ9LIyo="; + x86_64-darwin = "sha256-AUfbdJNBK2fCJ6Pq4gkH4+y/undu6Nx64wcejVAB7iU="; + aarch64-linux = "sha256-FWgTLE3fW/6j1W1FNDqyVOTMGuFqc4e3Eq2tj8IEcWk="; + aarch64-darwin = "sha256-oM+dEUYNUcYHemDWYBf5mqUo3aHXEu6LUuLOboGfTrQ="; }; }; }; diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index a958bba1ac451..4a12be195c83f 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.9"; + version = "2.5.10"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-wzc++enDDjUfj5zYW+hRTOtXkZbFByl2pmFGSrAtUHo="; + hash = "sha256-09xRELdWcwyTgvJKE5+srM9Uxb6BIZEQN3pR5ggRhYk="; }; vendorHash = "sha256-vwcItklYe6ljFdGTxef19plaI5OMoOtQohY0xZLBUos="; diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index 2d107cc56246a..d0e2e5d7a0df5 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "19.0.3"; + version = "19.0.4"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-Zy54nZCnwyZ1JNPvaKi0/bRt5g5ucPANwer/3pl4dGU="; + hash = "sha256-rP2a/t+5FhGIj9T6CQodMp9YXYf3fL5oBdFpAn7e7hw="; }; - vendorHash = "sha256-QUzBxYEvxVzv4c8tKiFb+4NLy8RsXh0QTn9twfstMtw="; + vendorHash = "sha256-BlHd5GQJwdntmvVti+Jvfw65LrYM+hjwdvQ0duKk5d8="; buildInputs = [ sqlite ]; diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 0f006fca5c920..ce84ab242f447 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -23,13 +23,13 @@ let pname = "devpod"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h7FT8Mp/JOOf3XoAJDl1tBKoLfOAS7oaacirPZRQr6A="; + sha256 = "sha256-fIksTguHaWlbwUWnANyb/ftx3Fhhiz8k5n7N/7lhspc="; }; meta = with lib; { diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 0a266560d5598..6662cf4e37659 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-73Ftm5/eGqgjtYcvKcRuHGzKnKYdCJ5WqDBsMSSiMuA="; + hash = "sha256-9yo2LgZ/c23FcZuOxUTlp1CfwFmg6yvhlOsDpY71Pic="; }; - vendorHash = "sha256-Uj7GGRknXtcu64rzS7SSnwQyE84hnGAyiT62vyppDE4="; + vendorHash = "sha256-OuZypIUIUDG1Gipg4RYkQZVUD8+G/U3N2VkbP+rnbkc="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix index b9ca4160fe3eb..8ac2f2499fb9e 100644 --- a/pkgs/development/tools/extism-cli/default.nix +++ b/pkgs/development/tools/extism-cli/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "extism-cli"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-F+Kb9ZAgHkw5kcOSt2Q8Lm+B8B4VPkr4FVYbe6HD+is="; + hash = "sha256-t0SbjTuM298Cka2zhavR6bOGDriz2XUGcfAy25se7M4="; }; - vendorHash = "sha256-/faWWYwY7oxbIOoqpyXC+EU4gECl/o34M+SFyfMOWj8="; + vendorHash = "sha256-5QSZDPRMlLVyOQGCSxNC5BBiuegschkHA0sWvOVAODI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index 4af5783d7112a..2239e42df3ead 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.10.0"; + version = "13.10.1"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-g6VmfVBGAjMH2a+oQpS3fVJm9rRNrYFaVfZ/GeqLSus="; + hash = "sha256-20YDBbkMJblZisFewTXLcvgT+Jtr7T/iaCukoTpbNF8="; }; - npmDepsHash = "sha256-W+XiuYTFmPgcS03U579/J3HsdPkX9WIHMR33DzWQlr8="; + npmDepsHash = "sha256-HSzX4Ptl2WVRf0kw4pDrRoBH6b6JVOB+FD7LymJeaO0="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index ecbda3802d4d8..e2b468b740af6 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-e8XL79Qj38I+oYJdBut1VL0DlU/tE1q7v1N8JmWjrfA="; + sha256 = "sha256-+Kh+Pn0oEq/eDXE+vsYrSOqhSoeQoIueb6mVpT2bljc="; }; vendorHash = "sha256-ccqhuUL99dtIeiEM4hRdi0479I0cyf8pxSZz0G6Vm+w="; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index c4210b1f37381..e91020494036e 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.58.2"; + version = "1.59.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-LVkBIoRzmGQ6aJTOEyW51pdPqi7YOvuuAnaQwm0Fuyw="; + hash = "sha256-m4VT4jJa8AQipH1KQOYYEG84cbCS6qXORZQC8PA7838="; }; - vendorHash = "sha256-BqNBglFoQQHhXIlI0UYerz0JLKmIzjjwqg2NYIeE14E="; + vendorHash = "sha256-ZNoBXSJsLCqRXc09/3woUCJVyeMrFjHIznXMlNz8MsI="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index b95473aac7452..bdae66da33669 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - hash = "sha256-QXlHiVlKx9qmW5Cw4IGzjuUSUfoc9IvA5ZkTc1Ev37Q="; + hash = "sha256-6HqZBJeUaYykTZLSrqQN0Rt6rvnvzb53T56oy06wIUw="; }; - cargoHash = "sha256-9fv8Z9AE9GV/Bq+iAsxUkD/CS25/kOBKKS4SAke/tFk="; + cargoHash = "sha256-Zais+yGfrzxKrKA4uAG65uzhamnuYxQEKkIaeiOlcLQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index fe2678be6d2c2..d3c8d86a14e12 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.6.25"; + version = "0.6.26"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-2eZ1f0oxCNf0hJEQ8hkvsTwCaAWJrIYCyIY5PNfaxI4="; + hash = "sha256-9pCi7bevgE2tO0n1LvhLIcFV8sVpAagkVB8l5WWdIbM="; }; - cargoHash = "sha256-mo/d99Y41/pxMzVvI6LkjnhotGV5j0ee4GItly0aqpY="; + cargoHash = "sha256-xm+8IDLvPDOFJ6FyeQdpbWgQ9XE6bW5i29W0S9JSQzc="; meta = with lib; { description = "A cmake lsp based on tower-lsp and treesitter"; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 1adea9552be07..7e9e83ea6fb3a 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.4.2"; + version = "4.4.3"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-5Loc9H5wqafoZYjPGCJ4kTNulS1/Njgn35T74zHr9s4="; + sha256 = "sha256-lRZs/+oClNdSGapBDt9hROfergHi1cGeP5jlkL8LWxs="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index c707d0daec896..a60457e73591e 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -170,8 +170,13 @@ stdenv.mkDerivation (finalAttrs: { # As binutils takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) + # + # for FreeBSD it's more complicated. With -static-libgcc, configure + # thinks that limits.h does not exist and the build fails for not finding + # LONG_MIN. The configure test itself succeeds but the compiler issues a + # warning about -static-libgcc being unused. env.NIX_CFLAGS_COMPILE = - if hostPlatform.isDarwin + if (hostPlatform.isDarwin || hostPlatform.isFreeBSD) then "-Wno-string-plus-int -Wno-deprecated-declarations" else "-static-libgcc"; @@ -217,6 +222,14 @@ stdenv.mkDerivation (finalAttrs: { ] ++ (if enableShared then [ "--enable-shared" "--disable-static" ] else [ "--disable-shared" "--enable-static" ]) + ++ (lib.optionals (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") [ + # lld17+ passes `--no-undefined-version` by default and makes this a hard + # error; libctf.ver version script references symbols that aren't present. + # + # This is fixed upstream and can be removed with the future release of 2.43. + # For now we allow this with `--undefined-version`: + "LDFLAGS=-Wl,--undefined-version" + ]) ; # Fails diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index df6e223aeb19a..34389a5506b8a 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions let phpMajor = lib.versions.majorMinor php.version; - version = "1.92.15"; + version = "1.92.16"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-CTh3HdTZS5tjnSN5JUX55aioFSqs3FQfy7S5ofXlyBs="; - "8.2" = "sha256-q/Zwpvm+pT6JdkC2nX7fEf+eDmWmtLniL+5Cys8kdNI="; - "8.3" = "sha256-8MGY3Spa4cWqUL4S/qHKPJql5DRhtvmYEE3oBLNNm3M="; + "8.1" = "sha256-HcgIDyz7O3B4PGyNvf87Qw9ddxIyMy4Wt1HunsFDYto="; + "8.2" = "sha256-JKUAw3WDw99lFF/Rl4Pw2Wm3EpAQLR0awfyjpiEkOcg="; + "8.3" = "sha256-bXSJbLW3Oz4mgSRyzkbSzqP8YTdilKas+W4HtrX8YTk="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-mOiBQLXiPYMgHpcPTguEm0hffm+DZnv6MCbFbmRoEdE="; - "8.2" = "sha256-3xPG33DSxnQ9a9rbTov5ILi3hPWsruNZJS1NXttxfxQ="; - "8.3" = "sha256-4Nk+8ZIZ83/oeygDdhHI0mRRCvOEMmdWJoteDVkYuT4="; + "8.1" = "sha256-Eo4teWlzEPw3j/v/5FqFNGykXUZDmWGMLK6LNNkFBRQ="; + "8.2" = "sha256-hf4lmaJeSBT1f2fJ3qduen8i8Fat+U/u0LXecaca+J8="; + "8.3" = "sha256-p4+/B11BDJlvh+tFfn3rgE/Mp3vJ5QRV/hVZjn9wAUI="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-5XUk2v65ceHqnfatLq9E1+J5QRgCDpKxR4ZFpCAsfdI="; - "8.2" = "sha256-Lr8wBAXYHXwPokwQMni5tsNncor9ZRjNwtL/5hodUq8="; - "8.3" = "sha256-KZLPFaa5NPksfhA99S8qV3FngJTDonhG+MMPkCwxUys="; + "8.1" = "sha256-LcOjqZ7WUfm7Woa0S4Zs0jEsErd9yfdSj448s3ym6PA="; + "8.2" = "sha256-ZT2QQqMyezZ0FFgBUECvvYxFWZ8UnDPrQB6zLx0m5hU="; + "8.3" = "sha256-q8aNtMq/olCms240b0gTyEsTqNYgJWJhdtmzIU0S0jw="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-G5wrH9M+b69BLKRI4n9FydGDV/q7Ch7u+Zvol2+ptwI="; - "8.2" = "sha256-zgcYT2oWCa2kc4wLx94nxRjg0sebjdGxuPJNbiBZ/Is="; - "8.3" = "sha256-l1zNH47lNpHj7qRgqoxJisn7dU2VzSGFt0v8/9VpYiI="; + "8.1" = "sha256-lzOmGL08eQlIYnHzy7wijPiFYC7bS8Rn/6zDMj6Zhj0="; + "8.2" = "sha256-PcUZ8elx/wojILwNvH8bF9DxUXBUiSkHzBeD2h2ypGM="; + "8.3" = "sha256-8z2zYYvoq8adeYm22TQ6iypjwfh/dKzCbXAkoNIBMpY="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-mmmzmR4yzwmXAl6YoSOKSivF7uixGZYaFQVIqWd0Ud4="; - "8.2" = "sha256-1jnw3BADm38C1Hi4lBs5B+kJl1karTljVHxHGEfZmtw="; - "8.3" = "sha256-7a2JyeLP4HwyaYsb7zAio2HrUPbBVpVEOUjWKCilkFY="; + "8.1" = "sha256-8X3oeEUWdiqurGSreCxe3lmexsBix4KzrWYNWxOfceU="; + "8.2" = "sha256-iwJs205ZiInw3Rs6TxBF3iw2/t/wxRMXHQpVnxRPPb4="; + "8.3" = "sha256-fshkfbS7wOmevw8ClqPKneIv+UtXYo4sWTatvS9gOnM="; }; }; }; diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 2bc3aa5ecf4fa..b3734bbf06a4e 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -1,78 +1,90 @@ -{ pkgs, ctags }: - -with pkgs.lib; - -# define some ctags wrappers adding support for some not that common languages -# customization: -# a) add stuff here -# b) override asLang, phpLang, ... using packageOverrides -# c) use ctagsWrapped.override {args = [ your liste ];} +{ + lib, + ctags, + writeTextFile, + runtimeShell, + ctagsWrapped, + name ? "${ctags.name}-wrapped", + args ? lib.concatLists [ + ctagsWrapped.defaultArgs + ctagsWrapped.phpLang + ctagsWrapped.jsLang + ctagsWrapped.nixLang + ctagsWrapped.asLang + ctagsWrapped.rubyLang + ], +}: -# install using -iA ctagsWrapped.ctagsWrapped +# Define a ctags wrapper derivation adding support for some not-that-common languages customization. +# Override this to provide different args. -{ +writeTextFile { + inherit name; + executable = true; + destination = "/bin/${name}"; + text = '' + #!${runtimeShell} + exec ${ctags}/bin/ctags ${lib.concatStringsSep " " (map lib.escapeShellArg args)} "$@" + ''; + derivationArgs = { + # Inherit the metadata from the parent `ctags` derivation. + inherit (ctags) meta; - # the derivation. use language extensions specified by args - ctagsWrapped = makeOverridable ( {args, name} : pkgs.writeScriptBin name '' - #!${pkgs.runtimeShell} - exec ${pkgs.ctags}/bin/ctags ${concatStringsSep " " (map escapeShellArg args)} "$@" - '') { - args = let x = pkgs.ctagsWrapped; in concatLists [ - x.defaultArgs x.phpLang x.jsLang x.nixLang x.asLang x.rubyLang - ]; - name = "${ctags.name}-wrapped"; - }; + passthru = { + # `ctagsWrapped` exists for backwards compatibility; ctagsWrapped used to be an attrset and + # now is a derivation, so keep supporting the use of `ctagsWrapped.ctagsWrapped`. + inherit ctagsWrapped; - ### language arguments + ### language arguments - # don't scan version control directories - defaultArgs = [ - "--exclude=.svn" - "--exclude=.hg" - "--exclude=.git" - "--exclude=_darcs" - "--sort=yes" - ]; + # don't scan version control directories + defaultArgs = [ + "--exclude=.svn" + "--exclude=.hg" + "--exclude=.git" + "--exclude=_darcs" + "--sort=yes" + ]; - # actionscript - asLang = [ - "--langdef=ActionScript" - "--langmap=ActionScript:.as" - "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/" - "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/" - "--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/" - "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/" - "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/" - ]; + # actionscript + asLang = [ + "--langdef=ActionScript" + "--langmap=ActionScript:.as" + "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/" + "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/" + "--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/" + "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/" + "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/" + ]; - # PHP - phpLang = [ - "--langmap=PHP:.php" - "--regex-PHP=/abstract class ([^ ]*)/\\1/c/" - "--regex-PHP=/interface ([^ ]*)/\\1/i/" - "--regex-PHP=/function[ \\t]+([^ (]*)/\\1/f/" - ]; + # PHP + phpLang = [ + "--langmap=PHP:.php" + "--regex-PHP=/abstract class ([^ ]*)/\\1/c/" + "--regex-PHP=/interface ([^ ]*)/\\1/i/" + "--regex-PHP=/function[ \\t]+([^ (]*)/\\1/f/" + ]; - # Javascript: also find unnamed functions and functions being passed within a dict. - # the dict properties is used to implement duck typing in frameworks - # var foo = function () { ... } - # { - # a : function () {} - # only recognize names up 100 characters. Else you'll be in trouble scanning compressed .js files. - jsLang = [ - "--regex-JavaScript=/([^ \\t]{1,100})[ \\t]*:[ \\t]*function[ \\t]*\\(/\\1/f/" - ]; + # Javascript: also find unnamed functions and functions being passed within a dict. + # the dict properties is used to implement duck typing in frameworks + # var foo = function () { ... } + # { + # a : function () {} + # only recognize names up 100 characters. Else you'll be in trouble scanning compressed .js files. + jsLang = [ "--regex-JavaScript=/([^ \\t]{1,100})[ \\t]*:[ \\t]*function[ \\t]*\\(/\\1/f/" ]; - # find foo in "foo =", don't think we can do a lot better - nixLang = [ - "--langdef=NIX" - "--langmap=NIX:.nix" - "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/" - ]; + # find foo in "foo =", don't think we can do a lot better + nixLang = [ + "--langdef=NIX" + "--langmap=NIX:.nix" + "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/" + ]; - rubyLang = [ - "--langmap=RUBY:.rb" - "--regex-RUBY=/class ([^ ]*)/\\1/c/" - "--regex-RUBY=/^[ ]*module[ ]*([^ ]*)/\\1/m/" - ]; + rubyLang = [ + "--langmap=RUBY:.rb" + "--regex-RUBY=/class ([^ ]*)/\\1/c/" + "--regex-RUBY=/^[ ]*module[ ]*([^ ]*)/\\1/m/" + ]; + }; + }; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index ed68482d0a86f..54067eb63d217 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -5,12 +5,12 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "5.8.1"; + version = "5.8.2"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - hash = "sha256-DohuELJzqMSNn0U9XEuHacofPrpe6VDgsYha3JQ/SlM="; + hash = "sha256-ciAZS9L5sU2VgVOlogZ1A1nXtJ3hL+iNdFDThc7L8Eo="; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 79514af491938..be53e197bd9bb 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.27.1"; + version = "2.27.2"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-CpU29+dVC/OHZdVtbQKSUwoBHsUUb2ZmBNtU1YSa/UA="; + hash = "sha256-aackeTtByetowH0SVk4/+Pwyeywe6Vpb/mRHudhzLao="; }; vendorHash = "sha256-RpkKWz/cJ1StbpVydqpSfA6uwIYgKa1YOCJVXZRer6k="; diff --git a/pkgs/development/tools/ols/default.nix b/pkgs/development/tools/ols/default.nix index 613dd0f5acbdc..2823cdc3b45ad 100644 --- a/pkgs/development/tools/ols/default.nix +++ b/pkgs/development/tools/ols/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-05-18"; + version = "0-unstable-2024-05-22"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "b5b6733320bd866b6895cc2f44910f180dda4e0b"; - hash = "sha256-Mok77ioHklE3jeSFT2um1XgrnRuQf0ysDcTo3Fjukmk="; + rev = "a2f333bfbdd187aa7463ae230f7a617f6bccb611"; + hash = "sha256-sM8UkfuzQib0L8mUhmtVZAjbZKA07aY2YLvooj3zdc0="; }; passthru.updateScript = unstableGitUpdater { diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index 15457e80aad9e..756340e3f091e 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -13,6 +13,7 @@ , libunwind , libxcrypt , libyaml +, rust-jemalloc-sys-unprefixed , Foundation , Security }: @@ -40,6 +41,7 @@ rustPlatform.buildRustPackage rec { zlib libxcrypt libyaml + rust-jemalloc-sys-unprefixed ] ++ lib.optionals stdenv.isDarwin [ readline libiconv diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 04aae84d0d860..6d55e580291e9 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.13.2"; + version = "0.14.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-sD3Y/FFfUgMtvBoSP0BBhS5aCZy+TkyO8S28q8Hoc5I="; + hash = "sha256-4NsEvmIvgyv186WwMVxjo/PM4ccUtcIVCde4pwXUX98="; }; - cargoHash = "sha256-efVhaL1yUEpOgNZ4Bog1OB37lT1yQHJVE9M938jnGeE="; + cargoHash = "sha256-89YN0P6dsmliOf8mv5ugyWPbg/aflACfkDaZp8f1HBo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 11e5ba601c3e3..c3a42b7a059a2 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.34.1"; + version = "0.34.2"; src = fetchCrate { inherit pname version; - hash = "sha256-fNQ4FfOaS38KGhI/hCRLdtYmb0FXkoXyJsbcT+1K6Ow="; + hash = "sha256-cqFpvhlhgmytv8MzhwKafZYTWwLUXl9o2FQPCY8EN6Y="; }; - cargoHash = "sha256-DwhaVn6nuy2KbXaRcIUQN6iS85ONwAbCWX+vxfa0F7U="; + cargoHash = "sha256-HaZqvsM8QsHo5sdMKHrKdTdWgHIXpBiU3eTojqZXIDA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index e291ed8eab377..188568c43f450 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.31.2"; + version = "2.32.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-UL8PJnz+fV67F0t24OEReF4tIUa8S2NzICYgUU7fgUo="; + sha256 = "sha256-N92qv1CjOSeoknIbf+LA0oAzy75uRGjOpcpHCg7g5lY="; }; doCheck = false; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-S1NwnPn3PRL6GoRBFEhhNuy9StrAhG5qCDW2uWNyU4E="; + cargoHash = "sha256-9L02ox2T+dBRx+mmFpy5Bktsyp3C/havfZoDaNevIMw="; postInstall = '' installShellCompletion --cmd sentry-cli \ diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 4346b51efac89..25468947b5c7c 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wasmedge"; - version = "0.13.5"; + version = "0.14.0"; src = fetchFromGitHub { owner = "WasmEdge"; repo = "WasmEdge"; rev = finalAttrs.version; - sha256 = "sha256-JaFaqYIwcRXYl5JukAfViUn8VTpMPThFO8EaVTPIudA="; + sha256 = "sha256-JPuJIM5OU1qCvFZEQ3gDNBZsIiJijtWLAVGp54z7lt0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix index 352f41f47bb49..ad568f42673c9 100644 --- a/pkgs/development/tools/xqilla/default.nix +++ b/pkgs/development/tools/xqilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, xercesc }: +{ lib, stdenv, fetchurl, fetchpatch, darwin, xercesc }: stdenv.mkDerivation rec { pname = "xqilla"; @@ -17,7 +17,18 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--with-xerces=${xercesc}" ]; + configureFlags = [ + "--with-xerces=${xercesc}" + # code uses register storage specifier + "CXXFLAGS=-std=c++14" + ]; + + buildInputs = [ + xercesc + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreServices + SystemConfiguration + ]); meta = with lib; { description = "An XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 38f926c22ecac..e769924b86291 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.8"; + version = "1.1.9"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-n5ElTDuD0fap+llzrXN7de937jYaAG8dpJlKUB0npT4="; + hash = "sha256-gk3Zi8AcpMTCexL8ASY29W2LcwYICpD2QwpvuEbQpB4="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-4/kEyaF2kmu8MAjlrPgBqKFDId8bBibu3Zll3b0w8Ro="; + hash = "sha256-F5yfovHAsWeLiQ4Uigrm0hy3gwz8pK5PA6AuZiyrfOI="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-btyslaKqdk86whAnQV0on7NWTBTRTegFvMsOl0YyloY="; + hash = "sha256-HV8iVZwHPPyini8rCVMnSHmqL7HUM27uOSfaTcdnnZ0="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-JuDT+8FHbamdMVCDeSTGPYOvhPY2EZ9XeD2zjHEj36Y="; + hash = "sha256-yIz/CWKTSKoeOTb/2rxbyYovw0rralSj0r2ZMPu29i8="; }; }; updateScript = writeShellScript "update-bun" '' |