diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0efae325b6bc..666e564a4429 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7851,6 +7851,12 @@ githubId = 11705326; name = "Max Kochurov"; }; + fettgoenner = { + email = "paulmatti@protonmail.com"; + github = "fettgoenner"; + githubId = 92429150; + name = "Paul Meinhold"; + }; ffinkdevs = { email = "fink@h0st.space"; github = "ffinkdevs"; diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index c21e36403161..486b5f542ff4 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -101,7 +101,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [InvoicePlane](https://invoiceplane.com), web application for managing and creating invoices. Available at [services.invoiceplane](#opt-services.invoiceplane.sites._name_.enable). -- [k3b](https://userbase.kde.org/K3b), the KDE disk burning application. Available as [programs.k3b](#opt-programs.k3b.enable). +- [k3b](https://userbase.kde.org/K3b), the KDE disk burning application. Available as programs.k3b. - [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](#opt-programs.k40-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device. diff --git a/nixos/modules/programs/k3b.nix b/nixos/modules/programs/k3b.nix index 3e9435d3dc60..4bb76e2e7966 100644 --- a/nixos/modules/programs/k3b.nix +++ b/nixos/modules/programs/k3b.nix @@ -1,50 +1,8 @@ -{ config, pkgs, lib, ... }: +{ lib, ... }: { - # interface - options.programs.k3b = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable k3b, the KDE disk burning application. - - Additionally to installing `k3b` enabling this will - add `setuid` wrappers in `/run/wrappers/bin` - for both `cdrdao` and `cdrecord`. On first - run you must manually configure the path of `cdrdae` and - `cdrecord` to correspond to the appropriate paths under - `/run/wrappers/bin` in the "Setup External Programs" menu. - ''; - }; - }; - - # implementation - config = lib.mkIf config.programs.k3b.enable { - - environment.systemPackages = with pkgs; [ - k3b - dvdplusrwtools - cdrdao - cdrtools - ]; - - security.wrappers = { - cdrdao = { - setuid = true; - owner = "root"; - group = "cdrom"; - permissions = "u+wrx,g+x"; - source = "${pkgs.cdrdao}/bin/cdrdao"; - }; - cdrecord = { - setuid = true; - owner = "root"; - group = "cdrom"; - permissions = "u+wrx,g+x"; - source = "${pkgs.cdrtools}/bin/cdrecord"; - }; - }; - - }; + imports = [ + (lib.mkRemovedOptionModule [ "programs" "k3b" "enable" ] + "Please add kdePackages.k3b to environment.systemPackages instead") + ]; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d44ac5ebd08d..ede3e3fc3a0e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -341,7 +341,7 @@ in { documize = handleTest ./documize.nix {}; documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; }; doh-proxy-rust = handleTest ./doh-proxy-rust.nix {}; - dokuwiki = handleTest ./dokuwiki.nix {}; + dokuwiki = runTest ./dokuwiki.nix; dolibarr = handleTest ./dolibarr.nix {}; domination = handleTest ./domination.nix {}; dovecot = handleTest ./dovecot.nix {}; diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 6f7ee60fc193..ebbefd0dcfaf 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -1,6 +1,8 @@ -import ./make-test-python.nix ({ pkgs, ... }: +{ config, ... }: let + pkgs = config.node.pkgs; + template-bootstrap3 = pkgs.stdenv.mkDerivation rec { name = "bootstrap3"; version = "2022-07-27"; @@ -163,4 +165,4 @@ in { "curl -sSfL http://site1.local/rewrite-test | grep 'Hello, NixOS!'", ) ''; -}) +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8e04700b83fd..fd990baa6faf 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -26,7 +26,7 @@ still shows most of the available features is in `./gwenview`. */ { - lib, libsForQt5, fetchurl, + lib, config, libsForQt5, fetchurl, }: let @@ -96,7 +96,6 @@ let incidenceeditor = callPackage ./incidenceeditor.nix {}; itinerary = callPackage ./itinerary.nix {}; juk = callPackage ./juk.nix {}; - k3b = callPackage ./k3b.nix {}; kaccounts-integration = callPackage ./kaccounts-integration.nix {}; kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; @@ -264,6 +263,8 @@ let qmlkonsole = callPackage ./qmlkonsole.nix {}; telly-skout = callPackage ./telly-skout.nix {}; tokodon = callPackage ./tokodon.nix {}; + } // lib.optionalAttrs config.allowAliases { + k3b = throw "libsForQt5.k3b has been dropped in favor of kdePackages.k3b"; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix deleted file mode 100644 index 643c5e80b10f..000000000000 --- a/pkgs/applications/kde/k3b.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ mkDerivation, lib -, extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info -, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui -, flac, lame, libmad, libmpcdec, libvorbis -, libsamplerate, libsndfile, taglib -, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager -, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit -}: - -mkDerivation { - pname = "k3b"; - meta = with lib; { - homepage = "https://apps.kde.org/k3b/"; - description = "Disk burning application"; - mainProgram = "k3b"; - license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ sander ]; - platforms = platforms.linux; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - buildInputs = [ - # kde - libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui - # formats - flac lame libmad libmpcdec libvorbis - # sound utilities - libsamplerate libsndfile taglib - # cd/dvd - cdparanoia libdvdcss libdvdread - # others - ffmpeg libmusicbrainz3 shared-mime-info - ]; - propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; - postFixup = - let - binPath = lib.makeBinPath [ - cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode - vcdimager flac - ]; - libraryPath = lib.makeLibraryPath [ - cdparanoia - ]; - in '' - wrapProgram "$out/bin/k3b" \ - --prefix PATH : "${binPath}" \ - --prefix LD_LIBRARY_PATH : ${libraryPath} - ''; -} diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix index 4e568fcca434..b5282ed05206 100644 --- a/pkgs/by-name/an/anubis/package.nix +++ b/pkgs/by-name/an/anubis/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "anubis"; - version = "1.14.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "TecharoHQ"; repo = "anubis"; tag = "v${finalAttrs.version}"; - hash = "sha256-K4VXTO8F3GTOA9jOrI0OF6CYTRaDUlUT9/HujYmnHpM="; + hash = "sha256-n70H2FBvp7hxvRqU1+bvef9UrOzkSpg9QtFoqGyXiaM="; }; - vendorHash = "sha256-t+E3sILEwXGkTaBtKLO2kFEntivY9fVK8o86arvMaOU="; + vendorHash = "sha256-Rcra5cu7zxGm2LhL2x9Kd3j/uQaEb8OOh/j5Rhh8S1k="; subPackages = [ "cmd/anubis" @@ -43,7 +43,10 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/TecharoHQ/anubis/"; changelog = "https://github.com/TecharoHQ/anubis/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ knightpp ]; + maintainers = with lib.maintainers; [ + knightpp + soopyc + ]; mainProgram = "anubis"; }; }) diff --git a/pkgs/by-name/ar/arduino-language-server/package.nix b/pkgs/by-name/ar/arduino-language-server/package.nix index b291aa28eb1f..18b6761e30b3 100644 --- a/pkgs/by-name/ar/arduino-language-server/package.nix +++ b/pkgs/by-name/ar/arduino-language-server/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "arduino-language-server"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "arduino"; repo = "arduino-language-server"; tag = version; - hash = "sha256-PmPGhbB1HqxZRK+f28SdZNh4HhE0oseYsdJuEAAk90I="; + hash = "sha256-twTbJ5SFbL4AIX+ffB0LdOYXUxh4SzmZguJSRdEo1lQ="; }; subPackages = [ "." ]; - vendorHash = "sha256-tS6OmH757VDdViPHJAJAftQu+Y1YozE7gXkt5anDlT0="; + vendorHash = "sha256-wXArVPzYmuiivx+8M86rrvfKsvCMtkN3WgXQByr5fC4="; doCheck = false; diff --git a/pkgs/by-name/au/ausweiskopie/package.nix b/pkgs/by-name/au/ausweiskopie/package.nix new file mode 100644 index 000000000000..2a33cdd80b6f --- /dev/null +++ b/pkgs/by-name/au/ausweiskopie/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + makeDesktopItem, + copyDesktopItems, + desktopToDarwinBundle, + enableModern ? true, +}: + +python3Packages.buildPythonApplication rec { + pname = "ausweiskopie"; + version = "0.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Varbin"; + repo = pname; + tag = "v${version}"; + hash = "sha256-axy/cI5n2uvMKZ2Fkb0seFMRBKv6rpU01kgKSiQ10jE="; + }; + + nativeBuildInputs = [ + copyDesktopItems + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + desktopItems = [ + (makeDesktopItem { + name = "Meine Ausweiskopie"; + exec = "ausweiskopie"; + icon = "ausweiskopie"; + desktopName = "Meine Ausweiskopie"; + comment = "Create redacted copies of German identity cards"; + categories = [ + "Office" + "Viewer" + ]; + }) + ]; + + dependencies = + with python3Packages; + ( + [ + pillow + tkinter + importlib-resources + ] + ++ lib.optionals enableModern optional-dependencies.modern + ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus-next + pygobject3 + ] + ); + + optional-dependencies.modern = [ python3Packages.ttkbootstrap ]; + + postInstall = '' + install -Dm644 ./src/ausweiskopie/resources/icon_colored.png $out/share/icons/hicolor/256x256/apps/ausweiskopie.png + ''; + + meta = { + description = "Create privacy friendly and legal copies of your Ausweisdokument"; + homepage = "https://github.com/Varbin/ausweiskopie"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ e1mo ]; + platforms = lib.platforms.unix; + mainProgram = "ausweiskopie"; + }; +} diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix index 1e85aa006d5e..c9d50be042e8 100644 --- a/pkgs/by-name/ca/cargo-public-api/package.nix +++ b/pkgs/by-name/ca/cargo-public-api/package.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.44.2"; + version = "0.47.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Rdwn3izKSy5733KJw3OyGsBJ55xdxg9+MuI8ZNdei3s="; + hash = "sha256-g0kaJ3HPFeS5PvWQfUTanxCgm9sduW9nBx/N61kt3ZI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-11Y9BTtprv7EmBx7hsV8UnGDWmogj9azHOCAc/JdY7o="; + cargoHash = "sha256-jQx4VCarfbdTXOE/GAAzxeXf7xVwEaXDPhw6ywBR3wA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix index e56f83547a57..d61ac2cf6ace 100644 --- a/pkgs/by-name/co/codeql/package.nix +++ b/pkgs/by-name/co/codeql/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.20.6"; + version = "2.20.7"; dontConfigure = true; dontBuild = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-f3CigPHi3z2Sd4CwsITPDPMqKEZimbjuIPByd4+oeK8="; + hash = "sha256-PYTKW+zfmOuJr5BClB3JQKeuZH986uct0m4WyDTxxnQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index c2a29e19fa45..28a35d6577a3 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "coroot"; - version = "1.8.11"; + version = "1.9.0"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${version}"; - hash = "sha256-DUagBuGHght6kt63V+o1Rr51KN/yUK7qCfBgbqnAiAU="; + hash = "sha256-qhKpB1Gp2GPtWCjlkEjVAx9oB2y8FYfZIMMlnpJLduI="; }; vendorHash = "sha256-wyxNT8g5TUCjlxauL7NmCf4HZ91V2nD64L1L/rYH864="; diff --git a/pkgs/by-name/dv/dvd-slideshow/package.nix b/pkgs/by-name/dv/dvd-slideshow/package.nix index 619fda454393..fe2380d9c938 100644 --- a/pkgs/by-name/dv/dvd-slideshow/package.nix +++ b/pkgs/by-name/dv/dvd-slideshow/package.nix @@ -10,7 +10,6 @@ lame, mjpegtools, sox, - transcode, vorbis-tools, runtimeShell, }: @@ -24,7 +23,6 @@ let lame mjpegtools sox - transcode vorbis-tools ]; diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index 7e818893c91a..dd718663ba80 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -22,13 +22,13 @@ buildGoModule rec { pname = "ecapture"; - version = "0.9.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; tag = "v${version}"; - hash = "sha256-aubGM7kJMtfCRBeFgISuyXS9CkDwBC9hB3d6VA9mG2E="; + hash = "sha256-z2cl3yUNUQhLT9bPWApABUIRNdbYqG/7QDwRTvCWvjY="; fetchSubmodules = true; }; @@ -113,7 +113,7 @@ buildGoModule rec { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-8ilfqPt5Phuj5Uaf90+Ir/DFN27oW5Fd+Wsp34/EU9M="; + vendorHash = "sha256-3ry4eLe6W9YFFH7TdQm87CPvj8X/63XNC48A6EXqoDs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 8e12caf52d25..0fb68f056348 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-03-27"; + version = "2025-03-29"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-az5BZEWiDknvf0p1/5cbr9sDOVv2SDsXhdzlqtBYaO0="; + hash = "sha256-JSaOwl2JggWLAywxNTIpGB2KCp3qhepIeRjK5KWPX2I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fi/filesender/package.nix b/pkgs/by-name/fi/filesender/package.nix index 5880cdd7dbd2..8e85b598c5f1 100644 --- a/pkgs/by-name/fi/filesender/package.nix +++ b/pkgs/by-name/fi/filesender/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "filesender"; - version = "2.53"; + version = "2.54"; src = fetchFromGitHub { owner = "filesender"; repo = "filesender"; tag = "filesender-${finalAttrs.version}"; - hash = "sha256-a9hA1aHuuSbFHggeKlh374/rEVszDdRToKLSiuVb66Q="; + hash = "sha256-FmTjnOlst3KfKTHKw2KqkLNhK0IhfYVAbVv7tMSg6e8="; }; patches = [ diff --git a/pkgs/by-name/gc/gcfflasher/package.nix b/pkgs/by-name/gc/gcfflasher/package.nix index e5ee491ab68f..8aac346b5eae 100644 --- a/pkgs/by-name/gc/gcfflasher/package.nix +++ b/pkgs/by-name/gc/gcfflasher/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, libgpiod, cmake, @@ -9,15 +10,22 @@ stdenv.mkDerivation rec { pname = "gcfflasher"; - version = "4.6.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "dresden-elektronik"; repo = "gcfflasher"; tag = "v${version}"; - hash = "sha256-z7FsxTAsAmjz76NxbqZuecN1ywAZYHhgcPfOe6y5QNQ="; + hash = "sha256-W1sL3RyauEYAC/Fj0JhNnk0k5DT6Q8qIEuZNke3xNAE="; }; + patches = [ + (fetchpatch { + url = "https://github.com/dresden-elektronik/gcfflasher/commit/c1019d7ef2ab55a598ddd938db1b08169b05fc37.patch"; + hash = "sha256-Frd3Xerkv3QolGCOrTE4AqBPqPHTKjjhk+DzhHABTqo="; + }) + ]; + nativeBuildInputs = [ pkg-config cmake diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix index ebe11c9382f0..3b1bb6f0a6a4 100644 --- a/pkgs/by-name/gi/gir-rs/package.nix +++ b/pkgs/by-name/gi/gir-rs/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.17.1"; + version = "0.19.0"; in rustPlatform.buildRustPackage { pname = "gir"; @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage { owner = "gtk-rs"; repo = "gir"; rev = version; - sha256 = "sha256-WpTyT62bykq/uwzBFQXeJ1HxR1a2vKmtid8YAzk7J+Q="; + sha256 = "sha256-GAAK4ej16e5/sjnPOVWs4ul1H9sqa+tDE8ky9tbB9No="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bytICp0+1/suM+kf4VX9z/mpnsdXi3I3dPUlK3A9+V4="; + cargoHash = "sha256-ObEXOaEdwJpaLJDkcSmAK86P7E6y0eUQQHFpX4hsuog="; postPatch = '' rm build.rs diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index c681e7f0f5d3..951d7b453687 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "greenmask"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; tag = "v${version}"; - hash = "sha256-Upgf/VmWHtvldIx3n6e3NTHDzs7XoZUBVcEVC+ix9cQ="; + hash = "sha256-ORyczdynAAr2hYzXove/IXRngkRIhKgXLQg5VbvvGS8="; }; vendorHash = "sha256-UY79Fex8hwaXtFLefBUeyO7PxJevWWaQU5MEOAMLPkA="; diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix index a83955ab23de..75b67969093a 100644 --- a/pkgs/by-name/ht/htgettoken/package.nix +++ b/pkgs/by-name/ht/htgettoken/package.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "htgettoken"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "fermitools"; repo = pname; tag = "v${version}"; - hash = "sha256-cp/Y4l59MscQIrHjVdMUQEqgFZTPTEfVdRoH/pOG5uQ="; + hash = "sha256-O0OHnYaoTkqUqD4s+wEAzN3Paq9qsjBZdZ0QUXdFefE="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/hw/hwatch/package.nix b/pkgs/by-name/hw/hwatch/package.nix index dbff6d5397d3..fe418f68d6ee 100644 --- a/pkgs/by-name/hw/hwatch/package.nix +++ b/pkgs/by-name/hw/hwatch/package.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "hwatch"; - version = "0.3.18"; + version = "0.3.19"; src = fetchFromGitHub { owner = "blacknon"; repo = "hwatch"; tag = version; - sha256 = "sha256-E1IxeraZTHY+FDnOhyjygFyqOIwVEvnKuPuuNZvvL7o="; + sha256 = "sha256-lMsBzMDMgpHxcQFtfZ4K7r2WRUaVR8Ry/kPvwfzPObI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-gM9KLf2kEY48M8nQrSdBoqdU9ssQj4sH/hma3/+3JTw="; + cargoHash = "sha256-UnaZZEmX5XoTVFLEFj5JkJXJkjoUBwzJokfffJTPP4M="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix index cf1c8fd83574..c32d7b5f101b 100644 --- a/pkgs/by-name/jb/jbang/package.nix +++ b/pkgs/by-name/jb/jbang/package.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "0.124.0"; + version = "0.125.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-mFAp7lfXAS4Y6GERRpmOvE3cjonOi52BS9G8Z5ixvpw="; + sha256 = "sha256-twVqW8fzthhvU6T1r78bGv0yN4UI/px0YI9C4alACxs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix index 207823785854..16d3029eccd8 100644 --- a/pkgs/by-name/ku/kubetui/package.nix +++ b/pkgs/by-name/ku/kubetui/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "kubetui"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "sarub0b0"; repo = "kubetui"; tag = "v${version}"; - hash = "sha256-sEl/hkGn9X0NArCMA1Nr+KM5mR8ZXAl4hBiU8zGaS0U="; + hash = "sha256-p7NPHOmeDzZ8OlVnpOOoTksWbWcnKlzsXu/mYmMU4l4="; }; checkFlags = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ] ); useFetchCargoVendor = true; - cargoHash = "sha256-1wc2mXX2NQdFaygukeaSDn6qHUaBcTRvCo0uSX289s0="; + cargoHash = "sha256-fMrlZMe2uD+ImM6zPXzo/+/Eto2MeIyscYfU8msLJFw="; meta = { homepage = "https://github.com/sarub0b0/kubetui"; diff --git a/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix index 7d0d006dbb4c..7cd609484408 100644 --- a/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix +++ b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix @@ -66,5 +66,8 @@ stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ valodim ]; + # Does not compile against libfprint-tod, hasn't seen any maintenance + # since 2020. + broken = true; }; } diff --git a/pkgs/by-name/li/libfprint-tod/package.nix b/pkgs/by-name/li/libfprint-tod/package.nix index 30f2b91864d7..6abda09a6eb3 100644 --- a/pkgs/by-name/li/libfprint-tod/package.nix +++ b/pkgs/by-name/li/libfprint-tod/package.nix @@ -13,7 +13,7 @@ libfprint.overrideAttrs ( ... }: let - version = "1.90.7+git20210222+tod1"; + version = "1.94.9+tod1"; in { pname = "libfprint-tod"; @@ -24,18 +24,22 @@ libfprint.overrideAttrs ( owner = "3v1n0"; repo = "libfprint"; rev = "v${version}"; - sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j"; + hash = "sha256-xkywuFbt8EFJOlIsSN2hhZfMUhywdgJ/uT17uiO3YV4="; }; mesonFlags = [ # Include virtual drivers for fprintd tests "-Ddrivers=all" "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" + "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" ]; postPatch = '' ${postPatch} - patchShebangs ./tests/*.py ./tests/*.sh + patchShebangs \ + ./libfprint/tod/tests/*.sh \ + ./tests/*.py \ + ./tests/*.sh \ ''; meta = with lib; { diff --git a/pkgs/by-name/ll/lls/package.nix b/pkgs/by-name/ll/lls/package.nix index 6e3a56ebfd35..fad8352a9d78 100644 --- a/pkgs/by-name/ll/lls/package.nix +++ b/pkgs/by-name/ll/lls/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage rec { pname = "lls"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "jcaesar"; repo = "lls"; - rev = "v${version}"; - hash = "sha256-f2f09ptMBZfBY1jjOEc8ElAoEj4LKXXSdXLlYLf8Z3M="; + tag = "v${version}"; + hash = "sha256-7biyctXeTTZi8PQqKKYn7Qkuw1CxJ9lT6Wo1+rpnjVs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Hc6roJJ5xbqdCAsZIf0V2Z8KPm+t7AQ5Q9It1ynWqhw="; + cargoHash = "sha256-v4AW6kL546LNdBh9GEJfC5lKJBvVhfF52MS4bOkUbdU="; meta = with lib; { description = "Tool to list listening sockets"; diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index 0b9cf686cae5..13bce0bcd6b7 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "mitra"; - version = "3.19.0"; + version = "3.21.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "silverpill"; repo = "mitra"; rev = "v${version}"; - hash = "sha256-3Qa9L8RnEeKJw/+GSVaGXPkCNZ8aWG/JkV6e2DF6ZEk="; + hash = "sha256-xBcz9XNpEDtIZW7yfbfWYPklw3whYoNF+gx3vkHQXGI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-PFq6gKMDbRGZaLjqLp8eNLn4mQ1we6RJXunzItdj+SQ="; + cargoHash = "sha256-LO7xJBWxEGKLxocVs6EDWzGYLX/YtH4d9gSaVy+XxbM="; # require running database doCheck = false; diff --git a/pkgs/by-name/mn/mni_autoreg/package.nix b/pkgs/by-name/mn/mni_autoreg/package.nix index 9d89a6eeff0c..41f3d150e67e 100644 --- a/pkgs/by-name/mn/mni_autoreg/package.nix +++ b/pkgs/by-name/mn/mni_autoreg/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "mni_autoreg"; - version = "unstable-2022-05-20"; + version = "0.99.70-unstable-2024-10-04"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = "mni_autoreg"; - rev = "be7bd25bf7776974e0f2c1d90b6e7f8ccc0c8874"; - sha256 = "sGMZbCrdV6yAOgGiqvBFOUr6pGlTCqwy8yNrPxMoKco="; + rev = "85265398d90dc1bfef886e2cf876a1a2caae86b4"; + hash = "sha256-tKCDrIHlkArF5Xv6NlSkvmNMIMDsxEf5O3ATzm6DabQ="; }; nativeBuildInputs = [ @@ -30,6 +30,11 @@ stdenv.mkDerivation { MNI-Perllib ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-pointer-types" + ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; # testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc @@ -40,11 +45,11 @@ stdenv.mkDerivation { done ''; - meta = with lib; { + meta = { homepage = "https://github.com/BIC-MNI/mni_autoreg"; description = "Tools for automated registration using the MINC image format"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.free; + maintainers = with lib.maintainers; [ bcdarwin ]; + platforms = lib.platforms.unix; + license = lib.licenses.free; }; } diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index ff80c7d8deab..2da3eb5e7b6a 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.41.3"; + version = "2.42.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-5pM3usXT3ukKkhKtDR5nIllaCCEUj7GVIl5HWq9DwII="; + hash = "sha256-63vhxsoGK8YNs0wobFyViOHO9K3hSHgWJU/wbvUxJFw="; }; - vendorHash = "sha256-GnAo+B4UEZIf5K3d1XSU8WpHmdMqzO1nR0reSJ2D1Yk="; + vendorHash = "sha256-VA6/n89OIX+Au1JmCwWezh80xEtydUgBWYSlwpyXZtA="; ldflags = [ "-s" diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix index 8b6d262dfe39..a003f5eb65e5 100644 --- a/pkgs/by-name/ni/nixpacks/package.nix +++ b/pkgs/by-name/ni/nixpacks/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.34.0"; + version = "1.34.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "nixpacks"; rev = "v${version}"; - hash = "sha256-pCCyGFAeeRV9OV6bp5KIUb8/ZD7mktBR0pV+bB14AZc="; + hash = "sha256-G3PIQfwddATVNhe/cEZBSFESX3grFqjUQjq40DB5mH4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/Q92s2I/JG745Nd2ZewKx4P/SMdyhXIMsR4oa7TImm8="; + cargoHash = "sha256-h6DoUCj7wjN/qiy0rsC2fCHhQ8hcmSwFu7zaRw9tCUs="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index fa847d3916aa..63cd50a39d0c 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "10.1.5"; + version = "10.1.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; tag = "v${version}"; - hash = "sha256-8WfFNXxbDWV+AFybsLkcpNKUnJ8a1FpANv1cvmNIJqA="; + hash = "sha256-4li7585M7Pp1/mzD91+tgZgsnoo/Hfy55O+7bEyxUtA="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix index 42c03a9ccf99..74677277285c 100644 --- a/pkgs/by-name/nu/nuclei/package.nix +++ b/pkgs/by-name/nu/nuclei/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nuclei"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; tag = "v${version}"; - hash = "sha256-FseLPykYJrfjCyuS0+yLNcEhzFAaguJjMSdGHIacexo="; + hash = "sha256-ZSmyhNbZotNiqoXl4E+Pjap5zewPlwcTlPihcm4v6Qs="; }; vendorHash = "sha256-tTFEDTUM3ldH3/NtqYx4LyEazp7o5qZ6ionu01Vxwrw="; diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix index 73987c5267ac..69efb208b6bf 100644 --- a/pkgs/by-name/op/opengrok/package.nix +++ b/pkgs/by-name/op/opengrok/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.26"; + version = "1.13.27"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-MPKPbKi7u7SFBBkIxZDrE4TV8RRjGWpRBp6vmeeagwM="; + hash = "sha256-Qr30+paSn3I3+tWpzALTIXP8kxireL96rKopDDj/qnM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pa/partclone/package.nix b/pkgs/by-name/pa/partclone/package.nix index 58be43c9be43..ef10b1d3a9b7 100644 --- a/pkgs/by-name/pa/partclone/package.nix +++ b/pkgs/by-name/pa/partclone/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.33"; + version = "0.3.34"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-dWpl/6d5TSZnJ0IGTtl87NchJWmsCOKa/vmQA3OEK7A="; + sha256 = "sha256-VxHxg5O/ox97rgRvY+KJJx35DVruack2Nu7JKwysruc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sc/scipopt-gcg/package.nix b/pkgs/by-name/sc/scipopt-gcg/package.nix new file mode 100644 index 000000000000..bd55fcb22c17 --- /dev/null +++ b/pkgs/by-name/sc/scipopt-gcg/package.nix @@ -0,0 +1,65 @@ +{ + lib, + pkgs, + stdenv, + fetchFromGitHub, + cmake, + scipopt-scip, + cliquer, + gsl, + gmp, + bliss, + nauty, +}: + +stdenv.mkDerivation rec { + pname = "scipopt-gcg"; + version = "371"; + + # To correlate scipVersion and version, check: https://scipopt.org/#news + scipVersion = "9.2.1"; + + src = fetchFromGitHub { + owner = "scipopt"; + repo = "gcg"; + tag = "v${version}"; + hash = "sha256-+rD8tGE49Irg9xZTD3Ay87ISSeRI4kbBpCj5ppyENbo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + scipopt-scip + cliquer + gsl + gmp + bliss + nauty + ]; + + # Fixing the error + # > CMake Error at CMakeLists.txt:236 (find_package): + # > By not providing "FindNAUTY.cmake" in CMAKE_MODULE_PATH this project has + # > asked CMake to find a package configuration file provided by "NAUTY", but + # > CMake did not find one. + # with this weird workaround of setting SCIPOptSuite_SOURCE_DIR to include the scipopt-scip source + # files via symlinks, so the specific nauty files are found: + preConfigure = '' + mkdir -pv $out/scip + ln -sv ${scipopt-scip.src}/src/ $out/scip/src + cmakeFlagsArray+=( + "-DSCIPOptSuite_SOURCE_DIR=$out" + ) + ''; + doCheck = true; + meta = { + maintainers = with lib.maintainers; [ fettgoenner ]; + changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; + description = "Branch-and-Price & Column Generation for Everyone"; + license = lib.licenses.lgpl3Plus; + homepage = "https://gcg.zib.de"; + mainProgram = "gcg"; + }; +} diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix new file mode 100644 index 000000000000..9f0581f4f575 --- /dev/null +++ b/pkgs/by-name/sc/scipopt-papilo/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + boost, + blas, + gmp, + tbb_2021_11, + gfortran, +}: + +stdenv.mkDerivation rec { + pname = "scipopt-papilo"; + version = "2.4.1"; + + # To correlate scipVersion and version, check: https://scipopt.org/#news + scipVersion = "9.2.1"; + + src = fetchFromGitHub { + owner = "scipopt"; + repo = "papilo"; + tag = "v${version}"; + hash = "sha256-oQ9iq5UkFK0ghUx6uxdJIOo5niQjniHegSZptqi2fgE="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + blas + gmp + gfortran + boost + tbb_2021_11 + ]; + + cmakeFlags = [ + # Disable automatic download of TBB. + (lib.cmakeBool "TBB_DOWNLOAD" false) + + # Explicitly disable SoPlex as a built-in back-end solver to avoid this error: + # > include/boost/multiprecision/mpfr.hpp:22: fatal error: mpfr.h: No such file or directory + # > compilation terminated. + (lib.cmakeBool "SOPLEX" false) + + # (lib.cmakeBool "GMP" true) + # (lib.cmakeBool "QUADMATH" true) + # (lib.cmakeBool "TBB" true) + ]; + doCheck = true; + meta = { + maintainers = with lib.maintainers; [ fettgoenner ]; + changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; + description = "Parallel Presolve for Integer and Linear Optimization"; + license = lib.licenses.lgpl3Plus; + homepage = "https://github.com/scipopt/papilo"; + mainProgram = "papilo"; + }; +} diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix new file mode 100644 index 000000000000..c4939120ae08 --- /dev/null +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchzip, + fetchFromGitHub, + cmake, + zlib, + readline, + gmp, + scipopt-soplex, + scipopt-papilo, + scipopt-zimpl, + ipopt, + tbb_2021_11, + boost, + gfortran, + criterion, + mpfr, +}: + +stdenv.mkDerivation rec { + pname = "scipopt-scip"; + version = "9.2.1"; + + src = fetchFromGitHub { + owner = "scipopt"; + repo = "scip"; + tag = "v${lib.replaceStrings [ "." ] [ "" ] version}"; + hash = "sha256-xYxbMZYYqFNInlct8Ju0SrksfJlwV9Q+AHjxq7xhfAs="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + scipopt-soplex + scipopt-papilo + scipopt-zimpl + ipopt + gmp + readline + zlib + tbb_2021_11 + boost + gfortran + criterion + mpfr # if not included, throws fatal error: mpfr.h not found + ]; + + cmakeFlags = [ ]; + + doCheck = true; + + meta = { + maintainers = with lib.maintainers; [ fettgoenner ]; + changelog = "https://scipopt.org/doc-${version}/html/RN${lib.versions.major version}.php"; + description = "Solving Constraint Integer Programs"; + license = lib.licenses.asl20; + homepage = "https://github.com/scipopt/scip"; + mainProgram = "scip"; + }; +} diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix new file mode 100644 index 000000000000..ab79ae825c21 --- /dev/null +++ b/pkgs/by-name/sc/scipopt-soplex/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + cmake, + gmp, + mpfr, + zlib, + boost, + fetchFromGitHub, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "scipopt-soplex"; + version = "713"; + + # To correlate scipVersion and version, check: https://scipopt.org/#news + scipVersion = "9.2.1"; + + src = fetchFromGitHub { + owner = "scipopt"; + repo = "soplex"; + rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; + hash = "sha256-qI7VGPAm3ALzeiD/OgvlZ1w2GzHRYdBajTW5XdIN9pU="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + boost + gmp + mpfr + zlib + ]; + + strictDeps = true; + + doCheck = true; + + meta = { + homepage = "https://soplex.zib.de/"; + description = "Sequential object-oriented simPlex"; + license = with lib.licenses; [ asl20 ]; + mainProgram = "soplex"; + maintainers = with lib.maintainers; [ david-r-cox ]; + changelog = "https://scipopt.org/doc-${finalAttrs.scipVersion}/html/RN${lib.versions.major finalAttrs.scipVersion}.php"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/sc/scipopt-ug/package.nix b/pkgs/by-name/sc/scipopt-ug/package.nix new file mode 100644 index 000000000000..5905ce388596 --- /dev/null +++ b/pkgs/by-name/sc/scipopt-ug/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchzip, + cmake, + scipopt-scip, + zlib, + mpi, +}: + +stdenv.mkDerivation rec { + pname = "scipopt-ug"; + version = "1.0.0-beta6"; + + # To correlate scipVersion and version, check: https://scipopt.org/#news + scipVersion = "9.2.1"; + + # Take the SCIPOptSuite source since no other source exists publicly. + src = fetchzip { + url = "https://github.com/scipopt/scip/releases/download/v${ + lib.replaceStrings [ "." ] [ "" ] scipVersion + }/scipoptsuite-${scipVersion}.tgz"; + sha256 = "sha256-Hi6oDPtJZODTBIuRYE62sUMTJqfmF0flY3cGoWh2IZE="; + }; + + sourceRoot = "${src.name}/ug"; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + scipopt-scip + mpi + zlib + ]; + + meta = { + maintainers = with lib.maintainers; [ fettgoenner ]; + changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; + description = "Ubiquity Generator framework to parallelize branch-and-bound based solvers"; + license = lib.licenses.lgpl3Plus; + homepage = "https://ug.zib.de"; + }; +} diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix new file mode 100644 index 000000000000..d0e768b3e7ac --- /dev/null +++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + bison, + flex, + gmp, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "scipopt-zimpl"; + version = "362"; + + # To correlate scipVersion and version, check: https://scipopt.org/#news + scipVersion = "9.2.1"; + + src = fetchFromGitHub { + owner = "scipopt"; + repo = "zimpl"; + tag = "v${version}"; + sha256 = "juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o="; + }; + + postPatch = '' + chmod +x check/check.sh + ''; + + nativeBuildInputs = [ + cmake + bison + flex + ]; + + buildInputs = [ + gmp + zlib + ]; + doCheck = true; + + checkPhase = '' + runHook preCheck + pushd ../check + ./check.sh ../build/bin/zimpl + popd + runHook postCheck + ''; + meta = { + maintainers = with lib.maintainers; [ fettgoenner ]; + changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; + description = "Zuse Institut Mathematical Programming Language"; + longDescription = '' + ZIMPL is a little language to translate the mathematical model of a + problem into a linear or (mixed-)integer mathematical program + expressed in .lp or .mps file format which can be read by a LP or MIP + solver. + + If you use Zimpl for research and publish results, the best way + to refer to Zimpl is to cite my Ph.d. thesis: + + @PHDTHESIS{Koch2004, + author = "Thorsten Koch", + title = "Rapid Mathematical Programming", + year = "2004", + school = "Technische {Universit\"at} Berlin", + url = "http://www.zib.de/Publications/abstracts/ZR-04-58/", + note = "ZIB-Report 04-58", + } + ''; + license = lib.licenses.lgpl3Plus; + homepage = "https://zimpl.zib.de"; + mainProgram = "zimpl"; + }; +} diff --git a/pkgs/by-name/su/suricata/package.nix b/pkgs/by-name/su/suricata/package.nix index 630da8c0aeca..e03df3fd06f8 100644 --- a/pkgs/by-name/su/suricata/package.nix +++ b/pkgs/by-name/su/suricata/package.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.8"; + version = "7.0.9"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-SSkoxiLhcL2cRdNTC8KxAzxVgtwYCFxDb86vtigp084="; + hash = "sha256-5XspNDx7ahhXyZG9crCzRKuimOThGVM7F56BfampnT0="; }; nativeBuildInputs = diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix index 9f046d3b811b..a76f4ef4d16a 100644 --- a/pkgs/by-name/te/temporal/package.nix +++ b/pkgs/by-name/te/temporal/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.27.1"; + version = "1.27.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-hQs2rSTbNqknQ/N0mZ8BxeKQn2Pm9Yt/5eKGB2Kc+ME="; + hash = "sha256-3x94Cccy5CHAKb2eHdMThAC+ONQjuYZ4UyQ8YwrWvgU="; }; - vendorHash = "sha256-kasKs692fHojyCLsSdho5LWej11Asu8JJb61rbg1k2k="; + vendorHash = "sha256-g3XASZFZPS2Zs7gvGQpy9GO5kpA9gSL4Ur3LQhKIL6Y="; excludedPackages = [ "./build" ]; diff --git a/pkgs/by-name/tr/transcode/package.nix b/pkgs/by-name/tr/transcode/package.nix deleted file mode 100644 index d64d4f760b33..000000000000 --- a/pkgs/by-name/tr/transcode/package.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - flac, - lame, - zlib, - libjpeg, - libvorbis, - libtheora, - libxml2, - lzo, - libdvdread, - pkg-config, - x264, - libmpeg2, - xvidcore, -}: - -stdenv.mkDerivation rec { - pname = "transcode"; - version = "1.1.7"; - src = fetchurl { - url = "https://bitbucket.org/france/transcode-tcforge/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - flac - lame - zlib - libjpeg - libvorbis - libtheora - libxml2 - lzo - libdvdread - x264 - libmpeg2 - xvidcore - ]; - configureFlags = [ - "--disable-ffmpeg" - "--disable-libavcodec" - "--disable-libavformat" - "--enable-lzo" - "--enable-ogg" - "--enable-vorbis" - "--enable-theora" - "--enable-libxml2" - "--enable-x264" - "--enable-libmpeg2" - "--enable-xvid" - ]; - - enableParallelBuilding = true; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: tcextract-extract_pcm.o:/build/transcode-1.1.7/import/extract_pcm.c:36: multiple definition of - # `audio'; tcextract-extract_ac3.o:/build/transcode-1.1.7/import/extract_ac3.c:337: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - meta = with lib; { - description = "Suite of command line utilities for transcoding video and audio codecs, and for converting between different container formats"; - homepage = "http://www.transcoding.org/"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/tr/treesheets/package.nix b/pkgs/by-name/tr/treesheets/package.nix index e08be9dd7609..12737b3e670d 100644 --- a/pkgs/by-name/tr/treesheets/package.nix +++ b/pkgs/by-name/tr/treesheets/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2025-03-03"; + version = "0-unstable-2025-03-15"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "a09352dabf6c491eed411bca5e613ba58142debc"; - hash = "sha256-3lO8bsdluj24EMikvSQ7qOciHmIlKVxR3GWAG/SfUFM="; + rev = "6240644205b963e3e1b1fd4d21762e209ef38c05"; + hash = "sha256-sgzgqb1lirVVE1TKNarMgnn5altsSyNL/CQd+IBatPI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix index 0c1861d9f1a8..00edf3cf211d 100644 --- a/pkgs/by-name/tr/trivy/package.nix +++ b/pkgs/by-name/tr/trivy/package.nix @@ -11,19 +11,19 @@ buildGo124Module rec { pname = "trivy"; - version = "0.60.0"; + version = "0.61.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; tag = "v${version}"; - hash = "sha256-9JArivz+4GWfU2R7e4pFI/cWJgNFhMj/cQ09a4ESoy8="; + hash = "sha256-SC/EYozsPdqummWBCrQi852rHk6TAMnzxyn0FzwjJ6w="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-EF2oq3iYVhdeXjAYYLqtcF0OwDh6vgDay1y8z5w/S4k="; + vendorHash = "sha256-cQPfZnLDNqMfunBr0xa45H/Trh9+EvdDdiYrjZsOyF0="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index fc04ad442124..2e5179dea11e 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "271.250227.0"; + version = "274.250312.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-03RNIGY9gTuvHurVX1UiZEZwnBoxrL4GfsEMdoN/irM="; + hash = "sha256-30+ZKqbIEUvmWhQ3ZrDZkZMBUc7lKkv02Vbraq9vPrU="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/by-name/vi/video-compare/package.nix b/pkgs/by-name/vi/video-compare/package.nix new file mode 100644 index 000000000000..fb50c72099ef --- /dev/null +++ b/pkgs/by-name/vi/video-compare/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + SDL2, + SDL2_ttf, + ffmpeg, +}: + +stdenv.mkDerivation rec { + pname = "video-compare"; + version = "20250223"; + + src = fetchFromGitHub { + owner = "pixop"; + repo = "video-compare"; + tag = version; + hash = "sha256-h74TWXPcbIjfejGfHnjKZqKzpV0DIkC5llSD1jmiDDY="; + }; + + postPatch = '' + # Fix build on Darwin by using $CXX set by setup-hook + substituteInPlace makefile \ + --replace-fail 'CXX = g++' "" + ''; + + buildInputs = [ + SDL2 + SDL2_ttf + ffmpeg + ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2"; + + installPhase = '' + runHook preInstall + + install -Dt $out/bin video-compare + + runHook postInstall + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "https://github.com/pixop/video-compare"; + description = "Split screen video comparison tool"; + maintainers = with lib.maintainers; [ orivej ]; + license = lib.licenses.gpl2Only; + mainProgram = "video-compare"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/wa/watchyourlan/package.nix b/pkgs/by-name/wa/watchyourlan/package.nix index f7ab4f9022c6..5cf2e91c4d53 100644 --- a/pkgs/by-name/wa/watchyourlan/package.nix +++ b/pkgs/by-name/wa/watchyourlan/package.nix @@ -5,18 +5,19 @@ lib, arp-scan, }: + buildGoModule rec { pname = "watchyourlan"; - version = "2.0.4"; + version = "2.1.1"; src = fetchFromGitHub { owner = "aceberg"; repo = "WatchYourLAN"; - rev = version; - hash = "sha256-nJYDGCkT8vCkxySLONG3OkWVkaBqXqSFgd7N1TTMAf4="; + tag = version; + hash = "sha256-xiwDcqEfuNuqNQO2wtJ2XK0mPf91C1bapEqKKmKxw4c="; }; - vendorHash = "sha256-urSFoFkYllV+bsKIRV/azkbL30mbGeciYR7jy/fOE/w="; + vendorHash = "sha256-NUv90wq3nFHDtfk3BitwJ3ZfciPESUIDzS5S/6zafEQ="; ldflags = [ "-s" @@ -33,6 +34,7 @@ buildGoModule rec { meta = { description = "Lightweight network IP scanner with web GUI"; homepage = "https://github.com/aceberg/WatchYourLAN"; + changelog = "https://github.com/aceberg/WatchYourLAN/releases/tag/${src.tag}"; license = lib.licenses.mit; mainProgram = "WatchYourLAN"; maintainers = [ lib.maintainers.iv-nn ]; diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index f15bae2ca5ea..6e4cbf3b58d6 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -9,13 +9,13 @@ }: let pname = "workout-tracker"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; tag = "v${version}"; - hash = "sha256-J2Pu8SR1kS9rpbq6uvZncU+oGvB4Ijfrajw2EtakluA="; + hash = "sha256-6t+p/P8gAHTOMiWJ1lDcpHRPptO+lk0jl/llKy8fNrg="; }; assets = buildNpmPackage { diff --git a/pkgs/by-name/xp/xprompt/package.nix b/pkgs/by-name/xp/xprompt/package.nix index bbab28e66c8e..1d787c2df31b 100644 --- a/pkgs/by-name/xp/xprompt/package.nix +++ b/pkgs/by-name/xp/xprompt/package.nix @@ -30,11 +30,16 @@ stdenv.mkDerivation rec { ]; postPatch = - let - configFile = - if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.h" conf; - in - lib.optionalString (conf != null) "cp ${configFile} config.h"; + '' + sed -i "8i #include " xprompt.c + '' + + ( + let + configFile = + if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.h" conf; + in + lib.optionalString (conf != null) "cp ${configFile} config.h" + ); makeFlags = [ "CC:=$(CC)" diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index bd158cf04892..7fa30796e44c 100644 --- a/pkgs/development/interpreters/erlang/25.nix +++ b/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.18"; - sha256 = "sha256-PmDEJ0o6s27K0+g9zUXkmwbqibXNWQkF412DFYizrd8="; + version = "25.3.2.19"; + sha256 = "sha256-fd2YxFx/Skst+jRXAm4nLVxEIriu34lPRuBWvj+qaIk="; } diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index b6322d8ac8f3..5bb6407f8d70 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.2.5.9"; - sha256 = "sha256-FRNVmaeBUCFLmfhE9JVb1DgC/MIoryDV7lvh+YayRNA="; + version = "26.2.5.10"; + sha256 = "sha256-dnkt2tg2jQ4pHvkrUvDPmw7Bxsd5ECd/3lLvuScyFoc="; } diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index 109627e26ce2..2e7cec7569dc 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "aiocoap"; - version = "0.4.12"; + version = "0.4.14"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "chrysn"; repo = "aiocoap"; tag = version; - hash = "sha256-yy9TsNTdk7kfLilXsjDCVAe1C3O70P09It71zU26PKo="; + hash = "sha256-v0OzRWHlGaBKqqcIyAlVafd/siXVwaTAZqw+Sstju3s="; }; build-system = [ setuptools ]; @@ -59,29 +59,14 @@ buildPythonPackage rec { "tests/test_oscore_plugtest.py" ]; - disabledTests = - [ - # Communication is not properly mocked - "test_uri_parser" - # Doctest - "test_001" - ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # https://github.com/chrysn/aiocoap/issues/339 - "TestServerTCP::test_big_resource" - "TestServerTCP::test_empty_accept" - "TestServerTCP::test_error_resources" - "TestServerTCP::test_fast_resource" - "TestServerTCP::test_js_accept" - "TestServerTCP::test_manualbig_resource" - "TestServerTCP::test_nonexisting_resource" - "TestServerTCP::test_replacing_resource" - "TestServerTCP::test_root_resource" - "TestServerTCP::test_slow_resource" - "TestServerTCP::test_slowbig_resource" - "TestServerTCP::test_spurious_resource" - "TestServerTCP::test_unacceptable_accept" - ]; + disabledTests = [ + # Communication is not properly mocked + "test_uri_parser" + # Doctest + "test_001" + # CLI test + "test_help" + ]; pythonImportsCheck = [ "aiocoap" ]; @@ -89,7 +74,7 @@ buildPythonPackage rec { description = "Python CoAP library"; homepage = "https://aiocoap.readthedocs.io/"; changelog = "https://github.com/chrysn/aiocoap/blob/${version}/NEWS"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aiopulse/default.nix b/pkgs/development/python-modules/aiopulse/default.nix index 7309f774b14f..5d3527104be8 100644 --- a/pkgs/development/python-modules/aiopulse/default.nix +++ b/pkgs/development/python-modules/aiopulse/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiopulse"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-juubQHAAQYN9mSssfF3prYByy+wxscZFxwgspJU8zYA="; + hash = "sha256-DM/zDFoTYgaW+o2YYv4bDAja5iwabIBfFJ7Yep4Fywc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index aa05085d1968..9935c3e0cc99 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -6,24 +6,30 @@ azure-common, azure-mgmt-core, isodate, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-containerregistry"; - version = "10.3.0"; - format = "setuptools"; + version = "12.0.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-riFlGFXfsZxC2R1rOpZcbGEeI/i8S/cTiDXmUtL5GOM="; + pname = "azure_mgmt_containerregistry"; + inherit version; + hash = "sha256-8Z+PqniB3q8rUBXA6wUKkuI4DNnRje4zzbXyfUSgbAM="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core isodate + typing-extensions ]; # no tests included @@ -36,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Container Registry Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerregistry/azure-mgmt-containerregistry"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerregistry_${version}/sdk/containerregistry/azure-mgmt-containerregistry/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index a49d213a117f..80636d58b042 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.37.20"; + version = "1.37.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-fkGik7zbvqmbIdanOAgi58ijGZL21n2ImJrrums1zcI="; + hash = "sha256-AR8G2tzV7zxifsmAi5r6Thg3sPAJ2CuCCfEqhP+7OGc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index e86b479d4cbf..cd45dc4a24d2 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.37.20"; + version = "1.37.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-KVuSGMCocfk5JuAMG71pVvArOsmwWKRb27AL9ssEVAI="; + hash = "sha256-N5H0Y86UFIEcluKatmAryAapjLRrHVXaE/+UXeGQ5bY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/compressed-rtf/default.nix b/pkgs/development/python-modules/compressed-rtf/default.nix index 46ad11bfc1fc..acfdd2dae763 100644 --- a/pkgs/development/python-modules/compressed-rtf/default.nix +++ b/pkgs/development/python-modules/compressed-rtf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage { pname = "compressed-rtf"; - version = "1.0.6-unstable-2023-10-15"; + version = "1.0.7"; pyproject = true; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index 636fde33039f..c3601041d17c 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "2.6.2"; + version = "2.7.0"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; tag = version; - hash = "sha256-3NFbAxgY183RmZ+ats6M5WM07VO2amj7EdqMCLcKNvI="; + hash = "sha256-Diu8cHy3tRWsyI7mPsAcYREK9nUG7tzasmZYAARzpXU="; }; patches = [ ./bash-path.patch ]; diff --git a/pkgs/development/python-modules/dlms-cosem/default.nix b/pkgs/development/python-modules/dlms-cosem/default.nix index cfe444813ade..ed9435cc8735 100644 --- a/pkgs/development/python-modules/dlms-cosem/default.nix +++ b/pkgs/development/python-modules/dlms-cosem/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dlms-cosem"; - version = "24.1.0"; + version = "25.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,12 +25,12 @@ buildPythonPackage rec { owner = "pwitab"; repo = "dlms-cosem"; tag = version; - hash = "sha256-NeTaU8i18Zb39Y2JnYzr87Ozt7Rj074xusL4xaNe0q0="; + hash = "sha256-ZsF+GUVG9bZNZE5daROQJIZZgqpjAkB/bFyre2oGu+E="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ asn1crypto attrs cryptography @@ -47,8 +47,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to parse DLMS/COSEM"; homepage = "https://github.com/pwitab/dlms-cosem"; - changelog = "https://github.com/pwitab/dlms-cosem/blob/${version}/HISTORY.md"; - license = with licenses; [ mit ]; + changelog = "https://github.com/pwitab/dlms-cosem/blob/${src.tag}/HISTORY.md"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix index 8cd18b628502..e43a86f28702 100644 --- a/pkgs/development/python-modules/evtx/default.nix +++ b/pkgs/development/python-modules/evtx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "evtx"; - version = "0.8.5"; + version = "0.8.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +20,13 @@ buildPythonPackage rec { owner = "omerbenamram"; repo = "pyevtx-rs"; tag = version; - hash = "sha256-wo6CeHlEBbu3klzzC4dUbjSfu7XwLo/cmtmZsVIKgS8="; + hash = "sha256-rxE3Srm+5L9r6uNIeOPBnpQAbS89WCel/U7xgLc2ZDU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-Zdj0trB0wIVC9xg64wVOIrstdG7LGMOhWcRFXQJGNls="; + hash = "sha256-IqV4BsLE+5Dk3ey4M+h5wxR/SToZTLf8vU0BlWU5e8c="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix index c591c3887e28..93619ea1a540 100644 --- a/pkgs/development/python-modules/iaqualink/default.nix +++ b/pkgs/development/python-modules/iaqualink/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "iaqualink"; - version = "0.5.0"; + version = "0.5.3"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "flz"; repo = "iaqualink-py"; - rev = "v${version}"; - hash = "sha256-ewPP2Xq+ecZGc5kokvLEsRokGqTWlymrzkwk480tapk="; + tag = "v${version}"; + hash = "sha256-2DqZJlsbDWo9fxIDg5P0CvZs8AuAh8XrhNiwIvuRm80="; }; build-system = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Jandy iAqualink"; homepage = "https://github.com/flz/iaqualink-py"; - changelog = "https://github.com/flz/iaqualink-py/releases/tag/v${version}"; + changelog = "https://github.com/flz/iaqualink-py/releases/tag/v${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 9cfc926aca8d..8ef451cf0f69 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.13.5"; + version = "1.13.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-fMFTGzw7j4VylmKaG8K9FNFnKsyQ9R6g2c//DcUztfc="; + hash = "sha256-80qgV35B863B16L+kdQ+6p6laZo2v5dChyczO5VXvNY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix b/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix index 82abd2041a05..82c343070f31 100644 --- a/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix +++ b/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix @@ -24,11 +24,14 @@ buildPythonPackage rec { dependencies = [ cryptography - gssapi pyasn1 pycryptodomex ]; + optional-dependencies = { + kerberos = [ gssapi ]; + }; + pythonImportsCheck = [ "ldap3" ]; # Tests require network access diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 439b8403190c..600f52fcd14f 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.25.0"; + version = "1.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-CRs9Pqgv8sVhjlMPmC8UR03b4jP1Pm39Yndn2LF51jU="; + hash = "sha256-zCnv+1/rQzo1+Kya8y8M9hljrygT9ZhHstpm14FL9mE="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index a163227a563f..b6410ced2b5b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -78,16 +78,16 @@ rec { "sha256-QDagskTiBtIbR8dIh5E3bdAxaezblNXWNEGGmNUcrWY="; mypy-boto3-apigateway = - buildMypyBoto3Package "apigateway" "1.37.0" - "sha256-VS0iDnBlRPV6KBDC198tkxECMC13W1jjujsmig174BE="; + buildMypyBoto3Package "apigateway" "1.37.23" + "sha256-Ey2/SstD830TRvw6BQll2H9x8qPcvOZgm++mVv8AmlU="; mypy-boto3-apigatewaymanagementapi = buildMypyBoto3Package "apigatewaymanagementapi" "1.37.0" "sha256-Y6BQWnf8h7ec2Rt4bhuyAl1KAIe53rnhTupcNeROQ8I="; mypy-boto3-apigatewayv2 = - buildMypyBoto3Package "apigatewayv2" "1.37.0" - "sha256-vF9qDs4R1LCPpYjdRqSEmTB64rOTKToJjmKwHlwOkyc="; + buildMypyBoto3Package "apigatewayv2" "1.37.23" + "sha256-T4x9ayNwSPKNFIxL3OgoE1lBqv+j25LhvcymikqJmpM="; mypy-boto3-appconfig = buildMypyBoto3Package "appconfig" "1.37.0" @@ -138,8 +138,8 @@ rec { "sha256-4eY2gziQLvX2t39e201UitkV/Cs0E2RSP4yAG6/OdbI="; mypy-boto3-arc-zonal-shift = - buildMypyBoto3Package "arc-zonal-shift" "1.37.0" - "sha256-3s+fYgf1gAy1o5V0uNrUcznLplweWm+2mTgMl4cmMWQ="; + buildMypyBoto3Package "arc-zonal-shift" "1.37.21" + "sha256-m88NXN/OxX65E92CnQoIZ9+Uq/D1idXzq3NvYQqEilM="; mypy-boto3-athena = buildMypyBoto3Package "athena" "1.37.0" @@ -166,8 +166,8 @@ rec { "sha256-SFybjQDlMxvgIFQbv/D6wDexm+s4u26I6Lj2T94vwak="; mypy-boto3-batch = - buildMypyBoto3Package "batch" "1.37.2" - "sha256-cEJJucCt54tLZBZKseJWFzW+baIoySP2igPcgfj7Ri0="; + buildMypyBoto3Package "batch" "1.37.22" + "sha256-D2LSlIcSgCzO55DHMI9/q7zUMmujL6N0v94qiEgPykY="; mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.37.0" @@ -226,8 +226,8 @@ rec { "sha256-lIkRuhQHTqlXRkyf9hIIZ0oh3vgdr5GzLApLt9lXvaw="; mypy-boto3-cloudformation = - buildMypyBoto3Package "cloudformation" "1.37.0" - "sha256-v8dLqGFGcUBuEfKEYJZ0FnUz7aIg3WNcL7gky2Ajuu0="; + buildMypyBoto3Package "cloudformation" "1.37.22" + "sha256-v2vtJ9GtgtEVaWStq+sNYntVWrhw1okwWhYMuT4O8lU="; mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.37.9" @@ -266,8 +266,8 @@ rec { "sha256-nVAeLXy2hjJZDjNTjFccKClY7DS0oLv9Q9QLlngkX6M="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.37.12" - "sha256-nOZz1Yfl4UsuYBCbwS09QuWgW0ilQHTpzLqOR3HgO2g="; + buildMypyBoto3Package "codebuild" "1.37.23" + "sha256-dnwZL9dcrOJRb82phmusI7DMEKlM0mZ66kMwY34vBls="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.37.0" @@ -402,8 +402,8 @@ rec { "sha256-TqYdke3fLJRHZBmHbFkQYxPJ+Vm6aQyI0XNEsR12FvM="; mypy-boto3-directconnect = - buildMypyBoto3Package "directconnect" "1.37.0" - "sha256-sp2viLLUNRurZbDPlscmuqwo4Mgi5PA0cl68wtff4A8="; + buildMypyBoto3Package "directconnect" "1.37.21" + "sha256-G1oWu51jsk80Y2CHCg+Wj/LrU+BN1Z0urmuHjWi+kp4="; mypy-boto3-discovery = buildMypyBoto3Package "discovery" "1.37.0" @@ -462,16 +462,16 @@ rec { "sha256-7Sz4g1+0B99ZybhrzJOS0K71thybaDPUYmF4+SN1sGc="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.37.11" - "sha256-lUFZE7dC5C2RZQjt515X7gn/4U2Md8GYrrCDX1E6Edk="; + buildMypyBoto3Package "ecs" "1.37.23" + "sha256-laN5lEqfTiYJmhjt0FxwrH6rS1YHjHTCCaTYNfmuV6s="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.37.0" "sha256-uKccWDS0zhFrs6CQ9ve6by4rYL43T6iFZ3rjNy7SiyI="; mypy-boto3-eks = - buildMypyBoto3Package "eks" "1.37.20" - "sha256-jFap7gKOZHeBtIKRz7BfEbm2EidERQhU7qohKjnYb9Y="; + buildMypyBoto3Package "eks" "1.37.22" + "sha256-T/dhVpy1eW2kcjNe1jMMSrwyHFwttVNShhId1q2u8VE="; mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.36.0" @@ -562,8 +562,8 @@ rec { "sha256-wPym6XJ09JuqPS5ee+5iU4jXrtCiSutNE7BiZvP9w2A="; mypy-boto3-gamelift = - buildMypyBoto3Package "gamelift" "1.37.0" - "sha256-p32uq+oF5IVsI2eoBjmjmZO5actsyghuB5R81fuCEYA="; + buildMypyBoto3Package "gamelift" "1.37.22" + "sha256-5wycchIRl8vzVHyYzW5WoNckIIYjyUZHEv7vMmtarU4="; mypy-boto3-glacier = buildMypyBoto3Package "glacier" "1.37.0" @@ -606,8 +606,8 @@ rec { "sha256-cLuH24dACvIWq9+UDtLaeIXe8V7o8lz5oltGD94tTrU="; mypy-boto3-iam = - buildMypyBoto3Package "iam" "1.37.0" - "sha256-FlGDGUvHmvhPlrjXh7141YIOJh2P4q8baWINYQTfxOU="; + buildMypyBoto3Package "iam" "1.37.22" + "sha256-f3FqgcCMJeapoZA+nyZGndRDJ88qLX9km5R9ymLXnsY="; mypy-boto3-identitystore = buildMypyBoto3Package "identitystore" "1.37.0" @@ -862,8 +862,8 @@ rec { "sha256-TfeKy6dyjQJVyhmCjttwBxBQNi3iZdJQQwpY/HRvnf0="; mypy-boto3-mediaconvert = - buildMypyBoto3Package "mediaconvert" "1.37.15" - "sha256-bs9Zvpv3AyT/zhucLMqtdhmocG4+hbHkPjyGsvviFJ8="; + buildMypyBoto3Package "mediaconvert" "1.37.21" + "sha256-Ltzv3h+NATTcKsyd1PfnUdjIhT3V0OS3woGsStyI/qA="; mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.37.11" @@ -890,8 +890,8 @@ rec { "sha256-g/KoroOmWZgWPfC0HMgLGQrGpr9QWEirTL3S9t7iMjs="; mypy-boto3-mediatailor = - buildMypyBoto3Package "mediatailor" "1.37.0" - "sha256-IJJUCcWCds3xb01lV0ghy0Itweeg3vKEUW8Pmp/Er/I="; + buildMypyBoto3Package "mediatailor" "1.37.21" + "sha256-SssQmTozr5f/uwsbwmMZpkXKG4SWG43IkEmehVG53Lw="; mypy-boto3-medical-imaging = buildMypyBoto3Package "medical-imaging" "1.37.0" @@ -902,8 +902,8 @@ rec { "sha256-88OSler+2SJ2zDYtLmM5NeOPafKIf5zaLV8MMLRb5es="; mypy-boto3-meteringmarketplace = - buildMypyBoto3Package "meteringmarketplace" "1.37.20" - "sha256-Bpcsx33TRawi+ZzseMkkYxVbkTo+PYahe8kj7TwcwIs="; + buildMypyBoto3Package "meteringmarketplace" "1.37.23" + "sha256-rVSofDYP53P0MuI8aS8yJAdMfWvmp6u7dCYU15Li6tQ="; mypy-boto3-mgh = buildMypyBoto3Package "mgh" "1.37.0" @@ -954,8 +954,8 @@ rec { "sha256-Lth+Py9qwXU+mnbV21d9H7QoONrwWU1UmMCJWorypxs="; mypy-boto3-networkmanager = - buildMypyBoto3Package "networkmanager" "1.37.0" - "sha256-XQd/4cp7d5DB9g0QU8i5qvUpycPx4P3CxwTx5pijSLQ="; + buildMypyBoto3Package "networkmanager" "1.37.23" + "sha256-wJjK+WP4nS3CItgfxYXbo51y8SsZLRfe9nO5GanFiPg="; mypy-boto3-nimble = buildMypyBoto3Package "nimble" "1.35.0" @@ -1002,8 +1002,8 @@ rec { "sha256-5t43MNckv0+Gxdmp+4dkxMTtl9ToTk0Wfq9W0jr4Qko="; mypy-boto3-payment-cryptography = - buildMypyBoto3Package "payment-cryptography" "1.37.0" - "sha256-2JlRaJI+easfcwj7TqYJ1B/9mGlApbQ0sh9DYK2gE28="; + buildMypyBoto3Package "payment-cryptography" "1.37.23" + "sha256-Uy3TNwYrc0j+a08H0POVX1GTPFdc/8KpVeCnm4rb9Zk="; mypy-boto3-payment-cryptography-data = buildMypyBoto3Package "payment-cryptography-data" "1.37.0" @@ -1050,8 +1050,8 @@ rec { "sha256-/Wr+oP8wfgSoeynyZDJ0fTS0T2oeBXR8DctO25S7qPU="; mypy-boto3-polly = - buildMypyBoto3Package "polly" "1.37.0" - "sha256-xPW1Ogeucuynd6rOGji/ihdWWrEzTXQdqcjiJeFX2bs="; + buildMypyBoto3Package "polly" "1.37.21" + "sha256-G9EVOO0mU8f/tAd/mg0/04lMkvs4+6JLHF3E+ylnyEo="; mypy-boto3-pricing = buildMypyBoto3Package "pricing" "1.37.4" @@ -1074,8 +1074,8 @@ rec { "sha256-WqMrD+uGG7YQIQagu8L5pUOYMNHeneEQCYzkWrIZ+nA="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.37.0" - "sha256-+brjIm6GDK95Ft7bcCRKiEB34ERKqoLKwF18XlNp+fA="; + buildMypyBoto3Package "quicksight" "1.37.23" + "sha256-evmnL/VUlIk3b5tvPLL/QEGS5hJ4XoBUP85B5BNPOd8="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.37.0" @@ -1086,8 +1086,8 @@ rec { "sha256-csr3DYjsomhq4T+97ZEQdjt0RfsXbo8kBFGrB6cUUmM="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.37.6" - "sha256-IoXZZE9YwtHROZYy3A/nmSfhkpCpt6GE+AyF2KTmXlg="; + buildMypyBoto3Package "rds" "1.37.21" + "sha256-j6eNB3ImSJ/vKNGzRJZGiCQl0ln5NSP3sIr9m3Yd/fg="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.37.0" @@ -1174,8 +1174,8 @@ rec { "sha256-c0vXkW5sR7JkdzvsS/rMFme9EwY1x5eZAbRWYKew0v4="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.37.20" - "sha256-fncIq3N1qd+d0cvnecyn9LKd6ehjqwE8/EVnPhk/t5E="; + buildMypyBoto3Package "sagemaker" "1.37.23" + "sha256-w3zuzIXvQvxRv9unOJjBv2lnXXRA2tycfo3KCz4l9p4="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.37.0" @@ -1318,8 +1318,8 @@ rec { "sha256-y4IyBLiayIZObpAK/to12GaqhDqiKnJDta+038BdNSg="; mypy-boto3-sso-oidc = - buildMypyBoto3Package "sso-oidc" "1.37.0" - "sha256-w7E28nqg4N8dz7MpAyRwMOJb+Q1bFb4JkmVQ6Cw629U="; + buildMypyBoto3Package "sso-oidc" "1.37.22" + "sha256-ahiaClNbudP2banQ8+HK8BYkQARVo5dW9W9W7/LmkpY="; mypy-boto3-stepfunctions = buildMypyBoto3Package "stepfunctions" "1.37.0" @@ -1398,8 +1398,8 @@ rec { "sha256-nBigZ8YNNcy6TrQQ+dThN62xZ5IOq92EHbC3/tZbbuE="; mypy-boto3-wafv2 = - buildMypyBoto3Package "wafv2" "1.37.14" - "sha256-wfndS06dDJCEqVLceB+WMTIh1laTi9eVfTzx23K47nk="; + buildMypyBoto3Package "wafv2" "1.37.21" + "sha256-EiksZIqxgX/H/YF7Yo0B2YIQzgIYqcFhol81jDL9gKk="; mypy-boto3-wellarchitected = buildMypyBoto3Package "wellarchitected" "1.37.0" diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index f7698d0cb53b..5619fc76cbc9 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "7.7.0"; + version = "7.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = "ntc-templates"; tag = "v${version}"; - hash = "sha256-B5gKCvouqxzH5BoMpV9I6aLuUYbfdjABqjtzkXWs0Uw="; + hash = "sha256-v9+d9nZiYneG3vULtQZsa/gD6FCyBrrbGxUJsv1sMYA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-sqlalchemy/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-sqlalchemy/default.nix new file mode 100644 index 000000000000..6bbcf2bc53c5 --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-sqlalchemy/default.nix @@ -0,0 +1,52 @@ +{ + buildPythonPackage, + pythonOlder, + + # build-system + hatchling, + + # dependencies + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + packaging, + sqlalchemy, + wrapt, + + # tests + opentelemetry-test-utils, + pytestCheckHook, +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-sqlalchemy"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-sqlalchemy"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-semantic-conventions + packaging + sqlalchemy + wrapt + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.sqlalchemy" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-sqlalchemy"; + description = "SQLAlchemy instrumentation for OpenTelemetry"; + }; +} diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 6f67e8b335d5..21d14e710718 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.28.2"; + version = "1.28.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-zbEpTK1kH2bweQqWHPNtWekwZTdNqqLYnx0VDKyFiUA="; + hash = "sha256-uf1uCXuCgp9Ly7sYdcGiwyjI7QbEqLvQEtJt2DE/06k="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 52344a8c8e87..189720c5907b 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "25.3.2"; + version = "25.3.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "pontos"; tag = "v${version}"; - hash = "sha256-gxmNOrvV007nSwP2TNDCnB0CPspeWMt9ohnT4u8EzPw="; + hash = "sha256-jupd56zLx7tdsiklX0y8WNH0UkPeFtD/TLtzuoRefuI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/powerapi/default.nix b/pkgs/development/python-modules/powerapi/default.nix index 69aa219c68ae..1ae18ae1e5cd 100644 --- a/pkgs/development/python-modules/powerapi/default.nix +++ b/pkgs/development/python-modules/powerapi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "powerapi"; - version = "2.9.1"; + version = "2.10.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "powerapi-ng"; repo = "powerapi"; tag = "v${version}"; - hash = "sha256-iFWCrO9frMK68kefmKQrXra1g5efDCj2ZOlVwxDNvXw="; + hash = "sha256-rn1qe0RwYuUR23CgzOOeiwe1wuFihnhQ9a6ALgSP/cQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index c863b5010542..677b89f0fe07 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250319"; + version = "1.0.2.20250329"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OBBkjnDzMGKiwLb1Mnkcw/0IwaeJyoSSQh3YVuF1aRo="; + hash = "sha256-HinLmgjEHCmoW3tNTQF8vKWSh7IExxaGbdcztQsPuSk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 6e9f0cf7299c..70ebe0dff7ad 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.16.4"; + version = "1.16.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; tag = "v${version}"; - hash = "sha256-J3AjTMLgKDUeCzRLRkUk3bvqBCHqBl+p3EyLmlojYhU="; + hash = "sha256-uqpR3rGXIsdrVD2vjbSXHjFbFmyLSw/3MFcvX3HhQT8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix index b3f28bfa5af7..bf136eec51c1 100644 --- a/pkgs/development/python-modules/pywerview/default.nix +++ b/pkgs/development/python-modules/pywerview/default.nix @@ -3,7 +3,6 @@ beautifulsoup4, buildPythonPackage, fetchFromGitHub, - gssapi, impacket, ldap3-bleeding-edge, lxml, @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "pywerview"; - version = "0.7.2"; + version = "0.7.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,14 +23,13 @@ buildPythonPackage rec { owner = "the-useless-one"; repo = "pywerview"; tag = "v${version}"; - hash = "sha256-1JDohgEowOlbLsqzX5aAmMSfS6LffXwz1t3361IYq60="; + hash = "sha256-ZIv0IW7oruMBwinXvH/n1YEtbBFyLb8h/Qlh4JxvV4k="; }; build-system = [ setuptools ]; dependencies = [ beautifulsoup4 - gssapi impacket ldap3-bleeding-edge lxml @@ -39,6 +37,10 @@ buildPythonPackage rec { pyasn1 ]; + optional-dependencies = { + kerberos = [ ldap3-bleeding-edge ] ++ ldap3-bleeding-edge.optional-dependencies.kerberos; + }; + # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 76841e31d2e3..213d33de2314 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.6.0"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - hash = "sha256-4z1PmVoRs7mql/PhSG9Ek6NRkGXIXAYxaV8nNDoJjeY="; + hash = "sha256-JT0Ud17U9etByaDVu9+hcadymze1rfj+mEK6nqksuWc="; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index e7381b9dd7e0..5a622073b990 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "setupmeta"; - version = "3.7.2"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "codrsquad"; repo = "setupmeta"; tag = "v${version}"; - hash = "sha256-qtnewUmTApPYq7/X82GsduW0VcioW4huRAyDMHUD74Q="; + hash = "sha256-2SKiIkwfmXVOQBKBNUmw4SjiVpyLjIMpSHNA9IQxqwY="; }; preBuild = '' diff --git a/pkgs/development/python-modules/ttkbootstrap/default.nix b/pkgs/development/python-modules/ttkbootstrap/default.nix new file mode 100644 index 000000000000..c1307c09d94c --- /dev/null +++ b/pkgs/development/python-modules/ttkbootstrap/default.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildPythonPackage, + pillow, + setuptools, +}: + +buildPythonPackage rec { + pname = "ttkbootstrap"; + version = "1.10.1"; + + src = fetchFromGitHub { + owner = "israel-dryer"; + repo = pname; + tag = "v${version}"; + hash = "sha256-aUqr30Tgz3ZLjLbNIt9yi6bqhXj+31heZoOLOZHYUiU="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + pillow + ]; + + # As far as I can tell, all tests require a display and are not normal-ish pytests + # but appear to just be python scripts that run demos of components? + doCheck = false; + + meta = { + description = "Supercharged theme extension for tkinter inspired by Bootstrap"; + homepage = "https://github.com/israel-dryer/ttkbootstrap"; + maintainers = with lib.maintainers; [ e1mo ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index cb1440b51602..31898840acef 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "vt-py"; tag = version; - hash = "sha256-r6pEtq/GQzVY+gRzY2KZfSQEyp4ZoFRLBd8tlXp/aM8="; + hash = "sha256-5go6O5V8mY1Ph3peF6ISJ63/cnhNtDIlgeLztp2zpkY="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index d73a2578522a..a3115da5be01 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:0bw3xip9qg4zr42vx28iai954g5a1wprrrkr81zn7x7vv3ayjvya" }, "6.1": { - "version": "6.1.131", - "hash": "sha256:05jvvv3khadvfgdrv43fcrnm606jk4064a7qivkvnk1vc08gbjj4" + "version": "6.1.132", + "hash": "sha256:1l5vrc8an6h0fcnfmqb6pmal686imxbllcvlkqah19fg7wnv3dyx" }, "5.15": { "version": "5.15.179", @@ -20,16 +20,16 @@ "hash": "sha256:0vpgb3lmhgv5iw9b1z0kqr6vdv44if49marfp5858z3a8yj69bdk" }, "6.6": { - "version": "6.6.84", - "hash": "sha256:19vvq558vs2ivj4l6kmyha30a94fh42wmijsghsdnq8salhhglkz" + "version": "6.6.85", + "hash": "sha256:0abmgc5rg7hx18ykwsl6xl72gzaf3wbn5bkvh4kcsa1lrbscrfjy" }, "6.12": { - "version": "6.12.20", - "hash": "sha256:1ivakcj0gi191687zagl1qfsip0567p1pk3yy1s2xf0agfq8j3i3" + "version": "6.12.21", + "hash": "sha256:1iyn8qif6xfz04z698ib2dvmam54pyxzsign8sbdj9505sdf66lx" }, "6.13": { - "version": "6.13.8", - "hash": "sha256:1fqsfnam0ca2lyqgi9vh7x6xa24yjk6ym6z85bn6nrrxsxczm6i5" + "version": "6.13.9", + "hash": "sha256:1ci78x5dfjm3nlv4m2j02wl7ax82l47xwnr4k6j9n4dn53qa7rsk" }, "6.14": { "version": "6.14", diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index 0509becadd54..e028e085d02d 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "auth"; - version = "2.169.0"; + version = "2.170.0"; src = fetchFromGitHub { owner = "supabase"; repo = "auth"; rev = "v${version}"; - hash = "sha256-SPX4cdzz72Vd0d4fukxgZYQvESiXBzTKGEkDI5+tj04="; + hash = "sha256-dm6JBBHFX61acQ4tnkklZqAM4hiOqtvea0oy7/bSovQ="; }; - vendorHash = "sha256-em1dBnNHsVPI7owd2gjERcJnrQbiVtZGtIqnFyker6M="; + vendorHash = "sha256-D5wVbgxs5Hq+vmHNi/6t7rZVKez1DqAiTZCP5uJKRtA="; ldflags = [ "-s" diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 38c5a3ac1d11..b82459d22d84 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.88.18"; + version = "3.88.20"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-0STZXG7abx5viXhU2Zks1uiabNtL1ckoSH7foSn6WNw="; + hash = "sha256-JLBHg1hCTOOBRTJbjXJitILD/HSmH1WDuzm0t3/OJaA="; }; - vendorHash = "sha256-mxmPvuOznYN3sjuCzuircQNtot9ntApS9ygKywLIVv4="; + vendorHash = "sha256-vJl2gIS14NA9nV9j+81xKv3NnsDce4V7XoeipOZV+wI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7e7ba527c4df..79d2b29f970d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1576,6 +1576,7 @@ mapAliases { libtransmission = lib.warnOnInstantiate (transmission3Warning {prefix = "lib";}) libtransmission_3; # Added 2024-06-10 tracker = lib.warnOnInstantiate "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30 tracker-miners = lib.warnOnInstantiate "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30 + transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11 transfig = fig2dev; # Added 2022-02-15 transifex-client = transifex-cli; # Added 2023-12-29 trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c5db504f242..6627e1243207 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10033,7 +10033,7 @@ with pkgs; }); libsForQt5 = (recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget; + inherit lib config __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget; })) // { __recurseIntoDerivationForReleaseJobs = true; }; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 181acab6fa03..7b973dcbacd0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10311,6 +10311,10 @@ self: super: with self; { callPackage ../development/python-modules/opentelemetry-instrumentation-requests { }; + opentelemetry-instrumentation-sqlalchemy = + callPackage ../development/python-modules/opentelemetry-instrumentation-sqlalchemy + { }; + opentelemetry-instrumentation-wsgi = callPackage ../development/python-modules/opentelemetry-instrumentation-wsgi { }; @@ -17476,6 +17480,8 @@ self: super: with self; { ttfautohint-py = callPackage ../development/python-modules/ttfautohint-py { }; + ttkbootstrap = callPackage ../development/python-modules/ttkbootstrap { }; + ttls = callPackage ../development/python-modules/ttls { }; ttn-client = callPackage ../development/python-modules/ttn-client { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index a307fb5b072d..8d0f06d0f091 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -7,6 +7,7 @@ { lib +, config , __splicedPackages , makeScopeWithSplicing' , generateSplicesForMkScope @@ -47,7 +48,7 @@ makeScopeWithSplicing' { kdeGear = let mkGear = import ../applications/kde; attrs = { - inherit libsForQt5; + inherit config libsForQt5; inherit (pkgs) lib fetchurl; }; in (lib.makeOverridable mkGear attrs);