diff options
Diffstat (limited to 'pkgs/development')
69 files changed, 382 insertions, 360 deletions
diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index 3ab71a8d3e9d..23ed4a2a2042 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -159,6 +159,10 @@ stdenv.mkDerivation (rec { ln -s $out/bin/*-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; + passthru.vscodeExtName = "lldb-vscode"; + passthru.vscodeExtPublisher = "llvm"; + passthru.vscodeExtUniqueId = "llvm-org.lldb-vscode-0.1.0"; + meta = llvm_meta // { homepage = "https://lldb.llvm.org/"; description = "A next-generation high-performance debugger"; diff --git a/pkgs/development/compilers/pakcs/curry-base.nix b/pkgs/development/compilers/pakcs/curry-base.nix deleted file mode 100644 index c461d2caa93c..000000000000 --- a/pkgs/development/compilers/pakcs/curry-base.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ mkDerivation, base, Cabal, containers, directory, extra, filepath -, mtl, parsec, pretty, lib, time, transformers -}: -mkDerivation { - pname = "curry-base"; - version = "1.1.0"; - src = ./.; - libraryHaskellDepends = [ - base containers directory extra filepath mtl parsec pretty time - transformers - ]; - testHaskellDepends = [ base Cabal filepath mtl ]; - homepage = "http://curry-language.org"; - description = "Functions for manipulating Curry programs"; - license = lib.licenses.bsd3; -} diff --git a/pkgs/development/compilers/pakcs/curry-frontend.nix b/pkgs/development/compilers/pakcs/curry-frontend.nix index 88e88487594b..acf658024b01 100644 --- a/pkgs/development/compilers/pakcs/curry-frontend.nix +++ b/pkgs/development/compilers/pakcs/curry-frontend.nix @@ -1,26 +1,28 @@ -{ mkDerivation, base, bytestring, Cabal, containers, curry-base -, directory, extra, file-embed, filepath, mtl, network-uri, pretty -, process, set-extra, lib, template-haskell, transformers +{ mkDerivation, base, binary, bytestring, Cabal, containers +, directory, extra, file-embed, filepath, lib, mtl, network-uri +, parsec, pretty, process, set-extra, template-haskell, time +, transformers }: mkDerivation { pname = "curry-frontend"; - version = "1.0.4"; + version = "2.1.0"; src = ./.; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers curry-base directory extra file-embed - filepath mtl network-uri pretty process set-extra template-haskell - transformers + base binary bytestring containers directory extra file-embed + filepath mtl network-uri parsec pretty process set-extra + template-haskell time transformers ]; - executableHaskellDepends = [ - base bytestring containers curry-base directory extra file-embed + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring Cabal containers directory extra file-embed filepath mtl network-uri pretty process set-extra template-haskell transformers ]; - testHaskellDepends = [ base Cabal curry-base filepath ]; homepage = "http://curry-language.org"; description = "Compile the functional logic language Curry to several intermediate formats"; license = lib.licenses.bsd3; + mainProgram = "curry-frontend"; } diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index e38f4e8c02ba..42b2e208c1d4 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -5,27 +5,24 @@ let pname = "pakcs"; - version = "2.2.1"; + version = "3.6.0"; # Don't switch to "Current release" without a reason, because its # source updates without version bump. Prefer last from "Older releases" instead. src = fetchurl { url = "https://www.informatik.uni-kiel.de/~pakcs/download/pakcs-${version}-src.tar.gz"; - sha256 = "1jyg29j8r8pgcin7ixdya6c3zzfjdi66rghpwrfnkk133fz4iz7s"; + hash = "sha256-1r6jEY3eEGESKcAepiziVbxpIvQLtCS6l0trBU3SGGo="; }; curry-frontend = (haskellPackages.override { overrides = self: super: { - curry-base = haskell.lib.compose.overrideCabal (drv: { - inherit src; - postUnpack = "sourceRoot+=/frontend/curry-base"; - }) (super.callPackage ./curry-base.nix {}); curry-frontend = haskell.lib.compose.overrideCabal (drv: { inherit src; - postUnpack = "sourceRoot+=/frontend/curry-frontend"; - }) (super.callPackage ./curry-frontend.nix {}); + postUnpack = "sourceRoot+=/frontend"; + }) (super.callPackage ./curry-frontend.nix { }); }; }).curry-frontend; + in stdenv.mkDerivation { inherit pname version src; @@ -41,28 +38,24 @@ in stdenv.mkDerivation { ]; preConfigure = '' - # Since we can't expand $out in `makeFlags` - #makeFlags="$makeFlags PAKCSINSTALLDIR=$out/pakcs" - - for file in currytools/cpm/src/CPM/Repository.curry \ - currytools/cpm/src/CPM/Repository/CacheDB.curry \ - scripts/compile-all-libs.sh \ - scripts/cleancurry.sh \ - examples/test.sh testsuite/test.sh lib/test.sh; do + for file in examples/test.sh \ + currytools/optimize/Makefile \ + testsuite/test.sh \ + scripts/cleancurry.sh \ + scripts/compile-all-libs.sh; do substituteInPlace $file --replace "/bin/rm" "rm" done '' ; - # cypm new: EXISTENCE ERROR: source_sink - # "/tmp/nix-build-pakcs-2.0.2.drv-0/pakcs-2.0.2/currytools/cpm/templates/LICENSE" - # does not exist - buildPhase = '' + preBuild = '' mkdir -p $out/pakcs cp -r * $out/pakcs - (cd $out/pakcs ; make -j$NIX_BUILD_CORES $makeFlags) + cd $out/pakcs ''; installPhase = '' + runHook preInstall + ln -s $out/pakcs/bin $out mkdir -p $out/share/emacs/site-lisp @@ -75,6 +68,8 @@ in stdenv.mkDerivation { # List of dependencies from currytools/cpm/src/CPM/Main.curry wrapProgram $out/pakcs/bin/cypm \ --prefix PATH ":" "${lib.makeBinPath [ curl git unzip gnutar coreutils sqlite ]}" + + runHook postInstall ''; meta = with lib; { @@ -94,7 +89,7 @@ in stdenv.mkDerivation { with dynamic web pages, prototyping embedded systems). ''; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ t4ccer ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 4c9f2862752c..35fdf3d369b1 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.15.13"; + version = "0.15.14"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -25,17 +25,17 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz"; - sha256 = "0wdh9gv0qnrgsyvrzj1whyvbc5pf0vbk5wgcwh9vdpr2dw90m0ps"; + sha256 = "1sc8ygiha980wbg60bkinvvpdn4bdasq9zffanbxck8msdwxc4zx"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "0z2fyckyk5nx7awigsjfi4ybd5jn7hxvpq6i5wpx407xfwbhl554"; + sha256 = "01973wiybblfbgjbqrhr8435y6jk6c94i667nr3zxkxy4np3lv3q"; }) else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "0sr2k9awgjjz0k6lkd78kjmyv4wdgnwy3837bcw13mzg7j7bmrmi"; + sha256 = "0i717gb4d21m0pi1k90g5diq3yja1pwlw6ripv0d70jdnd9gsdl9"; }; diff --git a/pkgs/development/cuda-modules/setup-hooks/extension.nix b/pkgs/development/cuda-modules/setup-hooks/extension.nix index 930730ce6c06..10f126bc12fb 100644 --- a/pkgs/development/cuda-modules/setup-hooks/extension.nix +++ b/pkgs/development/cuda-modules/setup-hooks/extension.nix @@ -53,7 +53,7 @@ final: _: { autoAddCudaCompatRunpathHook = final.callPackage ( - {makeSetupHook, cuda_compat}: + {makeSetupHook, cuda_compat ? throw "autoAddCudaCompatRunpathHook: No cuda_compat for CUDA ${final.cudaMajorMinorVersion}" }: makeSetupHook { name = "auto-add-cuda-compat-runpath-hook"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4e061226e0d9..4bdc3552362b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -378,7 +378,42 @@ self: super: { # https://github.com/awakesecurity/nix-graph/issues/5 nix-graph = doJailbreak super.nix-graph; - cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] super.cachix; + # Manually maintained + cachix-api = overrideCabal (drv: { + version = "1.7"; + src = pkgs.fetchFromGitHub { + owner = "cachix"; + repo = "cachix"; + rev = "v1.7"; + sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s="; + }; + postUnpack = "sourceRoot=$sourceRoot/cachix-api"; + }) super.cachix-api; + cachix = (overrideCabal (drv: { + version = "1.7"; + src = pkgs.fetchFromGitHub { + owner = "cachix"; + repo = "cachix"; + rev = "v1.7"; + sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s="; + }; + postUnpack = "sourceRoot=$sourceRoot/cachix"; + }) (lib.pipe + (super.cachix.override { + nix = self.hercules-ci-cnix-store.nixPackage; + }) + [ + (addBuildTool self.hercules-ci-cnix-store.nixPackage) + (addBuildTool pkgs.buildPackages.pkg-config) + (addBuildDepend self.immortal) + # should be removed once hackage packages catch up + (addBuildDepend self.crypton) + (addBuildDepend self.generic-lens) + (addBuildDepend self.amazonka) + (addBuildDepend self.amazonka-core) + (addBuildDepend self.amazonka-s3) + ] + )); # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 154ce8f0d8c0..2e0ae0eec4c9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1093,41 +1093,8 @@ self: super: builtins.intersectAttrs super { # won't work (or would need to patch test suite). domaindriven-core = dontCheck super.domaindriven-core; - cachix-api = overrideCabal (drv: { - version = "1.6.1"; - src = pkgs.fetchFromGitHub { - owner = "cachix"; - repo = "cachix"; - rev = "v1.6.1"; - sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg="; - }; - postUnpack = "sourceRoot=$sourceRoot/cachix-api"; - postPatch = '' - sed -i 's/1.6/1.6.1/' cachix-api.cabal - ''; - }) super.cachix-api; - cachix = overrideCabal (drv: { - version = "1.6.1"; - src = pkgs.fetchFromGitHub { - owner = "cachix"; - repo = "cachix"; - rev = "v1.6.1"; - sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg="; - }; - postUnpack = "sourceRoot=$sourceRoot/cachix"; - postPatch = '' - sed -i 's/1.6/1.6.1/' cachix.cabal - ''; - }) (lib.pipe - (super.cachix.override { - nix = self.hercules-ci-cnix-store.nixPackage; - }) - [ - (addBuildTool self.hercules-ci-cnix-store.nixPackage) - (addBuildTool pkgs.pkg-config) - (addBuildDepend self.immortal) - ] - ); + cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] + (enableSeparateBinOutput super.cachix); hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }; hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }); diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/development/interpreters/expr/default.nix index 7a6384620d44..2ff0ffd4f6a9 100644 --- a/pkgs/development/interpreters/expr/default.nix +++ b/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.15.7"; + version = "1.15.8"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-dSZVReKQqQMKjVocqz6eoh8/+Yyf37egDf1tJ/JePJ0="; + hash = "sha256-leZEP6RJv136z/bNc1S74tw+JQ3QD7NCMbo/Wo7q0ek="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-ioNXzEQLLpBWhVw4tnDnL/umkEoExHBTSj2WBjIl3PQ="; + vendorHash = "sha256-Rs2tlno0vJo8FSdnnk3cxQCCxdByQD1jRzmePzMMfvs="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix index 5871d166c7db..1c0d4c647f54 100644 --- a/pkgs/development/interpreters/nelua/default.nix +++ b/pkgs/development/interpreters/nelua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nelua"; - version = "unstable-2023-11-19"; + version = "unstable-2024-01-02"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "e82695abf0a68a30a593cefb0bf1143cf9e14b6b"; - hash = "sha256-Srgoq07JQirxmZcDvw4UdfoYZ5HFT0PbYPoHY99BW/c="; + rev = "4d4b2b187675522a3cf4584ef734a9f8df201159"; + hash = "sha256-0ct4DG7ws16PrjmYfcAsr08zIO9cpb1Vtbm2OxcQcfY="; }; postPatch = '' diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 5cdd307e70fe..a77206ae3852 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -344,7 +344,7 @@ in with passthru; stdenv.mkDerivation ({ ''; license = lib.licenses.psfl; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ fridh thiagokokada ]; + maintainers = with lib.maintainers; [ fridh ]; knownVulnerabilities = [ "Python 2.7 has reached its end of life after 2020-01-01. See https://www.python.org/doc/sunset-python-2/." # Quote: That means that we will not improve it anymore after that day, diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index b68c540b39cf..344a83964233 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { buildInputs = [ SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib ] ++ (with python3.pkgs; [ - python pygame_sdl2 tkinter future six pefile requests ecdsa + python pygame-sdl2 tkinter future six pefile requests ecdsa ]); RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame_sdl2}/include/${python.libPrefix}"; + env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}"; meta = with lib; { description = "Visual Novel Engine"; diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 4fbf6f3a6e39..5ecfc299edd4 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk-layer-shell"; - version = "0.8.1"; + version = "0.8.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # for demo @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-WW5sdOAJUKbSLWUpI9BK7O63/Uli+Tu9Tj9ccCOREPM="; + hash = "sha256-8wpfoZcgusJdEbKGZ02UtOOcSogMTNP9Lm+ujo/eKdA="; }; strictDeps = true; diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix deleted file mode 100644 index 260a94e06ade..000000000000 --- a/pkgs/development/libraries/kpmcore/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, lib -, fetchurl -, extra-cmake-modules -, qca-qt5 -, kauth -, kio -, polkit-qt -, util-linux -}: - -stdenv.mkDerivation rec { - pname = "kpmcore"; - # NOTE: When changing this version, also change the version of `partition-manager`. - version = "23.04.1"; - - src = fetchurl { - url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-NFIq8CZwYvpqDOOYLlBqoGdgfNPsyf15FkB3dToDCB8="; - }; - - patches = [ - ./nixostrustedprefix.patch - ]; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - qca-qt5 - kauth - kio - polkit-qt - - util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat) - ]; - - dontWrapQtApps = true; - - preConfigure = '' - substituteInPlace src/util/CMakeLists.txt \ - --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions - substituteInPlace src/backend/corebackend.cpp \ - --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy - ''; - - meta = with lib; { - description = "KDE Partition Manager core library"; - homepage = "https://invent.kde.org/system/kpmcore"; - license = with licenses; [ cc-by-40 cc0 gpl3Plus mit ]; - maintainers = with maintainers; [ peterhoeg oxalica ]; - }; -} diff --git a/pkgs/development/libraries/kpmcore/nixostrustedprefix.patch b/pkgs/development/libraries/kpmcore/nixostrustedprefix.patch deleted file mode 100644 index cb1eb68364dd..000000000000 --- a/pkgs/development/libraries/kpmcore/nixostrustedprefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp -index a879c8d..3d7863b 100644 ---- a/src/util/externalcommandhelper.cpp -+++ b/src/util/externalcommandhelper.cpp -@@ -387,7 +387,7 @@ QVariantMap ExternalCommandHelper::RunCommand(const QString& command, const QStr - if (dirname == QStringLiteral("bin") || dirname == QStringLiteral("sbin")) { - prefix.cdUp(); - } -- if (trustedPrefixes.find(prefix.path()) == trustedPrefixes.end()) { // TODO: C++20: replace with contains -+ if (!prefix.path().startsWith(QStringLiteral("/nix/store")) && !prefix.path().startsWith(QStringLiteral("/run/current-system/sw"))) { // TODO: C++20: replace with contains - qInfo() << prefix.path() << "prefix is not one of the trusted command prefixes"; - reply[QStringLiteral("success")] = false; - return reply; diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index 8614bc4fee05..64351a85a9ae 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.19.4"; + version = "0.19.5"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = pname; rev = "v${version}"; - hash = "sha256-XtD46tEV6RU1xbQgGA/nP6zWMgnZkOffVPdl8t/hIiA="; + hash = "sha256-XTfe0NqDQWx4ISgEiUbzACH9csaG+IrUvwss07dnz80="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 5ecd27f60078..4570b10db39c 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/jedisct1/libsodium/commit/ffd1e374989197b44d815ac8b5d8f0b43b6ce534.patch"; hash = "sha256-jG0VirIoFBwYmRx6zHSu2xe6pXYwbeqNVhPJxO6eJEY="; }) - ] ++ lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; + ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libsodium/mingw-no-fortify.patch b/pkgs/development/libraries/libsodium/mingw-no-fortify.patch deleted file mode 100644 index e13a801f8db7..000000000000 --- a/pkgs/development/libraries/libsodium/mingw-no-fortify.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur libsodium-1.0.18-orig/configure.ac libsodium-1.0.18/configure.ac ---- libsodium-1.0.18-orig/configure.ac 2019-05-30 16:20:24.000000000 -0400 -+++ libsodium-1.0.18/configure.ac 2021-08-11 08:09:54.653907245 -0400 -@@ -217,11 +217,6 @@ - - AC_CHECK_DEFINE([__wasi__], [WASI="yes"], []) - --AC_CHECK_DEFINE([_FORTIFY_SOURCE], [], [ -- AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2], -- [CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"]) --]) -- - AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], - [CFLAGS="$CFLAGS -fvisibility=hidden"]) - diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix index 26f5553a58e8..643866329722 100644 --- a/pkgs/development/libraries/nng/default.nix +++ b/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-QnT27Xej8bu2wj2v1uwAAJt4DrQlgMsGOvj8ZLpx57A="; + hash = "sha256-6JFmoCELDkvDvTNy2ET4igFCc/J9wraN6Cl1lq9So1Q="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index 1c11e4d449e1..4f477a94a683 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -1,18 +1,22 @@ -{ lib, stdenv +{ lib +, stdenv +, callPackage , fetchFromGitHub -, fetchpatch +, testers + +, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format + , cmake -, pkg-config -, openscenegraph , curl , gdal , hdf5-cpp , LASzip -, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format , libe57format , libgeotiff , libtiff , libxml2 +, openscenegraph +, pkg-config , postgresql , tiledb , xercesc @@ -20,14 +24,14 @@ , zstd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdal"; version = "2.5.6"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-JKwa89c05EfZ/FxOkj8lYmw0o2EgSqafRDIV2mTpZ5E="; }; @@ -37,7 +41,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - openscenegraph curl gdal hdf5-cpp @@ -45,6 +48,7 @@ stdenv.mkDerivation rec { libgeotiff libtiff libxml2 + openscenegraph postgresql tiledb xercesc @@ -59,6 +63,8 @@ stdenv.mkDerivation rec { "-DBUILD_PLUGIN_HDF=ON" "-DBUILD_PLUGIN_PGPOINTCLOUD=ON" "-DBUILD_PLUGIN_TILEDB=ON" + "-DWITH_TESTS=ON" + "-DBUILD_PGPOINTCLOUD_TESTS=OFF" # Plugins can probably not be made work easily: "-DBUILD_PLUGIN_CPD=OFF" @@ -75,11 +81,52 @@ stdenv.mkDerivation rec { "-DBUILD_PLUGIN_RIVLIB=OFF" ]; + doCheck = true; + + disabledTests = [ + # Tests failing due to TileDB library implementation, disabled also + # by upstream CI. + # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81 + "pdal_io_tiledb_writer_test" + "pdal_io_tiledb_reader_test" + "pdal_io_tiledb_time_writer_test" + "pdal_io_tiledb_time_reader_test" + "pdal_io_tiledb_bit_fields_test" + "pdal_io_e57_read_test" + "pdal_io_e57_write_test" + "pdal_io_stac_reader_test" + + # Segfault + "pdal_io_hdf_reader_test" + + # Failure + "pdal_app_plugin_test" + ]; + + checkPhase = '' + runHook preCheck + # tests are flaky and they seem to fail less often when they don't run in + # parallel + ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$' + runHook postCheck + ''; + + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "pdal --version"; + version = "pdal ${finalAttrs.finalPackage.version}"; + }; + pdal = callPackage ./tests.nix { pdal = finalAttrs.finalPackage; }; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = with lib; { description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; homepage = "https://pdal.io"; license = licenses.bsd3; maintainers = teams.geospatial.members; platforms = platforms.all; + pkgConfigModules = [ "pdal" ]; }; -} +}) diff --git a/pkgs/development/libraries/pdal/tests.nix b/pkgs/development/libraries/pdal/tests.nix new file mode 100644 index 000000000000..1f71626856b3 --- /dev/null +++ b/pkgs/development/libraries/pdal/tests.nix @@ -0,0 +1,10 @@ +{ runCommand, pdal }: + +let + inherit (pdal) pname; +in +runCommand "${pname}-tests" { meta.timeout = 60; } + '' + ${pdal}/bin/pdal --drivers + touch $out + '' diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix deleted file mode 100644 index 5e63893bb232..000000000000 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "tinyxml-2"; - version = "10.0.0"; - - src = fetchFromGitHub { - repo = "tinyxml2"; - owner = "leethomason"; - rev = version; - sha256 = "sha256-9xrpPFMxkAecg3hMHzzThuy0iDt970Iqhxs57Od+g2g="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly - # (setting it to an absolute path causes include files to go to $out/$out/include, - # because the absolute path is interpreted with root at $out). - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - meta = { - description = "A simple, small, efficient, C++ XML parser"; - homepage = "https://www.grinninglizard.com/tinyxml2/index.html"; - platforms = lib.platforms.unix; - license = lib.licenses.zlib; - }; -} diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 8b4abf7d5d12..e9265de54c61 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -17,6 +17,7 @@ , xorg , libpng , ffmpeg_4 +, ffmpeg , hwdata , seatd , vulkan-loader @@ -57,7 +58,6 @@ let ++ extraNativeBuildInputs; buildInputs = [ - ffmpeg_4 libGL libcap libinput @@ -116,6 +116,9 @@ rec { wlroots_0_15 = generic { version = "0.15.1"; hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; + extraBuildInputs = [ + ffmpeg_4 + ]; }; wlroots_0_16 = generic { @@ -125,23 +128,20 @@ rec { substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ ''; + extraBuildInputs = [ + ffmpeg_4 + ]; }; wlroots_0_17 = generic { - version = "0.17.0"; - hash = "sha256-VUrnSG4UAAH0cBy15lG0w8RernwegD6lkOdLvWU3a4c="; + version = "0.17.1"; + hash = "sha256-Z0gWM7AQqJOSr2maUtjdgk/MF6pyeyFMMTaivgt+RMI="; extraBuildInputs = [ + ffmpeg hwdata libliftoff libdisplay-info ]; - patches = [ - (fetchpatch { - name = "tinywl-fix-wlroots-dependency-constraint-in-Makefile.patch"; - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/fe53ec693789afb44c899cad8c2df70c8f9f9023.patch"; - hash = "sha256-wU62hXgmsAyT5j/bWeCFBkvM9cYjUntdCycQt5HAhb8="; - }) - ]; }; wlroots = wlroots_0_17; diff --git a/pkgs/development/octave-modules/instrument-control/default.nix b/pkgs/development/octave-modules/instrument-control/default.nix index 711901eb2b51..a60770947c53 100644 --- a/pkgs/development/octave-modules/instrument-control/default.nix +++ b/pkgs/development/octave-modules/instrument-control/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "instrument-control"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-CyNix+UAGiiogoA63NPyNtaz9z7LTspyOw2V9oDAj2Q="; + sha256 = "sha256-N7lSJBA+DRex2jHWhSG7nUpJaFoSz26HhTtoc5/rdA0="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix index 8922c8283adc..214f12bcd6d0 100644 --- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix +++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiohappyeyeballs"; - version = "2.3.0"; + version = "2.3.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiohappyeyeballs"; rev = "refs/tags/v${version}"; - hash = "sha256-LMvELnN6Sy6DssXfH6fQ84N2rhdjqB8AlikTMidrjT4="; + hash = "sha256-3Lj1eUDPoVCElrxowBhhrS0GCjD5qeUCiSB/gHoqC3Q="; }; postPatch = '' @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modul for connecting with Happy Eyeballs"; homepage = "https://github.com/bdraco/aiohappyeyeballs"; - changelog = "https://github.com/bdraco/aiohappyeyeballs/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/bdraco/aiohappyeyeballs/blob/v${version}/CHANGELOG.md"; license = licenses.psfl; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index 64f7a23a17e4..46dfafb2ad75 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/pkgs/development/python-modules/aiowithings/default.nix @@ -1,6 +1,6 @@ { lib , aiohttp -, aresponses +, aioresponses , buildPythonPackage , fetchFromGitHub , poetry-core @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiowithings"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-withings"; rev = "refs/tags/v${version}"; - hash = "sha256-wVLoM1Lq1fchyjOOmn+6wVzEAra8x2uK6qaiocVqzmw="; + hash = "sha256-+pIIVCR+QsW9M3pH9Ss3dMvkeKM1OdhQ1y+s/T6pHtk="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - aresponses + aioresponses pytest-asyncio pytestCheckHook syrupy diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix index 4cd3e809a890..575c74a17be9 100644 --- a/pkgs/development/python-modules/babelfont/default.nix +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -10,7 +10,7 @@ , orjson , poetry-core , pytestCheckHook -, ufoLib2 +, ufolib2 }: buildPythonPackage rec { @@ -34,7 +34,7 @@ buildPythonPackage rec { glyphslib openstep-plist orjson - ufoLib2 + ufolib2 ]; nativeBuildInputs = [ poetry-core diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 0216d0f4305e..eaca06056f36 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.22.4"; + version = "0.22.5"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-DAy05ucvdamCq1qn6HQecAidAAj/V/sPQBVYeGrnGAc="; + hash = "sha256-u6FurFaAbkBOT2F+nTL/rGNdUhOpLq+nVKPF3ohuXEs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 5c1bcd0a32d8..b21f7fd77c23 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.11"; + version = "1.34.14"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-wLuHI8jm11bh4yFYTRGP3SGDtdHRnw6RC4ZYwBEPB6Y="; + hash = "sha256-qdjbhps6WuB0NMM8l9o9rmrOc8ApSB0G3oweuBXWCzI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix index 2c27dfe5fa01..54b170f37812 100644 --- a/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -4,7 +4,7 @@ # dependencies , cmake -, dateutil +, python-dateutil , dbus-python , dnf4 , gettext @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - dateutil + python-dateutil dbus-python dnf4.py libcomps diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index c1bee4d060df..faa7efa650f8 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2312"; + version = "1.3.0.post2401"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - hash = "sha256-uS0/Y4luCzJ2zJ0dQ84n4AsQXGWxUv/m5/xiJGPTGDI="; + hash = "sha256-mNpW9RSli7af0fHLh+cmBrOQaO0wlGOrcLigefMR2ww="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/formulaic/default.nix b/pkgs/development/python-modules/formulaic/default.nix index e119eb9f3b4f..a90c6b9f8d98 100644 --- a/pkgs/development/python-modules/formulaic/default.nix +++ b/pkgs/development/python-modules/formulaic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "formulaic"; - version = "0.6.6"; + version = "1.0.1"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "matthewwardrop"; repo = "formulaic"; rev = "refs/tags/v${version}"; - hash = "sha256-82+j3JAkjltXuzRhdvO4hoesSTWlNCY6w2mn6TsZqGM="; + hash = "sha256-qivWv1LtFkW55tVKD/Zjd8Q5gVbxhDpZ0inkV6NR7bA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 65cbc5b3b205..054f5db667f1 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fonttools , openstep-plist -, ufoLib2 +, ufolib2 , pytestCheckHook , unicodedata2 , setuptools-scm @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fonttools openstep-plist - ufoLib2 + ufolib2 unicodedata2 ufonormalizer xmldiff @@ -59,4 +59,3 @@ buildPythonPackage rec { maintainers = [ lib.maintainers.BarinovMaxim ]; }; } - diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 8f4b97547134..a23a313c8ee2 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.1.0"; + version = "2024.1.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-cf7hucJJzA3AGBb03aPHkz4sGGYI7OAfki7b8wdgQLM="; + hash = "sha256-8kkiZC4Xg8BlNCfVFb4keRVS/zvHK+34YwXpKqAtoDc="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index c8ec19468bc3..63a4d364623c 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.16"; + version = "2.2.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-5JEMiSLLVv7p8H5R8BDE5IKGmBb2bSht+s4sCsxWyzU="; + hash = "sha256-QmsnQf7bHTlVbSwp/jai1uTrBr/iHaf9DhMxgTujQUc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 7cca122333ca..68160474f078 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.4.2"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-jqevKKOQrVpeCe305VKYnF6ODD5JEdt7du+deSZXreA="; + hash = "sha256-k2KJSqOIBU1UwcmNgLek+XVI/C1YwOlAg+l/XJvTx5E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index a1aa0cbfce1c..af32abc4e856 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.5.23"; + version = "19.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lLxwc9maivUJAF2Day16B86ELVqsoVJsY9j4rS5FbPM="; + hash = "sha256-SPZlzJCrYzJEuqmGXuC4AZkPKRqiZWFLnfSO3bqYMM0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 1359096853ce..c40bcae0348e 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-b1ONVJzwvpuLKAtv2Rk3uUNt85mMChfGrlM+CpPACUw="; + hash = "sha256-bTlDDg3iIab75QynAkXU5u4fgTylPeE6OdiQb8hqP8s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix-ipc/default.nix index 58f13f20cf03..58f13f20cf03 100644 --- a/pkgs/development/python-modules/posix_ipc/default.nix +++ b/pkgs/development/python-modules/posix-ipc/default.nix diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 90aac0fef677..663c0427a5ab 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pot"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PythonOT"; repo = "POT"; - rev = version; - hash = "sha256-D61/dqO16VvcQx4FG1beKR4y1OQHndwCizaugNaUe4g="; + rev = "refs/tags/${version}"; + hash = "sha256-sq8jIWC2DD0T6675W4THbNethm7a//U8HuccKuK0Hjo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index b5bd3d8f50a2..3b94405d0445 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20231214"; + version = "0.10.0.20240108"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dqLtRoFPCR6oZ/tApsIMFCpDeveq56yOtCXdxGS8uOE="; + hash = "sha256-LRUwHL70tezJv6R7OJWa9zNQkVdI1Esvkdsqj8O5jSQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame-sdl2/default.nix index 5fe78281c884..3150104e74ad 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame-sdl2/default.nix @@ -2,7 +2,7 @@ , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { - pname = "pygame_sdl2"; + pname = "pygame-sdl2"; version = "2.1.0"; format = "setuptools"; renpy_version = renpy.base_version; diff --git a/pkgs/development/python-modules/pystatgrab/default.nix b/pkgs/development/python-modules/pystatgrab/default.nix new file mode 100644 index 000000000000..9ba3fb7b3785 --- /dev/null +++ b/pkgs/development/python-modules/pystatgrab/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, libstatgrab +, pkg-config +, pythonOlder +, setuptools +, unittestCheckHook +, wheel +}: + +buildPythonPackage rec { + pname = "pystatgrab"; + version = "0.7.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "libstatgrab"; + repo = "pystatgrab"; + rev = "PYSTATGRAB_${lib.replaceStrings ["."] ["_"] version}"; + hash = "sha256-0FDhkIK8jy3/SFmCzrl9l4RTeIKDjO0o5UoODx6Wnfs="; + }; + + nativeBuildInputs = [ + cython + pkg-config + setuptools + wheel + ]; + + buildInputs = [ + libstatgrab + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "statgrab" + ]; + + meta = with lib; { + description = "Python bindings for libstatgrab"; + homepage = "https://github.com/libstatgrab/pystatgrab"; + changelog = "https://github.com/libstatgrab/pystatgrab/blob/PYSTATGRAB_${lib.replaceStrings ["."] ["_"] version}/NEWS"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale-infcloud/default.nix index cbc4be6e7aa1..214c1dcffe87 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale-infcloud/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildPythonPackage, radicale }: buildPythonPackage { - pname = "radicale_infcloud"; + pname = "radicale-infcloud"; version = "unstable-2022-04-18"; format = "setuptools"; diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index bbeadee041c2..e26378b1e246 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sensorpush-ble"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "sensorpush-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-g0UFEkTPpKqx5+hrM+bM6iQrG8EaMcFN01JdHEVH9VQ="; + hash = "sha256-IZ2QSAHRdpDKFQYfqkcUm1o+7GaI8e50gEFRK3BV3s8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index d8a326112c33..bccad271d4a1 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , poetry-core , argparse-dataclass -, ConfigArgParse +, configargparse }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ argparse-dataclass - ConfigArgParse + configargparse ]; pythonImportsCheck = [ "snakemake_interface_common" ]; diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index 4efdee5927cc..4deeb396bd0c 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -13,7 +13,7 @@ , aiosqlite , asyncmy , asyncpg -, cx_oracle +, cx-oracle , mariadb , mypy , mysql-connector @@ -79,7 +79,7 @@ buildPythonPackage rec { mariadb ]; oracle = [ - cx_oracle + cx-oracle ]; postgresql = [ psycopg2 diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index b9d0a4425c41..6ddd9830bedc 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -11,7 +11,7 @@ , pytestCheckHook , pythonOlder , ufo2ft -, ufoLib2 +, ufolib2 }: buildPythonPackage rec { @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ufo2ft - ufoLib2 + ufolib2 ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 790692362677..923d2e581f97 100644 --- a/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.7"; + version = "4.12.0.20240106"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WZgAKNKb9V0Ns1nvowW3W6zwy5Lj8/az/UCPJTHfJ0w="; + hash = "sha256-mNYomFtxsUC9O8IqjLCrYDwvLQjyDTeSWWXrSiFzm+g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index d724378fee85..e23352724167 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.12"; + version = "0.4.15.20240106"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-+9/F2dJNhcM70FT74zrcbOxE7tsZz7ur+7tX3CV65Lg="; + hash = "sha256-SQlrTEy/yqEWmaBHDDbk9WMfGT+5gBiOAT6mREXTVlY="; }; # Module has no tests diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index c2e71f224569..d118f349ebd0 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.8.4"; + version = "5.1.8.20240106"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-qMOQJGNOmYNL7xRs7C42xYX0eISt303GXW0Lex9idRc="; + hash = "sha256-Mv+SszYVBg0judN2ASS9s1BsSqjZ61CWPPGjwguey78="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-deprecated/default.nix b/pkgs/development/python-modules/types-deprecated/default.nix index ee4ede8620f5..443a605a03c2 100644 --- a/pkgs/development/python-modules/types-deprecated/default.nix +++ b/pkgs/development/python-modules/types-deprecated/default.nix @@ -1,19 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "types-deprecated"; - version = "1.2.9.3"; - format = "setuptools"; + version = "1.2.9.20240106"; + pyproject = true; src = fetchPypi { pname = "types-Deprecated"; inherit version; - hash = "sha256-74cyet8+PEpMfY4G5Y9kdnENNGbs+1PEnvsICASnDvM="; + hash = "sha256-r+uBnpoD0KV5XxjIj+YgfEjtE8Y56TKBvZ2be7bTQxA="; }; + nativeBuildInputs = [ + setuptools + ]; + # Modules has no tests doCheck = false; diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index c67234d5f25d..5962e0083910 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "types-docutils"; - version = "0.20.0.3"; - format = "setuptools"; + version = "0.20.0.20240106"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-SSjnkPQrmdWDOZD5nI3Z+p8Wgl9u0wOAypgYRtNocM0="; + hash = "sha256-A5kuyXb74IDbWI4eVqg8Xkq6XHMwIrJbsmy4Q5e5YEk="; }; + nativeBuildInputs = [ + setuptools + ]; + # Module doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix index 843b1a108c85..7ce8ad6755b4 100644 --- a/pkgs/development/python-modules/types-html5lib/default.nix +++ b/pkgs/development/python-modules/types-html5lib/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "types-html5lib"; - version = "1.1.11.15"; - format = "setuptools"; + version = "1.1.11.20240106"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gOGiBi0io6/+XCjZfaML/786B205PID8bxZxIWwb1JI="; + hash = "sha256-/DobGOtgGz7q+SyQC9Z2dcCk+h3R0qKJPr20aSNUfuk="; }; + nativeBuildInputs = [ + setuptools + ]; + # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index 2d00bae5a29c..04f146e40e54 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.14"; - format = "setuptools"; + version = "2.8.19.20240106"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-H08QrJi7ixat6dvuNRjZrOAXgh2UsFekJbBp+DRzf0s="; + hash = "sha256-H42yIcO5jmygLqg6WDcbIsN09Crlu98YbbnJp2WBRZ8="; }; + nativeBuildInputs = [ + setuptools + ]; + # Modules doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 9aa9fc0f5f67..fe5787f805f2 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "types-tabulate"; - version = "0.9.0.3"; - format = "setuptools"; + version = "0.9.0.20240106"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-GXZR+dZGcZPNFm2FABFqbTom8qTrLbCTvJU17hwL5V4="; + hash = "sha256-ybbbEN1/z1W9FxLdNTf4bdznKgj9Yrsa9DOMcJbOlH4="; }; + nativeBuildInputs = [ + setuptools + ]; + # Module doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/types-tqdm/default.nix b/pkgs/development/python-modules/types-tqdm/default.nix index b8e7b096c835..3029545302aa 100644 --- a/pkgs/development/python-modules/types-tqdm/default.nix +++ b/pkgs/development/python-modules/types-tqdm/default.nix @@ -3,23 +3,22 @@ , pythonOlder , fetchPypi , setuptools -, wheel }: buildPythonPackage rec { pname = "types-tqdm"; - version = "4.66.0.5"; + version = "4.66.0.20240106"; pyproject = true; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dL1+RpI4wogWMA9yqbcT0CA29rVXc0YWQwrbe350ESw="; + hash = "sha256-es9KreW6097XbrgpeD+ZYbHCGHlI6qbdGuhkTf+VqTg="; }; nativeBuildInputs = [ setuptools - wheel ]; # This package does not have tests. diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 98087eaae75d..f0d517732805 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -13,7 +13,7 @@ , defcon , fonttools , skia-pathops -, ufoLib2 +, ufolib2 # tests , pytestCheckHook @@ -40,7 +40,7 @@ buildPythonPackage rec { compreffor booleanoperations cffsubr - ufoLib2 + ufolib2 skia-pathops ] ++ fonttools.optional-dependencies.lxml diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix index c2fef2e4656a..5712b150569e 100644 --- a/pkgs/development/python-modules/ufoLib2/default.nix +++ b/pkgs/development/python-modules/ufolib2/default.nix @@ -14,12 +14,13 @@ }: buildPythonPackage rec { - pname = "ufoLib2"; + pname = "ufolib2"; version = "0.16.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "ufoLib2"; + inherit version; hash = "sha256-SfDcf3LMrP5/rv4NU9N5cdRWZNiwVj7zaVb6e/pVor0="; }; diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 14f4fa806f0c..30f3c14c9d40 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.18.5"; + version = "1.19.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-NZiFxcEdNdqR38VDJe4lC5maLTguk3+t78yG1zqXuA0="; + hash = "sha256-BjSe5N9rFsVL5EueCbBTcnIJM4TYd5q/1wrsANCyniU="; }; - cargoHash = "sha256-BecaYeQYYoP7SubTktYqOejFyCTRolmUTV7rpGwXOGI="; + cargoHash = "sha256-tMqk0aI+ObxlgAOa1inL8mba9ti9Gxhg9mckmyNsuv8="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index a0c784d58258..058f894ab36b 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -29,6 +29,6 @@ buildGraalvmNativeImage rec { license = licenses.epl10; changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ]; + maintainers = with maintainers; [ jlesquembre bandresen ]; }; } diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 388bb0e92d4b..5b39548aa65e 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-q9RK7wTEbwptzNrXzifq6vUpOKD3idsG5FZKpQZ1uCc="; + hash = "sha256-DfFXKkYrJbO4stBM/5qewhy1etvJS6ey12jmd/NIs8Q="; }; - vendorHash = "sha256-KyeXVS07+WUV+Q5Z9Q+SFp/q9KLLQBpuBH9kRSAh8qg="; + vendorHash = "sha256-8mSX7fwgxwZ8aIXfv3WxLiVH5PjSFzcxM0oekod84tA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index e0f9b6811d9b..e56d3240cafb 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ninja, makeWrapper, CoreFoundation, Foundation, ditto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.7.3"; + version = "3.7.4"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; - rev = version; - hash = "sha256-iAxRGG7/zaUbJ/PWgmjxGS0UTq9/OXc8RWzlpUTUftc="; + rev = finalAttrs.version; + hash = "sha256-wJOOzKM2pgxfRqx5WZjOcCyRapz0Sub3AYm51LRYpFU="; fetchSubmodules = true; }; @@ -89,4 +89,4 @@ stdenv.mkDerivation rec { mainProgram = "lua-language-server"; platforms = platforms.linux ++ platforms.darwin; }; -} +}) diff --git a/pkgs/development/tools/manifest-tool/default.nix b/pkgs/development/tools/manifest-tool/default.nix index 6282619535b9..bba035d01e7c 100644 --- a/pkgs/development/tools/manifest-tool/default.nix +++ b/pkgs/development/tools/manifest-tool/default.nix @@ -9,15 +9,14 @@ buildGoModule rec { pname = "manifest-tool"; - version = "2.0.6"; - gitCommit = "2ed9312726765567a84f2acc44a0c8a6e50f4b7a"; + version = "2.1.5"; modRoot = "v2"; src = fetchFromGitHub { owner = "estesp"; repo = "manifest-tool"; rev = "v${version}"; - sha256 = "sha256-oopk++IdNF6msxOszT0fKxQABgWKbaQZ2aNH9chqWU0="; + hash = "sha256-TCR8A35oETAZszrZFtNZulzCsh9UwGueTyHyYe+JQeI="; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git-revision @@ -29,14 +28,26 @@ buildGoModule rec { nativeBuildInputs = [ git ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "-linkmode=external" + "-extldflags" + "-static" + ]; + preConfigure = '' - ldflags="-X main.gitCommit=$(cat .git-revision)" + export ldflags+=" -X main.gitCommit=$(cat .git-revision)" ''; - CGO_ENABLED = if stdenv.hostPlatform.isStatic then "0" else "1"; - GO_EXTLINK_ENABLED = if stdenv.hostPlatform.isStatic then "0" else "1"; - ldflags = lib.optionals stdenv.hostPlatform.isStatic [ "-w" "-extldflags" "-static" ]; - tags = lib.optionals stdenv.hostPlatform.isStatic [ "netgo" ]; + tags = lib.optionals stdenv.hostPlatform.isStatic [ + "cgo" + "netgo" + "osusergo" + "static_build" + ]; passthru.tests.version = testers.testVersion { package = manifest-tool; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index b6c43956adf7..15c634357217 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.5"; + version = "1.92.6"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-DT1ETsJGOebC0kt4zKiSMu/wF0TG2zUiNNh+Giokjz4="; - "8.2" = "sha256-X/inhHAA34aQSycoSzT28jfntH3QTZgHPId5zYgcWT4="; - "8.3" = "sha256-SHR+J+yFA2YxggdNPq2HtLkh9I3bG01TMk9EUKGkRM0="; + "8.1" = "sha256-ygBgs6tGZyim69tCol+tTXV5Lt/JLuatmKAo9aomM1s="; + "8.2" = "sha256-TrT7H2Tbu4ZrfeCUjpqlTMw9DAxS62aLvzTbpAdsZOc="; + "8.3" = "sha256-AH/kYlpVjCwXxNa90Qe5XpzAdSyNn9jdeyYTLlXxfLI="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-7aDO6shHWIAgby8qCwpc7aICnWyYvferqjDgtnYZCeI="; - "8.2" = "sha256-mpHS9zUjgJnxvi3np2sUS0GhtOjhDOzlepRByYbjUCk="; - "8.3" = "sha256-75C9NwMuUTNuAfdPRgtq4XK6bqo/IRa/SXfM7Wz2y90="; + "8.1" = "sha256-c1i6eq7l4LeUpuZCsYzS1N++IU4j0WydCxPokSJf6dI="; + "8.2" = "sha256-gWhyUQ3QP13klusSv7KWdHatnjy/4k17VvHJUCtqF1g="; + "8.3" = "sha256-kI3sVcI/bDVRMcjzPzlai1D2HvmBTXwQ3DF5zcp2GJk="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-Vj2rnKik+Fy+9yfbUMSOoiXTGm84YNPo1cfh9hojr9c="; - "8.2" = "sha256-lvWwwKJj3/ZxAQcnbcjv/0CLqDDRiOkFo2rJeMhZLHQ="; - "8.3" = "sha256-yqa5GE/FBINR3oFNTP1IZGnhSDYCfluRiEFiTSySjns="; + "8.1" = "sha256-1QPKTNOsJTrx+Q0MigiMBDCC7X3YlSDB33gy8DU9KBg="; + "8.2" = "sha256-e3YUAOLWSmsiHczb44oRiOIafMSBWQaJY+m4OSUMzV8="; + "8.3" = "sha256-h0/ZEy6IkIpAfeL0Al7a+FpPeX2KMSd7zD1i1ew5rUk="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-OcQtr16Qt6TsxPBG3OY/viGXqknKx5GdM/fcCJlFiaY="; - "8.2" = "sha256-ay/6JwB959bT2f18LGMB5560dIPAPSAY5Nby44FGBMc="; - "8.3" = "sha256-7yyhcusin7pLYZqjUgyIkDGmufIPX8cKWqplXetZzMU="; + "8.1" = "sha256-gLCPTTCfoBgp3GgKzVisfGlxQsYa+4x2WDwvhwcf1R8="; + "8.2" = "sha256-OtWUwkeLGfxkxjGSDMyv61UVoSwFo1puGjmwYOB51nI="; + "8.3" = "sha256-M3lz0TnTuJVgD32RS3ffcZsKVJdyx75AjSKFkkODiSE="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-l0xgj0tAjYNI0EwoZhnGpRadg5EJtBlt5WhylmZaGDg="; - "8.2" = "sha256-lD6lE6u9nzHhHPTPLoGKaDsZlvrpbshd+4fr4ua8H8c="; - "8.3" = "sha256-CMPv+pDPJVwQ4gDAnQxyeJXp4YYkwAVoSdS3a+49fDU="; + "8.1" = "sha256-dVau4kieQsj4m97Sepw1jMRtf1VCUnvZEJjVsO+hFWs="; + "8.2" = "sha256-HRBVr4JTiZDRzIt6JfITD5N824Ivcag6DUyEhsc23co="; + "8.3" = "sha256-nRRG42/Yhsupln4j7nWlKvfQ067fwQ17un1yXplPf14="; }; }; }; diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index cf9f1589b75e..1e404f10eedb 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.4.9"; + version = "1.5.0"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-m6xmdFX1ih3ZkSzeR7fY25yXACikgvkOMczEwx+0EdE="; + hash = "sha256-QPUZnqELncUCfm995NN0hYDGFZcKrYXskZIaN2ZRtzk="; }; - cargoHash = "sha256-qAIUOnLX8uBYIUeXExEPWm4D9aIHlOHPBthTTZZ4Omo="; + cargoHash = "sha256-85r0jDBuvfrJq776MSbQT6w60/xWQkC9zLmZwjdanCk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/development/tools/rust/cargo-careful/default.nix index 9d4aa2d95600..7d147241b46e 100644 --- a/pkgs/development/tools/rust/cargo-careful/default.nix +++ b/pkgs/development/tools/rust/cargo-careful/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-careful"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "RalfJung"; repo = "cargo-careful"; rev = "v${version}"; - hash = "sha256-5FteKVlEx5NSj3lzRRj3qerkyK+UdJfTWtG6xEzI4t4="; + hash = "sha256-oiwR6NgHHu9B1L6dSK6KZfgcSdwBPEzUZONwPHr0a4k="; }; - cargoHash = "sha256-gs8o+tWvC4cgIITpfvJqfTquyYaEbvNMeZEJKFzd83I="; + cargoHash = "sha256-sVIAY9eYlpyS/PU6kLInc4hMeD3qcewoMbTH+wTIBuI="; meta = with lib; { description = "A tool to execute Rust code carefully, with extra checking along the way"; diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/development/tools/rust/cargo-run-bin/default.nix index 2bf9734be33e..d19cf8e9333e 100644 --- a/pkgs/development/tools/rust/cargo-run-bin/default.nix +++ b/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-run-bin"; - version = "1.7.0"; + version = "1.7.2"; src = fetchCrate { inherit pname version; - hash = "sha256-1+Xt+q2PgqMrSXhOkZ6+m1tqmgKICuIZe7vEmdSDdqI="; + hash = "sha256-VhDCOTabj/HHc6bYdAUOErvxXOzyY3+e7GccZcb1cSQ="; }; - cargoHash = "sha256-+avbhdKLUMqPFI8A/0w+Bne9/8KOKAJxJIMa4pSgRXs="; + cargoHash = "sha256-riWWxv3FsBrgzVUWGtKvV4WjhgsXImLpiS9EJ40kCn8="; # multiple impurities in tests doCheck = false; diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index af1dd355b5f2..128de43a9706 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uftrace"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "sha256-f0R3EbLd0sJ1kcsRquFZRrl8jXi0msIz2SZ0oJzoWUE="; + sha256 = "sha256-VK2lERzwsdXVOxgxRAA2RxeqBtOeINJDnsafnn461VQ="; }; postUnpack = '' |