diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9e4cf010da5e..96cab56ec2b1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6044,6 +6044,12 @@ githubId = 2025623; name = "Luc Chabassier"; }; + dwrege = { + email = "email@dwrege.de"; + github = "dominicwrege"; + githubId = 7389000; + name = "Dominic Wrege"; + }; dxf = { email = "dingxiangfei2009@gmail.com"; github = "dingxiangfei2009"; @@ -23060,6 +23066,12 @@ githubId = 2856634; name = "Tyler Compton"; }; + venikx = { + email = "code@venikx.com"; + github = "venikx"; + githubId = 24815061; + name = "Kevin De Baerdemaeker"; + }; veprbl = { email = "veprbl@gmail.com"; github = "veprbl"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 4a6bf60a6c24..ab018c6ac5aa 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -900,7 +900,9 @@ - `freecad` now supports addons and custom configuration in nix-way, which can be used by calling `freecad.customize`. -## Detailed Migration Information {#sec-release-24.11-migration} +- `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. + +## Detailed migration information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} diff --git a/nixos/modules/programs/obs-studio.nix b/nixos/modules/programs/obs-studio.nix index ee9ec520d1fb..b2a56ea61a6e 100644 --- a/nixos/modules/programs/obs-studio.nix +++ b/nixos/modules/programs/obs-studio.nix @@ -12,10 +12,13 @@ in options.programs.obs-studio = { enable = lib.mkEnableOption "Free and open source software for video recording and live streaming"; - package = lib.mkPackageOption pkgs "obs-studio" { example = "obs-studio"; }; + package = lib.mkPackageOption pkgs "obs-studio" { + nullable = true; + example = "obs-studio"; + }; finalPackage = lib.mkOption { - type = lib.types.package; + type = lib.types.nullOr lib.types.package; visible = false; readOnly = true; description = "Resulting customized OBS Studio package."; @@ -39,11 +42,16 @@ in }; config = lib.mkIf cfg.enable { - programs.obs-studio.finalPackage = pkgs.wrapOBS.override { obs-studio = cfg.package; } { - plugins = cfg.plugins; + assertions = lib.singleton { + assertion = cfg.package == null -> cfg.plugins == [ ]; + message = "Plugins cannot be set if package is null"; }; - environment.systemPackages = [ cfg.finalPackage ]; + programs.obs-studio.finalPackage = lib.mapNullable ( + obs-studio: pkgs.wrapOBS.override { inherit obs-studio; } { plugins = cfg.plugins; } + ) cfg.package; + + environment.systemPackages = lib.optional (cfg.finalPackage != null) cfg.finalPackage; boot = lib.mkIf cfg.enableVirtualCamera { kernelModules = [ "v4l2loopback" ]; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 6079062db6c3..41c099cd130c 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -38,9 +38,6 @@ let description = '' List of address ranges allowed to query this zone. Instead of the address(es), this may instead contain the single string "any". - - NOTE: This overrides the global-level `allow-query` setting, which is set to the contents - of `cachenetworks`. ''; default = [ "any" ]; }; @@ -65,7 +62,7 @@ let options { listen-on { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOn} }; listen-on-v6 { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6} }; - allow-query { cachenetworks; }; + allow-query-cache { cachenetworks; }; blackhole { badnetworks; }; forward ${cfg.forward}; forwarders { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.forwarders} }; diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index 76c6ee7a052c..5df6d56dd601 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -17,7 +17,7 @@ in meta = { description = "Fork of Firefox, focused on privacy, security and freedom"; homepage = "https://librewolf.net/"; - maintainers = with lib.maintainers; [ squalus ]; + maintainers = with lib.maintainers; [ squalus dwrege ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index ebb27eaba0c4..31127855da56 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "132.0.1", + "packageVersion": "132.0.1-1", "source": { - "rev": "132.0.1", - "sha256": "hjtzX6jMJh1pnnO6WsLiOqwfpVYmCTZcEEXAmdBm180=" + "rev": "132.0.1-1", + "sha256": "qqwuqEw5wfUvOukdhUivTLbER0R7Ohscix791vAt73E=" }, "firefox": { - "version": "132.0", - "sha512": "JU/7oW1ubGHP+qgTH4Gpp4iA5XI7fueKw2JRon2C5v8IgjiuKJ0HRpujpRtbWWmgjs0fwC3LTZMyWgj6wc/JFg==" + "version": "132.0.1", + "sha512": "ENWwX2Fijeuaacs0ss88dbtrh2j1pxjO8hV9X+sWce3g1YNDlWLhwSIZFOtu03/fQV3WUbFGXAVr4XQTbNgLnQ==" } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c6d2412ceea0..7269935f2936 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -750,13 +750,13 @@ "vendorHash": "sha256-UXX7jnphsPq25dSkcVT5McV6/FcD99wEhPzazsgKTTA=" }, "linuxbox": { - "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", + "hash": "sha256-+8Wyrb/AjzpfhDK42ze0HBIAdGvtJUFEIpYZs7uOym4=", "homepage": "https://registry.terraform.io/providers/numtide/linuxbox", "owner": "numtide", "repo": "terraform-provider-linuxbox", - "rev": "v0.4.3", + "rev": "v0.5.6", "spdx": "BSD-3-Clause", - "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" + "vendorHash": "sha256-GxMCY/udIy3c7zLeNeghXtfCUw4+Ll83L/40N4/yVh8=" }, "local": { "hash": "sha256-BwbKkChQFtNHr/UwMNWGD/KU82vxlcXNaRWrsyzYrRg=", @@ -1373,13 +1373,13 @@ "vendorHash": "sha256-SF11E60OQiRdf+Pf6XyJg60yGRnGOcSzhrYccrWaeYE=" }, "vpsadmin": { - "hash": "sha256-MFEerVGKros+9zubcjK8qUpYQveKuBgbfyai32Y0KLI=", + "hash": "sha256-kkH+VUfh5TsjCOQWnpTn4++ZhpBw/rF2pQI5ITA0jlE=", "homepage": "https://registry.terraform.io/providers/vpsfreecz/vpsadmin", "owner": "vpsfreecz", "repo": "terraform-provider-vpsadmin", - "rev": "v1.0.0", + "rev": "v1.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" + "vendorHash": "sha256-intukvmxiczvE3DmstYeNhgHgk3Dk/1wp11XrC0JDhE=" }, "vra7": { "hash": "sha256-KzxthTn3z0kZTUTKO8zq6DaNMTnfb7gFlbuWgxZtqwo=", diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix index 8f3eabb7bc27..7a047df74241 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.23.0"; + version = "7.33.0"; url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; - hash = "sha256-fQb2nYE1+q6DNcMF0z5NadGlffYaCFNgcu8IIGVUtf8="; + hash = "sha256-2PwEPwQkoNrnSI00CVeTjF7QvxQb9NxQqrcOVisWwFU="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix index ff5137debe39..2f7258717b57 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "signal-desktop"; - version = "7.29.0"; + version = "7.33.0"; src = fetchurl { url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg"; - hash = "sha256-R/NYPb7bvLbyDYntw2K75SC1/sqNO7HAJ3QUwGThvUg="; + hash = "sha256-kq4HkLlTWTE8CLPnZ0o4XYDUC0n5LmgJiGdiIDTtdTI="; }; sourceRoot = "."; diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch index 7b6d1d90f3e9..e19711b706e4 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch @@ -12,7 +12,7 @@ endif --- a/sc/qa/extras/vba-macro-test.cxx +++ b/sc/qa/extras/vba-macro-test.cxx -@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) +@@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) // Failed: : Test change event for Range.FillRight: // Tests passed: 4 // Tests failed: 4 @@ -32,10 +32,21 @@ m_pDoc->InsertTab(0, u"Formula"_ustr); sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. +--- a/sw/qa/extras/layout/layout.cxx ++++ b/sw/qa/extras/layout/layout.cxx +@@ -1347,6 +1347,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader) + #if !defined(MACOSX) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf150606) + { ++ return; // flaky ++ + createSwDoc("tdf150606-1-min.odt"); + + SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); --- a/sw/qa/extras/layout/layout3.cxx +++ b/sw/qa/extras/layout/layout3.cxx -@@ -3039,6 +3041,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL) - +@@ -3354,6 +3354,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) { + return; // requests Noto Sans Hebrew with charset=28, which the font does not have @@ -44,8 +55,8 @@ // Verify that line breaking a first bidi portion correctly underflows in LTR text createSwDoc("tdf56408-ltr.fodt"); auto pXmlDoc = parseLayoutDump(); -@@ -3053,6 +3058,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) - +@@ -3368,6 +3371,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) { + return; // same Noto Sans Hebrew issue @@ -53,8 +64,17 @@ // Verify that line breaking a first bidi portion correctly underflows in RTL text createSwDoc("tdf56408-rtl.fodt"); auto pXmlDoc = parseLayoutDump(); -@@ -3083,6 +3090,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) - +@@ -3382,6 +3387,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) + { ++ return; // same Noto Sans Hebrew issue ++ + // The fix for tdf#56408 introduced a change to line breaking between text with + // direction changes. This test verifies behavior in the trivial case, when a + // break opportunity exists at the direction change boundary. +@@ -3398,6 +3405,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash) { + return; // same Noto Sans Hebrew issue @@ -62,8 +82,8 @@ // Verify there is no crash/assertion for underflow after a number field createSwDoc("tdf56408-after-field.fodt"); } -@@ -3121,6 +3130,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081) - +@@ -3436,6 +3445,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) { + return; // same Noto Sans Hebrew issue @@ -71,8 +91,8 @@ // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions createSwDoc("tdf157829-ltr.fodt"); auto pXmlDoc = parseLayoutDump(); -@@ -3135,6 +3146,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) - +@@ -3450,6 +3461,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL) { + return; // same Noto Sans Hebrew issue @@ -82,7 +102,7 @@ auto pXmlDoc = parseLayoutDump(); --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -4230,6 +4232,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) +@@ -4091,6 +4091,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) // toggling Formatting Marks on/off for one view should have no effect on other views CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) { @@ -90,4 +110,4 @@ + SwXTextDocument* pXTextDocument = createDoc(); int nView1 = SfxLokHelper::getView(); - + diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index a2876c9cd294..bfcb4b419add 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.10.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.10.1.tar.xz"; - sha256 = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee"; + name = "curl-8.11.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.11.0.tar.xz"; + sha256 = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb"; md5 = ""; - md5name = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee-curl-8.10.1.tar.xz"; + md5name = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb-curl-8.11.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -147,11 +147,11 @@ md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.6.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.3.tar.xz"; - sha256 = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc"; + name = "expat-2.6.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz"; + sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee"; md5 = ""; - md5name = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc-expat-2.6.3.tar.xz"; + md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -224,18 +224,18 @@ md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; } { - name = "NotoSans-v2.013.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSans-v2.013.zip"; - sha256 = "9fd595dd701d7ea103a9ba8a9cfdcf0c35c5574ef754fecabe718eadad8bccde"; + name = "NotoSans-v2.014.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSans-v2.014.zip"; + sha256 = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1"; md5 = ""; - md5name = "9fd595dd701d7ea103a9ba8a9cfdcf0c35c5574ef754fecabe718eadad8bccde-NotoSans-v2.013.zip"; + md5name = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1-NotoSans-v2.014.zip"; } { - name = "NotoSerif-v2.013.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.013.zip"; - sha256 = "fb4c6c75f10365f63b5c8ad5a1864ebe46dd0c70c40d0461cb0dc1b1b7c13a35"; + name = "NotoSerif-v2.014.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.014.zip"; + sha256 = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3"; md5 = ""; - md5name = "fb4c6c75f10365f63b5c8ad5a1864ebe46dd0c70c40d0461cb0dc1b1b7c13a35-NotoSerif-v2.013.zip"; + md5name = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3-NotoSerif-v2.014.zip"; } { name = "NotoSerifHebrew-v2.004.zip"; @@ -882,11 +882,11 @@ md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { - name = "libvisio-0.1.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; - sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; + name = "libvisio-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz"; + sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b"; md5 = ""; - md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; + md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index 2544928cdde9..9e0d85a01d75 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1xlfs1380h9axqx37kp9nwq4bwlg08rm136ayzglaz57vx87vxsg"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-help-24.8.2.1.tar.xz"; + sha256 = "04z77jzn816r19ig54fhl0p1arh3fpamn5bh2wc2v17rz73chp8y"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-help-24.8.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index 6bda045c5779..871d41255bb9 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1ky4ph9g7x9k68px6x4dgfnf5wqbxqabkp75pjhsj521nsp1nc5b"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-24.8.2.1.tar.xz"; + sha256 = "1sa7bxxh7v26p77vj1mspynhn2l2b1vnz1mpyczhnmcxcan9nw2x"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-24.8.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index 488ee5acfe1c..cdc786d80e6a 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1yvfcwj9dr2216b9fyi89849jy4lw3jg2yqrx4dm30qdn07jqf3j"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-translations-24.8.2.1.tar.xz"; + sha256 = "11qwbkn2i84g439ya5fw5by7wf4c8rs7is4k2v7yijpngrp9370a"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-translations-24.8.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 7e7df1e016ec..42484acdfd9c 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"24.8.2.1" +"24.8.3.2" diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix index 1188c115dafd..317a2ec79163 100644 --- a/pkgs/by-name/ba/badger/package.nix +++ b/pkgs/by-name/ba/badger/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "badger"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "badger"; rev = "v${version}"; - hash = "sha256-Kzhua1nF9Y0j6Ez35ucKdYMRR46yEwM0pJ8P6A7pUrw="; + hash = "sha256-2d+OnSEERWx2JNYawbnuorBl6uIIoi2oO5n7uCsUzFo="; }; - vendorHash = "sha256-A9rMLWjCpM9VrXmWXNo/mZbGCBKrakxbjthVOl2aDa4="; + vendorHash = "sha256-iaTR7V8l66BEadAiCftUZy7Gr+fdLRNnvBbtwdU/m/k="; subPackages = [ "badger" ]; diff --git a/pkgs/by-name/ex/excalidraw_export/package.nix b/pkgs/by-name/ex/excalidraw_export/package.nix new file mode 100644 index 000000000000..e265af7ed94b --- /dev/null +++ b/pkgs/by-name/ex/excalidraw_export/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + cairo, + pango, + pkg-config, + stdenv, +}: + +buildNpmPackage rec { + pname = "excalidraw_export"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "Timmmm"; + repo = "excalidraw_export"; + rev = "320c8be92f468e5e19564f83e37709b80afc0e46"; + hash = "sha256-E5kYI8+hzObd2WNVBd0aQDKMH1Sns539loCQfClJs1Q="; + }; + + npmDepsHash = "sha256-5yec7BCi1c/e+y00TqxIeoazs49+WdKdfsskAqnVkFs="; + + npmBuildScript = "compile"; + + buildInputs = [ + cairo + pango + ]; + nativeBuildInputs = [ pkg-config ]; + + meta = { + description = "CLI to export Excalidraw drawings to SVG and PDF"; + homepage = "https://github.com/Timmmm/excalidraw_export"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ venikx ]; + mainProgram = "excalidraw_export"; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/by-name/go/goimports-reviser/package.nix b/pkgs/by-name/go/goimports-reviser/package.nix index b7bdf8632164..8541434b6826 100644 --- a/pkgs/by-name/go/goimports-reviser/package.nix +++ b/pkgs/by-name/go/goimports-reviser/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goimports-reviser"; - version = "3.6.5"; + version = "3.7.4"; src = fetchFromGitHub { owner = "incu6us"; repo = "goimports-reviser"; rev = "v${version}"; - hash = "sha256-46s6A1sGqoJR3XihaCkVCxTpManl330mMcJ8hv66zDc="; + hash = "sha256-1lI8KAzu9Bg1099E/h+NCDdiRINhPP93FZvWm4y6nas="; }; vendorHash = "sha256-z+FeAXPXKi653im2X2WOP1R9gRl/x7UBnndoEXoxdwA="; diff --git a/pkgs/by-name/go/gossa/package.nix b/pkgs/by-name/go/gossa/package.nix index 0a4073781434..a19ae4672f9b 100644 --- a/pkgs/by-name/go/gossa/package.nix +++ b/pkgs/by-name/go/gossa/package.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "gossa"; - version = "1.0.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "pldubouilh"; repo = "gossa"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-vonhVxXbYI/5Gl9ZwI8+a3YXSjoqLVic1twykiy+e34="; + hash = "sha256-FGlUj0BJ8KeCfvdN9+NG4rqtaUIxgpqQ+09Ie1/TpAQ="; }; vendorHash = null; diff --git a/pkgs/by-name/ha/harsh/package.nix b/pkgs/by-name/ha/harsh/package.nix index a2ba9a1bfd0f..fbc8175619c1 100644 --- a/pkgs/by-name/ha/harsh/package.nix +++ b/pkgs/by-name/ha/harsh/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "harsh"; - version = "0.10.2"; + version = "0.10.4"; src = fetchFromGitHub { owner = "wakatara"; repo = pname; rev = "v${version}"; - hash = "sha256-XkOdW6ewout69A1ovth1iQR36nRtkdsbDI9CWibSHXs="; + hash = "sha256-njFKmskbOvsIqtakOEvHZS20WSQTXtk+1u6N0Av/uXI="; }; - vendorHash = "sha256-4Sa8/mVD7t4uR8Wq4n+fvot7LZfraphFobrG6rteQeI="; + vendorHash = "sha256-hdPkiF1HHuIl6KbilPre6tAqSnYPhYhrxBEj3Ayy2AY="; meta = with lib; { description = "CLI habit tracking for geeks"; diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index ed78d69b6b0d..76ca03ac42d1 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "havn"; - version = "0.1.13"; + version = "0.1.16"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; rev = "refs/tags/v${version}"; - hash = "sha256-z6505lMqNQ0FpMMRJwpOFodELfDeoIjrjG58mrfSvTY="; + hash = "sha256-6fj/RtHqZihhqK+qzGNOouLOrydP5bnylBIhOWJ7fuQ="; }; - cargoHash = "sha256-RzfIu2apaFacSJz29UTaCKcC7Y81uxj1EerVyxZB50E="; + cargoHash = "sha256-hV2HxgksFj80eDNAAbxJcMpjX58yCkk6xS+gv2on9YA="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/by-name/ht/httpdirfs/package.nix b/pkgs/by-name/ht/httpdirfs/package.nix index d74535bfdabd..bf7c8ced2606 100644 --- a/pkgs/by-name/ht/httpdirfs/package.nix +++ b/pkgs/by-name/ht/httpdirfs/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "httpdirfs"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "fangfufu"; repo = "httpdirfs"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-4Tp9DTYWUHElO0YNeINgzmbI0tpXxmKfZ1Jhz5UYn5M="; + hash = "sha256-6TGptKWX0hSNL3Z3ioP7puzozWLiMhCybN7hATQdD/k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index 37efd4bea5e4..527dcafd5669 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-SO/9G2h5nXCnMahTP9m46eqsu0Lr8A60Fhc0ABkx0Y0="; + hash = "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 994cac355cca..4c248a807b4e 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "manifold"; - version = "2.5.1-unstable-2024-11-08"; + version = "3.0.0"; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; - rev = "66bca6e3fdfce0f590ca84edc1a6256502636f4b"; - hash = "sha256-XgmJtkBf5SOgvtwU2x1cJLjEQKEmKnB40oIaoYrUYEQ="; + rev = "v${finalAttrs.version}"; + hash = "sha256-02bZAPA4mnWzS9NYVcSW0JE7BidrwzNKBO2nl7BxiiE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 18e8e2546d93..83823e63386c 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "microfetch"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "NotAShelf"; repo = "microfetch"; rev = "refs/tags/v${version}"; - hash = "sha256-bRN16Iq9m6HaeT+KWCpeukTu1tnMOvtM6lDHO5OiIS4="; + hash = "sha256-mK1sBcTieMjYneMhkuxoOt5+fELcyjH9+SQpzs7542Y="; }; - cargoHash = "sha256-dGlAiPrOWFI8ogo/1S2ZK/ZPBtKGCyA72B+6B4bp5Mg="; + cargoHash = "sha256-LEw7z73Jm7/mJomN6yy87iCFauXifA+vffn/drXwqpY="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix index a401438a0dca..b3b81b100680 100644 --- a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix +++ b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-dock-hyprland"; rev = "refs/tags/v${version}"; - hash = "sha256-Vp8JmRQf71vezdknzifxlK7zTlorwiEHsyXpmy6mxIE="; + hash = "sha256-pSkA4N/scVZgRQ2NL8iUUq7DmAhXVNS2o4lqDZDELE0="; }; - vendorHash = "sha256-RBU0l4YRtV5JPH1dLT+lZ05jmxRwyn3glMUKHw1Eg8g="; + vendorHash = "sha256-FBuk6qNfJ7mVzKoD6Q/O8zo+AfAPUyXExlLu5uGbHBk="; ldflags = [ "-s" diff --git a/pkgs/by-name/pr/proxsuite-nlp/package.nix b/pkgs/by-name/pr/proxsuite-nlp/package.nix index 194ff2fe967d..f522a4c9618a 100644 --- a/pkgs/by-name/pr/proxsuite-nlp/package.nix +++ b/pkgs/by-name/pr/proxsuite-nlp/package.nix @@ -4,7 +4,6 @@ eigenrand, example-robot-data, fetchFromGitHub, - fetchpatch, fmt, fontconfig, graphviz, @@ -19,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxsuite-nlp"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "proxsuite-nlp"; rev = "v${finalAttrs.version}"; - hash = "sha256-Dy8+pPTv/B6vVdpGndVOV16WSLiENJfaIrn1+FYwcI0="; + hash = "sha256-JWMvPIxmZ5vSVS3nSlhFyNu8hLSVTc7Hdvd4YmE/pI8="; }; outputs = [ @@ -33,15 +32,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Fix use of system jrl-cmakemodules - # This patch was merged upstream and can be removed on next release - (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite-nlp/pull/109/commits/9bf741ce6010052a773071472891f42adc6cbbea.patch"; - hash = "sha256-sluMVrTw7EXLFa0dqkoZTkpGjKe7zODqIqbJxCdfSwY="; - }) - ]; - nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix index 054a26f9e394..374e52b7ebcc 100644 --- a/pkgs/by-name/sa/saunafs/package.nix +++ b/pkgs/by-name/sa/saunafs/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "saunafs"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "leil-io"; repo = "saunafs"; rev = "v${finalAttrs.version}"; - hash = "sha256-oMFS5eNNzCpaineCLn0hh3bXGw3SNdj+Pdvk3pevIZg="; + hash = "sha256-uPHgyCL4/HYjoIm1Ev5p7lXAf1KlpV/OAqLVhu5Ang4="; }; patches = [ diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix index 0ace1d81a2a5..b5efa10f1fc6 100644 --- a/pkgs/by-name/sq/sqldef/package.nix +++ b/pkgs/by-name/sq/sqldef/package.nix @@ -2,29 +2,29 @@ buildGoModule rec { pname = "sqldef"; - version = "0.17.20"; + version = "0.17.23"; src = fetchFromGitHub { - owner = "k0kubun"; + owner = "sqldef"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-r175nhzPLoU4CBjEiktsQIuQTgRJ64uW1MhDKHEDR+4="; + hash = "sha256-hknfPVOtxs2Hv4GrbIM1tyrmJHWnK86qdD1FQUmpk10="; }; proxyVendor = true; - vendorHash = "sha256-reYZUuZTNeNFrbrDQPVXwx+UuBGdEmTdSowbneZc/No="; + vendorHash = "sha256-N9+theiJnDP8Nbe0pcEPpjYcy2YVyueF8Q2bdLCCbEc="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; # The test requires a running database doCheck = false; - meta = with lib; { + meta = { description = "Idempotent SQL schema management tool"; - license = with licenses; [ mit /* for everything except parser */ asl20 /* for parser */ ]; - homepage = "https://github.com/k0kubun/sqldef"; - changelog = "https://github.com/k0kubun/sqldef/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ kgtkr ]; + license = with lib.licenses; [ mit /* for everything except parser */ asl20 /* for parser */ ]; + homepage = "https://github.com/sqldef/sqldef"; + changelog = "https://github.com/sqldef/sqldef/blob/v${version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ kgtkr ]; }; } diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix new file mode 100644 index 000000000000..44a64a6ec318 --- /dev/null +++ b/pkgs/by-name/ti/tideways-cli/package.nix @@ -0,0 +1,90 @@ +{ + stdenvNoCC, + lib, + fetchurl, + curl, + common-updater-scripts, + writeShellApplication, + gnugrep, + installShellFiles, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "tideways-cli"; + version = "1.2.2"; + + nativeBuildInputs = [ installShellFiles ]; + + src = + finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} + or (throw "Unsupported platform for tideways-cli: ${stdenvNoCC.hostPlatform.system}"); + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp tideways $out/bin/tideways + chmod +x $out/bin/tideways + + installShellCompletion --cmd tideways \ + --bash <($out/bin/tideways completion bash) \ + --zsh <($out/bin/tideways completion zsh) \ + --fish <($out/bin/tideways completion fish) + + runHook postInstall + ''; + + passthru = { + sources = { + "x86_64-linux" = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz"; + hash = "sha256-g06PE464P/A0PDGG7xMa644ztcIRMAU/ueee2IOhiHc="; + }; + "aarch64-linux" = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz"; + hash = "sha256-nbC9vMXA5vHKxEpINDQJTUqh7YOe0T0x5MbbQg03gk4="; + }; + "x86_64-darwin" = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz"; + hash = "sha256-RfCTl61r/zfWy/3W+zmrSaAjIWe52POfZnzsmm5loD4="; + }; + "aarch64-darwin" = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz"; + hash = "sha256-4N4hUvbf8b9BnKUY4YTsB76Z35DmSTyWv6BC+bqJNCI="; + }; + }; + + updateScript = "${ + writeShellApplication { + name = "update-tideways-cli"; + runtimeInputs = [ + curl + gnugrep + common-updater-scripts + ]; + text = '' + NEW_VERSION=$(curl --fail -L -s https://tideways.com/profiler/downloads | grep -E 'https://tideways.s3.amazonaws.com/cli/([0-9]+\.[0-9]+\.[0-9]+)/tideways-cli_linux_amd64-\1.tar.gz' | grep -oP 'cli/\K[0-9]+\.[0-9]+\.[0-9]+') + + if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then + echo "The new version same as the old version." + exit 0 + fi + + for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do + update-source-version "tideways-cli" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" + done + ''; + } + }/bin/update-tideways-cli"; + }; + + meta = with lib; { + description = "Tideways Profiler CLI"; + homepage = "https://tideways.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "tideways"; + license = licenses.unfree; + maintainers = with maintainers; [ shyim ]; + platforms = lib.attrNames finalAttrs.passthru.sources; + }; +}) diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix new file mode 100644 index 000000000000..0a76c2dba528 --- /dev/null +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -0,0 +1,75 @@ +{ + stdenvNoCC, + lib, + fetchurl, + curl, + common-updater-scripts, + writeShellApplication, + gnugrep, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "tideways-daemon"; + version = "1.9.18"; + + src = + finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} + or (throw "Unsupported platform for tideways-cli: ${stdenvNoCC.hostPlatform.system}"); + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp tideways-daemon $out/bin/tideways-daemon + chmod +x $out/bin/tideways-daemon + runHook postInstall + ''; + + passthru = { + sources = { + "x86_64-linux" = fetchurl { + url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; + hash = "sha256-CFVHD2CfY1yOP621PzkflvapCrIuqY0rtTgm20xW41E="; + }; + "aarch64-linux" = fetchurl { + url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; + hash = "sha256-59quxF5rClfw8xd8mT2jU1/DVatrZyJw7Rj6pikKXF0="; + }; + "aarch64-darwin" = fetchurl { + url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; + hash = "sha256-4h7Vn9s8Y63M1BnzwjcxSV8ydRqhNeJnFvG9Cs1Cq8Q="; + }; + }; + updateScript = "${ + writeShellApplication { + name = "update-tideways-daemon"; + runtimeInputs = [ + curl + gnugrep + common-updater-scripts + ]; + text = '' + NEW_VERSION=$(curl --fail -L -s https://tideways.com/profiler/downloads | grep -E 'https://tideways.s3.amazonaws.com/daemon/([0-9]+\.[0-9]+\.[0-9]+)/tideways-daemon_linux_amd64-\1.tar.gz' | grep -oP 'daemon/\K[0-9]+\.[0-9]+\.[0-9]+') + + if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then + echo "The new version same as the old version." + exit 0 + fi + + for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do + update-source-version "tideways-daemon" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" + done + ''; + } + }/bin/update-tideways-daemon"; + }; + + meta = with lib; { + description = "Tideways Daemon"; + homepage = "https://tideways.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "tideways-daemon"; + license = licenses.unfree; + maintainers = with maintainers; [ shyim ]; + platforms = lib.attrNames finalAttrs.passthru.sources; + }; +}) diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix index 9436e2a8d5f4..901afe1da275 100644 --- a/pkgs/by-name/vi/viddy/package.nix +++ b/pkgs/by-name/vi/viddy/package.nix @@ -6,31 +6,31 @@ rustPlatform.buildRustPackage rec { pname = "viddy"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "sachaos"; repo = "viddy"; rev = "v${version}"; - hash = "sha256-r+zgZutBwNRLYNltdSaIB5lS4qHAhI5XL3iFF+FVd64="; + hash = "sha256-lk992sI5kXo5Q8+rgBCKo/knV3/6uPs83Zj27JQcR6M="; }; - cargoHash = "sha256-rEz3GFfqtSzZa0r4Nwbu3gEf7GhsOkfawaFaNplD/tE="; + cargoHash = "sha256-9xXUlsRGKw0rvIYAr4pMDh6oD/ZjBYPaL0g6dCC5sCo="; # requires nightly features env.RUSTC_BOOTSTRAP = 1; - env.VERGEN_BUILD_DATE = "2024-10-13"; # managed via the update script + env.VERGEN_BUILD_DATE = "2024-11-16"; # managed via the update script env.VERGEN_GIT_DESCRIBE = "Nixpkgs"; passthru.updateScript.command = [ ./update.sh ]; - meta = with lib; { + meta = { description = "Modern watch command, time machine and pager etc."; changelog = "https://github.com/sachaos/viddy/releases"; homepage = "https://github.com/sachaos/viddy"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ j-hui phanirithvij ]; diff --git a/pkgs/by-name/vi/viddy/update.sh b/pkgs/by-name/vi/viddy/update.sh index ae1586d7e00d..cae2ff9ac2a6 100755 --- a/pkgs/by-name/vi/viddy/update.sh +++ b/pkgs/by-name/vi/viddy/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash nix-update curl coreutils jq common-updater-scripts nix-prefetch +#!nix-shell -i bash -p bash nix-update curl coreutils jq +# shellcheck shell=bash # adapted from pkgs/by-name/ya/yazi-unwrapped/update.sh @@ -28,17 +29,12 @@ if [[ "$oldVersion" == "$latestVersion" ]]; then exit 0 fi -echo "Updating viddy" +echo "Updating viddy $oldVersion -> $latestVersion" -# Version -update-source-version viddy "${latestVersion}" +# nix-prefetch broken due to ninja finalAttrs.src.rev +nix-update viddy --version "$latestVersion" -pushd "$SCRIPT_DIR" # Build date -sed -i 's#env.VERGEN_BUILD_DATE = "[^"]*"#env.VERGEN_BUILD_DATE = "'"${latestBuildDate}"'"#' package.nix +sed -i 's#env.VERGEN_BUILD_DATE = "[^"]*"#env.VERGEN_BUILD_DATE = "'"${latestBuildDate}"'"#' "$SCRIPT_DIR/package.nix" + -# Hashes -# https://github.com/msteen/nix-prefetch/issues/51 -cargoHash=$(nix-prefetch --option extra-experimental-features flakes "{ sha256 }: (import $NIXPKGS_DIR {}).viddy.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") -sed -i -E 's#\bcargoHash = ".*?"#cargoHash = "'"$cargoHash"'"#' package.nix -popd diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index f6bd304bbfc0..9a20aa7a9906 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-e7XjiqOxa0UtqUOfbsUiF497sOPgQd+lc93ARearXTw="; + sha256 = "sha256-GLeQxdrrjz4MurN8Ia5Q68y6gHuyxiMVNneft1AXKvs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 24a028e77974..37e88287f5c8 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -28,7 +28,7 @@ let "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; - "19.1.3".officialRelease.sha256 = "sha256-NUx01eJNsYMlk+8mtlf10isIqhK8zBmqaOTjuFqMNRQ="; + "19.1.4".officialRelease.sha256 = "sha256-qi1a/AWxF5j+4O38VQ2R/tvnToVAlMjgv9SP0PNWs3g="; "20.0.0-git".gitRelease = { rev = "0e8555d4dbfdfeddc01dc2ecf9a9b6e804f7b645"; rev-version = "20.0.0-unstable-2024-10-07"; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 4f417c5e15e3..0819c77ba7b5 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "python-qt"; - version = "3.5.4"; + version = "3.5.6"; src = fetchFromGitHub { owner = "MeVisLab"; repo = "pythonqt"; rev = "v${finalAttrs.version}"; - hash = "sha256-uzOSm1Zcm5La0mDAbJko5YtxJ4WesPr9lRas+cwhNH4="; + hash = "sha256-+cmwTTNmy87yuHukesA+nukM2RjMTHsvIbeG7J7X8ig="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index eb2fa8f6f35c..3d82633cf7bd 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -8,11 +8,11 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; pname = "x509"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz"; - hash = "sha256-PgnTmD5TEZ1Aywv6mwfVldt9DFyd8G9fKsgqYlj15wI="; + hash = "sha256-77Cdu+UOUh6iqa80/PKMGTm7a+mVIlTc/VKUJwyaKRs="; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/php-packages/tideways/default.nix b/pkgs/development/php-packages/tideways/default.nix new file mode 100644 index 000000000000..6649d0194710 --- /dev/null +++ b/pkgs/development/php-packages/tideways/default.nix @@ -0,0 +1,90 @@ +{ + stdenvNoCC, + lib, + fetchurl, + autoPatchelfHook, + php, + writeShellApplication, + curl, + gnugrep, + common-updater-scripts, +}: + +let + soFile = + { + "8.0" = "tideways-php-8.0.so"; + "8.1" = "tideways-php-8.1.so"; + "8.2" = "tideways-php-8.2.so"; + "8.3" = "tideways-php-8.3.so"; + } + .${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "tideways-php"; + extensionName = "tideways"; + version = "5.13.0"; + + src = + finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} + or (throw "Unsupported platform for tideways-php: ${stdenvNoCC.hostPlatform.system}"); + + nativeBuildInputs = lib.optionals stdenvNoCC.isLinux [ + autoPatchelfHook + ]; + + installPhase = '' + runHook preInstall + install -D ${soFile} $out/lib/php/extensions/tideways.so + runHook postInstall + ''; + + passthru = { + sources = { + "x86_64-linux" = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-x86_64.tar.gz"; + hash = "sha256-HiH7EjAOqHIYaIRlp/cemhU+QX9Q66ZX8RpX1qcctZ0="; + }; + "aarch64-linux" = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-arm64.tar.gz"; + hash = "sha256-kntNr8KMrOBK2ZZT/EMTR7MCuRt3rJAqhpt5B0m5qVM="; + }; + "aarch64-darwin" = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-macos-arm.tar.gz"; + hash = "sha256-zNVBTXKwCRLKmDlEUUUpP7feB/n2fMevEuKZrgdyAkw="; + }; + }; + + updateScript = "${ + writeShellApplication { + name = "update-tideways-probe"; + runtimeInputs = [ + curl + gnugrep + common-updater-scripts + ]; + text = '' + NEW_VERSION=$(curl --fail -L https://tideways.com/profiler/downloads | grep -E 'https://tideways.s3.amazonaws.com/extension/[0-9]+\.[0-9]+\.[0-9]+/tideways-php-[0-9]+\.[0-9]+\.[0-9]+-x86_64.tar.gz' | grep -oP 'extension/\K[0-9]+\.[0-9]+\.[0-9]+') + + if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then + echo "The new version same as the old version." + exit 0 + fi + + for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do + update-source-version "php82Extensions.tideways" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" + done + ''; + } + }/bin/update-tideways-probe"; + }; + + meta = with lib; { + description = "Tideways PHP Probe"; + homepage = "https://tideways.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ shyim ]; + platforms = lib.attrNames finalAttrs.passthru.sources; + }; +}) diff --git a/pkgs/development/python-modules/captum/default.nix b/pkgs/development/python-modules/captum/default.nix new file mode 100644 index 000000000000..b8d022f89952 --- /dev/null +++ b/pkgs/development/python-modules/captum/default.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pythonOlder, + buildPythonPackage, + pytestCheckHook, + setuptools, + matplotlib, + numpy, + packaging, + torch, + tqdm, + flask, + flask-compress, +}: + +buildPythonPackage rec { + pname = "captum"; + version = "0.7.0"; + pyproject = true; + + build-system = [ setuptools ]; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = "captum"; + rev = "refs/tags/v${version}"; + hash = "sha256-1VOvPqxn6CNnmv7M8fl7JrqRfJQUH2tnXRCUqKnl7i0="; + }; + + dependencies = [ + matplotlib + numpy + packaging + torch + tqdm + ]; + + pythonImportsCheck = [ "captum" ]; + + nativeCheckInputs = [ + pytestCheckHook + flask + flask-compress + ]; + + disabledTestPaths = + [ + # These tests requires `parametrized` module (https://pypi.org/project/parametrized/) which seem to be unavailable on Nix. + "tests/attr/test_dataloader_attr.py" + "tests/attr/test_interpretable_input.py" + "tests/attr/test_llm_attr.py" + "tests/influence/_core/test_dataloader.py" + "tests/influence/_core/test_tracin_aggregate_influence.py" + "tests/influence/_core/test_tracin_intermediate_quantities.py" + "tests/influence/_core/test_tracin_k_most_influential.py" + "tests/influence/_core/test_tracin_regression.py" + "tests/influence/_core/test_tracin_self_influence.py" + "tests/influence/_core/test_tracin_show_progress.py" + "tests/influence/_core/test_tracin_validation.py" + "tests/influence/_core/test_tracin_xor.py" + "tests/insights/test_contribution.py" + "tests/module/test_binary_concrete_stochastic_gates.py" + "tests/module/test_gaussian_stochastic_gates.py" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # These tests are failing on macOS: + # > E AttributeError: module 'torch.distributed' has no attribute 'init_process_group' + "tests/attr/test_data_parallel.py" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + # Issue reported upstream at https://github.com/pytorch/captum/issues/1447 + "tests/concept/test_tcav.py" + ]; + + disabledTests = [ + # Failing tests + "test_softmax_classification_batch_multi_target" + "test_softmax_classification_batch_zero_baseline" + ]; + + meta = { + description = "Model interpretability and understanding for PyTorch"; + homepage = "https://github.com/pytorch/captum"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index 99a00df4ea0c..c6a161b34ef6 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.11.8"; + version = "0.11.9"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-1npXzPqasgtI5KLq791hfneKFO5GrSiRdqfRd13//6M="; + hash = "sha256-7fRn7KvB7CEq8keVR8nrf6IY2G8omAQqNX+DPEf+7nc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix index 62852fe60a0c..cb0468c6bff4 100644 --- a/pkgs/development/python-modules/manifold3d/default.nix +++ b/pkgs/development/python-modules/manifold3d/default.nix @@ -11,34 +11,20 @@ numpy, clipper2, tbb, - glm, pytestCheckHook, trimesh, }: -let - # archived library, but manifold3d has removed this on master - thrust-src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "thrust"; - rev = "refs/tags/2.1.0"; - hash = "sha256-U9WgRZva7R/bNOF5VZTvIwIQDQDD3/bRO08j2TPLl9Q="; - fetchSubmodules = true; - }; - -in - buildPythonPackage rec { pname = "manifold3d"; - version = "2.5.1"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; rev = "refs/tags/v${version}"; - hash = "sha256-0zjS4ygt85isP1jyiTCeD/umhQ8ffIN+u2CeLeybX9U="; - fetchSubmodules = true; + hash = "sha256-02bZAPA4mnWzS9NYVcSW0JE7BidrwzNKBO2nl7BxiiE="; }; dontUseCmakeConfigure = true; @@ -56,13 +42,10 @@ buildPythonPackage rec { ]; buildInputs = [ - glm tbb clipper2 ]; - env.SKBUILD_CMAKE_DEFINE = "FETCHCONTENT_SOURCE_DIR_THRUST=${thrust-src}"; - nativeCheckInputs = [ pytestCheckHook trimesh diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b819e581e500..05822ea24a7e 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -90,8 +90,8 @@ rec { "sha256-yZy38db9vBO64Bw01X2iDEQFb4dBGik+3qLntaG4538="; mypy-boto3-appconfig = - buildMypyBoto3Package "appconfig" "1.35.48" - "sha256-rNPWvmbvopDcCfY2ntjpZYG/fL6xu8dHejtKcp4Gsm4="; + buildMypyBoto3Package "appconfig" "1.35.64" + "sha256-fHGX/Rn7APJqCNKp/Yy5gK3n4/6p3RWBTFjcJg8nouI="; mypy-boto3-appconfigdata = buildMypyBoto3Package "appconfigdata" "1.35.0" @@ -150,8 +150,8 @@ rec { "sha256-nr00I/1oqR16ZIw3+iA2BrS0C0Wr7UlJ48VnuOFIcb0="; mypy-boto3-autoscaling = - buildMypyBoto3Package "autoscaling" "1.35.56" - "sha256-UmJt7Yp7Nf5M/PV6c077GMYVdKbFT9XGV/o6Y7HSbs0="; + buildMypyBoto3Package "autoscaling" "1.35.64" + "sha256-UwbbspFXW+5byIur1AV1FVslKf9RZnYgcQ3J5MOiMh8="; mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.35.0" @@ -226,8 +226,8 @@ rec { "sha256-D64DZgrma3/kvhyH6ZbPtD8nlRrzFVM8WT8Ex2fTZLM="; mypy-boto3-cloudformation = - buildMypyBoto3Package "cloudformation" "1.35.41" - "sha256-ElaYUwcYs2/Z5CoTzclkAoMERA2AknrfLh389eN2g54="; + buildMypyBoto3Package "cloudformation" "1.35.64" + "sha256-0aFQDfgRrI69RZZA9bMcFNqseE2KAPxPZ7xus5Hntag="; mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.35.58" @@ -338,8 +338,8 @@ rec { "sha256-1pS2EkJapoNVi5lUEftaxbdoN4fd7XSFjWyLXH1noL0="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.35.52" - "sha256-Y9vBiRNCWaZBjKUyxWVEwsws6pFBdXJBKe6jEiH9AhU="; + buildMypyBoto3Package "connect" "1.35.64" + "sha256-TljMq8EhV4iwe3g7dqlUQ12RbbNMaR3Zx5mPnGpQW00="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.35.0" @@ -366,8 +366,8 @@ rec { "sha256-YEm3nBfWCSzwPZ3Yvm4Nf3cMxaTccvHdBrs84g7KE4g="; mypy-boto3-customer-profiles = - buildMypyBoto3Package "customer-profiles" "1.35.29" - "sha256-RBT3HkjCx8HpPIn/CMLiW1zA29B1F1skhxnfxYzfMNM="; + buildMypyBoto3Package "customer-profiles" "1.35.64" + "sha256-ZF9Vuw2lXjo4n1jsd4Xwmc4olte2DZaP0HZDrbMxdiY="; mypy-boto3-databrew = buildMypyBoto3Package "databrew" "1.35.0" @@ -446,8 +446,8 @@ rec { "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.35.63" - "sha256-+vtNsMh4Wz5g362h8wopTQrgeEwO81o62h5awZYrDRI="; + buildMypyBoto3Package "ec2" "1.35.64" + "sha256-hyYGaUhX5OOZa6SdbS5WNoa9hz1EHVzArwJnqw7xJws="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.35.0" @@ -462,8 +462,8 @@ rec { "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.35.52" - "sha256-hSTuuzjGARNBBmT+s1tzQKZLz7nIYttbtCb1w+cgqWQ="; + buildMypyBoto3Package "ecs" "1.35.64" + "sha256-3kD4U7XmqHVIYrSOU361t+OCf0GLjaORpV0vQB/rEyg="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.35.0" @@ -682,8 +682,8 @@ rec { "sha256-A1sYvlnpbfKZyxZvFCzBfD/Jbzd1PwlQwgj+fvcybGU="; mypy-boto3-iotsitewise = - buildMypyBoto3Package "iotsitewise" "1.35.6" - "sha256-WICduOodvGT0EP7Txjbe49f0+ZhtVmzkIg6XJV4qHJU="; + buildMypyBoto3Package "iotsitewise" "1.35.64" + "sha256-r7jA3qFgJj98b5l1AZrWUxS1bsau8aimRbhuC1R8+nE="; mypy-boto3-iotthingsgraph = buildMypyBoto3Package "iotthingsgraph" "1.35.0" @@ -1086,12 +1086,12 @@ rec { "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.35.59" - "sha256-287lEFwBHJEvRK1b+heJrpOC6WouOoYyk1Sc1ogMVbo="; + buildMypyBoto3Package "rds" "1.35.64" + "sha256-6B3bAEd3qBDsfi6K0wSjvERi+cacRHpmRWBe9nDdzLE="; mypy-boto3-rds-data = - buildMypyBoto3Package "rds-data" "1.35.28" - "sha256-XPb/7sVSVFkDjPQ2x6w7tJmIBiS1YH10805lv/eGsyw="; + buildMypyBoto3Package "rds-data" "1.35.64" + "sha256-wYdJOvvjN2biCMEBeFD87mqomOitaGQdiiB6b5Yiji4="; mypy-boto3-redshift = buildMypyBoto3Package "redshift" "1.35.61" diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 66ada4405dbb..d7cde9159563 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "9.0.0"; + version = "9.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pubnub"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-v3tFbq2YvQJRvRu9+8yzWLkFo+7AMsJDlqjMK2Q/FAE="; + hash = "sha256-aVnhCRTm6lqwec4TRbvHFF4l/XvbBTbclJLxf7oyUak="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index cc4b50eb7f36..06d177b851b9 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-+PbxYmyo9S85atl6B+DB+ZSW9HLN/2fAPwALn719TjM="; + hash = "sha256-JA5xBoqNC6F97Obs+0ig/ALw1rkUVX7A0bStKHS+uv4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 99b4d3815424..d763463184a8 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-+YdUZj5Edbm+jm6s/0RflQVVQg3enBwlmBwpLrk3534="; + hash = "sha256-RhicZSVkaDtIngIOvzyEQ+VMZwdV45wDk7e7bThTIh8="; }; pythonRelaxDeps = [ diff --git a/pkgs/kde/gear/merkuro/default.nix b/pkgs/kde/gear/merkuro/default.nix index ec149aea4bf7..a6a2c70c5732 100644 --- a/pkgs/kde/gear/merkuro/default.nix +++ b/pkgs/kde/gear/merkuro/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + qtlocation, qtsvg, libplasma, }: @@ -7,6 +8,7 @@ mkKdeDerivation { pname = "merkuro"; extraBuildInputs = [ + qtlocation qtsvg libplasma ]; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 1a8366f652db..3ef0422af789 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -14,12 +14,12 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.6.60"; - hash = "sha256-hbuMuLoXVaFb/HnkVlJm8BSwStxsWmz5e4y65kXBJto="; + version = "6.6.62"; + hash = "sha256-KbD5YaaZLDDsp5wuEkenUe+/KrFjOgUomXtLKHtQzvs="; }; main = { - version = "6.11.7"; - hash = "sha256-+gj6sR20v4+NHR4cqsVK5fVpqXs9zxcBh0kJUH5qpNE="; + version = "6.11.9"; + hash = "sha256-lR7GXFy3eYq75+LwVlXScPYWbdVW6wAV+He0YZ+5AF4="; }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c02e9f8ed068..74e9b08ec6ec 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -357,6 +357,8 @@ in { swoole = callPackage ../development/php-packages/swoole { }; + tideways = callPackage ../development/php-packages/tideways { }; + uv = callPackage ../development/php-packages/uv { }; vld = callPackage ../development/php-packages/vld { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95ba57162dae..63be75ca0110 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2039,6 +2039,8 @@ self: super: with self; { captcha = callPackage ../development/python-modules/captcha { }; + captum = callPackage ../development/python-modules/captum { }; + capturer = callPackage ../development/python-modules/capturer { }; carbon = callPackage ../development/python-modules/carbon { };