diff options
Diffstat (limited to 'pkgs')
121 files changed, 889 insertions, 496 deletions
diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/applications/audio/g4music/default.nix index 9063a8351a188..a0a9f5f828a5a 100644 --- a/pkgs/applications/audio/g4music/default.nix +++ b/pkgs/applications/audio/g4music/default.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "g4music"; - version = "3.3"; + version = "3.4-1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-sajA8+G1frQA0p+8RK84hvh2P36JaarmSZx/sxMoFqo="; + hash = "sha256-uklgxhyrnFQSUcttXvYQtm2BybRkdTK1IfaRpOp0sOE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 3e485e9de4c30..31fa497022033 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -2,38 +2,49 @@ , lib , fetchFromGitHub , nix-update-script -, autoreconfHook -, perl -, pkg-config -, libsidplayfp , alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib +, autoreconfHook , pulseSupport ? stdenv.hostPlatform.isLinux , libpulseaudio +, libsidplayfp , out123Support ? stdenv.hostPlatform.isDarwin , mpg123 +, perl +, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; - rev = "v${version}"; - sha256 = "sha256-ECHtHJrkJ5Y0YvDNdMM3VB+s7I/8JCPZiwsPYLM/oig="; + rev = "v${finalAttrs.version}"; + hash = "sha256-oV7ZPWgMEsNlsF2OoOvf7Ah5ZLcVkIDyC+PrPIJGyzQ="; }; - nativeBuildInputs = [ autoreconfHook perl pkg-config ]; + strictDeps = true; - buildInputs = [ libsidplayfp ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional out123Support mpg123; + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + ]; + + buildInputs = [ + libsidplayfp + ] ++ lib.optionals alsaSupport [ + alsa-lib + ] ++ lib.optionals pulseSupport [ + libpulseaudio + ] ++ lib.optionals out123Support [ + mpg123 + ]; - configureFlags = lib.optionals out123Support [ - "--with-out123" + configureFlags = [ + (lib.strings.withFeature out123Support "out123") ]; enableParallelBuilding = true; @@ -46,7 +57,8 @@ stdenv.mkDerivation rec { description = "A SID player using libsidplayfp"; homepage = "https://github.com/libsidplayfp/sidplayfp"; license = with licenses; [ gpl2Plus ]; + mainProgram = "sidplayfp"; maintainers = with maintainers; [ dezgeg OPNA2608 ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index b41ca774cf968..bcf6ff6af7211 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "23.12.1"; + version = "23.12.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - sha256 = "uesedEXPfvI/mRs8BiNkv8B2vVxmtTSaIvlQIsajkVg="; + sha256 = "xeO1/YQGRTCCGMRPr6Dqb9+89lP24fPBDBJpvtcr2X0="; }; patches = [ diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index d8378f5e9f060..ace8329bb876b 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -68,10 +68,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests = { - smoke-test = nixosTests.bitcoind-knots; - }; - meta = with lib; { description = "A derivative of Bitcoin Core with a collection of improvements"; homepage = "https://bitcoinknots.org/"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 52fa085311ef2..d7df2dac1b5a3 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -710,8 +710,8 @@ let mktplcRef = { name = "ruff"; publisher = "charliermarsh"; - version = "2023.40.0"; - sha256 = "sha256-Ym76WtKvz18NgxH9o8O/Ozn+/AtqLvjJs8ffLhPOWkQ="; + version = "2023.60.0"; + sha256 = "sha256-zxE4QcWt8M6djTbdIf0YNSpeF1w7vMK4/BW5ArCOYbE="; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index d0151aa5aa0c7..bbce1b15a19a3 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.32.0"; + version = "1.33.0"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-aF7EByUQ6CO+rXfGz4ivU18N5sh0X8nGgJT94dCuN8c="; + hash = "sha256-59RkynW02gxVPz48diC1Th+vtru+oHMeuArfdA2a1IU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index a9e87e7240598..0e7800b9bbb32 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "2.1"; + version = "2.2"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "sha256-D5FUhv1moQKzcLj/3VWJNs24jTXJir1dMpv59orPTtc="; + sha256 = "sha256-88cCQm3eViy0OwSyCTlnW7uuiFwz2/6Wz45QzxCgXxg="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index b09e0fe047247..585a18bb34329 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3Only; maintainers = [ maintainers.nickhu ]; + mainProgram = "rmapi"; }; } diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index c65c795a173bc..8e5a7e68ef560 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-A1jUlEgjBoiN+NYwpyW/1eYzkCK3UuPID++fu+zGvzk="; + sha256 = "sha256-2mLbBvdUWGspTNeU3QJzR5NDI24njvRO2nss/Bo93W8="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/popeye/cmd.commit=${version}" ]; - vendorHash = "sha256-MEsChBBn0mixgJ7pzRoqAqup75b/mVv6k3OMmzgyLC4="; + vendorHash = "sha256-Vt5QwggdasVk4j2huSIneBMemi3Q0R4MgZn2yNlOH5E="; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index b7948a9df97d5..792a785317f8d 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.50.1"; + version = "3.50.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "577S3Z/AhFf3W6ufiWJV8w/TTHu8nIqV74fi4pEqCa0="; + sha256 = "gYgjez2TGnOrire1c5/0Pqoky8mtjnK4I5KZ9pizHmY="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch index aa1b1bcb89db9..55fcb25f1551b 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch @@ -1,8 +1,8 @@ diff --git a/src/EWS/calendar/e-cal-backend-ews-utils.c b/src/EWS/calendar/e-cal-backend-ews-utils.c -index 653a8fb..ad80283 100644 +index b7c65ae..b334198 100644 --- a/src/EWS/calendar/e-cal-backend-ews-utils.c +++ b/src/EWS/calendar/e-cal-backend-ews-utils.c -@@ -2406,7 +2406,19 @@ e_cal_backend_ews_get_configured_evolution_icaltimezone (void) +@@ -2425,7 +2425,19 @@ e_cal_backend_ews_get_configured_evolution_icaltimezone (void) if (schema) { GSettings *settings; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 51957037cc2be..8dbcd13f1c99d 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "planner"; - version = "0.14.91"; + version = "0.14.92"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "planner"; rev = version; - hash = "sha256-LxctZv/CKolJ1I4Hql20E+/+p+ZoJLR1eZe34HPMqvY="; + hash = "sha256-2LmNeyZURVtA52Vosyn44wT8zSaJn8tR+8sPM9atAwM="; }; postPatch = '' diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 7a714d6f3008f..e7f8cd804460e 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.12.3"; + version = "23.12.5"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-cQjO5LgGDU9ZHnvKniFMBzcxgWRFfS+PQ0OSe+NFv+c="; + hash = "sha256-nPlaKbtG6ncHI9I/qHUFRtc98lWkz7C/VXFX/JkXhDo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 596f220242bb2..c7242117b68ca 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, dpkg, makeWrapper , mono, gtk-sharp-3_0 -, glib, libusb1 , zlib, gtk3-x11, callPackage +, glib, libusb1 , zlib, gtk3-x11, callPackage, writeTextDir , scopes ? [ "picocv" "ps2000" @@ -114,7 +114,7 @@ in stdenv.mkDerivation rec { # services.udev.packages = [ pkgs.picoscope.rules ]; # users.groups.pico = {}; # users.users.you.extraGroups = [ "pico" ]; - passthru.rules = lib.writeTextDir "lib/udev/rules.d/95-pico.rules" '' + passthru.rules = writeTextDir "lib/udev/rules.d/95-pico.rules" '' SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ce9", MODE="664",GROUP="pico" ''; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 3520138a7d60d..158a7c491007b 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -1,84 +1,98 @@ { lib -, callPackage , config +, newScope , runCommand }: let - buildLua = callPackage ./buildLua.nix { }; - unionOfDisjoints = lib.fold lib.attrsets.unionOfDisjoint {}; - addTests = name: drv: let - inherit (drv) scriptName; - scriptPath = "share/mpv/scripts/${scriptName}"; - fullScriptPath = "${drv}/${scriptPath}"; + addTests = name: drv: + if ! lib.isDerivation drv then + drv + else let + inherit (drv) scriptName; + scriptPath = "share/mpv/scripts/${scriptName}"; + fullScriptPath = "${drv}/${scriptPath}"; + in drv.overrideAttrs (old: { passthru = (old.passthru or {}) // { tests = unionOfDisjoints [ + (old.passthru.tests or {}) - in drv.overrideAttrs (old: { passthru = (old.passthru or {}) // { tests = unionOfDisjoints [ - (old.passthru.tests or {}) + { + scriptName-is-valid = runCommand "mpvScripts.${name}.passthru.tests.scriptName-is-valid" { + meta.maintainers = with lib.maintainers; [ nicoo ]; + preferLocalBuild = true; + } '' + if [ -e "${fullScriptPath}" ]; then + touch $out + else + echo "mpvScripts.\"${name}\" does not contain a script named \"${scriptName}\"" >&2 + exit 1 + fi + ''; + } - { - scriptName-is-valid = runCommand "mpvScripts.${name}.passthru.tests.scriptName-is-valid" { - meta.maintainers = with lib.maintainers; [ nicoo ]; - preferLocalBuild = true; - } '' - if [ -e "${fullScriptPath}" ]; then - touch $out - else - echo "mpvScripts.\"${name}\" does not contain a script named \"${scriptName}\"" >&2 - exit 1 - fi - ''; - } + # can't check whether `fullScriptPath` is a directory, in pure-evaluation mode + (with lib; optionalAttrs (! any (s: hasSuffix s drv.passthru.scriptName) [ ".js" ".lua" ".so" ]) { + single-main-in-script-dir = runCommand "mpvScripts.${name}.passthru.tests.single-main-in-script-dir" { + meta.maintainers = with lib.maintainers; [ nicoo ]; + preferLocalBuild = true; + } '' + die() { + echo "$@" >&2 + exit 1 + } - # can't check whether `fullScriptPath` is a directory, in pure-evaluation mode - (with lib; optionalAttrs (! any (s: hasSuffix s drv.passthru.scriptName) [ ".js" ".lua" ".so" ]) { - single-main-in-script-dir = runCommand "mpvScripts.${name}.passthru.tests.single-main-in-script-dir" { - meta.maintainers = with lib.maintainers; [ nicoo ]; - preferLocalBuild = true; - } '' - die() { - echo "$@" >&2 - exit 1 - } + cd "${drv}/${scriptPath}" # so the glob expands to filenames only + mains=( main.* ) + if [ "''${#mains[*]}" -eq 1 ]; then + touch $out + elif [ "''${#mains[*]}" -eq 0 ]; then + die "'${scriptPath}' contains no 'main.*' file" + else + die "'${scriptPath}' contains multiple 'main.*' files:" "''${mains[*]}" + fi + ''; + }) + ]; }; }); - cd "${drv}/${scriptPath}" # so the glob expands to filenames only - mains=( main.* ) - if [ "''${#mains[*]}" -eq 1 ]; then - touch $out - elif [ "''${#mains[*]}" -eq 0 ]; then - die "'${scriptPath}' contains no 'main.*' file" - else - die "'${scriptPath}' contains multiple 'main.*' files:" "''${mains[*]}" - fi - ''; - }) - ]; }; }); -in + scope = self: let + inherit (self) callPackage; + in lib.mapAttrs addTests { + inherit (callPackage ./mpv.nix { }) + acompressor autocrop autodeint autoload; + inherit (callPackage ./occivink.nix { }) + blacklistExtensions seekTo; -lib.recurseIntoAttrs - (lib.mapAttrs addTests ({ - chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; - convert = callPackage ./convert.nix { inherit buildLua; }; - cutter = callPackage ./cutter.nix { inherit buildLua; }; + buildLua = callPackage ./buildLua.nix { }; + chapterskip = callPackage ./chapterskip.nix { }; + convert = callPackage ./convert.nix { }; + cutter = callPackage ./cutter.nix { }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; - mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; - mpv-webm = callPackage ./mpv-webm.nix { inherit buildLua; }; - mpvacious = callPackage ./mpvacious.nix { inherit buildLua; }; - quality-menu = callPackage ./quality-menu.nix { inherit buildLua; }; - simple-mpv-webui = callPackage ./simple-mpv-webui.nix { inherit buildLua; }; + mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; + mpv-webm = callPackage ./mpv-webm.nix { }; + mpvacious = callPackage ./mpvacious.nix { }; + quality-menu = callPackage ./quality-menu.nix { }; + simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; sponsorblock = callPackage ./sponsorblock.nix { }; - sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { inherit buildLua; }; - thumbfast = callPackage ./thumbfast.nix { inherit buildLua; }; - thumbnail = callPackage ./thumbnail.nix { inherit buildLua; }; - uosc = callPackage ./uosc.nix { inherit buildLua; }; - visualizer = callPackage ./visualizer.nix { inherit buildLua; }; + sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { }; + thumbfast = callPackage ./thumbfast.nix { }; + thumbnail = callPackage ./thumbnail.nix { }; + uosc = callPackage ./uosc.nix { }; + visualizer = callPackage ./visualizer.nix { }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; - } - // (callPackage ./mpv.nix { inherit buildLua; }) - // (callPackage ./occivink.nix { inherit buildLua; }))) - // lib.optionalAttrs config.allowAliases { - youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 -} + }; + + aliases = { + youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 + }; +in + +with lib; pipe scope [ + (makeScope newScope) + (self: + assert builtins.intersectAttrs self aliases == {}; + self // optionalAttrs config.allowAliases aliases) + recurseIntoAttrs +] diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 83654cf471442..85bc8aa37b3aa 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -40,8 +40,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "c48aa078c01b4f07b804270c4583a0a58ffea1c0"; - sha256 = "sha256-MzPj375upIiYXdQR+wWXv3A1zMqbSrZlH0taLuxx/1M="; + rev = "c3c535e93d9dc92acd21ebc4b15016b5c3b90e7d"; + sha256 = "17z0wbqdd6fspbj43yq8biff6wfggk74xgnaf1xx6ynsp1i74is5"; }; patches = [ ./package-build-dont-use-mtime.patch ]; diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el index 3de77dbf5e5c6..72667dea652c1 100644 --- a/pkgs/build-support/emacs/melpa2nix.el +++ b/pkgs/build-support/emacs/melpa2nix.el @@ -11,22 +11,22 @@ ;; Allow installing package tarfiles larger than 10MB (setq large-file-warning-threshold nil) -(defun melpa2nix-build-package-1 (rcp) - (let* ((default-directory (package-recipe--working-tree rcp))) +(defun melpa2nix-build-package-1 (rcp version commit) + (let ((source-dir (package-recipe--working-tree rcp))) (unwind-protect (let ((files (package-build-expand-files-spec rcp t))) - (unless files - (error "Unable to find files matching recipe patterns")) - (if (> (length files) 1) - (package-build--build-multi-file-package rcp files) - (package-build--build-single-file-package rcp files)))))) + (cond + ((= (length files) 1) + (package-build--build-single-file-package + rcp version commit files source-dir)) + ((> (length files) 1) + (package-build--build-multi-file-package + rcp version commit files source-dir)) + (t (error "Unable to find files matching recipe patterns"))))))) (defun melpa2nix-build-package () - (unless noninteractive - (error "`melpa2nix-build-package' is to be used only with -batch")) + (if (not noninteractive) + (error "`melpa2nix-build-package' is to be used only with -batch")) (pcase command-line-args-left (`(,package ,version ,commit) - (let ((recipe (package-recipe-lookup package))) - (setf (oref recipe commit) commit) - (setf (oref recipe version) version) - (melpa2nix-build-package-1 recipe))))) + (melpa2nix-build-package-1 (package-recipe-lookup package) version commit)))) diff --git a/pkgs/build-support/emacs/package-build-dont-use-mtime.patch b/pkgs/build-support/emacs/package-build-dont-use-mtime.patch index 1ace7771ea3ac..fe94de57a3002 100644 --- a/pkgs/build-support/emacs/package-build-dont-use-mtime.patch +++ b/pkgs/build-support/emacs/package-build-dont-use-mtime.patch @@ -1,21 +1,40 @@ diff --git a/package-build.el b/package-build.el -index 29cdb61..c19be1b 100644 +index e572045..9eb0f82 100644 --- a/package-build.el +++ b/package-build.el -@@ -923,7 +923,6 @@ DIRECTORY is a temporary directory that contains the directory - that is put in the tarball." - (let* ((name (oref rcp name)) - (version (oref rcp version)) -- (time (oref rcp time)) - (tar (expand-file-name (concat name "-" version ".tar") - package-build-archive-dir)) - (dir (concat name "-" version))) -@@ -939,7 +938,7 @@ that is put in the tarball." - ;; prevent a reproducible tarball as described at +@@ -415,7 +415,7 @@ (defun package-build--write-pkg-file (desc dir) + (princ ";; Local Variables:\n;; no-byte-compile: t\n;; End:\n" + (current-buffer))))) + +-(defun package-build--create-tar (name version directory mtime) ++(defun package-build--create-tar (name version directory) + "Create a tar file containing the contents of VERSION of package NAME. + DIRECTORY is a temporary directory that contains the directory + that is put in the tarball. MTIME is used as the modification +@@ -434,7 +434,7 @@ (defun package-build--create-tar (name version directory mtime) + ;; prevent a reproducable tarball as described at ;; https://reproducible-builds.org/docs/archives. "--sort=name" -- (format "--mtime=@%d" time) +- (format "--mtime=@%d" mtime) + "--mtime=@0" "--owner=0" "--group=0" "--numeric-owner" "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime")) (when (and package-build-verbose noninteractive) +@@ -848,12 +848,11 @@ (defun package-build--build-multi-file-package (rcp version commit files source- + (package-build--desc-from-library + name version commit files 'tar) + (error "%s[-pkg].el matching package name is missing" +- name)))) +- (mtime (package-build--get-commit-time rcp commit))) ++ name))))) + (package-build--copy-package-files files source-dir target) + (package-build--write-pkg-file desc target) + (package-build--generate-info-files files source-dir target) +- (package-build--create-tar name version tmp-dir mtime) ++ (package-build--create-tar name version tmp-dir) + (package-build--write-pkg-readme name files source-dir) + (package-build--write-archive-entry desc)) + (delete-directory tmp-dir t nil)))) +-- +2.37.2 + diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix new file mode 100644 index 0000000000000..f7da4eaef797b --- /dev/null +++ b/pkgs/by-name/ca/caido/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchurl +, appimageTools +, makeWrapper +}: + +let + pname = "caido"; + version = "0.29.2"; + src = fetchurl { + url = "https://storage.googleapis.com/caido-releases/v${version}/caido-desktop-linux-v${version}-e0f8102b.AppImage"; + hash = "sha256-4PgQK52LAX1zacmoUK0muIhrvFDF7anQ6sx35I+ErVs="; + }; + appimageContents = appimageTools.extractType2 { inherit pname src version; }; + +in appimageTools.wrapType2 { + inherit pname src version; + + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ]; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications + substituteInPlace $out/share/applications/caido.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + install -m 444 -D ${appimageContents}/caido.png \ + $out/share/icons/hicolor/512x512/apps/caido.png + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ''; + + meta = with lib; { + description = "A lightweight web security auditing toolkit"; + homepage = "https://caido.io/"; + changelog = "https://github.com/caido/caido/releases/tag/v${version}"; + license = licenses.unfree; + maintainers = with maintainers; [ octodi ]; + mainProgram = "caido"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/gi/git-releaser/package.nix b/pkgs/by-name/gi/git-releaser/package.nix index f5b0518aaabca..f5be82cec2936 100644 --- a/pkgs/by-name/gi/git-releaser/package.nix +++ b/pkgs/by-name/gi/git-releaser/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "git-releaser"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "git-releaser"; repo = "git-releaser"; rev = "refs/tags/v${version}"; - hash = "sha256-owIXiLLnCkda9O0C0wW0nEuwXC4hipNpR9fdFqgbWts="; + hash = "sha256-rgnOXon68QMfVbyYhERy5z2pUlLCBwum7a/U9kdp5M0="; }; - vendorHash = "sha256-dTyHKSCEImySu6Tagqvh6jDvgDbOTL0fMUOjFBpp64k="; + vendorHash = "sha256-O6Rqdf6yZvW8aix51oIziip+WcVIiyDZZ2VOQfwP8Fs="; ldflags = [ "-X main.version=${version}" ]; diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 186810876b32a..9f64d08ca7710 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-bnoNkBsNJ/6CVmm5I/nwy6LGxYhxPXssjZ3TT7FdEz8="; + hash = "sha256-Auuu+hRYVziAF3hXH7XSOyNlDehEKg6QmSJicY+XQLk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix new file mode 100644 index 0000000000000..839680bf83af2 --- /dev/null +++ b/pkgs/by-name/ig/ignite-cli/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +, go +, buf +}: + +buildGoModule rec { + pname = "ignite-cli"; + version = "28.1.0"; + + src = fetchFromGitHub { + repo = "cli"; + owner = "ignite"; + rev = "v${version}"; + hash = "sha256-/MsBVJ3aqlNfGtktjqDKGdibbZea/bdLuQbXnP3Ag0k="; + }; + + vendorHash = "sha256-VAXzwZ79TGvAoSRzjupL9XkXBn05tvaPCtRuxhls6XE="; + + nativeBuildInputs = [ makeWrapper ]; + + # Many tests require access to either executables, state or networking + doCheck = false; + + # Required for wrapProgram + allowGoReference = true; + + # Required for commands like `ignite version`, `ignite network` and others + postFixup = '' + wrapProgram $out/bin/ignite --prefix PATH : ${lib.makeBinPath [ go buf ]} + ''; + + meta = with lib; { + homepage = "https://ignite.com/"; + changelog = "https://github.com/ignite/cli/releases/tag/v${version}"; + description = "All-in-one platform to build, launch, and maintain any crypto application on a sovereign and secured blockchain"; + license = licenses.asl20; + maintainers = with maintainers; [ kashw2 ]; + mainProgram = "ignite"; + }; +} diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix new file mode 100644 index 0000000000000..c2c2f6b18ea2c --- /dev/null +++ b/pkgs/by-name/li/libui-ng/package.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, cmocka +, darwin +, fetchFromGitHub +, gtk3 +, meson +, ninja +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "libui-ng"; + version = "unstable-2023-12-19"; + + src = fetchFromGitHub { + owner = "libui-ng"; + repo = "libui-ng"; + rev = "8de4a5c8336f82310df1c6dad51cb732113ea114"; + hash = "sha256-ZMt2pEHwxXxLWtK8Rm7hky9Kxq5ZIB0olBLf1d9wVfc="; + }; + + postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace meson.build --replace "'-arch', 'arm64'" "" + ''; + + nativeBuildInputs = [ + cmocka + meson + ninja + pkg-config + ]; + + buildInputs = + if stdenv.isDarwin then [ + darwin.libobjc + darwin.apple_sdk_11_0.Libsystem + darwin.apple_sdk_11_0.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.AppKit + darwin.apple_sdk_11_0.frameworks.CoreFoundation + ] else [ + gtk3 + ]; + + mesonFlags = [ + (lib.mesonBool "examples" (!stdenv.isDarwin)) + ]; + + meta = with lib; { + description = "A portable GUI library for C"; + homepage = "https://github.com/libui-ng/libui-ng"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index a5b44e83a80bb..ee23810c35472 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -17,7 +17,7 @@ , openclSupport ? false , clblast -, openblasSupport ? true +, openblasSupport ? !rocmSupport , openblas , pkg-config }: @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "1671"; + version = "1710"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-OFRc3gHKQboVCsDlQVHwzEBurIsOMj/bVGYuCLilydE="; + hash = "sha256-fbzHjaL+qAE9HdtBVxboo8T2/KCdS5O1RkTQvDwD/xs="; }; patches = [ diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index 8f04fdae7bbd5..7ff1794850a2f 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-4jysBL6fwX2ns+N+ldhTCXZ7L/IuXjbAwou18Ur5+JU="; + hash = "sha256-sErdlHXMn97acVIxKapsnLkyOAgO7lOB0UQC5GkL4sQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index e9b9c1746a877..b22ea923a9591 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-5FKEQUH43qx8w7s7lW8EDOWtWCUJTbWlXcMQazR8Thk="; + hash = "sha256-KCHKR6DP8scd9xdWi0bLw3wObrEi0tOsflXHa9f4Z5k="; }; - cargoHash = "sha256-FpCmzU2C+5+5eSB5Mno+lOFd4trHXmfp6e5oV+CvU1c="; + cargoHash = "sha256-pUBtUC+WOuiypLUpXCPR1pu0fRrMVTxg7FE2JSaszNw="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 2d3d3be5092f9..2f6f2f77ba4c1 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-/kjl/0Qdro6H3fMfs1dA0Zf/GT5Z4s6kK4vB+EBKw0g="; + hash = "sha256-8Y+WUnNQ4p/JeUR4q6Ti6HdoN5bghXs6XJsuWGY66S4="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index a42fa79c6768d..17d846f305b25 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-jWUPn5+ynuLdb2GaqKph1M62Ky00sRP/vUXedEvBT7A="; + hash = "sha256-6Js670Z3/5BwAHvEJrXJkBZvEvx1NeT+eXOKaqKqFqI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 9e86a0fb9ddaf..4742e7af83089 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Uzayo1hmNwOMszTV8/KqOLxjERBC/L16hRpCWbK10Uc="; + hash = "sha256-8dwJyvM5sQNtUzhreBCgSWeElGlp/z3Dk7/xCeUSGKU="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 98ee19c27e783..893ddf0653335 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "6.0.0"; + version = "6.0.1"; outputs = [ "out" "dev" "man" ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-17B2C3SW9smTgLBBGJc9LwFpXoP9WidZEGgI2hbJTH8="; + hash = "sha256-yd23naaPIa6xrdf7ipOvVZKqkr7/CMxNqDZ3CQ2QH+Y="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 202bfa19af390..7b124c7987daf 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-3iGwpHuZrRBd35nAa3x1Lu/KDS1L42y5u8A4vM41b0Q="; + sha256 = "sha256-vSLFp0sgqGsZtcXdv82PVH0HcBbmcxrMySLFCBrLJpA="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 4ccb373d0666a..0539075ca51d3 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-dxbs2Qq1Ix04yIA587tntLJ3W/pnA0wTiQ4BB5GCTR0="; + hash = "sha256-wBln4YqjZ8aI3D4Arwa7UgDKxNPSlC5fRZtjanTHl4Q="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index fbf8fbdf64d43..c20177e043ee3 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-TL8LlNQLGUevXlNcnS9HcdGh1TzC/0I/6reJpe6rahM="; + sha256 = "sha256-sADdslxDtI+zV8DLnczlzNtB9W+BhMP8vb5riSnPYaw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 167ffa0b5cc87..c2f688efce4d8 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.17.10"; + version = "0.18.1"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-LUAYfR6MNNGLaqv8EBx0JQ8KYYD7jRvez3HJFnczV+Y="; + hash = "sha256-o5/H2FeDXzT/ZyWtLmRs+TWJQfmuDUnnR5Brvkifn6E="; fetchSubmodules = true; }; in @@ -21,7 +21,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-MVGYENy6/xI/ph/X0DxquigCuLK1FAEIONzoQU7TXoM="; + hash = "sha256-q4VKtGxrRaAhtNIJFjNN7tF+HFgU/UX9sKq0BkOIiQI="; }; # elixir-ls is an umbrella app @@ -50,9 +50,9 @@ mixRelease { --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" chmod +x $out/bin/elixir-ls - substitute release/debugger.sh $out/bin/elixir-debugger \ + substitute release/debug_adapter.sh $out/bin/elixir-debug-adapter \ --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" - chmod +x $out/bin/elixir-debugger + chmod +x $out/bin/elixir-debug-adapter # prepare the launcher substituteInPlace $out/lib/launch.sh \ --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 7bb0d3742a976..dcb2bf87692f3 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2023.06.1"; + version = "2023.06.2"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-3+eIR8wkBlcUQVDsugHo/rHNHbE2vpE9gutp55kRY4Y="; + hash = "sha256-I3+MP2Q7ENOdQdvvCqcyD+I8ImF6c+9HQDpY6QUWuY8="; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 1bc1777acd471..ff0ecf45fd235 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage.override { passthru = { rustc = rustc; - inherit (rustc) tests; + inherit (rustc.unwrapped) tests; }; # Upstream rustc still assumes that musl = static[1]. The fix for diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 86c47da2e538c..50dd86f7bd86b 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-TaNuw84VCC1s2I7rmTdVKTrpT/nTrb+45haEFWf6S7k="; + sha256 = "sha256-sueFfR5KVj6HXR+5XWowL0Zjbuu7K+p/+skcTaXlOMc="; }; vendorHash = "sha256-rxWYNGFbFUKjy232DOhVlh341GV2VKLngJKM+DEd27o="; diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index b8b62781d0a69..fbfdc0b7ff0de 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -4,38 +4,55 @@ , fetchpatch , makeFontsConf , nix-update-script +, testers , autoreconfHook -, pkg-config -, perl -, unittest-cpp -, xa -, libgcrypt -, libexsid , docSupport ? true , doxygen , graphviz +, libexsid +, libgcrypt +, perl +, pkg-config +, unittest-cpp +, xa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-KCp/8UjVl8e3+4s1FD4GvHP7AUAS+eIB7RWhmgm5GIA="; + hash = "sha256-1e1QDSJ8CjLU794saba2auCKko7p2ylrdI0JWhh8Kco="; }; + outputs = [ + "out" + ] ++ lib.optionals docSupport [ + "doc" + ]; + patches = [ # Pull autoconf-2.72 compatibility fix: # https://github.com/libsidplayfp/libsidplayfp/pull/103 + # Remove when version > 2.5.1 (fetchpatch { - name = "autoconf-2.72"; - url = "https://github.com/libsidplayfp/libsidplayfp/commit/b8fff55f6aaa005a3899b59e70cd8730f962641b.patch"; + name = "0001-libsidplayfp-autoconf-2.72-compat.patch"; + url = "https://github.com/libsidplayfp/libsidplayfp/commit/2b1b41beb5099d5697e3f8416d78f27634732a9e.patch"; hash = "sha256-5Hk202IuHUBow7HnnPr2/ieWFjKDuHLQjQ9mJUML9q8="; }) + + # Fix --disable-tests logic + # https://github.com/libsidplayfp/libsidplayfp/pull/108 + # Remove when version > 2.5.1 + (fetchpatch { + name = "0002-libsidplayfp-Fix-autoconf-logic-for-tests-option.patch"; + url = "https://github.com/libsidplayfp/libsidplayfp/commit/39dd2893b6186c4932d17b529bb62627b742b742.patch"; + hash = "sha256-ErdfPvu8R81XxdHu2TaV87OpLFlRhJai51QcYUIkUZ4="; + }) ]; postPatch = '' @@ -44,30 +61,35 @@ stdenv.mkDerivation rec { strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkg-config perl xa ] - ++ lib.optionals docSupport [ doxygen graphviz ]; - - buildInputs = [ libgcrypt libexsid ]; + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + xa + ] ++ lib.optionals docSupport [ + doxygen + graphviz + ]; - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + buildInputs = [ + libexsid + libgcrypt + ]; - checkInputs = [ unittest-cpp ]; + checkInputs = [ + unittest-cpp + ]; enableParallelBuilding = true; - installTargets = [ "install" ] - ++ lib.optionals docSupport [ "doc" ]; - - outputs = [ "out" ] - ++ lib.optionals docSupport [ "doc" ]; - configureFlags = [ - "--enable-hardsid" - "--with-gcrypt" - "--with-exsid" - ] - ++ lib.optional doCheck "--enable-tests"; + (lib.strings.enableFeature true "hardsid") + (lib.strings.withFeature true "gcrypt") + (lib.strings.withFeature true "exsid") + (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests") + ]; + # Make Doxygen happy with the setup, reduce log noise FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; }); preBuild = '' @@ -75,12 +97,21 @@ stdenv.mkDerivation rec { export XDG_CACHE_HOME=$TMPDIR ''; + buildFlags = [ + "all" + ] ++ lib.optionals docSupport [ + "doc" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + postInstall = lib.optionalString docSupport '' mkdir -p $doc/share/doc/libsidplayfp mv docs/html $doc/share/doc/libsidplayfp/ ''; passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; updateScript = nix-update-script { }; }; @@ -96,5 +127,9 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ ramkromberg OPNA2608 ]; platforms = platforms.all; + pkgConfigModules = [ + "libsidplayfp" + "libstilview" + ]; }; -} +}) diff --git a/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch new file mode 100644 index 0000000000000..e8b07b4ae5990 --- /dev/null +++ b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/common.h b/include/internal/common.h +index 15666f1..d91e25b 100644 +--- a/include/internal/common.h ++++ b/include/internal/common.h +@@ -83,7 +83,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch new file mode 100644 index 0000000000000..13a36fbcd0314 --- /dev/null +++ b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/common.h b/include/internal/common.h +index 15666f1..d91e25b 100644 +--- a/include/internal/common.h ++++ b/include/internal/common.h +@@ -83,7 +83,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 3aeafccb1edb2..a8e178c7e6d37 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -234,6 +234,13 @@ let }); in { + # intended version "policy": + # - 1.1 as long as some package exists, which does not build without it + # - latest 3.x LTS + # - latest 3.x non-LTS as preview/for development + # + # - other versions in between only when reasonable need is stated for some package + # - backport every security critical fix release e.g. 3.0.y -> 3.0.y+1 but no new version, e.g. 3.1 -> 3.2 # If you do upgrade here, please update in pkgs/top-level/release.nix # the permitted insecure version to ensure it gets cached for our users @@ -279,9 +286,9 @@ in { }; }; - openssl_3_1 = common { - version = "3.1.4"; - hash = "sha256-hAr1Nmq5tSK95SWCa+PvD7Cvgcap69hMqmAP6hcx7uM="; + openssl_3_2 = common { + version = "3.2.0"; + hash = "sha256-FMgm8Hx+QzcG+1xp+p4l2rlWhIRLTJYqLPG/GD60aQ4="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -291,8 +298,8 @@ in { ./3.0/openssl-disable-kernel-detection.patch (if stdenv.hostPlatform.isDarwin - then ./use-etc-ssl-certs-darwin.patch - else ./use-etc-ssl-certs.patch) + then ./3.2/use-etc-ssl-certs-darwin.patch + else ./3.2/use-etc-ssl-certs.patch) ]; withDocs = true; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 24ed871c4037a..d607fab5194bb 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -11,6 +11,7 @@ , packaging , psutil , pyyaml +, safetensors , torch , evaluate , parameterized @@ -19,26 +20,18 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.24.1"; - format = "pyproject"; + version = "0.25.0"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DKyFb+4DUMhVUwr+sgF2IaJS9pEj2o2shGYwExfffWg="; + hash = "sha256-WIMOSfo9fGbevMkUHvFsA51SOiGkBO1cK388FudRDY0="; }; - patches = [ - # https://github.com/huggingface/accelerate/pull/2121 - (fetchpatch { - name = "fix-import-error-without-torch_distributed.patch"; - url = "https://github.com/huggingface/accelerate/commit/42048092eabd67a407ea513a62f2acde97079fbc.patch"; - hash = "sha256-9lvnU6z5ZEFc5RVw2bP0cGVyrwAp/pxX4ZgnmCN7qH8="; - }) - ]; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -46,6 +39,7 @@ buildPythonPackage rec { packaging psutil pyyaml + safetensors torch ]; @@ -83,9 +77,6 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # RuntimeError: torch_shm_manager: execl failed: Permission denied "CheckpointTest" - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # python3.11 not yet supported for torch.compile - "test_dynamo_extract_model" ]; disabledTestPaths = lib.optionals (!(stdenv.isLinux && stdenv.isx86_64)) [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 8edaa24958246..e85c15e534d8b 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.81"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ovV6BlhED9Du/jKQzgBFSp+XPYVAkNONU5iOEd52e2s="; + hash = "sha256-jDejI5e2ASoQUMPS9Ajis14RF66HnbkoOK6+Xs8ydis="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 3d15fbb30be56..516d86acb6fd5 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.81"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-ckak602Uz8YqBDVmh3iDh9d9/SPNRZMil8PskUbrjLA="; + hash = "sha256-3DqR1p2VK9Xe2Yk+gZ81GM4Cn39TDrx1LSivu4xVDOI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index e8096551d022a..fc31ed21b8140 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.81"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e/13v2hm0yYoO2A/kz6ekvN1FP8XNqqypfZdHKGEItM="; + hash = "sha256-uK42wbP6zZFRR6JqHs3Ag5zsPT9JFyKviDRxLDa1QjY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index 0497c542fe24a..3abe60f64d5e2 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { cp39 = "sha256-BzMOVue7E1S1+5+XTcPELko81ujc9MbmqLhNsU7pqO0="; cp310 = "sha256-eUD9pQu9GsbV8MPD1MiF3Ihr+zYioSOo6P15hYIwPYo="; cp311 = "sha256-rAmkI3EIZPYiXrxFowfDC0Gf3kRw0uX0i6Kx6Zu+hNM="; - }.${pyShortVersion}; + }.${pyShortVersion} or (throw "${pname} is missing hash for ${pyShortVersion}"); }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 0a186781b4a22..63bf85273811b 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -8,13 +8,11 @@ , numba , numpy , pandas -, pytest , setuptools , cloudpickle , pytestCheckHook , scipy , packaging -, typing-extensions , pythonOlder , xarray , xarray-einstats @@ -33,7 +31,7 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.16.1"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -42,7 +40,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = "arviz"; rev = "refs/tags/v${version}"; - hash = "sha256-kixWGj0M0flTq5rXSiPB0nfZaGYRvvMBGAJpehdW8KY="; + hash = "sha256-DqVwbiNJHdRxK3Ppfa6sqPJzDqMaj1mtlAJHFq09u2Y="; }; propagatedBuildInputs = [ @@ -86,6 +84,7 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access + "test_plot_ppc_transposed" "test_plot_separation" "test_plot_trace_legend" "test_cov" diff --git a/pkgs/development/python-modules/binary2strings/default.nix b/pkgs/development/python-modules/binary2strings/default.nix new file mode 100644 index 0000000000000..c122b67886da2 --- /dev/null +++ b/pkgs/development/python-modules/binary2strings/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pybind11 +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "binary2strings"; + version = "0.1.13"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "glmcdona"; + repo = "binary2strings"; + rev = "refs/tags/v${version}"; + hash = "sha256-3UPT0PdnPAhOu3J2vU5NxE3f4Nb1zwuX3hJiy87nLD0="; + }; + + nativeBuildInputs = [ + pybind11 + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "binary2strings" + ]; + + pytestFlagsArray = [ + "tests/test.py" + ]; + + meta = with lib; { + description = "Module to extract Ascii, Utf8, and Unicode strings from binary data"; + homepage = "https://github.com/glmcdona/binary2strings"; + changelog = "https://github.com/glmcdona/binary2strings/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index d7b727830b13a..d8b74f55f7d41 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "9.11.2"; + version = "9.11.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-ImfZ5g/EhAqkP4CbA7AZHWHQ88KBVCwMVU/j0OQCilg="; + hash = "sha256-uCXtd9m2phIgP85syIPtoFIxM9dkBzFxxK6OOF0VWAA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 138c75836d15a..81a111c7f1454 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.81"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-6DqIeLoJzpONte4WHI5EeV3iDDh1lNhegrNiKIgSAbY="; + hash = "sha256-veJd3M2Jf6snXZsR4P0wQpC0rSbIFT92QgyFFI5Er4Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index e6906ffe103ba..1ae119f8404a3 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.81"; + version = "9.2.82"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-42J6uBM5Ek1uv5gc4ZwtWpVgUdS3Sd4Y+ge2hkG8QTA="; + hash = "sha256-fUp0nS4ILU90uvROH3qNy3kYrpt7yHzbCG5TE/0BqKU="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-NS3yi5Ysu0s5PcqnLYOUYI0qpfOX4/E/UDmReX7aNGM="; + hash = "sha256-wzRHYgnZPLDgcf1IlXxY2a52mbeImejj/F8DUAuB1VU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index ae22d4bcafbfa..b76de3717bf48 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cloudpathlib"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "drivendataorg"; repo = "cloudpathlib"; - rev = "v${version}"; - hash = "sha256-d4CbzPy3H5HQ4YmSRCRMEYaTpwB7F0Bznd26aKWiHTA="; + rev = "refs/tags/v${version}"; + hash = "sha256-rj8v4EUMPdB5zmbP4VQli2H6GjDor3BHaA95GwoKS5E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-azure/default.nix b/pkgs/development/python-modules/dvc-azure/default.nix index fee36f66d8865..339e36fc04894 100644 --- a/pkgs/development/python-modules/dvc-azure/default.nix +++ b/pkgs/development/python-modules/dvc-azure/default.nix @@ -6,34 +6,46 @@ , fetchPypi , knack , pythonRelaxDepsHook -, setuptools-scm }: +, setuptools-scm +}: buildPythonPackage rec { pname = "dvc-azure"; - version = "2.22.1"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-v3VRCN1OoST5RlfUOP9Dpfmf3o9C/ckusmh91Ya2Cik="; + hash = "sha256-TB7yY5b2AWBFt8+AnxyKyP6hoXi6cdHVjtffapRVfHc="; }; # Prevent circular dependency - pythonRemoveDeps = [ "dvc" ]; + pythonRemoveDeps = [ + "dvc" + ]; - nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ]; + nativeBuildInputs = [ + setuptools-scm + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ - adlfs azure-identity dvc-objects knack + adlfs + azure-identity + dvc-objects + knack ]; # Network access is needed for tests doCheck = false; - pythonImportsCheck = [ "dvc_azure" ]; + # Circular dependency + # pythonImportsCheck = [ + # "dvc_azure" + # ]; meta = with lib; { - description = "azure plugin for dvc"; + description = "Azure plugin for dvc"; homepage = "https://pypi.org/project/dvc-azure/${version}"; changelog = "https://github.com/iterative/dvc-azure/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 7c5489e3648ad..ea4d12b9921d1 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "3.0.1"; + version = "3.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-OySGTJFHBb+Ot5NUZsQZ4gJkbc6ojrSyDWDPp32q74E="; + hash = "sha256-vLSb+RIaebF+ili+6bvU8wplcpycPVRadUkhkLHdqi8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-gs/default.nix b/pkgs/development/python-modules/dvc-gs/default.nix index e36ec61a88c3f..fa01c64c8daf5 100644 --- a/pkgs/development/python-modules/dvc-gs/default.nix +++ b/pkgs/development/python-modules/dvc-gs/default.nix @@ -4,29 +4,41 @@ , fetchPypi , gcsfs , pythonRelaxDepsHook -, setuptools-scm }: +, setuptools-scm +}: buildPythonPackage rec { pname = "dvc-gs"; - version = "2.22.1"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-IKDwdSfolZwv8TvHHicVV42PYeULhskv8csbkiJzLbk="; + hash = "sha256-5UMKKX+4GCNm98S8kQsasQTY5cwi9hGhm84FFl3/7NQ="; }; # Prevent circular dependency - pythonRemoveDeps = [ "dvc" ]; + pythonRemoveDeps = [ + "dvc" + ]; - nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ]; + nativeBuildInputs = [ + setuptools-scm + pythonRelaxDepsHook + ]; - propagatedBuildInputs = [ gcsfs dvc-objects ]; + propagatedBuildInputs = [ + gcsfs + dvc-objects + ]; # Network access is needed for tests doCheck = false; - pythonImportsCheck = [ "dvc_gs" ]; + # Circular dependency + # pythonImportsCheck = [ + # "dvc_gs" + # ]; meta = with lib; { description = "gs plugin for dvc"; diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index b5df60a987e64..1f07fe7b87079 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "2.0.1"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-objects"; rev = "refs/tags/${version}"; - hash = "sha256-nxZN0Q9mRAZJUOoxfE58lXZVOrY0r05iROcuo+nV99A="; + hash = "sha256-hpiDbECVXbBkewJa+RwrgTQFEFAb3Ir2qs0ENYuJtwI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-s3/default.nix b/pkgs/development/python-modules/dvc-s3/default.nix index ca4fe5a810d0d..a15295649d4e3 100644 --- a/pkgs/development/python-modules/dvc-s3/default.nix +++ b/pkgs/development/python-modules/dvc-s3/default.nix @@ -7,36 +7,48 @@ , flatten-dict , pythonRelaxDepsHook , s3fs -, setuptools-scm }: +, setuptools-scm +}: buildPythonPackage rec { pname = "dvc-s3"; - version = "2.23.0"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HyhZj1sN70o1CTNCiroGKjaMk7tBGqPG2PRsrnm1uVc="; + hash = "sha256-ax2Wsjfvu4hoF99eDPT2sbFhl30wuYtGdEonYCCkJMY="; }; # Prevent circular dependency - pythonRemoveDeps = [ "dvc" ]; + pythonRemoveDeps = [ + "dvc" + ]; # dvc-s3 uses boto3 directly, we add in propagatedBuildInputs postPatch = '' substituteInPlace setup.cfg --replace 'aiobotocore[boto3]' 'aiobotocore' ''; - nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ]; + nativeBuildInputs = [ + setuptools-scm + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ - aiobotocore boto3 dvc-objects flatten-dict s3fs + aiobotocore + boto3 + dvc-objects + flatten-dict s3fs ]; # Network access is needed for tests doCheck = false; - pythonImportsCheck = [ "dvc_s3" ]; + # Circular dependency + # pythonImportsCheck = [ + # "dvc_s3" + # ]; meta = with lib; { description = "s3 plugin for dvc"; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index c4577e6913575..3d1461ab0a765 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.33.4"; + version = "3.37.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NWu12FVJDSSuxYGVWFNlbAEUINg05s64EJ6gIaErQ9E="; + hash = "sha256-mO6fhPUub09nWmiFSciwNhuS4VJAjQgIukc+lQWB7Qg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index f97a418a61ea3..ebe26e2b057fa 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.4.1"; + version = "3.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-apk1akdFLtps5fq28GUgLef2VEgZulj7vuhxsGpCqJE="; + hash = "sha256-QsA8HZ6wIWKvtQ+f3nyRKKZRNJS56eZ1sKw+KNHxfXc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/gpxpy/default.nix b/pkgs/development/python-modules/gpxpy/default.nix index 17632c72a3971..40708972823aa 100644 --- a/pkgs/development/python-modules/gpxpy/default.nix +++ b/pkgs/development/python-modules/gpxpy/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "gpxpy"; - version = "1.5.0"; + version = "1.6.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "tkrajina"; repo = pname; rev = "v${version}"; - hash = "sha256-Fkl2dte1WkPi2hBOdT23BMfNflR0j4GeNH86d46WNQk="; + hash = "sha256-s65k0u4LIwHX9RJMJIYMkNS4/Z0wstzqYVPAjydo2iI="; }; propagatedBuildInputs = [ lxml ]; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 9d32925f0ca9e..d96ab023c87f3 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.27.1"; + version = "6.28.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fV1ZS2aQZUtNKZ7bpehy3Be7c5ao0GCcl8t7ihxgXeY="; + hash = "sha256-acEUA9Jt5p3wIiWRb5FrN+pLmvQX2gqMgn+EMo2I5fM="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = { description = "IPython Kernel for Jupyter"; homepage = "https://ipython.org/"; + changelog = "https://github.com/ipython/ipykernel/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ] ++ lib.teams.jupyter.members; }; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 888147b4b5719..a24fc80db16c4 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.0.72"; + version = "0.0.75"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-o7KERA+fYo69jR8LSsa901nE1r3GD38rYO7sj0QsOgM="; + hash = "sha256-BbDB3xP3OCRXxbOqFIzFNrpK5+wHbIZ/VlurNXrXpTw="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/ndms2-client/default.nix b/pkgs/development/python-modules/ndms2-client/default.nix index feeb36737a8a3..ff872aa6f3861 100644 --- a/pkgs/development/python-modules/ndms2-client/default.nix +++ b/pkgs/development/python-modules/ndms2-client/default.nix @@ -1,22 +1,27 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "ndms2-client"; - version = "0.1.2"; + version = "0.1.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "foxel"; repo = "python_ndms2_client"; rev = version; - hash = "sha256-cM36xNLymg5Xph3bvbUGdAEmMABJ9y3/w/U8re6ZfB4="; + hash = "sha256-A19olC1rTHTy0xyeSP45fqvv9GUynQSrMgXBgW8ySOs="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 42bcc9e660f1f..6b415cf9f52a2 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "2.12.1"; + version = "2.12.3"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-So9Kyj4jMRiaBRQGXE88DSWgLEPqQkv8R/Sd8tyRvE0="; + hash = "sha256-fzHEy9/BxstPAYhVTG0o7Gn2D9UKuSZvI0X5ynZ+oEk="; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/pylibjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg/default.nix new file mode 100644 index 0000000000000..65055d94280c6 --- /dev/null +++ b/pkgs/development/python-modules/pylibjpeg/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools +, numpy +, pydicom +, pylibjpeg-libjpeg +}: + +let + pylibjpeg-data = buildPythonPackage rec { + pname = "pylibjpeg-data"; + version = "1.0.0dev0"; + pyproject = true; + + nativeBuildInputs = [ setuptools ]; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = "pylibjpeg-data"; + rev = "2ab4b8a65b070656eca2582bd23197a3d01cdccd"; + hash = "sha256-cFE1XjrqyGqwHCYGRucXK+q4k7ftUIbYwBw4WwIFtEc="; + }; + + doCheck = false; + }; +in + +buildPythonPackage rec { + pname = "pylibjpeg"; + version = "1.4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = "pylibjpeg"; + rev = "refs/tags/v${version}"; + hash = "sha256-Px1DyYDkKAUdYo+ZxZ1w7TkPzWN++styiFl02iQOvyQ="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + pydicom + pylibjpeg-data + pylibjpeg-libjpeg + ]; + + pythonImportsCheck = [ "pylibjpeg" ]; + + meta = with lib; { + description = "Python framework for decoding JPEG images, with a focus on supporting Pydicom"; + homepage = "https://github.com/pydicom/pylibjpeg"; + changelog = "https://github.com/pydicom/pylibjpeg/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + # several test failures of form + # "pydicom.errors.InvalidDicomError: File is missing DICOM File Meta Information header or the 'DICM' prefix is missing from the header. ..." + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 0038db89f6cc9..e5c027171813c 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.0.3"; + version = "7.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-RNi0ivQKsLb/JD9+vdJYGf5HDC6BmeNdseR2OU8v1uY="; + hash = "sha256-VEIsGjVFx5Q7G2cKtMYQY7Te1TpFUZYZJRZvRMAwSS8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 17f8185a8dfbf..3712580637635 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.81"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-59Lq2JKDWrtkRMZb5AjH69LX9+Zk+BvfKxKXG/qGw6g="; + hash = "sha256-m3vHz56w15M2oZhSDzO5wiAVk1+/DoxZxS0qBFh5pQM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index fc0165c464e6f..0fa3895caa58d 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.30.0"; + version = "2.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = "refs/tags/${version}"; - hash = "sha256-jcnA5qxS4eq1nZ0uo8NGPoSGTI/JrrH02MJPFxL3hQM="; + hash = "sha256-qK5JCaCL+gbgNcBo5IjhlRrXD1IhA1B56hmcjvPie6Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/simple-term-menu/default.nix b/pkgs/development/python-modules/simple-term-menu/default.nix new file mode 100644 index 0000000000000..9f21c327da978 --- /dev/null +++ b/pkgs/development/python-modules/simple-term-menu/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "simple-term-menu"; + version = "1.6.4"; + pyproject = true; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-vpxdvY3xKkBLFM2Oldb8AtWMYOJVX2Xd3kF3fEh/s7k="; + }; + + nativeBuildInputs = [ setuptools ]; + + pythonImportsCheck = [ "simple_term_menu" ]; + + # no unit tests in the upstream + doCheck = false; + + meta = with lib; { + description = "A Python package which creates simple interactive menus on the command line"; + homepage = "https://github.com/IngoMeyer441/simple-term-menu"; + license = licenses.mit; + changelog = "https://github.com/IngoMeyer441/simple-term-menu/releases/tag/v${version}"; + maintainers = with maintainers; [ smrehman ]; + }; +} diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index d496d42fff1bd..40bcd475604e9 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.30.0"; + version = "0.30.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "refs/tags/v${version}"; - hash = "sha256-xoHXUcHmzEDmE17r0+vI56UBAPQEhpglBkWtwE9b2Nw="; + hash = "sha256-MajtB754VY+WmeJ2UROeNfvFdqSWIDXQwDSDK7zn8fk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix index 7c17ba2d49a9e..6202fcdf1f798 100644 --- a/pkgs/development/python-modules/streamdeck/default.nix +++ b/pkgs/development/python-modules/streamdeck/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "streamdeck"; - version = "0.9.4"; + version = "0.9.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-aVmWbrBhZ49NfwOp23FD1dxZF+w/q26fIOVs7iQXUxo="; + hash = "sha256-BHliZrRFd64D+UD1xcpp2HAH4D0Z7tibawJobAMM65E="; }; patches = [ diff --git a/pkgs/development/python-modules/textdistance/default.nix b/pkgs/development/python-modules/textdistance/default.nix index 2c2d5ee23adf6..c362e936eb32d 100644 --- a/pkgs/development/python-modules/textdistance/default.nix +++ b/pkgs/development/python-modules/textdistance/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "textdistance"; - version = "4.6.0"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cyxQMVzU7pRjg4ZDzxnWkiEwLDYDHqpgcMMMwKpdqMo="; + hash = "sha256-JYllgBse+FaGppq/bDzv3F2iHC+9iMkMaHJfV6fUXyE="; }; # There aren't tests diff --git a/pkgs/development/python-modules/withings-sync/default.nix b/pkgs/development/python-modules/withings-sync/default.nix index 60cce387fa626..0e57cd5b7914a 100644 --- a/pkgs/development/python-modules/withings-sync/default.nix +++ b/pkgs/development/python-modules/withings-sync/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "withings-sync"; - version = "4.2.1"; + version = "4.2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jaroslawhartman"; repo = "withings-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-6igjUmgIA077/1SQMt10tRpnLVKxGFNJN1GeLhQLROg="; + hash = "sha256-p1coGTbMQ+zptFKVLW5qgSdoudo2AggGT8Xu+cSCCs4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index e662c14fa399d..08944413b7a04 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -287,7 +287,7 @@ stdenv.mkDerivation rec { sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k"; }; - in (lib.optionalSttrs (!stdenv.hostPlatform.isDarwin) { + in (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { # `extracted` doesn’t work on darwin shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self;}; }) // { diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 2a40c59709843..bf06954df4dee 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -7,6 +7,9 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison ]; + # Jam uses c89 conventions + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=c89"; + # Jambase expects ar to have flags. preConfigure = '' export AR="$AR rc" diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix deleted file mode 100644 index c5074cd037768..0000000000000 --- a/pkgs/development/tools/deadcode/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ buildGoPackage -, lib -, fetchFromGitHub -}: - -# TODO(yl): should we package https://github.com/remyoudompheng/go-misc instead of -# the standalone extract of deadcode from it? -buildGoPackage rec { - pname = "deadcode-unstable"; - version = "2016-07-24"; - rev = "210d2dc333e90c7e3eedf4f2242507a8e83ed4ab"; - - goPackagePath = "github.com/tsenart/deadcode"; - excludedPackages = "cmd/fillswitch/test-fixtures"; - - src = fetchFromGitHub { - inherit rev; - - owner = "tsenart"; - repo = "deadcode"; - sha256 = "05kif593f4wygnrq2fdjhn7kkcpdmgjnykcila85d0gqlb1f36g0"; - }; - - meta = with lib; { - description = "Very simple utility which detects unused declarations in a Go package"; - homepage = "https://github.com/remyoudompheng/go-misc/tree/master/deadcode"; - license = licenses.bsd3; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/djlint/default.nix b/pkgs/development/tools/djlint/default.nix index ba3e5606d0950..27d66f6dd42cb 100644 --- a/pkgs/development/tools/djlint/default.nix +++ b/pkgs/development/tools/djlint/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "djlint"; - version = "1.32.1"; - format = "pyproject"; + version = "1.34.1"; + pyproject = true; src = fetchFromGitHub { owner = "Riverside-Healthcare"; repo = "djlint"; rev = "v${version}"; - hash = "sha256-///ZEkVohioloBJn6kxpEK5wmCzMp9ZYeAH1mONOA0E="; + hash = "sha256-p9RIzX9zoZxBrhiNaIeCX9OgfQm/lXNwYsh6IcsnIVk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/gi-crystal/default.nix b/pkgs/development/tools/gi-crystal/default.nix index b5d66566a6fff..8b664ee1e00f3 100644 --- a/pkgs/development/tools/gi-crystal/default.nix +++ b/pkgs/development/tools/gi-crystal/default.nix @@ -5,13 +5,13 @@ }: crystal.buildCrystalPackage rec { pname = "gi-crystal"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "hugopl"; repo = "gi-crystal"; rev = "v${version}"; - hash = "sha256-SwBzGAgs0cBbBYXtaJSDWjORE+vrvI5aKG9kaC9VA4o="; + hash = "sha256-hL+4MvJn1z9UKCtyvU4zzIxOwRyYQ3Qt4qRb5F0J+sg="; }; # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 213a411b6b6b1..424c5f0db2be2 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.18.1"; + version = "1.20.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jmTSTx2WSLOtxy0gPCTonjcoy4o9FKA5aiQW3+wPrZQ="; + hash = "sha256-MTfxVUr5rQpu5AXJmP/7rOjeHSsX+iQqfBdYb8YWfiU="; }; - cargoHash = "sha256-4kbvtmXkU5bhuC079K5NOGKVdqYvTileVNXSNLIV0ok="; + cargoHash = "sha256-lvqtt6RCy/SqzZXWRR5u2P9UOlHC5Hjg6UhYjxpS3as="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/mutmut/default.nix b/pkgs/development/tools/mutmut/default.nix index 4b40930c646d1..85d981961d165 100644 --- a/pkgs/development/tools/mutmut/default.nix +++ b/pkgs/development/tools/mutmut/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , python3 +, testers }: let self = with python3.pkgs; buildPythonApplication rec { diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 85ff24c845d6d..bf3a36591d3da 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.75"; + version = "1.0.77"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-1huB+wQ0x770PQF/mFEDzfyjhjYiTRmr2Y+IhqAKP8M="; + sha256 = "sha256-jaTSbEmqu9xyv9E5VgiHLE5YIBHVNXdVw8B+rSCjaZQ="; }; - cargoHash = "sha256-svb1qWJpaZ2uBdXGWrMXwm1wwQGrhGe891JOtiHnaVg="; + cargoHash = "sha256-WXNfxyD0CpoXEkVI+t30aTrdq/KqPnqeDt3wCEBoyLg="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 51e2e5d062ddb..e1b2f6867e1f6 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-M7ovDD9dwxVZgbggnXhe1A/hDQ8QRmY/2J6qdWU4mys="; + hash = "sha256-DN50syZ965MWXKg3lhEhvINeqZUtZgJNjusevf4EIUw="; }; - cargoHash = "sha256-wPWSuvAmPCquwg44PsbExnDKp7xDVWIy+/1SnnCuJmE="; + cargoHash = "sha256-ulsU/QSSNqyZTjM77PQnr3HVUg2dS8SxHv2y6Lsvths="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index ddb57f7ee20a8..541e82c600548 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.127.1"; + version = "1.129.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-FzAGhIEuAOvLNQdoDqkIJBWcl0cDGz1nkbpp4Ha4yQo="; + hash = "sha256-qbm7ByPZpLx0BB/iZ3UjYFe/g6l7ZuUw4wzrH72Ut7U="; }; vendorHash = "sha256-lFholyFVr6uMcfafM/tb8r1/4ysgWZOW5neoy3uL0Vw="; diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 9c75e6d662345..f663da08b0b00 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.7.6"; - vendorHash = "sha256-GuLcevYEM+neWAJoNBZrAVzVxdaLFFi9nubXGzp4EXw="; + version = "5.7.7"; + vendorHash = "sha256-R0/zJlK9T0iAfquROOWraoBHzd//rIIXNIps3GvGRvA="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-HMyq4raB6pPtx4DEJlcSM2+jlw7KWJW72RRVdG2wvn0="; + hash = "sha256-ZoBMOArpsmUniVc7cqbB4UZZ6ujnVfHqRos0Mcr+E4Q="; }; ldflags = [ diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index c8c5105531388..3ef4b44953d15 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-rpH87aFvbYanthwPw/SlluOH/rtj6owcVetBD4+TJeU="; + sha256 = "sha256-cFHcfpsHSDlR82PtZ0leRDpvCD6nw0Qdb3PsYKMnosA="; }; nativeBuildInputs = [ diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index ffa52a6746d76..e042e9d295eb7 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2023.1224.0"; + version = "2023.1229.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-6+Ddar9uu/0U0H/rvs0J3v+BfNHtDnJbnjmzRt5zYlc="; + hash = "sha256-aZp8pVeCxmaAyWYnBg7w8sPMXy+L2UGRk3NvG/VsxYI="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-TJR0GpMEL3Gu+cQZMI7rwdeY0rm5CIbhIJ1AG653csg="; + hash = "sha256-Xle/WcWg+lYA+DxQmE4Kzn1pJTa+HrM13utXqdK8ZZY="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-4kwRTgkiLWbDxR+KTc6pyULKLS2wDKNC4BO6OhysijI="; + hash = "sha256-lRdRPwa6xix5Nvt3szPeposmqU8D826iFmE6S1uPBF8="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index bbcc13e6ec5d1..9949a2ee9f0fa 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2023.1224.0"; + version = "2023.1229.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-o/I8f0aYM9FnMuRF6+Yk2DH20EwgzbLwvl4lqPPPJUk="; + hash = "sha256-2GcPV6UHnNdToXfLs2+i3XNwE6Ymaj2bqNb5EePE3kM="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index d0d247d85ad7a..8a67a1d16171e 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -126,22 +126,23 @@ (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NVika"; version = "2.2.0"; sha256 = "1lxv5m5nf4hfwfdhcscrl8m0hhjkqxxn555wxwb95x0d5w2czx6x"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.3"; sha256 = "1ac4s2422gyfmi5b2znn6i9j5p3w3w2jjng7g9lzh1mfgad3wfc2"; }) - (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.3"; sha256 = "176lj975yz2m34dzhjjawnsca4vviaayvmqinh6vsss6v1084fws"; }) - (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.3"; sha256 = "0dd37qfh6mxsf13bfnywy5ni17wvy6g419ksc4ga3ljv0zhrbpfz"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.3"; sha256 = "0pq43y1zlx4a0lidav1w6jsywvwc4z3aaq4w53w68cqf855k4wv9"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.4"; sha256 = "14wc2rgnbi2ili6sx9iqnmcbn1zlmbsk49zbiz5cycib6rxkqfdm"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.4"; sha256 = "0l7vf607i54y1xilr7bmjy9zlxacm00wz42mfbvzjf9rr54sy2pm"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.4"; sha256 = "1jsw2kwxxskwppk65i52yrxjjgbfbhicpmz30iaxlm68d5m6gwz2"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.4"; sha256 = "0lbd80yddsy7wqjw014kvj9an49h2rbgd9s86ifq38dyin5r2czn"; }) (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2023.1117.0"; sha256 = "04q65q27nzjq0fmv8p62r5lmhzdbpfk6y65fxqmfmm7qz2wkiy27"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2023.1117.0"; sha256 = "1yr0r628x5aaa1vqxpkr9ys1xnf4qnz6ypggms6v4a336gjz2734"; }) (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.1219.0"; sha256 = "0ljm2pj5brf024wd50mqzmqxw2ngchwyvbsxdx2g3dp9459bwsrh"; }) - (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1205.0-nativelibs"; sha256 = "1ldsn6fdcgp2dl64z2r4m87fwm84r4vfwlqfnyhxgs5n7xwwmb11"; }) + (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.1227.1"; sha256 = "1jx40963xr1wsbx09n7aq9i86wa33qm932159wp0nhbk6iqwafix"; }) + (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1225.0-nativelibs"; sha256 = "008kj91i9486ff2q7fcgb8mmpinskvnmfsqza2m5vafh295y3h7m"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.1215.0"; sha256 = "03zmwpvmqw24zgl9hhnbxh3a9l2jmj5yb7j067606hk7kg14k04d"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.1228.0"; sha256 = "09qjfavp71nlzyl6fqgpjfpsilii2fbsjyjggdbq9hf9i49hwz7s"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.671-alpha"; sha256 = "1yzakyp0wwayd9k2wmmfklmpvhig0skqk6sn98axpfgnq4hxhllm"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.693-alpha"; sha256 = "15fgd3j9cs3adldiscqm0ffixf68h06wqdz1xy1286z4gczhi954"; }) (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g91ce5a6cda"; sha256 = "0m96jkagz1ab3jgmz61d4z7jrxz058nzsamvqz93c90rlw802cvm"; }) (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "14qcrvhpvj3w9nr8fcki0j53qxc8bfgflivr989salh0srnlv764"; }) (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "1gdwk7s9sdvzrqr2rs9j87nvyl7b47b7m6kkhk1mpz6ryq403nsx"; }) diff --git a/pkgs/os-specific/linux/bpftune/default.nix b/pkgs/os-specific/linux/bpftune/default.nix index c2fd9d3f6a5eb..86c706ac2702d 100644 --- a/pkgs/os-specific/linux/bpftune/default.nix +++ b/pkgs/os-specific/linux/bpftune/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bpftune"; - version = "unstable-2023-09-11"; + version = "unstable-2023-12-20"; src = fetchFromGitHub { owner = "oracle"; repo = "bpftune"; - rev = "22926812a555eac910eac0699100bac0f8776f1b"; - hash = "sha256-BflJc5lYWYFIo9LzKfb34F4V1qOI8ywVjnzOLz605DI="; + rev = "0e6bca2e5880fcbaac6478c4042f5f9314e61463"; + hash = "sha256-y9WQrQb9U5YdzKAR63FzC8V1+jZL027pzAmQPpgM3jM="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index e71062e8ac472..408dfa408e1d7 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -8,7 +8,6 @@ , makeWrapper , requireFile , substituteAll -, nixosTests }: let @@ -69,12 +68,6 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; - passthru = { - tests = { - inherit (nixosTests) displaylink; - }; - }; - meta = with lib; { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; homepage = "https://www.displaylink.com/"; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c635af0672c76..3d95407fbe817 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.144-hardened1.patch", - "sha256": "03b2hg01z7fpscgpiw10bvlhq5dph5shdx5zn15csg5vjy6dl2cb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.144-hardened1/linux-hardened-5.15.144-hardened1.patch" + "name": "linux-hardened-5.15.145-hardened1.patch", + "sha256": "0jip4c7r41a3nzgv6zzrkjg4flb0ri6ar60l246ixzyp9sv19x9r", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.145-hardened1/linux-hardened-5.15.145-hardened1.patch" }, - "sha256": "0fsv18q64q17ad7mq818wfhb11dax4bdvbvqyk5ilxyfmypsylzh", - "version": "5.15.144" + "sha256": "086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j", + "version": "5.15.145" }, "5.4": { "patch": { diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index bddd68d46ae40..13fd2ed4d371e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.7-rc6", - "hash": "sha256:164jik11lv35jxfbci3vdb413qi241w51jrisilvfqy8ap0ccs4k" + "version": "6.7-rc7", + "hash": "sha256:1w1np05mqyviykj0gyx6z2l9ql4f909dy0ximh0gkcpkgy6zz9qc" }, "6.5": { "version": "6.5.13", @@ -12,8 +12,8 @@ "hash": "sha256:0hdm28k49kmy9r96hckps0bvvaq9m06l72n8ih305rccs6a2cgby" }, "5.15": { - "version": "5.15.144", - "hash": "sha256:0fsv18q64q17ad7mq818wfhb11dax4bdvbvqyk5ilxyfmypsylzh" + "version": "5.15.145", + "hash": "sha256:086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j" }, "5.10": { "version": "5.10.205", diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 9cf5f46cfb80d..9308cba46f139 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19441"; - sha256 = "1z0x8cw9nr7qf5qh3xjf6rg20q0i79bg71lik847sabyb6vcrk0z"; + rev = "19453"; + sha256 = "12jy0kyhl9dsp20yprbw27kzh1p4qxi5m5zy9j7sglm9ajrbnkar"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index ce26a38ed069d..58a1be131962e 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.201-rt98"; # updated by ./update-rt.sh + version = "5.10.204-rt100"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0642y6qj2d4aww6jcki81ba53pvjyfazjxgzgj8brqx8ixchdz3a"; + sha256 = "1vnamiyr378q52xgkg7kvpx80zck729dim77vp06a3q6n580g5gz"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1g7xbjsfrgins3agz9sq9ia13h5k9605gak7s14z5i4vd34y8pk8"; + sha256 = "1zbpkira8wf3w46586af72k43j8xkj15f0dgq86z975vl60hdk68"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index ce64711dac42e..658dc4a193c3d 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,8 +12,8 @@ let # ./update-zen.py lqx lqxVariant = { version = "6.6.8"; #lqx - suffix = "lqx1"; #lqx - sha256 = "04ix6mifnwg1flk2mnjxsajg227svwazhyi8r2h6xwbg0sy80qps"; #lqx + suffix = "lqx2"; #lqx + sha256 = "1hb6g657ivpnyqw6xsd6b09kwlh4vv11wv68ydcmsd5cg6qmv2zy"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 12cf26db2b2ac..f1d81aae92faf 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -4,6 +4,7 @@ , enableInfiniBandRdma ? false , enableMonitoring ? false , enableSnmp ? false +, nixosTests }: with lib; diff --git a/pkgs/servers/ebusd/default.nix b/pkgs/servers/ebusd/default.nix index 318c274cf2700..3e0b24c42c86d 100644 --- a/pkgs/servers/ebusd/default.nix +++ b/pkgs/servers/ebusd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ebusd"; - version = "23.2"; + version = "23.3"; src = fetchFromGitHub { owner = "john30"; repo = "ebusd"; rev = version; - sha256 = "2CkcTTxEzVrEPtUVVDxXPPkYqZT6+gsCcfTrt83sFv8="; + sha256 = "sha256-K3gZ5OudNA92S38U1+HndxjA7OVfh2ymYf8OetB646M="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/guacamole-client/default.nix b/pkgs/servers/guacamole-client/default.nix index db10f2851df2c..23c56df62a46a 100644 --- a/pkgs/servers/guacamole-client/default.nix +++ b/pkgs/servers/guacamole-client/default.nix @@ -1,7 +1,6 @@ { lib , stdenvNoCC , fetchurl -, nixosTests }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -25,10 +24,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = { - inherit (nixosTests) guacamole-client; - }; - meta = { description = "Clientless remote desktop gateway"; homepage = "https://guacamole.apache.org/"; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 3450ea73c68af..42db8a165a556 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.55.0"; + version = "1.56.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-KF3tbMgcmZHn8u2wPVidH35vi/Aj7xXUvXPXUci6qrM="; + sha256 = "sha256-7tnl8iItGegfRXLF3f+tmNxgJWkai6n8EOP00zyqyYs="; }; - vendorHash = "sha256-zwWiUXexGI9noHSRC+h9/IT0qdNwPMDZyP3AIKtnRn0="; + vendorHash = "sha256-r+VJ2+4F3BQ0tmNTVHDOxKaKAPSIvgu7ZcQZ6BXt2kA="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index 4c7b8d46638ce..824c56584e2bf 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.24.1"; + version = "2.24.2"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-U+B/k/stwjJw+mxUCb4A3yUtc/+Tg0PsWhVnovLLX4A="; + hash = "sha256-5Axqn3sYLM4yjGkN8d0ZUe8KrjYszaZmTg5GqmamNtc="; }; - cargoHash = "sha256-ZDrRjIM8187nr72MlzFr0NAqH2f8qkF1sGAT9+NvfhA="; + cargoHash = "sha256-xS2XARqXXcQ2J1k3jC5St19RdcK2korbEia4koUxG5s="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index e7eee6515fb76..3c2c27a9e9569 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , nixosTests , php -, pkgs }: stdenvNoCC.mkDerivation rec { @@ -31,8 +30,10 @@ stdenvNoCC.mkDerivation rec { ''; installPhase = '' + runHook preInstall mkdir -p $out cp -vr * $out/ + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 35cdb6311df32..d2f3cc31ca08a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -89,9 +89,9 @@ else null) null (lib.attrNames archLookupTable); archLookupTable = table.${localSystem.libc} - or (abort "unsupported libc for the pure Linux stdenv"); + or (throw "unsupported libc for the pure Linux stdenv"); files = archLookupTable.${localSystem.system} or (if getCompatibleTools != null then getCompatibleTools - else (abort "unsupported platform for the pure Linux stdenv")); + else (throw "unsupported platform for the pure Linux stdenv")); in files }: diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index d27e5eb7386d2..e6207b4402529 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.38"; + version = "0.40"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-MA7mMGZyRbQ4165qB+Q6/gQZP/yaUoZmMCVrPCPZoj4="; + sha256 = "sha256-G1CHm5z2D7l3NDmUMhubJsrXYUHb6FJ70EsYQShhsDE="; }; - vendorHash = "sha256-OmukK6ecaiCRnK6fL238GhkxW4A4yrcR/xelBZzVwqI="; + vendorHash = "sha256-j0tdFvOEp9VGx8OCfUruCzwVSB8thcenpvVNn7Rf0dA="; ldflags = [ "-s" "-w" diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 5df6986380b78..00f45c332cbe1 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "juicefs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UtERYOjAKOTK+A1qPdD1PajOkf/t5vqWRBvEuxkZmdg="; + sha256 = "sha256-dMzBgwd5tVxE6OFHf6QTZfoqgL/t2pX+OgI6Pki6PG8="; }; - vendorHash = "sha256-BpqxCCuWyUgzPyh7sq3/HyQ29qm/PWD7mQFh1nkkAkA="; + vendorHash = "sha256-orq03bwN1cbwHoZFXz92tcA2F0oivGR/C5EJDAPA+pk="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index 25acf8cebb1eb..928b9233bccde 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -1,8 +1,8 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , libgamemode32 +, makeWrapper , meson , ninja , pkg-config @@ -10,36 +10,28 @@ , inih , systemd , appstream -, makeWrapper , findutils , gawk , procps +, nix-update-script }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gamemode"; - version = "1.7"; + version = "1.8.1"; src = fetchFromGitHub { owner = "FeralInteractive"; - repo = pname; - rev = version; - sha256 = "sha256-DIFcmWFkoZOklo1keYcCl6n2GJgzWKC8usHFcJmfarU="; + repo = "gamemode"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-kusb58nGxYA3U9GbZdW3hLjA3NmHc+af0VT4iGRewBw="; }; - outputs = [ "out" "dev" "lib" "man" "static" ]; + outputs = [ "out" "dev" "lib" "man" ]; patches = [ # Add @libraryPath@ template variable to fix loading the PRELOAD library ./preload-nix-workaround.patch - # Do not install systemd sysusers configuration - ./no-install-systemd-sysusers.patch - - # fix build with glibc >=2.36 (declaration of pidfd_open) - (fetchpatch { - url = "https://github.com/FeralInteractive/gamemode/commit/4934191b1928ef695c3e8af21e75781f8591745f.patch"; - sha256 = "sha256-pWf2NGbd3gEJFwVP/EIJRbTD29V7keTQHy388enktsY="; - }) ]; postPatch = '' @@ -66,12 +58,15 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # libexec is just a way to package binaries without including them - # in PATH. It doesn't make sense to install them to $lib - # (the default behaviour in the meson hook). - "--libexecdir=${placeholder "out"}/libexec" - + "-Dwith-pam-limits-dir=etc/security/limits.d" "-Dwith-systemd-user-unit-dir=lib/systemd/user" + "-Dwith-systemd-group-dir=lib/sysusers.d" + + # The meson builder installs internal executables to $lib/lib by + # default, but they should be installed to "$out". It's also more + # appropriate to install these executables under a libexec + # directory instead of lib. + "--libexecdir=libexec" ]; doCheck = true; @@ -79,11 +74,6 @@ stdenv.mkDerivation rec { appstream ]; - # Move static libraries to $static so $lib only contains dynamic libraries. - postInstall = '' - moveToOutput lib/*.a "$static" - ''; - postFixup = '' # Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since # they use dlopen to load libgamemode. Can't use makeWrapper since @@ -100,11 +90,15 @@ stdenv.mkDerivation rec { ]} ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Optimise Linux system performance on demand"; - homepage = "https://github.com/FeralInteractive/GameMode"; + homepage = "https://github.com/FeralInteractive/gamemode"; + changelog = "https://github.com/FeralInteractive/gamemode/blob/${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; + mainProgram = "gamemoderun"; # Requires NixOS module to run }; -} +}) diff --git a/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch b/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch deleted file mode 100644 index 27aa1d4d710c9..0000000000000 --- a/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git i/data/meson.build w/data/meson.build -index 6fb82d8..2e9e170 100644 ---- i/data/meson.build -+++ w/data/meson.build -@@ -21,11 +21,6 @@ if sd_bus_provider == 'systemd' - configuration: data_conf, - install_dir: path_systemd_unit_dir, - ) -- # Install the sysusers.d file -- install_data( -- files('gamemode.conf'), -- install_dir: path_systemd_sysusers_dir, -- ) - endif - - # Install the D-BUS service file diff --git a/pkgs/tools/games/gamemode/preload-nix-workaround.patch b/pkgs/tools/games/gamemode/preload-nix-workaround.patch index 9c8db37f5d91e..06989ff984abd 100644 --- a/pkgs/tools/games/gamemode/preload-nix-workaround.patch +++ b/pkgs/tools/games/gamemode/preload-nix-workaround.patch @@ -6,7 +6,7 @@ index 573b3e4..6f2799e 100755 # ld will find the right path to load the library, including for 32-bit apps. LD_PRELOAD="${GAMEMODEAUTO_NAME}${LD_PRELOAD:+:$LD_PRELOAD}" -+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ++LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" -exec env LD_PRELOAD="${LD_PRELOAD}" $GAMEMODERUNEXEC "$@" +exec env LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" $GAMEMODERUNEXEC "$@" diff --git a/pkgs/tools/misc/charasay/default.nix b/pkgs/tools/misc/charasay/default.nix index 9051638a8c2c9..7e79c6479b40d 100644 --- a/pkgs/tools/misc/charasay/default.nix +++ b/pkgs/tools/misc/charasay/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "charasay"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "latipun7"; repo = pname; rev = "v${version}"; - hash = "sha256-ijr6AvhoiYWHYTPUxSdBds9jBW1HEy1n7h6zH1VGP1c="; + hash = "sha256-7z5+7yrx5X5rdBMNj9oWBZ2IX0s88c1SLhgz2IDDEn8="; }; - cargoHash = "sha256-HCHdiCeb4dqxQMWfYZV2k8Yq963vWfmL05BRpVYmIcg="; + cargoHash = "sha256-5htNU8l+amh+C8EL1K4UcXzf5Pbhhjd5RhxrucJoj/M="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 489250776213a..a8ab91f8f3296 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -75,6 +75,7 @@ python.pkgs.buildPythonApplication rec { # esptool is used in esphomeyaml/__main__.py # git is used in esphomeyaml/writer.py "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}" + "--prefix PYTHONPATH : $PYTHONPATH" # will show better error messages "--set ESPHOME_USE_SUBPROCESS ''" ]; diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix index 43a803dfa3e5f..6f11a2b3f3b57 100644 --- a/pkgs/tools/misc/pmbootstrap/default.nix +++ b/pkgs/tools/misc/pmbootstrap/default.nix @@ -1,21 +1,20 @@ { stdenv, lib, git, openssl, buildPythonApplication, pytestCheckHook, ps -, fetchPypi, fetchFromGitLab, sudo }: +, fetchPypi, fetchFromSourcehut, sudo }: buildPythonApplication rec { pname = "pmbootstrap"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - hash = "sha256-nN4KUP9l3g5Q+QeWr4Fju2GiOyu2f7u94hz/VJlCYdw="; + hash = "sha256-buCfQsi10LezDzYeplArmFRSc3vbjtl+FuTm/VUS2us="; }; - repo = fetchFromGitLab { - domain = "gitlab.com"; - owner = "postmarketOS"; + repo = fetchFromSourcehut { + owner = "~postmarketos"; repo = pname; rev = version; - hash = "sha256-UkgCNob4nazFO8xXyosV+11Sj4yveYBfgh7aw+/6Rlg="; + hash = "sha256-3GZ4PeMnG/a46WwvWPQFeYbJPp+NGU7A98QasnlMIL0="; }; pmb_test = "${repo}/test"; @@ -45,6 +44,7 @@ buildPythonApplication rec { "test_chroot_arguments" "test_chroot_interactive_shell" "test_chroot_interactive_shell_user" + "test_chroot_mount" "test_clean_worktree" "test_config_user" "test_cross_compile_distcc" diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix index 954924c3ca225..4602f5ba35bc1 100644 --- a/pkgs/tools/misc/wakapi/default.nix +++ b/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.10.0"; + version = "2.10.2"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-CyMzhEKaTiLODjXbHqkqEJNeCsssCjmdVOzg3vXVjJY="; + sha256 = "sha256-ecbWP6WnFCMCnk8o3A0UUdMj8cSmKm5KD/gVN/AVvIY="; }; - vendorHash = "sha256-+FYeaIQXHZyrik/9OICl2zk+OA8X9bry7JCQbdf9QGs="; + vendorHash = "sha256-RG6lc2axeAAPHLS1xRh8gpV/bcnyTWzYcb1YPLpQ0uQ="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/tools/networking/onetun/default.nix index ca07db7583a44..5200cff7076f7 100644 --- a/pkgs/tools/networking/onetun/default.nix +++ b/pkgs/tools/networking/onetun/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "onetun"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "aramperes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NH3K/EGFtBcTAxGntneV86zd8eWSV4fFxvr76xtE/mw="; + sha256 = "sha256-GVIRCMeuuhUA8lqQ1oI/Xcuf90QIlwhqYeU+HhbGWXQ="; }; - cargoHash = "sha256-ZpgcFzQLiOWyhjSI+WcLa0UFUw8zQWfqJkrVVpIexgM="; + cargoHash = "sha256-TRfr4riMzR/MbsV2RiQNlPoPLhHK5EScNBCeyyamfgE="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/tools/security/flare-floss/default.nix index b049ea1661083..212d0a74ebb1e 100644 --- a/pkgs/tools/security/flare-floss/default.nix +++ b/pkgs/tools/security/flare-floss/default.nix @@ -5,15 +5,15 @@ python3.pkgs.buildPythonPackage rec { pname = "flare-floss"; - version = "2.3.0"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "mandiant"; repo = "flare-floss"; rev = "refs/tags/v${version}"; fetchSubmodules = true; # for tests - hash = "sha256-tOLnve5XBc3TtSgucPIddBHD0YJhsRpRduXsKrtJ/eQ="; + hash = "sha256-bmOWOFqyvOvSrNTbwLqo0WMq4IAZxZ0YYaWCdCrpziU="; }; postPatch = '' @@ -24,7 +24,12 @@ python3.pkgs.buildPythonPackage rec { --replace 'sigs_path = os.path.join(get_default_root(), "sigs")' 'sigs_path = "'"$out"'/share/flare-floss/sigs"' ''; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ + binary2strings halo networkx pefile @@ -47,6 +52,10 @@ python3.pkgs.buildPythonPackage rec { cp -r floss/sigs $out/share/flare-floss/ ''; + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = with lib; { description = "Automatically extract obfuscated strings from malware"; homepage = "https://github.com/mandiant/flare-floss"; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 78f4af894a306..59e7bcc13d669 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -5,6 +5,7 @@ , enableMinimal ? false , withPcsc ? !enableMinimal, pcsclite , guiSupport ? stdenv.isDarwin, pinentry +, nixosTests }: assert guiSupport -> enableMinimal == false; @@ -80,7 +81,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests = lib.nixosTests.gnupg; + passthru.tests = nixosTests.gnupg; meta = with lib; { homepage = "https://gnupg.org"; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index edc02b3f44655..52102fcb1872f 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.137"; + version = "1.0.138"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+/P+pt79kGIr399c3oTwqbvtMc1nJNRhBYmYJsLrmDg="; + sha256 = "sha256-QygghEMpIoYaIIzINHXKUQmkCdoZdScZLHlIW9sObWk="; }; - cargoHash = "sha256-QCWlyuoogrU09JvP+X5If1KcYjaoL0zVhBexXwSqc1U="; + cargoHash = "sha256-HLqONTd+8kn6nUWEEJTGevJxntnfYEu5e41/wvENZAw="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/nkeys/default.nix b/pkgs/tools/system/nkeys/default.nix index a9328067463a5..54a02a9065764 100644 --- a/pkgs/tools/system/nkeys/default.nix +++ b/pkgs/tools/system/nkeys/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nkeys"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Sgj4+akOs/3fnpP0YDoRY9WwSk4uwtIPyPilutDXOlE="; + hash = "sha256-ui/vSa2TGe6Pe2aAzitBa1Pd2vKgTMuHoBhYYy2p6Rw="; }; - vendorHash = "sha256-8EfOtCiYCGmhGtZdPiFyNzBj+QsPx67vwFDMZ6ATidc="; + vendorHash = "sha256-SiSqmj6ktfiGsJOSu/pBY53e3vnN+RBfTkGwUuW52uo="; meta = with lib; { description = "Public-key signature system for NATS"; diff --git a/pkgs/tools/wayland/kanshi/default.nix b/pkgs/tools/wayland/kanshi/default.nix index c0884acfeadb5..6d2d1a4b1a981 100644 --- a/pkgs/tools/wayland/kanshi/default.nix +++ b/pkgs/tools/wayland/kanshi/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "kanshi"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "kanshi"; rev = "v${version}"; - sha256 = "sha256-5dIBQBA3OMlmaSYswwggFuedsb3i4uy9bcTZahIS2gQ="; + sha256 = "sha256-vxysZWFcfYwOgFMcRuPzYpWmFOFMiwc62DqI+nTQ4MI="; }; strictDeps = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f9583cb8c21e3..300b15940cdfe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -187,6 +187,7 @@ mapAliases ({ dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16 dart_stable = dart; # Added 2020-01-15 dat = nodePackages.dat; + deadcode = throw "'deadcode' has been removed, as upstream is abandoned since 2019-04-27. Use the official deadcode from 'gotools' package."; # Added 2023-12-28 deadpixi-sam = deadpixi-sam-unstable; debugedit-unstable = debugedit; # Added 2021-11-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01e0c01acf825..b949b03b79a8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -614,8 +614,6 @@ with pkgs; djhtml = python3Packages.callPackage ../development/tools/djhtml { }; - deadcode = callPackage ../development/tools/deadcode { }; - deadnix = callPackage ../development/tools/deadnix { }; dec-decode = callPackage ../development/tools/dec-decode { }; @@ -24445,7 +24443,7 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3 - openssl_3_1; + openssl_3_2; opensubdiv = callPackage ../development/libraries/opensubdiv { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7669bf2db61ee..0c2464cb071c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22693,10 +22693,10 @@ with self; { SpreadsheetParseExcel = buildPerlPackage { pname = "Spreadsheet-ParseExcel"; - version = "0.65"; + version = "0.66"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz"; - hash = "sha256-bsTLQpvVjYFkD+EhFvQ1xG9R/xBAxo8JzIt2gcFnW+w="; + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-ParseExcel-0.66.tar.gz"; + hash = "sha256-v9dqz7qYhgHcBRvac7S7JfaDmgBt2WC2p0AcJJJF9ls="; }; propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOStringy OLEStorage_Lite ]; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f42299fb5368..6abbf8b053b7c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1456,6 +1456,8 @@ self: super: with self; { binary = callPackage ../development/python-modules/binary { }; + binary2strings = callPackage ../development/python-modules/binary2strings { }; + binaryornot = callPackage ../development/python-modules/binaryornot { }; bincopy = callPackage ../development/python-modules/bincopy { }; @@ -10602,6 +10604,8 @@ self: super: with self; { inherit (pkgs) libusb1; }; + pylibjpeg = callPackage ../development/python-modules/pylibjpeg { }; + pylibjpeg-libjpeg = callPackage ../development/python-modules/pylibjpeg-libjpeg { }; pyliblo = callPackage ../development/python-modules/pyliblo { }; @@ -13122,6 +13126,8 @@ self: super: with self; { simber = callPackage ../development/python-modules/simber { }; + simple-term-menu = callPackage ../development/python-modules/simple-term-menu { }; + simpleaudio = callPackage ../development/python-modules/simpleaudio { }; simplebayes = callPackage ../development/python-modules/simplebayes { }; |