diff options
Diffstat (limited to 'pkgs/development')
55 files changed, 301 insertions, 320 deletions
diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix index 1df763e4c4fd4..5b7c4a92a5ffc 100644 --- a/pkgs/development/compilers/idris2/build-idris.nix +++ b/pkgs/development/compilers/idris2/build-idris.nix @@ -18,11 +18,24 @@ , ... }@attrs: let + # loop over idrisLibraries and normalize them by turning any that are + # direct outputs of the buildIdris function into the `.library {}` + # property. + idrisLibraryLibs = map (idrisLib: + if lib.isDerivation idrisLib + then idrisLib + else if builtins.isFunction idrisLib + then idrisLib {} + else if (builtins.isAttrs idrisLib && idrisLib ? "library") + then idrisLib.library {} + else throw "Found an Idris2 library dependency that was not the result of the buildIdris function" + ) idrisLibraries; + propagate = libs: lib.unique (lib.concatMap (nextLib: [nextLib] ++ nextLib.propagatedIdrisLibraries) libs); ipkgFileName = ipkgName + ".ipkg"; idrName = "idris2-${idris2.version}"; libSuffix = "lib/${idrName}"; - propagatedIdrisLibraries = propagate idrisLibraries; + propagatedIdrisLibraries = propagate idrisLibraryLibs; libDirs = (lib.makeSearchPath libSuffix propagatedIdrisLibraries) + ":${idris2}/${idrName}"; diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix index 095b973cc0cb3..59a718c045ce5 100644 --- a/pkgs/development/compilers/idris2/idris2-lsp.nix +++ b/pkgs/development/compilers/idris2/idris2-lsp.nix @@ -11,8 +11,8 @@ let ]; globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries; - idris2Api = idris2Packages.idris2Api { }; - lspLib = (idris2Packages.buildIdris { + inherit (idris2Packages) idris2Api; + lspLib = idris2Packages.buildIdris { ipkgName = "lsp-lib"; version = "2024-01-21"; src = fetchFromGitHub { @@ -22,7 +22,7 @@ let hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM="; }; idrisLibraries = [ ]; - }).library { }; + }; lspPkg = idris2Packages.buildIdris { ipkgName = "idris2-lsp"; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 786bd82fa648c..ff76aad22a718 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -20,9 +20,9 @@ # LLVM release information; specify one of these but not both: , gitRelease ? { version = "19.0.0-git"; - rev = "78ee473784e5ef6f0b19ce4cb111fb6e4d23c6b2"; - rev-version = "19.0.0-unstable-2024-06-12"; - sha256 = "sha256-oLVMwWjo6Nt8ZsTnDTfoiM5U0+1lVIc1NO+4qBNYlzs="; + rev = "a9ac31910db3975d5e92a6265ab29dafd6a4691d"; + rev-version = "19.0.0-unstable-2024-06-23"; + sha256 = "sha256-MTt2FU84rgu6FqB9aCO6M54VZexoogkdx5RKS1NzSkk="; } # i.e.: # { diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 5a172bd360db7..61a8c3a5c5bd8 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,26 +18,29 @@ in stdenv.mkDerivation rec { version = "0.15.15"; # These hashes can be updated automatically by running the ./update.sh script. - src = - if stdenv.isDarwin - then - (if stdenv.isAarch64 - then - fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz"; - sha256 = "0bi231z1yhb7kjfn228wjkj6rv9lgpagz9f4djr2wy3kqgck4xg0"; - } - else - fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; + src = let + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/"; + sources = { + "x86_64-linux" = fetchurl { + url = url + "linux64.tar.gz"; + sha256 = "1w4jgjpfhaw3gkx9sna64lq9m030x49w4lwk01ik5ci0933imzj3"; + }; + "aarch64-linux" = fetchurl { + url = url + "linux-arm64.tar.gz"; + sha256 = "1ws5h337xq0l06zrs9010h6wj2hq5cqk5ikp9arq7hj7lxf43vn5"; + }; + "x86_64-darwin" = fetchurl { + url = url + "macos.tar.gz"; sha256 = "178ix54k2yragcgn0j8z1cfa78s1qbh1bsx3v9jnngby8igr6yn3"; - }) - else - fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1w4jgjpfhaw3gkx9sna64lq9m030x49w4lwk01ik5ci0933imzj3"; + }; + "aarch64-darwin" = fetchurl { + url = url + "macos-arm64.tar.gz"; + sha256 = "0bi231z1yhb7kjfn228wjkj6rv9lgpagz9f4djr2wy3kqgck4xg0"; + }; }; - + in + sources.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); buildInputs = [ zlib gmp ]; libPath = lib.makeLibraryPath buildInputs; @@ -49,7 +52,7 @@ in stdenv.mkDerivation rec { install -D -m555 -T purs $PURS ${patchelf libPath} - + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions $PURS --bash-completion-script $PURS > $out/share/bash-completion/completions/purs-completion.bash ''; @@ -67,7 +70,7 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "purs"; changelog = "https://github.com/purescript/purescript/releases/tag/v${version}"; }; diff --git a/pkgs/development/compilers/purescript/purescript/update.sh b/pkgs/development/compilers/purescript/purescript/update.sh index 259fb8aa56107..186a51a2bca3a 100755 --- a/pkgs/development/compilers/purescript/purescript/update.sh +++ b/pkgs/development/compilers/purescript/purescript/update.sh @@ -25,6 +25,10 @@ old_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/puresc echo "v${old_version} linux tarball hash (current version): $old_linux_version_hash" new_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/linux64.tar.gz")" echo "v${new_version} linux tarball hash: $new_linux_version_hash" +old_linux_arm_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/linux-arm64.tar.gz")" +echo "v${old_version} linux tarball hash (current version): $old_linux_arm_version_hash" +new_linux_arm_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/linux-arm64.tar.gz")" +echo "v${new_version} linux tarball hash: $new_linux_arm_version_hash" old_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/macos.tar.gz")" echo "v${old_version} darwin tarball hash (current version): $old_darwin_version_hash" new_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/macos.tar.gz")" @@ -37,6 +41,7 @@ echo echo "Replacing version and hashes in ${purescript_derivation_file}." sed -i -e "s/${old_linux_version_hash}/${new_linux_version_hash}/" "$purescript_derivation_file" +sed -i -e "s/${old_linux_arm_version_hash}/${new_linux_arm_version_hash}/" "$purescript_derivation_file" sed -i -e "s/${old_darwin_version_hash}/${new_darwin_version_hash}/" "$purescript_derivation_file" sed -i -e "s/${old_darwin_arm_version_hash}/${new_darwin_arm_version_hash}/" "$purescript_derivation_file" sed -i -e "s/${old_version}/${new_version}/" "$purescript_derivation_file" diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 1c6cbb96a490c..34388c8c033b1 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "janet"; - version = "1.34.0"; + version = "1.35.2"; src = fetchFromGitHub { owner = "janet-lang"; repo = "janet"; rev = "v${finalAttrs.version}"; - hash = "sha256-DxUEFW9NzAyaE/6vNEFfddIaxsi7qovousxZ28Hveb4="; + hash = "sha256-iqexxlBFM4ffxDsOdKMRJs/ufhKV0jvzqgZ3tH9S/k0="; }; postPatch = '' diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 0e4f62d42e2db..6f3342d057bd1 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -78,7 +78,7 @@ let luarocksDrv = luaLib.toLuaModule ( lua.stdenv.mkDerivation (self: attrs // { - name = namePrefix + pname + "-" + self.version; + name = namePrefix + self.pname + "-" + self.version; inherit rockspecVersion; __structuredAttrs = true; @@ -114,7 +114,7 @@ let rocksSubdir = "${self.pname}-${self.version}-rocks"; configFile = writeTextFile { - name = pname + "-luarocks-config.lua"; + name = self.pname + "-luarocks-config.lua"; text = self.luarocks_content; }; diff --git a/pkgs/development/libraries/abseil-cpp/202206.nix b/pkgs/development/libraries/abseil-cpp/202206.nix deleted file mode 100644 index b8eb30773a067..0000000000000 --- a/pkgs/development/libraries/abseil-cpp/202206.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, static ? stdenv.hostPlatform.isStatic -, cxxStandard ? null -}: - -stdenv.mkDerivation rec { - pname = "abseil-cpp"; - version = "20220623.2"; - - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = "refs/tags/${version}"; - hash = "sha256-ma8QJfSySsk2XVLA0rhwYJMQx+6HxMFgub6gi5mDrLI="; - }; - - patches = lib.optionals stdenv.isDarwin [ - # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages - # that require a different SDK other than the default one. - ./cmake-core-foundation.patch - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - ] ++ lib.optionals (cxxStandard != null) [ - "-DCMAKE_CXX_STANDARD=${cxxStandard}" - ]; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Open-source collection of C++ code designed to augment the C++ standard library"; - homepage = "https://abseil.io/"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = [ maintainers.andersk ]; - }; -} diff --git a/pkgs/development/libraries/abseil-cpp/202308.nix b/pkgs/development/libraries/abseil-cpp/202308.nix deleted file mode 100644 index f03ee08ea58ec..0000000000000 --- a/pkgs/development/libraries/abseil-cpp/202308.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gtest -, static ? stdenv.hostPlatform.isStatic -, cxxStandard ? null -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "abseil-cpp"; - version = "20230802.2"; - - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-wW7dCqiiHyBHiizyV0+M6p17itwTpzHv/T0/mcXyYWE="; - }; - - cmakeFlags = [ - "-DABSL_BUILD_TEST_HELPERS=ON" - "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - ] ++ lib.optionals (cxxStandard != null) [ - "-DCMAKE_CXX_STANDARD=${cxxStandard}" - ]; - - strictDeps = true; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ gtest ]; - - meta = with lib; { - description = "Open-source collection of C++ code designed to augment the C++ standard library"; - homepage = "https://abseil.io/"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = [ maintainers.andersk ]; - }; -}) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index b70e270ba6ffa..dfd09e5dc6c45 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -279,9 +279,13 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS"; pkgConfigModules = [ "gtk4" + ] ++ lib.optionals broadwaySupport [ "gtk4-broadway" + ] ++ lib.optionals stdenv.hostPlatform.isUnix [ "gtk4-unix-print" + ] ++ lib.optionals waylandSupport [ "gtk4-wayland" + ] ++ lib.optionals x11Support [ "gtk4-x11" ]; }; diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index 45e54673a0efa..5345dffc04458 100644 --- a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -1,36 +1,37 @@ -From ad42041cfedcf25716429d2aad16641e0e2a012f Mon Sep 17 00:00:00 2001 +From 58c07f1d59ef683faf8b747e40bd75401306acf4 Mon Sep 17 00:00:00 2001 From: Euan Kemp <euank@euank.com> -Date: Thu, 14 Jan 2021 00:32:00 -0800 +Date: Mon, 24 Jun 2024 15:59:48 +0200 Subject: [PATCH] meson: patch in an install prefix for building on nix Used in the nixpkgs version of libvirt so that we can install things in the nix store, but read them from the root filesystem. --- - meson.build | 9 ++++++++ + meson.build | 9 +++++++ meson_options.txt | 2 ++ src/ch/meson.build | 6 ++--- src/interface/meson.build | 2 +- - src/libxl/meson.build | 18 +++++++-------- + src/libxl/meson.build | 18 +++++++------- src/locking/meson.build | 8 +++---- src/lxc/meson.build | 10 ++++---- - src/meson.build | 18 +++++++-------- - src/network/meson.build | 14 ++++++------ + src/meson.build | 18 +++++++------- + src/network/meson.build | 14 +++++------ src/node_device/meson.build | 2 +- src/nwfilter/meson.build | 6 ++--- src/nwfilter/xml/meson.build | 2 +- - src/qemu/meson.build | 38 +++++++++++++++---------------- + src/qemu/meson.build | 40 +++++++++++++++---------------- src/remote/meson.build | 10 ++++---- src/secret/meson.build | 4 ++-- src/security/apparmor/meson.build | 8 +++---- src/storage/meson.build | 6 ++--- tools/meson.build | 2 +- - 18 files changed, 88 insertions(+), 77 deletions(-) + tools/ssh-proxy/meson.build | 2 +- + 19 files changed, 90 insertions(+), 79 deletions(-) diff --git a/meson.build b/meson.build -index 9016c0458a..b26e690194 100644 +index e98ab0d5ac..376f241c07 100644 --- a/meson.build +++ b/meson.build -@@ -39,6 +39,8 @@ if host_machine.system() == 'windows' +@@ -47,6 +47,8 @@ if host_machine.system() == 'windows' conf.set('WINVER', '0x0600') # Win Vista / Server 2008 endif @@ -39,7 +40,7 @@ index 9016c0458a..b26e690194 100644 # set various paths -@@ -57,6 +59,13 @@ else +@@ -65,6 +67,13 @@ else sysconfdir = prefix / get_option('sysconfdir') endif @@ -54,7 +55,7 @@ index 9016c0458a..b26e690194 100644 # sysconfdir as this makes a lot of things break in testing situations if prefix == '/usr' diff --git a/meson_options.txt b/meson_options.txt -index 5b43cdbd6b..e9dff18441 100644 +index cdc8687795..c2b6da140c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ @@ -64,10 +65,10 @@ index 5b43cdbd6b..e9dff18441 100644 option('packager', type: 'string', value: '', description: 'Extra packager name') option('packager_version', type: 'string', value: '', description: 'Extra packager version') diff --git a/src/ch/meson.build b/src/ch/meson.build -index 66b77907b0..6aa9bbc548 100644 +index 633966aac7..c0ce823345 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build -@@ -64,8 +64,8 @@ if conf.has('WITH_CH') +@@ -74,8 +74,8 @@ if conf.has('WITH_CH') } virt_install_dirs += [ @@ -80,10 +81,10 @@ index 66b77907b0..6aa9bbc548 100644 ] endif diff --git a/src/interface/meson.build b/src/interface/meson.build -index 828f274422..2a6b1f8c5e 100644 +index 3d2991315e..20f3266738 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build -@@ -56,6 +56,6 @@ if conf.has('WITH_INTERFACE') +@@ -59,6 +59,6 @@ if conf.has('WITH_INTERFACE') } virt_install_dirs += [ @@ -92,10 +93,10 @@ index 828f274422..2a6b1f8c5e 100644 ] endif diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 0cc277db82..48d8c5b962 100644 +index e75a8f2fdb..d1800b4ea5 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build -@@ -79,14 +79,14 @@ if conf.has('WITH_LIBXL') +@@ -81,14 +81,14 @@ if conf.has('WITH_LIBXL') } virt_install_dirs += [ @@ -120,10 +121,10 @@ index 0cc277db82..48d8c5b962 100644 ] endif diff --git a/src/locking/meson.build b/src/locking/meson.build -index 72f7780438..abe70d20d5 100644 +index c3dfcf2961..cdc1442775 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build -@@ -238,14 +238,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -249,14 +249,14 @@ if conf.has('WITH_LIBVIRTD') } virt_install_dirs += [ @@ -143,10 +144,10 @@ index 72f7780438..abe70d20d5 100644 endif endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index 99d4a34213..aae477c1ee 100644 +index bf9afabc0f..6e9547000a 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build -@@ -176,10 +176,10 @@ if conf.has('WITH_LXC') +@@ -190,10 +190,10 @@ if conf.has('WITH_LXC') } virt_install_dirs += [ @@ -163,10 +164,10 @@ index 99d4a34213..aae477c1ee 100644 ] endif diff --git a/src/meson.build b/src/meson.build -index b2d951d36c..305716010f 100644 +index dd2682ec19..b330d1159e 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -210,7 +210,7 @@ openrc_init_files = [] +@@ -220,7 +220,7 @@ openrc_init_files = [] # virt_install_dirs: # list of directories to create during installation @@ -175,7 +176,7 @@ index b2d951d36c..305716010f 100644 # driver_source_files: # driver source files to check -@@ -663,7 +663,7 @@ endforeach +@@ -697,7 +697,7 @@ endforeach virt_conf_files += 'libvirt.conf' @@ -184,7 +185,7 @@ index b2d951d36c..305716010f 100644 install_data(virt_aug_files, install_dir: virt_aug_dir) # augeas_test_data: -@@ -723,7 +723,7 @@ foreach data : virt_daemon_confs +@@ -760,7 +760,7 @@ foreach data : virt_daemon_confs output: '@0@.conf'.format(data['name']), configuration: daemon_conf, install: true, @@ -193,7 +194,7 @@ index b2d951d36c..305716010f 100644 ) if data.get('with_ip', false) -@@ -847,7 +847,7 @@ if conf.has('WITH_LIBVIRTD') +@@ -910,7 +910,7 @@ if conf.has('WITH_LIBVIRTD') install_data( init_file, @@ -202,7 +203,7 @@ index b2d951d36c..305716010f 100644 install_mode: 'rwxr-xr-x', rename: [ init['name'] ], ) -@@ -855,7 +855,7 @@ if conf.has('WITH_LIBVIRTD') +@@ -918,7 +918,7 @@ if conf.has('WITH_LIBVIRTD') if init.has_key('confd') install_data( init['confd'], @@ -211,7 +212,7 @@ index b2d951d36c..305716010f 100644 rename: [ init['name'] ], ) endif -@@ -882,10 +882,10 @@ endif +@@ -945,10 +945,10 @@ endif # Install empty directories virt_install_dirs += [ @@ -227,10 +228,10 @@ index b2d951d36c..305716010f 100644 meson.add_install_script( diff --git a/src/network/meson.build b/src/network/meson.build -index b5eff0c3ab..a0f26d624e 100644 +index 07cd5cda55..699309bb66 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -73,11 +73,11 @@ 'in_file': files('virtnetworkd.init.in'), +@@ -115,11 +115,11 @@ if conf.has('WITH_NETWORK') } virt_install_dirs += [ @@ -247,9 +248,9 @@ index b5eff0c3ab..a0f26d624e 100644 ] configure_file( -@@ -85,12 +85,12 @@ input: 'default.xml.in', +@@ -127,12 +127,12 @@ if conf.has('WITH_NETWORK') output: '@BASENAME@', - copy: true, + configuration: configmake_conf, install: true, - install_dir: confdir / 'qemu' / 'networks', + install_dir: install_prefix + confdir / 'qemu' / 'networks', @@ -263,10 +264,10 @@ index b5eff0c3ab..a0f26d624e 100644 ) diff --git a/src/node_device/meson.build b/src/node_device/meson.build -index 1c95975c37..a7831242db 100644 +index d66c02a0e2..f883b65431 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build -@@ -64,6 +64,6 @@ if conf.has('WITH_NODE_DEVICES') +@@ -67,6 +67,6 @@ if conf.has('WITH_NODE_DEVICES') } virt_install_dirs += [ @@ -275,10 +276,10 @@ index 1c95975c37..a7831242db 100644 ] endif diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build -index 55cf8fcce4..d331086f2e 100644 +index de3d202267..346c435ee7 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build -@@ -62,9 +62,9 @@ if conf.has('WITH_NWFILTER') +@@ -65,9 +65,9 @@ if conf.has('WITH_NWFILTER') } virt_install_dirs += [ @@ -302,10 +303,10 @@ index 0d96c54ebe..66c92a1016 100644 -install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') +install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 39f0f615cc..5f6f30f82b 100644 +index 907893d431..99b62c8955 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build -@@ -200,25 +200,25 @@ if conf.has('WITH_QEMU') +@@ -218,25 +218,25 @@ if conf.has('WITH_QEMU') endif virt_install_dirs += [ @@ -352,10 +353,10 @@ index 39f0f615cc..5f6f30f82b 100644 ] endif diff --git a/src/remote/meson.build b/src/remote/meson.build -index b2aafe6320..6972d254ca 100644 +index 831acaaa01..0ba34d3bad 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build -@@ -235,9 +235,9 @@ if conf.has('WITH_REMOTE') +@@ -261,9 +261,9 @@ if conf.has('WITH_REMOTE') } virt_install_dirs += [ @@ -367,8 +368,8 @@ index b2aafe6320..6972d254ca 100644 + install_prefix + runstatedir / 'libvirt' / 'common', ] - logrotate_conf = configuration_data() -@@ -251,7 +251,7 @@ if conf.has('WITH_REMOTE') + logrotate_conf = configuration_data({ +@@ -278,7 +278,7 @@ if conf.has('WITH_REMOTE') ) install_data( log_file, @@ -377,7 +378,7 @@ index b2aafe6320..6972d254ca 100644 rename: [ name ], ) endforeach -@@ -301,7 +301,7 @@ endif +@@ -328,7 +328,7 @@ endif if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -387,10 +388,10 @@ index b2aafe6320..6972d254ca 100644 ) endif diff --git a/src/secret/meson.build b/src/secret/meson.build -index 1bda59849b..392bc2cb2e 100644 +index 3b859ea7b4..ccddb3e805 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build -@@ -45,7 +45,7 @@ if conf.has('WITH_SECRETS') +@@ -48,7 +48,7 @@ if conf.has('WITH_SECRETS') } virt_install_dirs += [ @@ -412,7 +413,7 @@ index b9257c816d..98701755d8 100644 + install_dir: install_prefix + apparmor_dir, ) endforeach - + @@ -68,13 +68,13 @@ foreach name : apparmor_gen_abstractions command: apparmor_gen_cmd, capture: true, @@ -421,13 +422,13 @@ index b9257c816d..98701755d8 100644 + install_dir: install_prefix + apparmor_dir / 'abstractions', ) endforeach - + install_data( [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], - install_dir: apparmor_dir / 'libvirt', + install_dir: install_prefix + apparmor_dir / 'libvirt', ) - + if not conf.has('WITH_APPARMOR_3') @@ -83,7 +83,7 @@ if not conf.has('WITH_APPARMOR_3') # files in order to limit the amount of filesystem clutter. @@ -439,10 +440,10 @@ index b9257c816d..98701755d8 100644 ) endif diff --git a/src/storage/meson.build b/src/storage/meson.build -index 26e7ff1a1a..ad5c6eddc3 100644 +index 404d6a6941..fb4e67a0a8 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build -@@ -127,9 +127,9 @@ if conf.has('WITH_STORAGE') +@@ -126,9 +126,9 @@ if conf.has('WITH_STORAGE') } virt_install_dirs += [ @@ -456,10 +457,10 @@ index 26e7ff1a1a..ad5c6eddc3 100644 endif diff --git a/tools/meson.build b/tools/meson.build -index f4b4a16c29..059c73a955 100644 +index 1bb84be0be..e04a4e986d 100644 --- a/tools/meson.build +++ b/tools/meson.build -@@ -120,7 +120,7 @@ if conf.has('WITH_LOGIN_SHELL') +@@ -121,7 +121,7 @@ if conf.has('WITH_LOGIN_SHELL') install_rpath: libvirt_rpath, ) @@ -468,6 +469,18 @@ index f4b4a16c29..059c73a955 100644 endif if host_machine.system() == 'windows' +diff --git a/tools/ssh-proxy/meson.build b/tools/ssh-proxy/meson.build +index e9f312fa25..95d5d8fe0b 100644 +--- a/tools/ssh-proxy/meson.build ++++ b/tools/ssh-proxy/meson.build +@@ -20,6 +20,6 @@ if conf.has('WITH_SSH_PROXY') + output: '@BASENAME@', + configuration: tools_conf, + install: true, +- install_dir : sshconfdir, ++ install_dir : install_prefix + sshconfdir, + ) + endif -- -2.35.1 +2.45.1 diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index ec35e5727c8b5..097f19a29366f 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -115,28 +115,18 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> - version = "10.0.0"; + version = "10.4.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-xFl8AHcbeuydWzhJNnwZ3Bd7TQiTU8hjBxaALXvcLgE="; + hash = "sha256-grQyILVy0IYbbz/Wau8QRfCub7j+5nhnkfs2tprfpO0="; fetchSubmodules = true; }; patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch - (fetchpatch { - name = "CVE-2024-2494.patch"; - url = "https://gitlab.com/libvirt/libvirt/-/commit/8a3f8d957507c1f8223fdcf25a3ff885b15557f2.patch"; - hash = "sha256-kxSIZ4bPOhN6PpJepoSF+EDTgdmazRWh3a3KSVfm1GU="; - }) - (fetchpatch { - name = "CVE-2024-1441.patch"; - url = "https://gitlab.com/libvirt/libvirt/-/commit/c664015fe3a7bf59db26686e9ed69af011c6ebb8.patch"; - hash = "sha256-Qi/gk7+NPz9s9OpWOnF8XW6A75C9BbVxBTE4KVwalo4="; - }) ] ++ lib.optionals enableZfs [ (substituteAll { src = ./0002-substitute-zfs-and-zpool-commands.patch; @@ -150,7 +140,7 @@ stdenv.mkDerivation rec { sed -i '/commandtest/d' tests/meson.build sed -i '/virnetsockettest/d' tests/meson.build # delete only the first occurrence of this - sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build + sed -i '0,/qemuxmlconftest/{/qemuxmlconftest/d;}' tests/meson.build '' + lib.optionalString isLinux '' for binary in mount umount mkfs; do @@ -283,6 +273,7 @@ stdenv.mkDerivation rec { (cfg "install_prefix" (placeholder "out")) (cfg "localstatedir" "/var") (cfg "runstatedir" (if isDarwin then "/var/run" else "/run")) + (cfg "sshconfdir" "/etc/ssh/ssh_config.d") (cfg "init_script" (if isDarwin then "none" else "systemd")) (cfg "qemu_datadir" (lib.optionalString isDarwin "${qemu}/share/qemu")) @@ -313,6 +304,7 @@ stdenv.mkDerivation rec { (feat "polkit" isLinux) (feat "readline" true) (feat "secdriver_apparmor" isLinux) + (feat "ssh_proxy" isLinux) (feat "tests" true) (feat "udev" isLinux) (feat "yajl" true) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 639ff62887a0b..a5eeb4a193084 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -9,13 +9,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.4.3"; + version = "3.5"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ak49oFZkWNVjt98KXKqBGwKh7nz13/FO5riY7MIDR8g="; + hash = "sha256-IOS5w84/Dnwjqgk5Lf6o6P1l9q5KBUUll250B1mh/Gc="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index b3117364984e9..169376b2d2924 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -29,10 +29,7 @@ let stdenv = throw "Use effectiveStdenv instead"; effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; - cudaCapabilities = cudaPackages.cudaFlags.cudaCapabilities; - # E.g. [ "80" "86" "90" ] - cudaArchitectures = (builtins.map cudaPackages.cudaFlags.dropDot cudaCapabilities); - cudaArchitecturesString = lib.strings.concatStringsSep ";" cudaArchitectures; + cudaArchitecturesString = cudaPackages.flags.cmakeCudaArchitecturesString; howard-hinnant-date = fetchFromGitHub { owner = "HowardHinnant"; diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index bfe1cf1139aed..66714ba16c786 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -35,8 +35,8 @@ in builtins.listToAttrs (map (a: { name = a.pname; value = mkDataset a; }) [ { pname = "G4NDL"; - version = "4.7"; - sha256 = "sha256-fn09JiEQLcYU91OtkocwopDRlmDu2WMEqdJLRT1nAwk="; + version = "4.7.1"; + sha256 = "sha256-06yuSGIhGNJXneJKVNUz+yQWvw2p3SiPFyTfFIWkbHw="; envvar = "NEUTRONHP"; } diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index de775d2146755..7349c708e3d91 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -48,12 +48,12 @@ in lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt" stdenv.mkDerivation rec { - version = "11.2.1"; + version = "11.2.2"; pname = "geant4"; src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - hash = "sha256-g122VD1csugBZ1lYllvpaHf2bWkHu1IZVLWYt4Xerl4="; + hash = "sha256-0k9lc1uKCgOcAPlDSZHpnvEZuGxRDQ8qshFV24KjSR0="; }; # Fix broken paths in a .pc diff --git a/pkgs/development/libraries/py3c/default.nix b/pkgs/development/libraries/py3c/default.nix index 11ccba4c9ee36..32e7d12491187 100644 --- a/pkgs/development/libraries/py3c/default.nix +++ b/pkgs/development/libraries/py3c/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python311 }: stdenv.mkDerivation rec { pname = "py3c"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ - python3 + python311 ]; checkTarget = "test-python"; diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 59494fadfd900..5af73735fdf60 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -29,8 +29,7 @@ let pname = "faiss"; version = "1.7.4"; - inherit (cudaPackages) cudaFlags backendStdenv; - inherit (cudaFlags) cudaCapabilities dropDot; + inherit (cudaPackages) flags backendStdenv; stdenv = if cudaSupport then backendStdenv else inputs.stdenv; @@ -93,7 +92,7 @@ stdenv.mkDerivation { "-DFAISS_ENABLE_PYTHON=${if pythonSupport then "ON" else "OFF"}" "-DFAISS_OPT_LEVEL=${optLevel}" ] ++ lib.optionals cudaSupport [ - "-DCMAKE_CUDA_ARCHITECTURES=${builtins.concatStringsSep ";" (map dropDot cudaCapabilities)}" + "-DCMAKE_CUDA_ARCHITECTURES=${flags.cmakeCudaArchitecturesString}" "-DCUDAToolkit_INCLUDE_DIR=${cudaJoined}/include" ]; diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index 757a1b77dafc5..a675142f361d4 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -41,8 +41,7 @@ let then cudaPackages_11 else cudaPackages; - inherit (effectiveCudaPackages) cudaAtLeast cudaFlags cudaOlder; - inherit (cudaFlags) cudaCapabilities; + inherit (effectiveCudaPackages) cudaAtLeast flags cudaOlder; # move to newer ROCm version once supported rocmPackages = rocmPackages_5; @@ -52,7 +51,7 @@ let # lists.subtractLists a b = b - a # For ROCm - # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.realArches. + # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like flags.realArches. # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must # remove it. rocmArches = lists.map (x: strings.removePrefix "gfx" x) rocmPackages.clr.gpuTargets; @@ -83,12 +82,11 @@ let throw "No GPU targets specified" ); - # E.g. [ "80" "86" "90" ] - cudaArchitectures = (builtins.map cudaFlags.dropDot cudaCapabilities); - - cudaArchitecturesString = strings.concatStringsSep ";" cudaArchitectures; + cudaArchitecturesString = flags.cmakeCudaArchitecturesString; minArch = let + # E.g. [ "80" "86" "90" ] + cudaArchitectures = (builtins.map flags.dropDot flags.cudaCapabilities); minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures); in # "75" -> "750" Cf. https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-273 diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix index 2036c4c86253b..e9367d416e325 100644 --- a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -11,7 +11,7 @@ which, }: let inherit (lib) lists strings; - inherit (cudaPackages) backendStdenv cudaFlags; + inherit (cudaPackages) backendStdenv flags; cuda-common-redist = with cudaPackages; [ cuda_cudart.dev # cuda_runtime.h @@ -89,9 +89,7 @@ in doCheck = false; preConfigure = '' - export TCNN_CUDA_ARCHITECTURES="${ - strings.concatStringsSep ";" (lists.map cudaFlags.dropDot cudaFlags.cudaCapabilities) - }" + export TCNN_CUDA_ARCHITECTURES="${flags.cmakeCudaArchitecturesString}" export CUDA_HOME="${cuda-native-redist}" export LIBRARY_PATH="${cuda-native-redist}/lib/stubs:$LIBRARY_PATH" export CC="${backendStdenv.cc}/bin/cc" diff --git a/pkgs/development/python-modules/aionut/default.nix b/pkgs/development/python-modules/aionut/default.nix index 8c9b8038ce998..cfcefeb330289 100644 --- a/pkgs/development/python-modules/aionut/default.nix +++ b/pkgs/development/python-modules/aionut/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aionut"; - version = "4.3.2"; + version = "4.3.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aionut"; rev = "refs/tags/v${version}"; - hash = "sha256-QehVC/6RbWp8KnOuVtLFkK8/STTgHXkXmFbSmzu9z7w="; + hash = "sha256-DCWfa5YfrB7MTf78AeSHDgiZzLNXoiNLnty9a+Sr9tQ="; }; postPatch = '' @@ -27,7 +27,7 @@ buildPythonPackage rec { --replace-fail " --cov=aionut --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix index b6fc08e3c9d11..31e9ff403b7f8 100644 --- a/pkgs/development/python-modules/aiosteamist/default.nix +++ b/pkgs/development/python-modules/aiosteamist/default.nix @@ -4,46 +4,48 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytestCheckHook, pythonOlder, xmltodict, }: buildPythonPackage rec { pname = "aiosteamist"; - version = "0.3.2"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; - rev = version; - hash = "sha256-IKrAJ4QDcYJRO4hcomL9FRs8hJ3k7SgRgK4H1b8SxIM="; + repo = "aiosteamist"; + rev = "refs/tags/v${version}"; + hash = "sha256-vqCcQDUMFFhIOoiER5TMOxJPY7HYFS4K1fuu/1IqP44="; }; - nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov=aiosteamist" "" + ''; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ aiohttp xmltodict ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov=aiosteamist" "" \ - --replace 'xmltodict = "^0.12.0"' 'xmltodict = "*"' - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "aiosteamist" ]; - # Modules doesn't have test suite - doCheck = false; - meta = with lib; { description = "Module to control Steamist steam systems"; homepage = "https://github.com/bdraco/aiosteamist"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/bdraco/aiosteamist/releases/tag/v${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index 5344131279934..fc5b91f13a1bd 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-sy7/nCthmfI0WdBkwBU83fifcYTe9zUBOpxV7RX9F6w="; + hash = "sha256-ZBy3lo7rb361aysi2ezryd5H47r6sgSqmYNeAI+wXeQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index d44de866d323f..71a8688ed471a 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.12.3"; + version = "3.12.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = "asyncstdlib"; rev = "refs/tags/v${version}"; - hash = "sha256-OLb4+7FFeVDW0ePyVJW8aaosouxlU/4Uq2ktvVLpDFY="; + hash = "sha256-5xbz56/s448PIOZ4DN6NFcYYWXaebaZA3ApGAIMZXH4="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 28843f9887755..440ac99954f4b 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.36.2"; + version = "1.36.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "casbin"; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-RQYMQ1Zt+MJ3PyVGSTGo/Qi95M+NVGn7oC2gqXJdlEU="; + hash = "sha256-JTAd7Nkreyfczomki05WHuuJCFWspvG8i6DAWaQI6fs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index e5e4a13420517..78577b34d9396 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.5"; + version = "1.1.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-ON2Fyyq5fa0TgS28v6FAbR6MpI1k8EOS8HWchfZyT+g="; + hash = "sha256-O0s7jrxjTkIAb6zW+NuG1PPHhRHndcLt11uYNyknO4A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fasttext-predict/default.nix b/pkgs/development/python-modules/fasttext-predict/default.nix index 1a700111593ab..6bfddc120c6ff 100644 --- a/pkgs/development/python-modules/fasttext-predict/default.nix +++ b/pkgs/development/python-modules/fasttext-predict/default.nix @@ -16,6 +16,11 @@ buildPythonPackage rec { hash = "sha256-rMbf09pCHvVYI9g/aq74+PcsuU2LezpmDz4b/w9vRyc="; }; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py \ + --replace-fail "-flto" "" + ''; + nativeBuildInputs = [ pybind11 ]; # tests are removed from fork @@ -28,7 +33,5 @@ buildPythonPackage rec { homepage = "https://github.com/searxng/fasttext-predict/"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; - # ImportError: dynamic module does not define module export function (PyInit_fasttext_pybind) - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index 229e8e72b4033..9c05025ddfd9a 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.27"; + version = "0.0.29"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-3iIQNtdd8sBGfNJrugjjWv4PQKhdFH+prw4poevh+O0="; + hash = "sha256-3RUbHVbnfC0L9u6/VMKK2BhTuc2y5kD83Cn8dQ24kQQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index e2c83a079dcd9..929ca2abefa3d 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.34.1"; + version = "2.34.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "imageio"; repo = "imageio"; rev = "refs/tags/v${version}"; - hash = "sha256-/VZUifiz8iImq+JLvckFDr7YMIqu0Xro2t3GFj0obg0="; + hash = "sha256-1q/LPEdo9rzcIR1ZD+bIP8MIKe7PmxRd8UX6c5C0V5k="; }; patches = lib.optionals (!stdenv.isDarwin) [ @@ -113,11 +113,11 @@ buildPythonPackage rec { "test_reverse_read" ]; - meta = with lib; { + meta = { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; homepage = "https://imageio.readthedocs.io"; changelog = "https://github.com/imageio/imageio/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ Luflosi ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ Luflosi ]; }; } diff --git a/pkgs/development/python-modules/justnimbus/default.nix b/pkgs/development/python-modules/justnimbus/default.nix index 08a7592b29e28..5bc543a929760 100644 --- a/pkgs/development/python-modules/justnimbus/default.nix +++ b/pkgs/development/python-modules/justnimbus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "justnimbus"; - version = "0.7.3"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "kvanzuijlen"; repo = "justnimbus"; rev = "refs/tags/${version}"; - hash = "sha256-JO8T0JItkkNHxlnDKOO8kM9KSzT7QML4sszPymgXSBA="; + hash = "sha256-FsuvpmMWBYI1LheO3NFfCeaW4m3YQ41Tc81TP3gdNqo="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index f424240f91ea1..9af39f33d3d5e 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "libvirt"; - version = "10.0.0"; + version = "10.4.0"; pyproject = true; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-zl1Hfm7flRflNjIpLoLAlPDysYlieC05HEd/mzFW8pU="; + hash = "sha256-Qwn07C8N2ZZzE5+qCo2HtBSm5/zGBqbiLnJePxuEJjs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix index 893ea6338ee77..8beec615d8be8 100644 --- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-s3"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_s3"; inherit version; - hash = "sha256-O8V9b52gcsWm0bfHlNThIvxPox7d+qK4KzvPWT0fkGc="; + hash = "sha256-ramC3INitu++AHKCWov78ad66/XnZG+Z4bZJHBdN5Uk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 1b9bce9c41588..163bc05167875 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.6.1"; + version = "8.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lovasoa"; repo = "marshmallow_dataclass"; rev = "refs/tags/v${version}"; - hash = "sha256-IHHYYtQrdSAtZxbd/YV9J+c4B23HLr9gr01OE6Tgj94="; + hash = "sha256-O96Xv732euS0X+1ilhLVMoazpC4kUSJvyVYwdj10e2E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 5c072b4d16403..fc72540e9d56b 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.10.4"; + version = "1.10.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-UPtzt+7FR3HTRmHFtK+KVCeqtE6qNMLayh5v0uoJ5hc="; + hash = "sha256-LRBo404TGxWBQdhN3gTyDHjB389hcHCfZK/oEFdjpOY="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index b3bcbbacec39c..52e6abb8047cb 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.24"; + version = "1.25"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-omVSSxMAQQm+Sy023xIGBYm55qrb1dbds1Jj9WCtNfw="; + hash = "sha256-l97ZK9VT+kU9Hos91C7Q9Zhv3Dge3kyF7N//j4sZ5Kc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix index 5cfa4813951e9..b013c9b715a17 100644 --- a/pkgs/development/python-modules/pybalboa/default.nix +++ b/pkgs/development/python-modules/pybalboa/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pybalboa"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "garbled1"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7vjdRGnEnMf32pZwoKRxX16hxkyf0CXlncpbBJMQtfI="; + hash = "sha256-rSY6kU7F9ybpPXcmTM2WBazjb9tI2+8dG56pjrRXcKg="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 1aad1ae6668ca..9648fd9d206fd 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.6.4"; + version = "2024.6.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-I1VS9uNKybokbkKh6QVjsf5cLV3vg19EnblOheAyxn8="; + hash = "sha256-ug9gADM6ig6i2mu3GhQ+vsbNf3vEfR4L7OQ5Ixuh5so="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index c86678cbc499f..4a9dd9f6a750a 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.22"; + version = "0.2.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-zLGJ8MYfyXrJwy8GywOq9fM9rMMmRTgPrgiByGwQ+gM="; + hash = "sha256-myqv7zNhSUZTdyujg0ogrbzpypA5APGJhTM+FtrgXNA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index ff07c7253b296..715c455c3cabb 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -2,8 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, - marshmallow, marshmallow-dataclass, + marshmallow, + pdm-backend, pytestCheckHook, pythonOlder, requests, @@ -15,28 +16,32 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.14.0"; + version = "1.15.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-Uw65+YOnln+IOyT+RgqMEWt5cOZsaeS8Nu8U6ooivWA="; + hash = "sha256-jmjlNGyGYsiwQ0qi8KiSUI38J4n1ZTzqxzY9Bn9OdqY="; }; - pythonRelaxDeps = [ "marshmallow-dataclass" ]; + pythonRelaxDeps = [ + "marshmallow-dataclass" + "setuptools" + ]; - nativeBuildInputs = [ - setuptools + build-system = [ + pdm-backend ]; - propagatedBuildInputs = [ + dependencies = [ marshmallow marshmallow-dataclass requests + setuptools typing-extensions ]; @@ -63,6 +68,7 @@ buildPythonPackage rec { "test_multiscan_parameters" "test_quota_overview" "test_rate_limit" + "test_read_metadata_bad_response" "test_sca_client_scan_diff" "test_sca_scan_all_with_params" "test_sca_scan_directory_invalid_tar" diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 30dcee778a9b6..c2555281a6b03 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -2,43 +2,37 @@ lib, buildPythonPackage, deprecated, - fetchFromGitHub, - importlib-metadata, + fetchFromGitea, + importlib-resources, jaconv, py-cpuinfo, pytest-benchmark, pytestCheckHook, pythonOlder, - setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "pykakasi"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "miurahr"; repo = "pykakasi"; rev = "refs/tags/v${version}"; - hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM=="; + hash = "sha256-b2lYYdg1RW1xRD3hym7o1EnxzN/U5txVTWRifwZn3k0="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail ', "klepto"' "" - ''; - build-system = [ setuptools-scm ]; dependencies = [ jaconv deprecated - setuptools - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; nativeCheckInputs = [ py-cpuinfo @@ -51,16 +45,18 @@ buildPythonPackage rec { "test_benchmark" "pytest_benchmark_update_machine_info" "pytest_benchmark_update_json" + # Assertion error + "test_aozora" ]; pythonImportsCheck = [ "pykakasi" ]; meta = with lib; { description = "Python converter for Japanese Kana-kanji sentences into Kana-Roman"; - mainProgram = "kakasi"; - homepage = "https://github.com/miurahr/pykakasi"; - changelog = "https://github.com/miurahr/pykakasi/releases/tag/v${version}"; - license = licenses.mit; + homepage = "https://codeberg.org/miurahr/pykakasi"; + changelog = "https://codeberg.org/miurahr/pykakasi/src/tag/v${version}/CHANGELOG.rst"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; + mainProgram = "kakasi"; }; } diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 0a6a476979c1a..f90c52359634d 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; rev = "refs/tags/v${version}"; - hash = "sha256-1QYL2othFA/xTgdj549MA1aVDH6jjiuL+aN2Q/supp8="; + hash = "sha256-F7H06SGKq6jSasY0TQVBmn1TYONVEZn6ArJXlRR4lCc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index a3ca41383be3f..10d557f774952 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.1.0"; + version = "32.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WjVtE+3KtFdtBLqNUzFwDrWAUQLblE+DNGjABH+5zWc="; + hash = "sha256-P5Lmosa8PrqDYEbdoDLnby0ET4KsfbLWzXHmWHhy8ss="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index cce3de84a0e87..6eb35709fabc5 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.29.0"; + version = "3.30.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-49dSRg0nrTXuXfnrC2/3p/zYMxouXO9FLqSBSxg4TcU="; + hash = "sha256-KJC0M5sk1dlCzadQ1/MBEnWuAGva/MP2MygqehH2fTg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix index ec90db0811bb0..08340ae69b9aa 100644 --- a/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/pkgs/development/python-modules/syncedlyrics/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "syncedlyrics"; - version = "0.10.1"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rtcq"; repo = "syncedlyrics"; rev = "refs/tags/v${version}"; - hash = "sha256-jqd68Npt7qq9aMWO3AVR4JRAs9avO4x9u+MC/brU1Cw="; + hash = "sha256-W3cg/+nU0Zp5pDhkoHqUemYImlDKlZDVbB7jZ3dScnk="; }; build-system = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 2fd63f5e1d929..de1221035423e 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.1173"; + version = "3.0.1174"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-rCfTgK6ZfddBofxOfA1ilRwUGRkYTj4NpDEFRfpjSEk="; + hash = "sha256-RaeyaiVs+9iZxWxR2hrQ7MrmPfwu0NODC4NJSJ22/kQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index 4a125dd1775bc..d70ed13e37e8b 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "thriftpy2"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Thriftpy"; repo = "thriftpy2"; rev = "refs/tags/v${version}"; - hash = "sha256-Pjy9OPwFfKaw+XVl7IbbAKPz050TlqI4+yLqSITOkSY="; + hash = "sha256-F/h2XhzLA89CwgorKhrvKrajFbT9maiF3RBkulQQ9bk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix index fa0e4ff82aa4e..29a5e670e56ed 100644 --- a/pkgs/development/python-modules/webdataset/default.nix +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { hash = "sha256-selj7XD7NS831lbPnx/4o46bNpsxuFdSEIIb4S2b7S0="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ braceexpand numpy pyyaml @@ -84,12 +84,20 @@ buildPythonPackage rec { "test_webloader_unbatched" ]; - meta = with lib; { + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # AttributeError: <module 'torch.distributed' from /nix/store/... + "tests/test_wids.py" + + # Issue with creating a temp file in the sandbox + "tests/test_wids_mmtar.py" + ]; + + meta = { description = "High-performance Python-based I/O system for large (and small) deep learning problems, with strong support for PyTorch"; mainProgram = "widsindex"; homepage = "https://github.com/webdataset/webdataset"; changelog = "https://github.com/webdataset/webdataset/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ iynaix ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ iynaix ]; }; } diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 7d893fcf04384..9982af7b0f196 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.141"; + version = "3.2.144"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-1EKqqKm0QB9tS5uaS7xMPoK/KDWRkJH1uW7yGiHLbNU="; + hash = "sha256-BF2xeHoVb6uSqRB9kTj6QX4pDUkj49xdBOC2SbZ0qjE="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index aebe38d88b7e8..14336fc91dc38 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -2,16 +2,21 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.13.0"; + version = "0.14.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gsok5aDi5oYJPMXVv3MFAehyKZ5hHBtvwf7z6Ut4dBQ="; + hash = "sha256-KaMo0aZhwv9F4aya5ViTBwPxK6RLPZgfRJ9g6O48SUk="; }; # tests make dns requests and fails doCheck = false; + build-system = with python3Packages; [ + setuptools + ]; + propagatedBuildInputs = with python3Packages; [ requests dnspython diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 8bb971deef84c..9b745264eb9c5 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-H2F7akVox+s+irDzpnwWmJJFrcVH46fR/YYayzCPtbI="; + hash = "sha256-gqm7aWGjm+qPKAwUE9VIVEI/j5Li/0PuHA/q16O17dg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 2b7a31d05f2e8..3cb8c66f36532 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.14"; + version = "2.5.15"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-y57P6AM0w1AaOxCOHPjdgyhvqP/yasOP46JdErnYEvg="; + hash = "sha256-FKOpHvturPJQOhWJh5I7JwDhp0X0Y0ppFejTW1hG6Fk="; }; vendorHash = "sha256-vwcItklYe6ljFdGTxef19plaI5OMoOtQohY0xZLBUos="; diff --git a/pkgs/development/tools/dazel/default.nix b/pkgs/development/tools/dazel/default.nix new file mode 100644 index 0000000000000..f19d469697835 --- /dev/null +++ b/pkgs/development/tools/dazel/default.nix @@ -0,0 +1,22 @@ +{ lib +, buildPythonApplication +, fetchPypi +}: +buildPythonApplication rec { + version = "0.0.42"; + pname = "dazel"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-JE7+GS7DpuFoC2LK3dvYvjtOdzRxFMHzgZRfvrGBDtQ="; + }; + + meta = { + homepage = "https://github.com/nadirizr/dazel"; + description = "Run Google's bazel inside a docker container via a seamless proxy."; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + malt3 + ]; + }; +} diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix index bfb8561f6caa8..42ca82fea0bcc 100644 --- a/pkgs/development/tools/language-servers/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.3.1"; + version = "1.3.2"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-ugTYjXgD5SHagRtc1RNsnfcLAXPeWSHcos82ewr3UIs="; + outputHash = "sha256-hRESY7TFxUjEkNf0vhCG30mIHZHXoAyZl3nTQ3OvQ0E="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index d64e3c91ae7e0..1a0466596fdc3 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -1,11 +1,11 @@ -{ luarocks +{ luarocks_bootstrap , fetchFromGitHub , unstableGitUpdater , nurl , file }: -luarocks.overrideAttrs (old: { +luarocks_bootstrap.overrideAttrs (old: { pname = "luarocks-nix"; version = "0-unstable-2024-04-29"; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 463efbd198dbd..475b280c925a8 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.16.1"; + version = "5.17.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-oXROZdnmkqb0nd2CdLJO/KYkoe+BriYlfMJXe1yKGTA="; + hash = "sha256-4yMZxhq8Y3RFZHOlulG5hqj3bJSIYVycrtnmsbx+4bs="; }; - cargoHash = "sha256-4GWoTHSQD7DnAsiUWEF2TX+2r3XD3t/9+j/PGL7Haq8="; + cargoHash = "sha256-/qT/mxKjVvyA6XAB0Oa6jpKss0YtIL6cvGwBHM8Bt4M="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; |