diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 67218eb29880..ab85eed34eea 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -734,7 +734,7 @@ in -> cfg.package.enableSecretProvisioning; message = '' Specifying an admin account password or oauth2 basicSecretFile requires kanidm to be built with the secret provisioning patches. - You may want to set `services.kanidm.package = pkgs.kanidm.withSecretProvisioning;`. + You may want to set `services.kanidm.package = pkgs.kanidmWithSecretProvisioning;`. ''; } # Entity names must be globally unique: diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix index 27176c2086fe..b45b972fe449 100644 --- a/nixos/tests/kanidm-provisioning.nix +++ b/nixos/tests/kanidm-provisioning.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ( { pkgs, lib, ... }: { services.kanidm = { - package = pkgs.kanidm.withSecretProvisioning; + package = pkgs.kanidmWithSecretProvisioning; enableServer = true; serverSettings = { origin = "https://${serverDomain}"; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 76cd4ac02869..8256a1b6e9a3 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -231,7 +231,7 @@ rec { for dir in lib/ReSharperHost/linux-*; do rm -rf $dir/dotnet - ln -s ${dotnet-sdk_7} $dir/dotnet + ln -s ${dotnet-sdk_7.unwrapped}/share/dotnet $dir/dotnet done ) ''; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ac34c5c68988..8eb02081b06f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -976,11 +976,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-1IBi5945mjC48bDwbb/0XHjQKrd4klB97+/gzdSJPwY=", + "hash": "sha256-q23rVU224nOQefn3QZW63YYkBFKjFIj1xYoYBMs48og=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.16.0", + "rev": "v3.18.1", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index b42eb791d27f..3e8435a9ff02 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ANTs"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-DZzuHMC0XymFCnDn+H1pRFx9jUt+s03PaN88R4ZBRwY="; + hash = "sha256-7df9RcZZwfSkokG8dMQg65bCOk2atDGkJpPo8SrRrfY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index d11b842a83ee..5e3d3aa4e3ab 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -9,11 +9,13 @@ let unionOfDisjoints = lib.fold lib.attrsets.unionOfDisjoint { }; addTests = - name: drv: + attrPath: drv: if !lib.isDerivation drv then drv else let + name = lib.concatStringsSep "." attrPath; + inherit (drv) scriptName; scriptPath = "share/mpv/scripts/${scriptName}"; fullScriptPath = "${drv}/${scriptPath}"; @@ -34,7 +36,7 @@ let if [ -e "${fullScriptPath}" ]; then touch $out else - echo "mpvScripts.\"${name}\" does not contain a script named \"${scriptName}\"" >&2 + echo "mpvScripts.${name} does not contain a script named \"${scriptName}\"" >&2 exit 1 fi ''; @@ -83,62 +85,64 @@ let let inherit (self) callPackage; in - lib.mapAttrs addTests { - inherit (callPackage ./mpv.nix { }) - acompressor - autocrop - autodeint - autoload - ; - inherit (callPackage ./occivink.nix { }) - blacklistExtensions - crop - encode - seekTo - ; + lib.mapAttrsRecursiveCond (x: x.recurseForDerivations or false) addTests ( + lib.recurseIntoAttrs { + inherit (callPackage ./mpv.nix { }) + acompressor + autocrop + autodeint + autoload + ; + inherit (callPackage ./occivink.nix { }) + blacklistExtensions + crop + encode + seekTo + ; - buildLua = callPackage ./buildLua.nix { }; - autosub = callPackage ./autosub.nix { }; - autosubsync-mpv = callPackage ./autosubsync-mpv.nix { }; - chapterskip = callPackage ./chapterskip.nix { }; - convert = callPackage ./convert.nix { }; - cutter = callPackage ./cutter.nix { }; - dynamic-crop = callPackage ./dynamic-crop.nix { }; - evafast = callPackage ./evafast.nix { }; - inhibit-gnome = callPackage ./inhibit-gnome.nix { }; - memo = callPackage ./memo.nix { }; - manga-reader = callPackage ./manga-reader.nix { }; - modernx = callPackage ./modernx.nix { }; - modernx-zydezu = callPackage ./modernx-zydezu.nix { }; - mpris = callPackage ./mpris.nix { }; - mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { }; - mpv-discord = callPackage ./mpv-discord.nix { }; - mpv-notify-send = callPackage ./mpv-notify-send.nix { }; - mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; - mpv-osc-tethys = callPackage ./mpv-osc-tethys.nix { }; - mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; - mpv-slicing = callPackage ./mpv-slicing.nix { }; - mpv-subtitle-lines = callPackage ./mpv-subtitle-lines.nix { }; - mpv-webm = callPackage ./mpv-webm.nix { }; - mpvacious = callPackage ./mpvacious.nix { }; - quack = callPackage ./quack.nix { }; - quality-menu = callPackage ./quality-menu.nix { }; - reload = callPackage ./reload.nix { }; - simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; - smart-copy-paste-2 = callPackage ./smart-copy-paste-2.nix { }; - smartskip = callPackage ./smartskip.nix { }; - sponsorblock = callPackage ./sponsorblock.nix { }; - sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { }; - thumbfast = callPackage ./thumbfast.nix { }; - thumbnail = callPackage ./thumbnail.nix { }; - uosc = callPackage ./uosc.nix { }; - videoclip = callPackage ./videoclip.nix { }; - visualizer = callPackage ./visualizer.nix { }; - vr-reversal = callPackage ./vr-reversal.nix { }; - webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; - youtube-chat = callPackage ./youtube-chat.nix { }; - youtube-upnext = callPackage ./youtube-upnext.nix { }; - }; + buildLua = callPackage ./buildLua.nix { }; + autosub = callPackage ./autosub.nix { }; + autosubsync-mpv = callPackage ./autosubsync-mpv.nix { }; + chapterskip = callPackage ./chapterskip.nix { }; + convert = callPackage ./convert.nix { }; + cutter = callPackage ./cutter.nix { }; + dynamic-crop = callPackage ./dynamic-crop.nix { }; + evafast = callPackage ./evafast.nix { }; + inhibit-gnome = callPackage ./inhibit-gnome.nix { }; + memo = callPackage ./memo.nix { }; + manga-reader = callPackage ./manga-reader.nix { }; + modernx = callPackage ./modernx.nix { }; + modernx-zydezu = callPackage ./modernx-zydezu.nix { }; + mpris = callPackage ./mpris.nix { }; + mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { }; + mpv-discord = callPackage ./mpv-discord.nix { }; + mpv-notify-send = callPackage ./mpv-notify-send.nix { }; + mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; + mpv-osc-tethys = callPackage ./mpv-osc-tethys.nix { }; + mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; + mpv-slicing = callPackage ./mpv-slicing.nix { }; + mpv-subtitle-lines = callPackage ./mpv-subtitle-lines.nix { }; + mpv-webm = callPackage ./mpv-webm.nix { }; + mpvacious = callPackage ./mpvacious.nix { }; + quack = callPackage ./quack.nix { }; + quality-menu = callPackage ./quality-menu.nix { }; + reload = callPackage ./reload.nix { }; + simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; + smart-copy-paste-2 = callPackage ./smart-copy-paste-2.nix { }; + smartskip = callPackage ./smartskip.nix { }; + sponsorblock = callPackage ./sponsorblock.nix { }; + sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { }; + thumbfast = callPackage ./thumbfast.nix { }; + thumbnail = callPackage ./thumbnail.nix { }; + uosc = callPackage ./uosc.nix { }; + videoclip = callPackage ./videoclip.nix { }; + visualizer = callPackage ./visualizer.nix { }; + vr-reversal = callPackage ./vr-reversal.nix { }; + webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; + youtube-chat = callPackage ./youtube-chat.nix { }; + youtube-upnext = callPackage ./youtube-upnext.nix { }; + } + ); aliases = { youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 @@ -152,5 +156,4 @@ lib.pipe scope [ assert builtins.intersectAttrs self aliases == { }; self // lib.optionalAttrs config.allowAliases aliases ) - lib.recurseIntoAttrs ] diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index b5dd84fdbea4..e2642352de25 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; rev = "refs/tags/v${version}"; - hash = "sha256-WbTxy8ijXez1x2G7NGGVMcyjgE7J7MDsGgGRpb4jKXQ="; + hash = "sha256-Zo89XPaZncsKhePCQgcRY3lfOxBx4NWIZi+r37L1SbE="; }; - cargoHash = "sha256-rlWNrkzUDs3rbQ5ZV4fKU/EKEy4fVbxEP0+wNwXi7Ag="; + cargoHash = "sha256-EV55vzkBXvTJ3nw76mZNn96eOpn06v3+NdQsKYPybHc="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index 14c0c3dd74e7..5eec3d1ebbea 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -13,16 +13,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.87.0"; + version = "3.87.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - hash = "sha256-yCbK6qS7A8K4B3qTZnA6Hl5kOdQ8UCDGmHsVh6LFpbM="; + hash = "sha256-L7ruto57E4uUEwo18krZgCQYl+9aJoIGgeecNEeVt54="; }; - vendorHash = "sha256-Ovi1xK+TtWli6ZG0s5Pu0JGAjtbyUWBgiKCBybVbcXk="; + vendorHash = "sha256-Snms9jzQ8+Tw+pJJth7AndskebF31bHKviJBA6Qu52I="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/by-name/ca/calcure/package.nix b/pkgs/by-name/ca/calcure/package.nix index bc82942ffccf..29fc8c6c91ca 100644 --- a/pkgs/by-name/ca/calcure/package.nix +++ b/pkgs/by-name/ca/calcure/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "calcure"; - version = "3.0.2"; + version = "3.1"; pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "calcure"; rev = "refs/tags/${version}"; - hash = "sha256-2yWg/9NQxFIwoSLj1e0y1+tgKer8GtOmjzwlTRX/Q+c="; + hash = "sha256-ufrJbc3WMY88VEsUHlWxQ1m0iupts4zNusvQL8YAqJc="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/ca/cascadia-code/package.nix b/pkgs/by-name/ca/cascadia-code/package.nix index e4f92ebe71b3..a0d4f44f1434 100644 --- a/pkgs/by-name/ca/cascadia-code/package.nix +++ b/pkgs/by-name/ca/cascadia-code/package.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "cascadia-code"; - version = "2404.23"; + version = "2407.24"; src = fetchzip { url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; stripRoot = false; - hash = "sha256-Z2AzBeNiM6mc1OHCJRv0rUvH8WRygyQGSOvwbAISYHE="; + hash = "sha256-bCQzGCvjSQ1TXFVC3w9VPXNtjM4h7lRvljVjX/w1TJ4="; }; installPhase = '' diff --git a/pkgs/by-name/ca/castxml/package.nix b/pkgs/by-name/ca/castxml/package.nix index 03a984741211..8368a4aa2383 100644 --- a/pkgs/by-name/ca/castxml/package.nix +++ b/pkgs/by-name/ca/castxml/package.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "castxml"; - version = "0.6.8"; + version = "0.6.10"; src = fetchFromGitHub { owner = "CastXML"; repo = "CastXML"; rev = "v${finalAttrs.version}"; - hash = "sha256-J4Z/NjCVOq4QS7ncCi87P5YPgqRwFyDAc14uS5T7s6M="; + hash = "sha256-3TVJu63O1spleR9hNZKfSNoVa+q+oxtMWCOXetFNrgI="; }; nativeBuildInputs = [ cmake ] ++ lib.optionals (withManual || withHTML) [ sphinx ]; diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index 5324b2e5daaa..4ff52c773492 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.23.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = pname; - rev = version; - sha256 = "sha256-RUwJxoD6H0CgS7xyfzMLdoy19p/FuOg82EbocZh7vWs="; + rev = "v${version}"; + sha256 = "sha256-4Ea/YCh0a5xToEmyqpvt8fTtsbL/K0RcQBUitHNCKgo="; }; - cargoHash = "sha256-rbGl7jQABZu4aMpzlv49uMuKmw7U+9zLS6pAJIJajR8="; + cargoHash = "sha256-pZ4aHmfiHMvatUY5oTvLtJiIVvknAi3NFVP30rcEmRo="; meta = with lib; { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; mainProgram = "comrak"; homepage = "https://github.com/kivikakk/comrak"; - changelog = "https://github.com/kivikakk/comrak/blob/${version}/changelog.txt"; + changelog = "https://github.com/kivikakk/comrak/blob/v${version}/changelog.txt"; license = licenses.bsd2; maintainers = with maintainers; [ figsoda kivikakk ]; }; diff --git a/pkgs/by-name/di/discrete-scroll/package.nix b/pkgs/by-name/di/discrete-scroll/package.nix new file mode 100644 index 000000000000..f3b0f1c98109 --- /dev/null +++ b/pkgs/by-name/di/discrete-scroll/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "discrete-scroll"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "emreyolcu"; + repo = "discrete-scroll"; + rev = "v${finalAttrs.version}"; + hash = "sha256-FYYtJUl1tvMu9yMK5VpHmMeM6otDIpoOvSGTjYNPBr0="; + }; + + buildPhase = '' + runHook preBuild + $CC -O3 -framework ApplicationServices DiscreteScroll/main.c + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 a.out $out/bin/discretescroll + runHook postInstall + ''; + + meta = { + description = "Fix for OS X's scroll wheel problem"; + homepage = "https://github.com/emreyolcu/discrete-scroll"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bb2020 ]; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/do/docker-credential-gcr/package.nix b/pkgs/by-name/do/docker-credential-gcr/package.nix index 11362c871745..1005bb4f87f7 100644 --- a/pkgs/by-name/do/docker-credential-gcr/package.nix +++ b/pkgs/by-name/do/docker-credential-gcr/package.nix @@ -9,20 +9,20 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.25"; + version = "2.1.26"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "refs/tags/v${version}"; - hash = "sha256-BnYh+MFTj76AWf0GfjzjQ/g/ACgCOLOLVfCSPssvfUY="; + hash = "sha256-4sgUeEXBfP0qaR92ZulqAf1ObQBDbSjEHqhAqa0EV2Q="; }; postPatch = '' rm -rf ./test ''; - vendorHash = "sha256-VsJ5OI8D1u9qZqtirYf682+z0wLJr/vAxRLHAEGwKSY="; + vendorHash = "sha256-YcBDurQjGhjds3CB63gTjsPbsvlHJnGxWbsFrx3vCy4="; CGO_ENABLED = 0; diff --git a/pkgs/by-name/fa/factorio/mods.nix b/pkgs/by-name/fa/factorio/mods.nix deleted file mode 100644 index 9a06453ccce8..000000000000 --- a/pkgs/by-name/fa/factorio/mods.nix +++ /dev/null @@ -1,213 +0,0 @@ -# This file is here for demo purposes only, populated with a small sampling of -# mods. It will eventually be replaced by a nixos-channel that will provide -# derivations for most or all of the mods tracked through the official mod -# manager site. -{ lib, fetchurl -, factorio-utils -, allRecommendedMods ? true -, allOptionalMods ? false -}: - -let - modDrv = factorio-utils.modDrv { inherit allRecommendedMods allOptionalMods; }; -in -rec { - - bobassembly = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobassembly_0.13.0.zip" - ]; - sha256 = "0c0m7sb45r37g882x0aq8mc82yhfh9j9h8g018d4s5pf93vzr6d1"; - }; - deps = [ boblibrary ]; - optionalDeps = [ bobconfig ]; - recommendedDeps = [ bobplates ]; - }; - - bobconfig = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobconfig_0.13.1.zip" - ]; - sha256 = "0z4kmggm1slbr3qiy5xahc9nhdffllp21n9nv5gh1zbzv72sb1rp"; - }; - }; - - bobelectronics = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobelectronics_0.13.1.zip" - ]; - sha256 = "16sn5w33s0ckiwqxx7b2pcsqmhxbxjm2w4h4vd99hwpvdpjyav52"; - }; - deps = [ boblibrary ]; - optionalDeps = [ bobconfig ]; - recommendedDeps = [ bobplates ]; - }; - - bobenemies = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobenemies_0.13.1.zip" - ]; - sha256 = "1wnb5wsvh9aa3i9mj17f36ybbd13qima3iwshw60i6xkzzqfk44d"; - }; - optionalDeps = [ bobconfig ]; - }; - - bobgreenhouse = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobgreenhouse_0.13.2.zip" - ]; - sha256 = "1ql26875dvz2lqln289jg1w6yjzsd0x0pqmd570jffwi5m320rrw"; - }; - deps = [ boblibrary ]; - optionalDeps = [ bobconfig ]; - recommendedDeps = [ bobplates ]; - }; - - bobinserters = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobinserters_0.13.3.zip" - ]; - sha256 = "0nys9zhaw0v3w2xzrhawr8g2hcxkzdmyqd4s8xm5bnbrgrq86g9z"; - }; - deps = [ boblibrary ]; - optionalDeps = [ bobconfig ]; - recommendedDeps = [ ]; - }; - - boblibrary = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/boblibrary_0.13.1.zip" - ]; - sha256 = "04fybs626lzxf0p21jl8kakh2mddah7l9m57srk7a87jw5bj1zx8"; - }; - }; - - boblogistics = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/boblogistics_0.13.7.zip" - ]; - sha256 = "0c91zmyxwsmyv6vm6gp498vb7flqlcyzkbp9s5q1651hpyd378hx"; - }; - deps = [ boblibrary ]; - optionalDeps = [ bobconfig ]; - recommendedDeps = [ bobplates ]; - }; - - bobmining = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobmining_0.13.1.zip" - ]; - sha256 = "1l7k3v4aizihppgi802fr5b8zbnq2h05c2bbsk5hds239qgxy80m"; - }; - deps = [ boblibrary ]; - optionalDeps = [ bobconfig bobores bobplates ]; - }; - - bobmodules = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobmodules_0.13.0.zip" - ]; - sha256 = "0ggd2gc4s5sbld7gyncbzdgq8gc00mvxjcfv7i2dchcrdzrlr556"; - }; - deps = [ boblibrary ]; - optionalDeps = [ bobconfig ]; - recommendedDeps = [ bobplates bobassembly bobelectronics ]; - }; - - bobores = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobores_0.13.1.zip" - ]; - sha256 = "1rri70655kj77sdr3zgp56whmcl0gfjmw90jm7lj1jp8l1pdfzb9"; - }; - deps = [ boblibrary ]; - optionalDeps = [ bobconfig ]; - }; - - bobplates = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobplates_0.13.2.zip" - ]; - sha256 = "0iczpa26hflj17k84p4n6wz0pwhbbrfk86dgac4bfz28kqg58nj1"; - }; - deps = [ boblibrary ]; - optionalDeps = [ bobconfig bobenemies ]; - recommendedDeps = [ bobores bobtech ]; - }; - - bobpower = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobpower_0.13.1.zip" - ]; - sha256 = "18sblnlvprrm2vzlczlki09yj9lr4y64808zrwmcasf7470skar3"; - }; - deps = [ boblibrary ]; - optionalDeps = [ bobconfig ]; - recommendedDeps = [ bobplates ]; - }; - - bobrevamp = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobrevamp_0.13.0.zip" - ]; - sha256 = "0rkyf61clh8fjg72z9i7r4skvdzgd49ky6s0486xxljhbil4nxb7"; - }; - deps = [ boblibrary ]; - }; - - bobtech = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobtech_0.13.0.zip" - ]; - sha256 = "0arc9kilxzdpapn3gh5h8269ssgsjxib4ny0qissq2sg95gxlsn0"; - }; - deps = [ boblibrary ]; - optionalDeps = [ bobenemies ]; - }; - - bobtechsave = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobtechsave_0.13.0.zip" - ]; - sha256 = "1vlv4sgdfd9ldjm8y79n95ms5k6x2i7khjc422lp9080m03v1hcl"; - }; - }; - - bobwarfare = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/bobwarfare_0.13.4.zip" - ]; - sha256 = "07wzn16i4r0qjm41wfyl17rrhry2vrph08a0kq8w5iy6qcbqqfd3"; - }; - deps = [ boblibrary ]; - optionalDeps = [ boblibrary bobplates ]; - recommendedDeps = [ bobtech ]; - }; - - clock = modDrv { - src = fetchurl { - urls = [ - "https://f.xor.us/factorio-mods/clock_0.13.0.zip" - ]; - sha256 = "0nflywbj6p2kz2w9wff78vskzljrzaf32ib56k3z456d9y8mlxfd"; - }; - }; - -} diff --git a/pkgs/by-name/ff/ffms/package.nix b/pkgs/by-name/ff/ffms/package.nix index 6d5db4cdac5b..61db0ad742ed 100644 --- a/pkgs/by-name/ff/ffms/package.nix +++ b/pkgs/by-name/ff/ffms/package.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, ffmpeg -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + ffmpeg, + zlib, }: stdenv.mkDerivation rec { @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { # https://github.com/FFMS/ffms2#avisynth-and-vapoursynth-plugin postInstall = '' mkdir $out/lib/vapoursynth - ln -s $out/lib/libffms2.so $out/lib/vapoursynth/libffms2.so + ln -s $out/lib/libffms2${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/vapoursynth/libffms2${stdenv.hostPlatform.extensions.sharedLibrary} ''; meta = with lib; { @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { description = "FFmpeg based source library for easy frame accurate access"; mainProgram = "ffmsindex"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ wegank ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix index ba745f60b6f8..ba363960cf96 100644 --- a/pkgs/by-name/fh/fh/package.nix +++ b/pkgs/by-name/fh/fh/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fh"; - version = "0.1.18"; + version = "0.1.19"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "fh"; rev = "v${version}"; - hash = "sha256-McfJXbr/oadsfQV7hzB6sEMy9sfXthHcjsbOiQs2+rU="; + hash = "sha256-QFlNSjrXU4vdiAYylS4UmDmaOcqcz9ujo0mkj4LStAo="; }; - cargoHash = "sha256-PGXd4spD2gNyQIloVZuhWZ1VQtacXPLMCQiBekZbEp4="; + cargoHash = "sha256-jaZRKeFg0iFbhmi5rqyr2hbWQ8inAgbcYvGcFWLdYbI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fo/folder-color-switcher/package.nix b/pkgs/by-name/fo/folder-color-switcher/package.nix index e6fd9dd0e569..c219574fb1c2 100644 --- a/pkgs/by-name/fo/folder-color-switcher/package.nix +++ b/pkgs/by-name/fo/folder-color-switcher/package.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "c9d1a2b9c7f40ff7bb77ee74a277988bb8a4adf2"; - hash = "sha256-5k0YybA40MefqQixNFyQFMuy7t4aSGsI3BK0RbZDu28="; + rev = "ba8ea15a48a1a31f318676f4079789af20bdf099"; + hash = "sha256-jbfc831wTA3NMa905ZzMnV0dyzzqZxOzrRPdgS7E2ZU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix index ca3767b5db60..77e3a449ba4e 100644 --- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-Q6V4axKlGhX1/uaugNkjoynHSL5jWA/eqzAsbJYcRSo="; + sha256 = "sha256-ZsbX4xB6sLpZH6vaVFlkC7hAhPLZa1T+FlPANqBQTOg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index 80a9879ffc8c..6a9066f70d9b 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -7,13 +7,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "mapproxy"; - version = "3.1.0"; + version = "3.1.2"; src = fetchFromGitHub { owner = "mapproxy"; repo = "mapproxy"; - rev = version; - hash = "sha256-hSktJnYRPA2R6gpmZCUpGeZYDcBL5bhq4B3ev7xDjPc="; + rev = "refs/tags/${version}"; + hash = "sha256-D3ZPcl9++yCq4zVR3WUIyu9UWQO3FT1MNyV7/Iuzkcw="; }; prePatch = '' diff --git a/pkgs/by-name/mi/mint-l-icons/package.nix b/pkgs/by-name/mi/mint-l-icons/package.nix index 8de1c8be2d22..f58266a6d668 100644 --- a/pkgs/by-name/mi/mint-l-icons/package.nix +++ b/pkgs/by-name/mi/mint-l-icons/package.nix @@ -9,14 +9,14 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-icons"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # https://github.com/linuxmint/mint-l-icons/issues/11 - rev = "ee03e6dad0b1f9e25847977eae42766e2ddd4877"; - hash = "sha256-OKlkqDp9mZOeM4M9QN9H0WH4k+5eMEUshvadaV6qhBA="; + # They don't really do tags, this is just a named commit. + rev = "f1900facf915715623ef0ca2874ae4dd04039e81"; + hash = "sha256-UpVuhzZdw0Ri6X20N/yGFMmwEymMvLr78DwYaHD+CNY="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/mi/mint-themes/package.nix b/pkgs/by-name/mi/mint-themes/package.nix index 13db58183cb5..e8a6caba1575 100644 --- a/pkgs/by-name/mi/mint-themes/package.nix +++ b/pkgs/by-name/mi/mint-themes/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.8"; + version = "2.1.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-mkcIhZRaOUom1Rurz/IO646FSF50efLN6xfesPdyVHc="; + hash = "sha256-+RuhpM4Qk5iU+Mxi8adneUL8fpC896FGKR2HNTnc1+U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mint-x-icons/package.nix b/pkgs/by-name/mi/mint-x-icons/package.nix index b4ee6d7259fa..4b9b420e35f5 100644 --- a/pkgs/by-name/mi/mint-x-icons/package.nix +++ b/pkgs/by-name/mi/mint-x-icons/package.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-x-icons"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-OiMQpVT5cydhw6Lb+vW+LiB/4gRuRhKXe93ocFj6qa4="; + hash = "sha256-9oXMMLVjirzRVJ0Pmd/1LjeeNUgYMKaGeih3eQA7k5U="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/mi/mint-y-icons/package.nix b/pkgs/by-name/mi/mint-y-icons/package.nix index 7e2fb23df1ce..b3fb96dfab4f 100644 --- a/pkgs/by-name/mi/mint-y-icons/package.nix +++ b/pkgs/by-name/mi/mint-y-icons/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-SJ6h1All5bub+Yue8zUrAYdlNf005MAdnl+pkOelods="; + hash = "sha256-30Mv6ixNgXK2CbLoX7Dw9i57QCkG8U3RA48WB4e3e8o="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/mo/mopac/package.nix b/pkgs/by-name/mo/mopac/package.nix index 44d3f690604b..69f3355a24f9 100644 --- a/pkgs/by-name/mo/mopac/package.nix +++ b/pkgs/by-name/mo/mopac/package.nix @@ -12,13 +12,13 @@ assert blas.isILP64 == lapack.isILP64; stdenv.mkDerivation rec { pname = "mopac"; - version = "23.0.0"; + version = "23.0.2"; src = fetchFromGitHub { owner = "openmopac"; repo = pname; rev = "v${version}"; - hash = "sha256-5Ybhnq99609mb1BCf7SfBOu14VfG54aF1bEf96yhbVI="; + hash = "sha256-FHJ8R8s82qSt4l6IawODkHhk2jitcxjUXCgZOU9iXDM="; }; nativeBuildInputs = [ gfortran cmake ]; diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 1e2d12b7fa72..f60494cc1234 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -30,6 +30,7 @@ let env.CYPRESS_INSTALL_BINARY = "0"; # disallow cypress from downloading binaries in sandbox env.ONNXRUNTIME_NODE_INSTALL_CUDA = "skip"; + env.NODE_OPTIONS = "--max-old-space-size=8192"; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index a3c25bbc9e7b..03bb24119123 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -1,18 +1,19 @@ -{ stdenv -, lib -, buildGoModule -, fetchFromGitHub -, makeWrapper -, coreutils -, runCommand -, runtimeShell -, writeText -, terraform-providers -, installShellFiles +{ + stdenv, + lib, + buildGoModule, + fetchFromGitHub, + makeWrapper, + coreutils, + runCommand, + runtimeShell, + writeText, + terraform-providers, + installShellFiles, }: let - package = buildGoModule rec { + package = buildGoModule rec { pname = "opentofu"; version = "1.8.6"; @@ -24,7 +25,12 @@ let }; vendorHash = "sha256-MHdEY2nlUGTKybMPran5mTXlAlTFilfrY5K2sMlPe5U="; - ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ]; + ldflags = [ + "-s" + "-w" + "-X" + "github.com/opentofu/opentofu/version.dev=no" + ]; postConfigure = '' # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 @@ -37,7 +43,9 @@ let passthru = { inherit full plugins withPlugins; - tests = { inherit opentofu_plugins_test; }; + tests = { + inherit opentofu_plugins_test; + }; }; # https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/bash.go#L8 @@ -67,49 +75,61 @@ let full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders)); - opentofu_plugins_test = let - mainTf = writeText "main.tf" '' - terraform { - required_providers { - random = { - source = "registry.terraform.io/hashicorp/random" + opentofu_plugins_test = + let + mainTf = writeText "main.tf" '' + terraform { + required_providers { + random = { + source = "registry.terraform.io/hashicorp/random" + } } } - } - resource "random_id" "test" {} - ''; - opentofu = package.withPlugins (p: [ p.random ]); - test = runCommand "opentofu-plugin-test" { - buildInputs = [ opentofu ]; - } '' - # make it fail outside of sandbox - export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0 - cp ${mainTf} main.tf - tofu init - touch $out - ''; - in + resource "random_id" "test" {} + ''; + opentofu = package.withPlugins (p: [ p.random ]); + test = runCommand "opentofu-plugin-test" { buildInputs = [ opentofu ]; } '' + # make it fail outside of sandbox + export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0 + cp ${mainTf} main.tf + tofu init + touch $out + ''; + in test; - plugins = removeAttrs terraform-providers [ - "override" - "overrideDerivation" - "recurseForDerivations" - ]; + plugins = + lib.mapAttrs + ( + _: provider: + # use opentofu plugin registry over terraform's + provider.override (oldArgs: { + provider-source-address = lib.replaceStrings [ "https://registry.terraform.io/providers" ] [ + "registry.opentofu.org" + ] oldArgs.homepage; + }) + ) + ( + removeAttrs terraform-providers [ + "override" + "overrideDerivation" + "recurseForDerivations" + ] + ); - withPlugins = plugins: + withPlugins = + plugins: let actualPlugins = plugins package.plugins; # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries - wrapperInputs = lib.unique (lib.flatten - (lib.catAttrs "propagatedBuildInputs" - (builtins.filter (x: x != null) actualPlugins))); + wrapperInputs = lib.unique ( + lib.flatten (lib.catAttrs "propagatedBuildInputs" (builtins.filter (x: x != null) actualPlugins)) + ); passthru = { - withPlugins = newplugins: - withPlugins (x: newplugins x ++ actualPlugins); + withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins); # Expose wrappers around the override* functions of the terraform # derivation. @@ -131,21 +151,20 @@ let # 3. Specifying overrides on the wrapper is unsupported. # # See nixpkgs#158620 for details. - overrideDerivation = f: - (package.overrideDerivation f).withPlugins plugins; - overrideAttrs = f: - (package.overrideAttrs f).withPlugins plugins; - override = x: - (package.override x).withPlugins plugins; + overrideDerivation = f: (package.overrideDerivation f).withPlugins plugins; + overrideAttrs = f: (package.overrideAttrs f).withPlugins plugins; + override = x: (package.override x).withPlugins plugins; }; - # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading - # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. in - if actualPlugins == [ ] then - package.overrideAttrs - (orig: { passthru = orig.passthru // passthru; }) - else - lib.appendToName "with-plugins" (stdenv.mkDerivation { + # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading + # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. + if actualPlugins == [ ] then + package.overrideAttrs (orig: { + passthru = orig.passthru // passthru; + }) + else + lib.appendToName "with-plugins" ( + stdenv.mkDerivation { inherit (package) meta pname version; nativeBuildInputs = [ makeWrapper ]; @@ -178,6 +197,7 @@ let --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \ --prefix PATH : "${lib.makeBinPath wrapperInputs}" ''; - }); + } + ); in package diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index 2f9aad6497a0..64275a277f22 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -1,38 +1,45 @@ -{ lib -, python3Packages -, fetchFromGitHub +{ + lib, + python3Packages, + fetchFromGitHub, }: python3Packages.buildPythonApplication rec { pname = "rclip"; - version = "1.10.3"; + version = "1.11.0"; pyproject = true; src = fetchFromGitHub { owner = "yurijmikhalevich"; repo = "rclip"; rev = "refs/tags/v${version}"; - hash = "sha256-MdqO6X1dbIzmDuDSjrbmKbQfPIPcyhVIbodERYu9PZU="; + hash = "sha256-bu9kz0CCq78lp+d2uPoApzZnVybwyWD/fwgnXYG52dk="; }; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ poetry-core ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ + numpy open-clip-torch pillow requests torch torchvision tqdm + rawpy ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - - pythonRelaxDeps = [ "torch" "torchvision" ]; + pythonRelaxDeps = [ + "pillow" + "torch" + "torchvision" + ]; pythonImportsCheck = [ "rclip" ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + disabledTestPaths = [ # requires network "tests/e2e/test_rclip.py" @@ -45,11 +52,12 @@ python3Packages.buildPythonApplication rec { "test_loads_full_model_when_text_processing_only_requested_and_checkpoint_doesnt_exist" ]; - meta = with lib; { + meta = { description = "AI-Powered Command-Line Photo Search Tool"; homepage = "https://github.com/yurijmikhalevich/rclip"; - license = licenses.mit; - maintainers = with maintainers; [ iynaix ]; + changelog = "https://github.com/yurijmikhalevich/rclip/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ iynaix ]; mainProgram = "rclip"; }; } diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index c80945179547..871b14be1078 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-10-09"; + version = "0-unstable-2024-11-27"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "ada6afd90cc36ef3114ba81c057e48bfaa9b70e3"; - hash = "sha256-8f1Vg1rRsavyX+7D8w6JZ0y0PWnYWXuETBPEd5aBKtA="; + rev = "fd2d207bf88d5a97256d858cd01cd46159f404b2"; + hash = "sha256-+4WEhmuPGPtHBIoG87b+B2sxn+38YD3gtFC7R1+Y1/4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/rogcat/package.nix b/pkgs/by-name/ro/rogcat/package.nix index d4d930c174b7..8c38e03d3f43 100644 --- a/pkgs/by-name/ro/rogcat/package.nix +++ b/pkgs/by-name/ro/rogcat/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "rogcat"; - version = "0.4.7"; + version = "0.5.0"; src = fetchFromGitHub { owner = "flxo"; repo = "rogcat"; rev = "refs/tags/v${version}"; - hash = "sha256-l2zfVt2vm5GTrYs6/0D3EesxxPWSmjf2tGS545766iA="; + hash = "sha256-nXKvepuiBDIGo8Gga5tbbT/mnC6z+HipV5XYtlrURRU="; }; - cargoHash = "sha256-cDAS8mengFgBsq9nTiVAjt7pJhKjj7/F9x8IS6vP2ck="; + cargoHash = "sha256-a+B9bMuKhmt3ka9p7a/O6JggiAxMzm9C5PdbFZD1KP0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index 5d60be2f96c0..e27d63939973 100644 --- a/pkgs/by-name/se/sequoia-sq/package.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-sq"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sq"; rev = "v${version}"; - hash = "sha256-nLrwf/4vbASOAyOWlc4X9ZQKFq/Kdh83XadpRuquEA4="; + hash = "sha256-RHQPlxkwnj31io417Ro8Jo7RE6OMe9y9TdMIWsYj+pQ="; }; - cargoHash = "sha256-MnxvuO1KG7X2plFkQ/DNBHnH2cPi1X3SVbvcN8N7ZXk="; + cargoHash = "sha256-4OdBYvVIYdfQEm2+TvRXPKgjd6OTY+ViE9N5PkhzfRU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/so/soundconverter/package.nix b/pkgs/by-name/so/soundconverter/package.nix index 5e5303bb1da3..ef48e90b3970 100644 --- a/pkgs/by-name/so/soundconverter/package.nix +++ b/pkgs/by-name/so/soundconverter/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { pname = "soundconverter"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "kassoulet"; repo = "soundconverter"; - rev = version; - hash = "sha256-sno5EOh8HHfBTIE67VA8mheYp5wUMFRCbcS2EtKES3c="; + rev = "refs/tags/${version}"; + hash = "sha256-qa8VBPpB27hw+mYXGi6I35dxjJAOucH/SevxqKeu6o0="; }; buildInputs = [ diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix index 2e9a3af2e42b..c8d231c2538a 100644 --- a/pkgs/by-name/sq/sqlitestudio/package.nix +++ b/pkgs/by-name/sq/sqlitestudio/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "sqlitestudio"; - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitHub { owner = "pawelsalawa"; repo = "sqlitestudio"; rev = version; - hash = "sha256-51gvjQULHI4MC+odsLPjK2n/9dIMrhq8S9R/uMGueXU="; + hash = "sha256-ETahZYAbayQEo+1mlSlJkUgzskIgdDdDM/MMOL2kXMk="; }; nativeBuildInputs = diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix index 31c347b9e8c2..10dea51455a1 100644 --- a/pkgs/by-name/ta/taler-exchange/package.nix +++ b/pkgs/by-name/ta/taler-exchange/package.nix @@ -102,10 +102,11 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "check"; meta = { - description = '' + description = "Exchange component for the GNU Taler electronic payment system"; + longDescription = '' Taler is an electronic payment system providing the ability to pay anonymously using digital cash. Taler consists of a network protocol - definition (using a RESTful API over HTTP), a Exchange (which creates + definition (using a RESTful API over HTTP), an Exchange (which creates digital coins), a Wallet (which allows customers to manage, store and spend digital coins), and a Merchant website which allows customers to spend their digital coins. Naturally, each Merchant is different, but diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix index 60350fcf5794..75f0356f6a0e 100644 --- a/pkgs/by-name/ta/taler-merchant/package.nix +++ b/pkgs/by-name/ta/taler-merchant/package.nix @@ -80,7 +80,8 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "check"; meta = { - description = '' + description = "Merchant component for the GNU Taler electronic payment system"; + longDescription = '' This is the GNU Taler merchant backend. It provides the logic that should run at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that can be used to setup orders and process payments. This component allows diff --git a/pkgs/by-name/ug/ugm/package.nix b/pkgs/by-name/ug/ugm/package.nix index df62946c4452..05881924b4bf 100644 --- a/pkgs/by-name/ug/ugm/package.nix +++ b/pkgs/by-name/ug/ugm/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "ugm"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ariasmn"; repo = "ugm"; rev = "v${version}"; - hash = "sha256-Ui/JYU/ZbMP8E20vWHah1GFFVu5E4xf0RaVv9X0QnR4="; + hash = "sha256-FTgu5bzhX+B71dj4wHcgwbtrde5fzF98zMV1lRO++AE="; }; - vendorHash = "sha256-34D9fQnmKnOyUqshduLmFiVgcVKi7mDKBs3X5ZQxsuw="; + vendorHash = "sha256-Nz9Be2Slfan6FmV9/OxVh7GrLgHBhmt5nOOuXNfjy48="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix index a483513d30ef..a8454fda4239 100644 --- a/pkgs/by-name/xa/xapp/package.nix +++ b/pkgs/by-name/xa/xapp/package.nix @@ -14,6 +14,7 @@ , stdenv , vala , wrapGAppsHook3 +, file , inxi , mate , dbus @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.8.5"; + version = "2.8.6"; outputs = [ "out" "dev" ]; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-HGWaa1S+maphP9colWdWSzGyoA0f4vJkF889X5/rzvs="; + hash = "sha256-OQfP0XPBQrxJDrKb5PEqpBtinkQ35NMUbsYnxhbuehU="; }; # Recommended by upstream, which enables the build of xapp-debug. @@ -76,13 +77,18 @@ stdenv.mkDerivation rec { chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file patchShebangs schemas/meson_install_schemas.py - # Patch pastebin & inxi location - sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info - sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info + # Used in cinnamon-settings + substituteInPlace scripts/upload-system-info \ + --replace-fail "'/usr/bin/pastebin'" "'$out/bin/pastebin'" \ + --replace-fail "'inxi'" "'${inxi}/bin/inxi'" + + # Used in x-d-p-xapp + substituteInPlace scripts/xfce4-set-wallpaper \ + --replace-fail "file --mime-type" "${file}/bin/file --mime-type" ''; # Fix gtk3 module target dir. Proper upstream solution should be using define_variable. - PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib"; + env.PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib"; meta = with lib; { homepage = "https://github.com/linuxmint/xapp"; diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix index 7180e6992e91..3adb978f0d4e 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix @@ -10,17 +10,18 @@ , gsettings-desktop-schemas , mate , xdg-desktop-portal +, xapp }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-4U8d9lQxMHQ2XYXnNCQjrNup8z14Q8Ke1Bkf09AVM6k="; + hash = "sha256-9v0faB5HhUUPXOWDDyTUPaPwzMjhqdiAyuv9kM4mm2Q="; }; nativeBuildInputs = [ @@ -42,6 +43,11 @@ stdenv.mkDerivation rec { "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" ]; + preFixup = '' + # For xfce4-set-wallpaper + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ xapp ]}") + ''; + meta = with lib; { description = "Backend implementation for xdg-desktop-portal for Cinnamon, MATE, Xfce"; homepage = "https://github.com/linuxmint/xdg-desktop-portal-xapp"; diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix index 80fe7d8fc49f..94646ba66547 100644 --- a/pkgs/by-name/xe/xed-editor/package.nix +++ b/pkgs/by-name/xe/xed-editor/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - hash = "sha256-Lpdv8mX3GDzXH1FGGdmgK9b8P3EY7ETuEhGfSwc6IIE="; + hash = "sha256-hQy06+/8rJIvHK7uKyMsIMH0qAZgza/2l/hOHDMOgo4="; }; patches = [ diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index edb6d900c99a..35b722e03fac 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -16,13 +16,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-+Q/z5xrhiKTh2hVT6sdpI6sY6E7MTtTJQZBGASy5tAU="; + hash = "sha256-lldANJ4J1DrV6o9cwEmUPdbVx6edDp9GdyxdwRIS6Bs="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index e0d39956b7b5..390cd7d4bbab 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.5.6"; + version = "0.5.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-q3PAQbx3ch3Cq3634wxR1V3sLQom17V+oiJyjU2F7wY="; + hash = "sha256-RrRwtWoOqHsHa0TtQFF2QXgF0RnAe+TsG2eAjjKtE0I="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index c5b77eef9ad6..09796a6d7968 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.6.13"; + version = "0.6.16"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-5RLD3Y0DxsOSejSOPo+071hpsgoduMcLniQNqt/shs8="; + hash = "sha256-0uVOvUrBSfvD6ZU3vyuJlF3Ek9nMhvVLR5vDVyq5jbg="; }; pythonRelaxDeps = [ "pydantic" ]; diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 874e9a253244..60e2776135f1 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.9.32"; + version = "0.9.36"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-Fglvycbwrd1OTaFWZiVbEF8JC1WEogbjtxvF4FEWG5c="; + hash = "sha256-oeFJ1xfFV6PDCuQwmUfSJBU1nOdLWW6ChBH2GQ6NiXE="; }; pythonRelaxDeps = [ "typer" ]; diff --git a/pkgs/development/python-modules/aiorwlock/default.nix b/pkgs/development/python-modules/aiorwlock/default.nix index f5033ae3431e..91a492542718 100644 --- a/pkgs/development/python-modules/aiorwlock/default.nix +++ b/pkgs/development/python-modules/aiorwlock/default.nix @@ -1,24 +1,32 @@ { - buildPythonPackage, - fetchPypi, lib, + buildPythonPackage, + fetchFromGitHub, pytest-asyncio, pytestCheckHook, + poetry-core, + pythonOlder, }: buildPythonPackage rec { pname = "aiorwlock"; - version = "1.4.0"; - format = "setuptools"; + version = "1.5.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-TOpb7E6dA1M6JpGSmTlIIqFCKqUZvKndCReOxJD40cw="; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "aiorwlock"; + rev = "refs/tags/v${version}"; + hash = "sha256-QwjwuXjaxE1Y+Jzn8hJXY4wKltAT8mdOM7jJ9MF+DhA="; }; + build-system = [ poetry-core ]; + nativeCheckInputs = [ - pytestCheckHook pytest-asyncio + pytestCheckHook ]; pythonImportsCheck = [ "aiorwlock" ]; @@ -26,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Read write lock for asyncio"; homepage = "https://github.com/aio-libs/aiorwlock"; + changelog = "https://github.com/aio-libs/aiorwlock/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ billhuang ]; }; diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 942372b2f4e0..a3cb5c207feb 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2024.10.31.17"; + version = "2024.11.21.20"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-TFs71py2BonLGGJB0RoqYEOIRSEcB+eiHv8w3b0m8xU="; + hash = "sha256-Xa5eWzckhlAGyfA1c0+Cs11ClOrRfYks2mdz2wBuPyo="; }; pythonRelaxDeps = [ "typer" ]; diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index bfe12debae6a..c38f63749099 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; rev = "refs/tags/v${version}"; - hash = "sha256-acmEECW486Q1t/y+ym9giAcN7QfzU9whsHP6HImgBm0="; + hash = "sha256-iTNxD9PehYYcWlZTfIMGoon2goPac/UvCaxTrbHy+5s="; }; build-system = [ diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix index 8d86b44706c4..260ee49538cc 100644 --- a/pkgs/development/python-modules/elmax-api/default.nix +++ b/pkgs/development/python-modules/elmax-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elmax-api"; - version = "0.0.6.1"; + version = "0.0.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KMszoyeAIUyHCAuSUuCgbMos7SrQXncz38WqyPblJuE="; + hash = "sha256-71ewBzAMWncvgXII2VAcbSDwudxqA+MBCl+TCCwTxa4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/findimports/default.nix b/pkgs/development/python-modules/findimports/default.nix index 7a03e9aeea71..b7c50c85020e 100644 --- a/pkgs/development/python-modules/findimports/default.nix +++ b/pkgs/development/python-modules/findimports/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "findimports"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mgedmin"; repo = "findimports"; rev = "refs/tags/${version}"; - hash = "sha256-0HD5n9kxlXB86w8zkti6MkVZxEgGRrXzM6f+g0H/jrs="; + hash = "sha256-W4GKnIYOh3bk18yviL7GfMyXoWNLFWWDhKur9id1a78="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index e2bc68074ee4..18de6f4c4bb7 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.5.4"; + version = "2.5.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-A1C+xkQFjoEMKyz9S7T/GzZYrcznpi/9yjBmue1Ahu4="; + hash = "sha256-k+Hq3pIuh8lwyoCl1KyHLt2B3OrGzBC6XDauUfVEyd8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 86fe8a0c206f..2a8bbabe760a 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -334,12 +334,12 @@ rec { "sha256-Iwi1LaWrIytRxtW38kVnYVIXihIy5ZFhRGaGHa9X+VM="; mypy-boto3-config = - buildMypyBoto3Package "config" "1.35.0" - "sha256-1pS2EkJapoNVi5lUEftaxbdoN4fd7XSFjWyLXH1noL0="; + buildMypyBoto3Package "config" "1.35.71" + "sha256-qycjnRcrEJ2P3dpciMVFPno1wz3tEJ6pa6z8TlLwTME="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.35.68" - "sha256-GYoIg5r8ZvIbf1R/ED9FqN2GVyrtNNWF4Jxd8seFFds="; + buildMypyBoto3Package "connect" "1.35.70" + "sha256-oq3BEKupaGgOJd3zlXSaglG4SaPfRuU++XEai2N8vRs="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.35.0" @@ -446,8 +446,8 @@ rec { "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.35.67" - "sha256-lcm+V2h0cVogSktbLJd1duPUYaHvDTVKVFJIhfbbZrc="; + buildMypyBoto3Package "ec2" "1.35.70" + "sha256-k/ndrawwPWPzTNTApgpoLACNZV07LPp00SNPvemgtAE="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.35.0" @@ -558,8 +558,8 @@ rec { "sha256-dUbtx84rCJ5zRHxmdpGFAychNH/F98eviwdwqmslPLk="; mypy-boto3-fsx = - buildMypyBoto3Package "fsx" "1.35.27" - "sha256-rPVWNk0+Xt9kMAl8xD0xM/EIbiYPSUL8Yc8b+2RcD4o="; + buildMypyBoto3Package "fsx" "1.35.71" + "sha256-niDZs6XFOHHFSVxFNNbHqTeEiFqIpAYrOSd/A0I/FbI="; mypy-boto3-gamelift = buildMypyBoto3Package "gamelift" "1.35.59" diff --git a/pkgs/development/python-modules/rawpy/default.nix b/pkgs/development/python-modules/rawpy/default.nix new file mode 100644 index 000000000000..6931b96afcf9 --- /dev/null +++ b/pkgs/development/python-modules/rawpy/default.nix @@ -0,0 +1,90 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython, + setuptools, + + # nativeBuildInputs + pkg-config, + + # buildInputs + libraw, + + # dependencies + numpy, + + # tests + imageio, + pytestCheckHook, + scikit-image, +}: + +buildPythonPackage rec { + pname = "rawpy"; + version = "0.23.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "letmaik"; + repo = "rawpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-s7/YbD5Jy9Jzry817djG63Zs4It8b1S95qmcJgPYGZQ="; + }; + + build-system = [ + cython + numpy + setuptools + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libraw + ]; + + dependencies = [ + numpy + ]; + + env = { + RAWPY_USE_SYSTEM_LIBRAW = 1; + }; + + pythonImportsCheck = [ + "rawpy" + "rawpy._rawpy" + ]; + + # Delete the source files to load the library from the installed folder instead of the source files + preCheck = '' + rm -rf rawpy + ''; + + nativeCheckInputs = [ + imageio + pytestCheckHook + scikit-image + ]; + + disabledTests = [ + # rawpy._rawpy.LibRawFileUnsupportedError: b'Unsupported file format or not RAW file' + "testFoveonFileOpenAndPostProcess" + "testThumbExtractBitmap" + ]; + + meta = { + description = "RAW image processing for Python, a wrapper for libraw"; + homepage = "https://github.com/letmaik/rawpy"; + license = with lib.licenses; [ + lgpl21Only + mit + ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index 9095dcb7ae7f..14b8ff40533a 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -1,8 +1,11 @@ { lib, + apple-sdk_11, buildPythonPackage, + darwinMinVersionHook, fetchFromGitHub, pythonOlder, + stdenv, # build-system cmake, @@ -60,7 +63,13 @@ buildPythonPackage rec { typing-extensions ]; - buildInputs = [ libsoxr ]; + buildInputs = + [ libsoxr ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer + (darwinMinVersionHook "10.13") + apple-sdk_11 + ]; dependencies = [ numpy ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index e1a505704dba..3e621c2a2a6d 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1272"; + version = "3.0.1273"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-J6W4czmoxxdEudKoeqEH57vNBb2fEyqYU2LAiYTBq40="; + hash = "sha256-VuclFe6Msa4vll2X82a1LeKnq28H6xy+HYV3mLKu/jQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/os-specific/darwin/discrete-scroll/default.nix b/pkgs/os-specific/darwin/discrete-scroll/default.nix deleted file mode 100644 index f38bf8d81322..000000000000 --- a/pkgs/os-specific/darwin/discrete-scroll/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, Cocoa }: - -## after launching for the first time, grant access for parent application (e.g. Terminal.app) -## from 'system preferences >> security & privacy >> accessibility' -## and then launch again - -stdenv.mkDerivation rec { - pname = "discrete-scroll"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "emreyolcu"; - repo = "discrete-scroll"; - rev = "v${version}"; - sha256 = "0aqkp4kkwjlkll91xbqwf8asjww8ylsdgqvdk8d06bwdvg2cgvhg"; - }; - - buildInputs = [ Cocoa ]; - - buildPhase = '' - cc -std=c99 -O3 -Wall -framework Cocoa -o dc DiscreteScroll/main.m - ''; - - installPhase = '' - mkdir -p $out/bin - cp ./dc $out/bin/discretescroll - ''; - - meta = with lib; { - description = "Fix for OS X's scroll wheel problem"; - homepage = "https://github.com/emreyolcu/discrete-scroll"; - platforms = platforms.darwin; - license = licenses.mit; - maintainers = with lib.maintainers; [ bb2020 ]; - }; -} diff --git a/pkgs/tools/misc/pandoc-include/default.nix b/pkgs/tools/misc/pandoc-include/default.nix index a0ee1da6c811..74e24926be3b 100644 --- a/pkgs/tools/misc/pandoc-include/default.nix +++ b/pkgs/tools/misc/pandoc-include/default.nix @@ -10,14 +10,14 @@ buildPythonApplication rec { pname = "pandoc-include"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "DCsunset"; repo = "pandoc-include"; rev = "refs/tags/v${version}"; - hash = "sha256-rhA+mPjwMoWwX0VIoSZ3aRmlgUy88eGyjSuM3BhyAAQ="; + hash = "sha256-UUjQA2QYz9QqMek29vGGBMLMahZx2sJ4RfXcxz+b194="; }; build-system = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b088f38c580..7e806f98b32b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11731,6 +11731,10 @@ with pkgs; jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; + kanidmWithSecretProvisioning = callPackage ../by-name/ka/kanidm/package.nix { + enableSecretProvisioning = true; + }; + knot-resolver = callPackage ../servers/dns/knot-resolver { systemd = systemdMinimal; # in closure already anyway }; @@ -16865,8 +16869,6 @@ with pkgs; factorio-space-age-experimental = factorio.override { releaseType = "expansion"; experimental = true; }; - factorio-mods = callPackage ../by-name/fa/factorio/mods.nix { }; - factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { }; ferium = callPackage ../games/ferium { diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index 6fafa5f487c4..768e908a361c 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -59,6 +59,10 @@ mapAliases ({ cctools-llvm = pkgs.cctools; # added 2024-07-01 cctools-port = pkgs.cctools; # added 2024-07-17 + ### D ### + + discrete-scroll = pkgs.discrete-scroll; # added 2024-11-27 + ### I ### insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04 diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index ab8d9c387b40..9c9cb9043591 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -239,8 +239,6 @@ impure-cmds // apple-source-packages // apple-source-headers // stubs // { ios-deploy = callPackage ../os-specific/darwin/ios-deploy {}; - discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { }; - # See doc/packages/darwin-builder.section.md linux-builder = lib.makeOverridable ({ modules }: let diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f6ff72f5d2d..c5065e4563a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13666,6 +13666,8 @@ self: super: with self; { rawkit = callPackage ../development/python-modules/rawkit { }; + rawpy = callPackage ../development/python-modules/rawpy { }; + ray = callPackage ../development/python-modules/ray { }; raylib-python-cffi = callPackage ../development/python-modules/raylib-python-cffi {};