diff --git a/pkgs/applications/audio/radiotray-ng/tests-c++17.patch b/pkgs/applications/audio/radiotray-ng/tests-c++17.patch deleted file mode 100644 index 750c12f6d211..000000000000 --- a/pkgs/applications/audio/radiotray-ng/tests-c++17.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 58ab5c2..4f56a25 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,5 +1,7 @@ - include(GoogleTest) - -+set(CMAKE_CXX_STANDARD 17) -+ - function(add_gmock_test target) - add_executable(${target} ${ARGN}) - target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread) -diff --git a/tests/bookmarks_test.cpp b/tests/bookmarks_test.cpp -index 2d72356..97f898a 100644 ---- a/tests/bookmarks_test.cpp -+++ b/tests/bookmarks_test.cpp -@@ -215,7 +215,7 @@ TEST(Bookmarks, test_that_stations_are_added_and_removed_from_a_group_and_moved) - ASSERT_FALSE(bm[0].stations[0].notifications); - - // vector only throws when using at() -- EXPECT_THROW(bm[0].stations.at(100), std::out_of_range); -+ EXPECT_THROW(static_cast(bm[0].stations.at(100)), std::out_of_range); - EXPECT_THROW(bm[1], std::out_of_range); - } - diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index df74e5e63ae3..0b1e6d33d2b2 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -10,11 +10,11 @@ buildMozillaMach rec { pname = "firefox-beta"; binaryName = "firefox-beta"; - version = "146.0b9"; + version = "147.0b9"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "77a9a4617f3d24f7eff77289e03e53373998ae617f601893be255a1eba85dd81fea5a26976159a25187aada7401ad8da6cbb0b5a3650c4936a7445a3a7f55d42"; + sha512 = "346beb18a5012349da2f87c82080bf5fa605339db27644bdce4474bd63246dcfa9369e7d95620ee336649ff9c1d28677ff892d2309662a9b6f7ef0f055648c81"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 2c74b044c326..d76b0fe33ef8 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = "firefox-devedition"; - version = "146.0b9"; + version = "147.0b9"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "6fac88325150620388f49ffe1ba0385216184b98e0faa54e01804292563798a032a8cef375dbc78a41b9ba3e18d1e9258aca5e090bc827f2e7e842f76ee34c25"; + sha512 = "66aad9dd7dc427d628fc7994a0e85997d6df0af4e0542f4bbd48dfdfe923e3b10ad6d6322c1eaed40bf30b61dfa5849785e46f7453b9fc6c478a2bb0fed6b93c"; }; # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index afa4f1ce54f2..046d9d5eaf15 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -4,8 +4,8 @@ buildMozillaMach, callPackage, fetchurl, - icu73, icu77, + icu78, fetchpatch2, config, }: @@ -25,8 +25,8 @@ let }) ]; }); - icu73' = patchICU icu73; icu77' = patchICU icu77; + icu78' = patchICU icu78; common = { @@ -49,8 +49,8 @@ let (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch) ]; extraPassthru = { - icu73 = icu73'; icu77 = icu77'; + icu78 = icu78'; }; meta = { @@ -77,8 +77,8 @@ let pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - icu73 = icu73'; icu77 = icu77'; + icu78 = icu78'; }; in diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 2c1276a886e6..58502c3ed32f 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -76,8 +76,8 @@ in glib, gnum4, gtk3, - icu73, icu77, # if you fiddle with the icu parameters, please check Thunderbird's overrides + icu78, libGL, libGLU, libevent, @@ -581,7 +581,7 @@ buildStdenv.mkDerivation { libdrm ] )) - ++ [ (if (lib.versionAtLeast version "138") then icu77 else icu73) ] + ++ [ (if (lib.versionAtLeast version "147") then icu78 else icu77) ] ++ lib.optional gssSupport libkrb5 ++ lib.optional jemallocSupport jemalloc ++ extraBuildInputs; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 73325c0d81eb..cf5c72b001c2 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1603,6 +1603,7 @@ in makeImageTestScript modulesClosure qemu + qemuCommandLinux rpmClosureGenerator rpmDistros runInLinuxImage diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index 03fcd2003b30..1b70f222850d 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "algia"; - version = "0.0.97"; + version = "0.0.98"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; tag = "v${version}"; - hash = "sha256-vja/l0zLoqTDog32YvkSya4wnMCNj/H93xzwipP2msQ="; + hash = "sha256-Xd0WhXvEPt1VLIdsswk91hTb2UK6ikqhKMR3l/D0/jk="; }; vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU="; diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix index 4c943d6d9d54..5745305c5a14 100644 --- a/pkgs/by-name/ar/armadillo/package.nix +++ b/pkgs/by-name/ar/armadillo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "15.2.2"; + version = "15.2.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-juAc1NpVvAe3vH08unAqxugTfThNfnGF8/SuHwx5cE8="; + hash = "sha256-AYLWfWlJ5DR6C8YvyMJ5O+frIDxx8Z7f+T+MRf1KgZA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ch/changelogger/package.nix b/pkgs/by-name/ch/changelogger/package.nix index 8327dcff00f9..64d3dd1fb480 100644 --- a/pkgs/by-name/ch/changelogger/package.nix +++ b/pkgs/by-name/ch/changelogger/package.nix @@ -6,26 +6,32 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "changelogger"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "MarkusFreitag"; repo = "changelogger"; - rev = "v${version}"; - sha256 = "sha256-XDiO8r1HpdsfBKzFLnsWdxte2EqL1blPH21137fNm5M="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-Glup2Y3sGO2hNKFeZXOrffHct2F4Ebn9+f6yOy3pekY="; }; - vendorHash = "sha256-E6J+0tZriskBnXdhQOQA240c3z+laXM5honoREjHPfM="; + vendorHash = "sha256-f6ojMri3m3pwLXbLnNbS/Xl2lqo0eEHLGbbT5KR1Clc="; ldflags = [ "-s" "-w" - "-X github.com/MarkusFreitag/changelogger/cmd.BuildVersion=${version}" + "-X github.com/MarkusFreitag/changelogger/cmd.BuildVersion=${finalAttrs.version}" "-X github.com/MarkusFreitag/changelogger/cmd.BuildDate=1970-01-01T00:00:00" ]; + preCheck = '' + # Test needs gitconfig + substituteInPlace pkg/gitconfig/gitconfig_test.go \ + --replace-fail "TestGetGitAuthor" "SkipGetGitAuthor" + ''; + nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' @@ -36,11 +42,11 @@ buildGoModule rec { ''; meta = { + changelog = "https://github.com/MarkusFreitag/changelogger/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "Tool to manage your changelog file in Markdown"; homepage = "https://github.com/MarkusFreitag/changelogger"; - changelog = "https://github.com/MarkusFreitag/changelogger/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = [ ]; mainProgram = "changelogger"; + maintainers = with lib.maintainers; [ hythera ]; }; -} +}) diff --git a/pkgs/development/tools/language-servers/fortran-language-server/default.nix b/pkgs/by-name/fo/fortran-language-server/package.nix similarity index 71% rename from pkgs/development/tools/language-servers/fortran-language-server/default.nix rename to pkgs/by-name/fo/fortran-language-server/package.nix index 59abe18298f8..2cbc117a12f0 100644 --- a/pkgs/development/tools/language-servers/fortran-language-server/default.nix +++ b/pkgs/by-name/fo/fortran-language-server/package.nix @@ -1,19 +1,23 @@ { lib, fetchPypi, - buildPythonApplication, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "fortran-language-server"; version = "1.12.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "7Dkh7yPX4rULkzfJFxg47YxrCaxuHk+k3TOINHS9T5A="; + hash = "sha256-7Dkh7yPX4rULkzfJFxg47YxrCaxuHk+k3TOINHS9T5A="; }; + build-system = [ + python3Packages.setuptools + ]; + checkPhase = "$out/bin/fortls --help 1>/dev/null"; pythonImportsCheck = [ "fortls" ]; diff --git a/pkgs/by-name/fu/func/package.nix b/pkgs/by-name/fu/func/package.nix index a2a5b15cd8ef..8bbbd2f9dd96 100644 --- a/pkgs/by-name/fu/func/package.nix +++ b/pkgs/by-name/fu/func/package.nix @@ -10,24 +10,24 @@ buildGoModule (finalAttrs: { pname = "func"; - version = "1.16.2"; + version = "1.20.1"; src = fetchFromGitHub { owner = "knative"; repo = "func"; tag = "knative-v${finalAttrs.version}"; - hash = "sha256-nbS7X5WPu+WBtPUKShE5aWve5m2gw2naQQzNeG7pbGM="; + hash = "sha256-SYqkWE7dVFy6stibcWayU2J+oIFIfwNDoK6TzchgBzo="; }; - vendorHash = "sha256-Gn+nyck/VOwf8iKPeyLvsPWOpfdN/maUcQOLFAU0oic="; + vendorHash = "sha256-F/TQ1QwfQfum1DOY2xrzpTlm7jvuJQUjtBLY6pZfTh8="; subPackages = [ "cmd/func" ]; ldflags = [ - "-X knative.dev/func/pkg/app.vers=v${finalAttrs.version}" + "-X knative.dev/func/pkg/version.Vers=v${finalAttrs.version}" "-X main.date=19700101T000000Z" - "-X knative.dev/func/pkg/app.hash=${finalAttrs.version}" - "-X knative.dev/func/pkg/app.kver=${finalAttrs.src.tag}" + "-X knative.dev/func/pkg/version.Hash=${finalAttrs.version}" + "-X knative.dev/func/pkg/version.Kver=${finalAttrs.src.tag}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 808a2efffc3e..786df314649b 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.23.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "github"; repo = "gh-gei"; rev = "v${version}"; - hash = "sha256-9sTyxLs5ug1fKh2qvKkuhA9r0cmfdaPT+pWuc6hxyN4="; + hash = "sha256-oyNnHEGOLQvxIoBnvH0rA6hYAx+BYY1+aG3qMx1RpX4="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix index 9f177e26656b..b6501a97d4e6 100644 --- a/pkgs/by-name/go/go-judge/package.nix +++ b/pkgs/by-name/go/go-judge/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "go-judge"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "criyle"; repo = "go-judge"; rev = "v${version}"; - hash = "sha256-qSTtXLjtrwwp6ipnquzoDM6yzAtoE3WIAXqWFCuOI9s="; + hash = "sha256-+NqBAxes9xnuyTN0ITrEDlRC8EvgUGBulF3EQx5XSDQ="; }; - vendorHash = "sha256-+KPbY63wF+zh7R7OVyfBI7Nuf8kAh35dxJIIRrP5Js0="; + vendorHash = "sha256-2yuWsNa4jyJEFAox0KMfTYAnwVv622hHErEd2RtJgl4="; tags = [ "nomsgpack" diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index 9ebd3485003d..ba4625382139 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -31,6 +31,13 @@ let vendorHash = "sha256-rIj4T+NEqWla6/+ofosTwagL4/VMovDp1NEYMuzbOrQ="; + # Fix C23 compat + preBuild = '' + chmod +w vendor/github.com/anacrolix/go-libutp/utp_types.h + substituteInPlace vendor/github.com/anacrolix/go-libutp/utp_types.h \ + --replace-fail "typedef uint8 bool;" "" + ''; + buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 6a2356b951d2..6fb149c7fb6f 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -214,7 +214,7 @@ customStdenv.mkDerivation (finalAttrs: { ''; passthru = { - providedSessions = [ "hyprland" ]; + providedSessions = [ "hyprland" ] ++ optionals withSystemd [ "hyprland-uwsm" ]; updateScript = ./update.sh; }; diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index 3f6d489521d0..adcde1d409fa 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "k6"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "grafana"; repo = "k6"; rev = "v${version}"; - hash = "sha256-393Ld7V7KBW9ZnItqW9U/8XkDapwNh7T2ABeh2CikGc="; + hash = "sha256-kgdJAmjk92xXBYJrfprYztBnTK4cqIpk9iwKULDVRl8="; }; subPackages = [ "./" ]; diff --git a/pkgs/applications/window-managers/i3/kitti3-fix-build-system.patch b/pkgs/by-name/ki/kitti3/kitti3-fix-build-system.patch similarity index 100% rename from pkgs/applications/window-managers/i3/kitti3-fix-build-system.patch rename to pkgs/by-name/ki/kitti3/kitti3-fix-build-system.patch diff --git a/pkgs/applications/window-managers/i3/kitti3.nix b/pkgs/by-name/ki/kitti3/package.nix similarity index 86% rename from pkgs/applications/window-managers/i3/kitti3.nix rename to pkgs/by-name/ki/kitti3/package.nix index 50e71aa49edd..90695c800211 100644 --- a/pkgs/applications/window-managers/i3/kitti3.nix +++ b/pkgs/by-name/ki/kitti3/package.nix @@ -1,13 +1,11 @@ { - buildPythonApplication, + python3Packages, fetchFromGitHub, - i3ipc, lib, - poetry-core, writeScript, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "kitti3"; version = "0.5.1-unstable-2021-09-10"; pyproject = true; @@ -25,12 +23,12 @@ buildPythonApplication rec { ./kitti3-fix-build-system.patch ]; - nativeBuildInputs = [ - poetry-core + build-system = [ + python3Packages.poetry-core ]; - propagatedBuildInputs = [ - i3ipc + dependencies = [ + python3Packages.i3ipc ]; passthru.updateScript = writeScript "update-kitti3" '' @@ -38,7 +36,7 @@ buildPythonApplication rec { #!nix-shell -i bash -p git common-updater-scripts perl tomlq tmpdir="$(mktemp -d)" trap "rm -rf $tmpdir" EXIT - git clone --depth=1 "${src.gitRepoUrl}" "$tmpdir" + git clone --depth=1 "${finalAttrs.src.gitRepoUrl}" "$tmpdir" pushd "$tmpdir" newVersionNumber=$(perl -ne 'print if s/version = "([\d.]+)"/$1/' pyproject.toml) newRevision=$(git show -s --pretty='format:%H') @@ -59,4 +57,4 @@ buildPythonApplication rec { license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/lu/lutris-free/package.nix b/pkgs/by-name/lu/lutris-free/package.nix new file mode 100644 index 000000000000..c4a8ba959acc --- /dev/null +++ b/pkgs/by-name/lu/lutris-free/package.nix @@ -0,0 +1,7 @@ +{ + lutris, +}: + +lutris.override { + steamSupport = false; +} diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/by-name/lu/lutris-unwrapped/package.nix similarity index 88% rename from pkgs/applications/misc/lutris/default.nix rename to pkgs/by-name/lu/lutris-unwrapped/package.nix index f91c0fc58be1..a701967a14ae 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/by-name/lu/lutris-unwrapped/package.nix @@ -1,5 +1,5 @@ { - buildPythonApplication, + python3Packages, lib, fetchFromGitHub, @@ -20,25 +20,6 @@ meson, ninja, - # check inputs - xvfb-run, - nose2, - flake8, - - # python dependencies - certifi, - dbus-python, - distro, - evdev, - lxml, - pillow, - pygobject3, - pypresence, - pyyaml, - requests, - protobuf, - moddb, - # commands that lutris needs xrandr, pciutils, @@ -79,14 +60,14 @@ let util-linux ]; in -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "lutris-unwrapped"; version = "0.5.19"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-CAXKnx5+60MITRM8enkYgFl5ZKM6HCXhCYNyG7kHhuQ="; }; @@ -123,7 +104,7 @@ buildPythonApplication rec { ]); # See `install_requires` in https://github.com/lutris/lutris/blob/master/setup.py - propagatedBuildInputs = [ + dependencies = with python3Packages; [ certifi dbus-python distro diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/by-name/lu/lutris/package.nix similarity index 100% rename from pkgs/applications/misc/lutris/fhsenv.nix rename to pkgs/by-name/lu/lutris/package.nix diff --git a/pkgs/tools/system/minijail/tools.nix b/pkgs/by-name/mi/minijail-tools/package.nix similarity index 87% rename from pkgs/tools/system/minijail/tools.nix rename to pkgs/by-name/mi/minijail-tools/package.nix index d80ab9e103e6..c050c48c7048 100644 --- a/pkgs/tools/system/minijail/tools.nix +++ b/pkgs/by-name/mi/minijail-tools/package.nix @@ -1,8 +1,8 @@ { lib, - buildPythonApplication, + python3Packages, pkgsBuildTarget, - python, + pkgsBuildHost, minijail, }: @@ -10,7 +10,7 @@ let targetClang = pkgsBuildTarget.targetPackages.clangStdenv.cc; in -buildPythonApplication { +python3Packages.buildPythonApplication { format = "setuptools"; pname = "minijail-tools"; inherit (minijail) version src; @@ -28,7 +28,7 @@ buildPythonApplication { make libconstants.gen.c libsyscalls.gen.c ${targetClang}/bin/${targetClang.targetPrefix}cc -S -emit-llvm \ libconstants.gen.c libsyscalls.gen.c - ${python.pythonOnBuildForHost.interpreter} tools/generate_constants_json.py \ + ${pkgsBuildHost.python3.interpreter} tools/generate_constants_json.py \ --output constants.json \ libconstants.gen.ll libsyscalls.gen.ll ''; diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 2d5c79932518..6be5b07cd1fd 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.179.0", + "version": "3.180.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_linux_x86_64", - "hash": "sha256-VStFqwOut1VnspK7963VvR5tnEEmASiWxHj8riiPUCg=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_x86_64", + "hash": "sha256-hpmuMhN2HS+4zPlTOh87A1UQvlxVKlzqHKKDm1VBLhg=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_linux_aarch64", - "hash": "sha256-mK+b3oCCZ098MMYQtRoXo1BuAlxz+4rtdB7EN1vDO38=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_aarch64", + "hash": "sha256-dGe0r7ckuKkMzVkGyWaYR2PVkDtGRRhC3ievXzKs5dU=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_mac_universal", - "hash": "sha256-TX4DolNZE0dqZj3DFzCyDOKSBcfHK2b8vjJQ07SOtIM=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal", + "hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_mac_universal", - "hash": "sha256-TX4DolNZE0dqZj3DFzCyDOKSBcfHK2b8vjJQ07SOtIM=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal", + "hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw=" } } } diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/by-name/mt/mtprotoproxy/package.nix similarity index 79% rename from pkgs/servers/mtprotoproxy/default.nix rename to pkgs/by-name/mt/mtprotoproxy/package.nix index 79fad4195681..bd69fbea102d 100644 --- a/pkgs/servers/mtprotoproxy/default.nix +++ b/pkgs/by-name/mt/mtprotoproxy/package.nix @@ -2,11 +2,8 @@ lib, stdenv, fetchFromGitHub, - python, - pyaes, - pycrypto, - uvloop, - wrapPython, + python3Packages, + python3, }: stdenv.mkDerivation rec { @@ -20,8 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-tQ6e1Y25V4qAqBvhhKdirSCYzeALfH+PhNtcHTuBurs="; }; - nativeBuildInputs = [ wrapPython ]; - pythonPath = [ + nativeBuildInputs = with python3Packages; [ wrapPython ]; + pythonPath = with python3Packages; [ pyaes pycrypto uvloop @@ -36,7 +33,7 @@ stdenv.mkDerivation rec { description = "Async MTProto proxy for Telegram"; license = lib.licenses.mit; homepage = "https://github.com/alexbers/mtprotoproxy"; - platforms = python.meta.platforms; + platforms = python3.meta.platforms; maintainers = [ ]; mainProgram = "mtprotoproxy"; }; diff --git a/pkgs/tools/package-management/nix-visualize/default.nix b/pkgs/by-name/ni/nix-visualize/package.nix similarity index 83% rename from pkgs/tools/package-management/nix-visualize/default.nix rename to pkgs/by-name/ni/nix-visualize/package.nix index 999b03a637f0..c031036333ca 100644 --- a/pkgs/tools/package-management/nix-visualize/default.nix +++ b/pkgs/by-name/ni/nix-visualize/package.nix @@ -2,15 +2,10 @@ lib, fetchFromGitHub, nix, - python, - matplotlib, - networkx, - pandas, - pygraphviz, - setuptools, + python3Packages, }: -python.pkgs.buildPythonApplication { +python3Packages.buildPythonApplication { version = "1.0.5-unstable-2024-01-17"; pname = "nix-visualize"; pyproject = true; @@ -27,9 +22,9 @@ python.pkgs.buildPythonApplication { --prefix PATH : ${lib.makeBinPath [ nix ]} ''; - nativeBuildInputs = [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ matplotlib networkx pandas diff --git a/pkgs/by-name/no/notepad-next/package.nix b/pkgs/by-name/no/notepad-next/package.nix index 32760a7495cf..036a8a015c1b 100644 --- a/pkgs/by-name/no/notepad-next/package.nix +++ b/pkgs/by-name/no/notepad-next/package.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ qt5.qtx11extras ]; + # Fix build with GCC 14+: Scintilla needs cstdint for intptr_t/uintptr_t types + # https://github.com/dail8859/NotepadNext/issues/752 + postPatch = '' + sed -i '1i #include ' src/scintilla/include/ScintillaTypes.h + ''; + qmakeFlags = [ "PREFIX=${placeholder "out"}" "src/NotepadNext.pro" diff --git a/pkgs/tools/networking/nxdomain/default.nix b/pkgs/by-name/nx/nxdomain/package.nix similarity index 71% rename from pkgs/tools/networking/nxdomain/default.nix rename to pkgs/by-name/nx/nxdomain/package.nix index 636ef4100963..df9a6b872fbf 100644 --- a/pkgs/tools/networking/nxdomain/default.nix +++ b/pkgs/by-name/nx/nxdomain/package.nix @@ -1,24 +1,24 @@ { lib, - buildPythonApplication, + python3Packages, fetchPypi, - dnspython, - pytestCheckHook, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "nxdomain"; version = "1.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "0va7nkbdjgzrf7fnbxkh1140pbc62wyj86rdrrh5wmg3phiziqkb"; }; - propagatedBuildInputs = [ dnspython ]; + build-system = with python3Packages; [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + dependencies = with python3Packages; [ dnspython ]; + + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; postCheck = '' echo example.org > simple.list diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index 7e91a2d92920..22fe6ebe8f13 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -4,7 +4,7 @@ dbus, fetchFromGitHub, gamescope, - godot_4_4, + godot_4_5, hwdata, lib, libGL, @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "opengamepadui"; - version = "0.42.3"; + version = "0.44.0"; buildType = if withDebug then "debug" else "release"; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ShadowBlip"; repo = "OpenGamepadUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-sqzCGGrMxOjepi9GxJFCAY+tzuIwOgs5qYeIYKb7Y1U="; + hash = "sha256-hVOoo6YHgGJMksVbn9PqDNQedw7Zxxrmydwxh6qVebo="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cargo - godot_4_4 + godot_4_5 pkg-config rustPlatform.cargoSetupHook ]; @@ -51,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: { env = let - versionAndRelease = lib.splitString "-" godot_4_4.version; + versionAndRelease = lib.splitString "-" godot_4_5.version; in { - GODOT = lib.getExe godot_4_4; + GODOT = lib.getExe godot_4_5; GODOT_VERSION = lib.elemAt versionAndRelease 0; GODOT_RELEASE = lib.elemAt versionAndRelease 1; - EXPORT_TEMPLATE = "${godot_4_4.export-template}/share/godot/export_templates"; + EXPORT_TEMPLATE = "${godot_4_5.export-template}/share/godot/export_templates"; BUILD_TYPE = "${finalAttrs.buildType}"; }; diff --git a/pkgs/by-name/ou/outfox/package.nix b/pkgs/by-name/ou/outfox/package.nix index 5bfe4933dc47..87e594575d35 100644 --- a/pkgs/by-name/ou/outfox/package.nix +++ b/pkgs/by-name/ou/outfox/package.nix @@ -10,29 +10,22 @@ libpulseaudio, makeDesktopItem, makeWrapper, + openldap, }: stdenv.mkDerivation rec { pname = "outfox"; - version = "0.5.0-pre042"; + version = "0.5.0-pre043"; src = { - i686-linux = fetchurl { - url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-14.04-32bit-i386-i386-legacy-date-20231227.tar.gz"; - hash = "sha256-NFjNoqJ7Fq4A7Y0k6oQcWjykV+/b/MiRtJ1p6qlZdjs="; - }; x86_64-linux = fetchurl { - url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-22.04-amd64-current-date-20231224.tar.gz"; - hash = "sha256-dW+g/JYav3rUuI+nHDi6rXu/O5KYiEdk/HH82jgOUnI="; + url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-043/OutFox-alpha-0.5.0-pre-043-Final-24.04-amd64-current-date-20250907.tar.gz"; + hash = "sha256-1YN3YCcSluHBUpNRQdh0pJ9R9hTHKBuTSULTKL28OO0="; }; aarch64-linux = fetchurl { - url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Raspberry-Pi-Linux-18.04-arm64-arm64v8-modern-date-20231225.tar.gz"; - hash = "sha256-7Qrq6t8KmUSIK4Rskkxw5l4UZ2vsb9/orzPegHySaJ4="; - }; - armv7l-linux = fetchurl { - url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Raspberry-Pi-Linux-14.04-arm32-arm32v7-legacy-date-20231227.tar.gz"; - hash = "sha256-PRp7kuqFBRy7nextTCB+/poc+A9AX2EiQphx6aUfT8E="; + url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-043/OutFox-alpha-0.5.0-pre-043-Final-RaspberryPi-debian12-arm64-aarch64-current-date-20250927.tar.gz"; + hash = "sha256-/E4Keh1J3iytqaq0ziJy9F1mRR3mPbjlGto1Dbct3JM="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -48,6 +41,7 @@ stdenv.mkDerivation rec { libjack2 libglvnd libpulseaudio + openldap ]; desktop = makeDesktopItem { @@ -73,14 +67,12 @@ stdenv.mkDerivation rec { meta = { description = "Rhythm game engine forked from StepMania"; homepage = "https://projectoutfox.com"; - changelog = "https://projectoutfox.com/releases/${version}"; + changelog = "https://github.com/TeamRizu/OutFox/releases/tag/OF5.0.0-043"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" - "i686-linux" "aarch64-linux" - "armv7l-linux" ]; maintainers = with lib.maintainers; [ maxwell-lt ]; mainProgram = "OutFox"; diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index 17e78f75e3e5..4e432c58da92 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.268.0"; + version = "0.269.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-z6hvjwrIscZHC/3pZkknyAMWpXEAItEhioRK37o82aw="; + sha256 = "sha256-fs4MXuC4CLxoApgimmHNOoxyhck2ZV/IE4rGoAKr7Lk="; }; - vendorHash = "sha256-0Db91ESDf+5j4+da4F44uxycGDBV4A5Wkwz8Uvjo9ec="; + vendorHash = "sha256-HxvjFM1o14L2EVToDaqdvnnm/UeOy5BQ73ge1xx815k="; ldflags = [ "-s" diff --git a/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch b/pkgs/by-name/ra/radiotray-ng/no-dl-googletest.patch similarity index 100% rename from pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch rename to pkgs/by-name/ra/radiotray-ng/no-dl-googletest.patch diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/by-name/ra/radiotray-ng/package.nix similarity index 89% rename from pkgs/applications/audio/radiotray-ng/default.nix rename to pkgs/by-name/ra/radiotray-ng/package.nix index 001a1024933b..f844a04d46c3 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/by-name/ra/radiotray-ng/package.nix @@ -18,7 +18,7 @@ libappindicator-gtk3, libnotify, libxdg_basedir, - wxGTK, + wxGTK32, # GStreamer glib-networking, gst_all_1, @@ -48,15 +48,15 @@ let lxml ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "radiotray-ng"; - version = "0.2.9"; + version = "0.2.10.1"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; - tag = "v${version}"; - hash = "sha256-rRD/IfVnOxowr2mO2BB2hcHK5ByZSmTbcgYdULogYUs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-GYSacYKS0az5sqPqZhnuTZOT9NSzW+P9o5r5p0RhTtI="; }; nativeBuildInputs = [ @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { libnotify libxdg_basedir lsb-release - wxGTK + wxGTK32 # for https gstreamer / libsoup glib-networking ] @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" + (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) ]; # 'wxFont::wxFont(int, int, int, int, bool, const wxString&, wxFontEncoding)' is deprecated @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { description = "Internet radio player for linux"; homepage = "https://github.com/ebruck/radiotray-ng"; license = lib.licenses.gpl3; - maintainers = [ ]; + maintainers = [ lib.maintainers.somasis ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch b/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch new file mode 100644 index 000000000000..234de3ff40f7 --- /dev/null +++ b/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch @@ -0,0 +1,12 @@ +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 58ab5c2..4f56a25 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,5 +1,7 @@ + include(GoogleTest) + ++set(CMAKE_CXX_STANDARD 17) ++ + function(add_gmock_test target) + add_executable(${target} ${ARGN}) + target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread) diff --git a/pkgs/development/embedded/rshell/default.nix b/pkgs/by-name/rs/rshell/package.nix similarity index 81% rename from pkgs/development/embedded/rshell/default.nix rename to pkgs/by-name/rs/rshell/package.nix index b9826336d9c6..560681e8c67b 100644 --- a/pkgs/development/embedded/rshell/default.nix +++ b/pkgs/by-name/rs/rshell/package.nix @@ -1,12 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchPypi, - pyserial, - pyudev, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "rshell"; version = "0.0.36"; format = "setuptools"; @@ -16,7 +14,7 @@ buildPythonApplication rec { hash = "sha256-SmbYNSB0eVUOWdDdPoMAPQTE7KeKTkklD4h+0t1LC/U="; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ pyserial pyudev ]; diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/by-name/sc/scfbuild/package.nix similarity index 74% rename from pkgs/tools/misc/scfbuild/default.nix rename to pkgs/by-name/sc/scfbuild/package.nix index 99b17307263e..1f3f6b3a4b32 100644 --- a/pkgs/tools/misc/scfbuild/default.nix +++ b/pkgs/by-name/sc/scfbuild/package.nix @@ -1,15 +1,11 @@ { lib, - buildPythonApplication, fetchFromGitHub, - python, - pyyaml, - fonttools, - fontforge, - setuptools, + python3Packages, + python3, }: -buildPythonApplication { +python3Packages.buildPythonApplication { pname = "scfbuild"; version = "2.0.0"; @@ -22,7 +18,7 @@ buildPythonApplication { sha256 = "0wkyzkhshlax9rvdmn441gv87n9abfr0qqmgs8bkg9kbcjb4bhad"; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ pyyaml fonttools fontforge @@ -32,8 +28,8 @@ buildPythonApplication { installPhase = '' runHook preInstall - mkdir -p $out/${python.sitePackages} - cp -r scfbuild $out/${python.sitePackages} + mkdir -p $out/${python3.sitePackages} + cp -r scfbuild $out/${python3.sitePackages} cp -r bin $out runHook postInstall diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 9fd84b6a07e2..7ce2c0872db6 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -54,13 +54,13 @@ let ''; }); - version = "7.83.0"; + version = "7.84.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-r1RB6vtG2mdRJifaKNrmQvxJxXOqkpHoWivvPPpesow="; + hash = "sha256-c76Z+AJCGBXpHPejtZaA2RJpEMy+sd2xvjx+epC1Eqw="; postCheckout = '' git -C "$out" show -s --format=%ct > "$out"/GIT_COMMIT_TIME ''; @@ -147,9 +147,9 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-taF3A2YcqMzqcS401fxRW9wEC/Ol7bVJ6belF4RTIRk=" + "sha256-/1/sUHt1J6wv/MuaZdE1XbkIkXfrllBoqt8AXP1d0Pw=" else - "sha256-sWxxANPW0W5/tmowoJ7ZPBEBSurKN6C+wZAcLa2QHz8="; + "sha256-x2A4sX7m/zNVTEWRXOKD6VsUR+aGjEFhIv+NQVe+RwQ="; }; env = { diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index eff4bc70f17e..dba9823cff51 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.60.7"; + version = "2.61.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-tTfWAnY7I1Gch/tRr4o7NhoZhZ5+jGoZ1BWgAYl0a+I="; + hash = "sha256-84QqCfz+NKVLr2FAEDSFAvCm4RhHhq+174M2rxD/D0s="; }; - cargoHash = "sha256-h44LLxKDKBVfBMVdVUtlQdct+sFK553rRoOAXsSYqIM="; + cargoHash = "sha256-LpYjNXc/HzV3OYSIyCxDTlL3UZYbOiRkPCBeIqW2hB8="; preConfigure = '' # Check for matching webrtc version diff --git a/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch b/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch deleted file mode 100644 index 701edc9c5d22..000000000000 --- a/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/p2p/base/port_interface.h b/p2p/base/port_interface.h -index f774b3d..c7242d9 100644 ---- a/p2p/base/port_interface.h -+++ b/p2p/base/port_interface.h -@@ -55,7 +55,7 @@ class PortInterface { - virtual ~PortInterface(); - - virtual IceCandidateType Type() const = 0; -- virtual const Network* Network() const = 0; -+ virtual const ::webrtc::Network* Network() const = 0; - - // Methods to set/get ICE role and tiebreaker values. - virtual void SetIceRole(IceRole role) = 0; -diff --git a/pc/codec_vendor.h b/pc/codec_vendor.h -index 1472225..251afbd 100644 ---- a/pc/codec_vendor.h -+++ b/pc/codec_vendor.h -@@ -119,7 +119,7 @@ class CodecVendor { - class CodecLookupHelper { - public: - virtual ~CodecLookupHelper() = default; -- virtual PayloadTypeSuggester* PayloadTypeSuggester() = 0; -+ virtual ::webrtc::PayloadTypeSuggester* PayloadTypeSuggester() = 0; - // Look up the codec vendor to use, depending on context. - // This call may get additional arguments in the future, to aid - // in selection of the correct context. -diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h -index ab914f3..3ff6f6f 100644 ---- a/pc/jsep_transport.h -+++ b/pc/jsep_transport.h -@@ -214,7 +214,7 @@ class JsepTransport { - return rtp_dtls_transport_; - } - -- scoped_refptr SctpTransport() const { return sctp_transport_; } -+ scoped_refptr<::webrtc::SctpTransport> SctpTransport() const { return sctp_transport_; } - - // TODO(bugs.webrtc.org/9719): Delete method, update callers to use - // SctpTransport() instead. diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json index 930dfda27d7a..6b824925c682 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -1,25 +1,25 @@ { "src": { "args": { - "hash": "sha256-bjbMVnTgSrjHbJOpQz+PSf0kppzX3Wvu5wihPTRY9qg=", + "hash": "sha256-M9cwhO7CbaqdffJgFguKkX1WN0q1m/INpb/+B4km15c=", "owner": "signalapp", "repo": "webrtc", - "tag": "7339f" + "tag": "7444a" }, "fetcher": "fetchFromGitHub" }, "src/build": { "args": { - "hash": "sha256-BFKseH/tEQcQ1UF2YPBcfMLY54qBmM7OboC15NFO9e0=", - "rev": "66d076c7ab192991f67891b062b35404f3cb0739", + "hash": "sha256-UHTiL6tMDu/rhSmfy89QQPwEEdU2kS0IaYBhWKKJ4Yo=", + "rev": "045565e91c7360951bddbd0618a20ea59cdd31f3", "url": "https://chromium.googlesource.com/chromium/src/build" }, "fetcher": "fetchFromGitiles" }, "src/buildtools": { "args": { - "hash": "sha256-c1I0yBRDb9JUkywmJJy0IZp802qJRsoQV72ydinzxVs=", - "rev": "0c4bbb0f8a874de0a2a15d196031c7303d04fbb3", + "hash": "sha256-OOCCh0pSzUPpjlaceYIR2VGQ66eAqUAv8x7kgDfBD/0=", + "rev": "3e6e75d1961a90054ee0e3030ee66b6a04164c10", "url": "https://chromium.googlesource.com/chromium/src/buildtools" }, "fetcher": "fetchFromGitiles" @@ -35,40 +35,40 @@ }, "src/testing": { "args": { - "hash": "sha256-PkTTET3CB1pQLipi0e6m+fVhf7S3MSEqiYeLFg9Pbjs=", - "rev": "305de9533d3ee2840af0b3f2c8ed0b32802b0a5d", + "hash": "sha256-UT4DGNjd+F6liecGeXDwS5Zast4ZriOinbrXAqd96ks=", + "rev": "c030c132cbab406942fb208b7180f8846aa4abf1", "url": "https://chromium.googlesource.com/chromium/src/testing" }, "fetcher": "fetchFromGitiles" }, "src/third_party": { "args": { - "hash": "sha256-P0fhs0vabiD7+C2ILX6gE62RKXfXbLmHRjbWLpqY48g=", - "rev": "e30091e8987ee0bb0cd30bc467250a96a7614762", + "hash": "sha256-qxIivQe2O9L6N5T5RpjtdSXvEFQ4CDZtMSounS8iixw=", + "rev": "de738129ebb915bbe34cdf06520c7050ef8aa9d9", "url": "https://chromium.googlesource.com/chromium/src/third_party" }, "fetcher": "fetchFromGitiles" }, "src/third_party/boringssl/src": { "args": { - "hash": "sha256-bpsZTEQ2/TE7xxhOtDz5PKzkOClImHtCTgOaINzg8Vk=", - "rev": "ddb2ca4b48fca9a1c468d83dc513b837331843ac", + "hash": "sha256-yGBxpmWrFURe3gziO3en5ZKs9wAup8XEwHhzq+cKVu8=", + "rev": "db638238d29708a20b991af3b2488e45a8bbcf71", "url": "https://boringssl.googlesource.com/boringssl.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/breakpad/breakpad": { "args": { - "hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok=", - "rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94", + "hash": "sha256-jGdQyM3+p3qt+Hjt44Wpg7XKiUt7kz9Lv1xRG7vp+dM=", + "rev": "a1220f673dc44632e821bd1a217089e5a159a203", "url": "https://chromium.googlesource.com/breakpad/breakpad.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/catapult": { "args": { - "hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM=", - "rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9", + "hash": "sha256-Is8yDmTyNyseTBPIDwIlhRthqfkFPgQIvu3b6u5c0m0=", + "rev": "04c85a1d0e324464c6be4b3d193b47cb6177d03a", "url": "https://chromium.googlesource.com/catapult.git" }, "fetcher": "fetchFromGitiles" @@ -99,12 +99,20 @@ }, "src/third_party/compiler-rt/src": { "args": { - "hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8=", - "rev": "dc425afb37a69b60c8c02fef815af29e91b61773", + "hash": "sha256-MHamj1BEwae6pohqjrMULEp2hrh8+jGDxNgYbzqtGK0=", + "rev": "dbef1a89100395f128231024d0c07e4dcfe72140", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git" }, "fetcher": "fetchFromGitiles" }, + "src/third_party/cpuinfo/src": { + "args": { + "hash": "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc=", + "rev": "877328f188a3c7d1fa855871a278eb48d530c4c0", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "fetcher": "fetchFromGitiles" + }, "src/third_party/crc32c/src": { "args": { "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=", @@ -115,60 +123,100 @@ }, "src/third_party/dav1d/libdav1d": { "args": { - "hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc=", - "rev": "716164239ad6e6b11c5dcdaa3fb540309d499833", + "hash": "sha256-dPVDZ4SyrHWsRWERUl6UKbbdUG/5dC/UTte6sItMYxg=", + "rev": "af5cf2b1e7f03d6f6de84477e1ca8eed1f3eb03d", "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/depot_tools": { "args": { - "hash": "sha256-+jbfCtruv6MR+A/uzw5WaSj2u92W6bB/vmLBCzL39mM=", - "rev": "d85491b0a1dcb82dd8e124a876ecd7e3d50dc5e8", + "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM=", + "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "fetcher": "fetchFromGitiles" }, + "src/third_party/eigen3/src": { + "args": { + "hash": "sha256-ZXDzAuvTu46YhieLIQ7MSQ0os+v2RF+KBtFuKU9fCWE=", + "rev": "430e35fbd15d3c946d2d2ba19ec41c16ba217cb3", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/farmhash/src": { + "args": { + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "fetcher": "fetchFromGitiles" + }, "src/third_party/ffmpeg": { "args": { - "hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY=", - "rev": "d2d06b12c22d27af58114e779270521074ff1f85", + "hash": "sha256-ZeFzrCE9LkDcp3VTMJkm5ypX29RGZCyZkp3tEr7yFKU=", + "rev": "9e751092c9498b84bbb77e2e0689ef9f50fe608f", "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/flatbuffers/src": { "args": { - "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=", - "rev": "8db59321d9f02cdffa30126654059c7d02f70c32", + "hash": "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E=", + "rev": "1c514626e83c20fffa8557e75641848e1e15cd5e", "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/fontconfig/src": { "args": { - "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0=", - "rev": "86b48ec01ece451d5270d0c5181a43151e45a042", + "hash": "sha256-2h0dWn7MxAX+4o2tMZLyjRFAES+FTMaGaf8M7ySkSV8=", + "rev": "f0ed9c3f43161d3555f6f7a5234b22fe7ca60727", "url": "https://chromium.googlesource.com/external/fontconfig.git" }, "fetcher": "fetchFromGitiles" }, + "src/third_party/fp16/src": { + "args": { + "hash": "sha256-CR7h1d9RFE86l6btk4N8vbQxy0KQDxSMvckbiO87JEg=", + "rev": "3d2de1816307bac63c16a297e8c4dc501b4076df", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "fetcher": "fetchFromGitiles" + }, "src/third_party/freetype/src": { "args": { - "hash": "sha256-oiezGGrPlHVGi24IpLr6UfUs7gT+Epzw37TtAkEixek=", - "rev": "08805be530d6820d2bf8a1b7685826de40f06812", + "hash": "sha256-b74O5i4xhHq8y0qepP8Wup2nuj9LFzBX7ahMCCVhc98=", + "rev": "d3668e00da732654b50e4e81f982544ed6e26390", "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/fuzztest/src": { "args": { - "hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk=", - "rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66", + "hash": "sha256-gMIDf/Alh9BCk0Gm0m+mmhHoKreHCiN7/WOomcMbS/k=", + "rev": "e101ca021a40733d0fa76a3bd9b49b5f76da4f8a", "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" }, "fetcher": "fetchFromGitiles" }, + "src/third_party/fxdiv/src": { + "args": { + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/gemmlowp/src": { + "args": { + "hash": "sha256-e6AeRhZioIiTG5R+IA9g2GBqI4o74wijJYmqINLOtQs=", + "rev": "16e8662c34917be0065110bfcd9cc27d30f52fdf", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "fetcher": "fetchFromGitiles" + }, "src/third_party/google_benchmark/src": { "args": { "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=", @@ -179,16 +227,16 @@ }, "src/third_party/googletest/src": { "args": { - "hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw=", - "rev": "373af2e3df71599b87a40ce0e37164523849166b", + "hash": "sha256-A3kDQbt9ITaxCjl/tJtwySsPUyH+NNb8erdjBzq81o8=", + "rev": "244cec869d12e53378fa0efb610cd4c32a454ec8", "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/grpc/src": { "args": { - "hash": "sha256-5vv8V/hEKalfHa2Qo8QIxLvXoamcLxNQ/bcqY8vCvjk=", - "rev": "806e186735cc3bf4375f43d2d6a9483c607e4278", + "hash": "sha256-JUws1tD5/4mfx/muCkx5FvQoh0Vb2mD5/bIacCAZVAg=", + "rev": "de6ce7f32b1bf254d2b4c04e8872b63284632fd3", "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" }, "fetcher": "fetchFromGitiles" @@ -203,8 +251,8 @@ }, "src/third_party/harfbuzz-ng/src": { "args": { - "hash": "sha256-lNnCtgIegUy4DLhYaGZXcEaFw83KWAHoKpz69AEsWp4=", - "rev": "9f83bbbe64654b45ba5bb06927ff36c2e7588495", + "hash": "sha256-gUUXBd2/di6MYhUzo0QkGQvRY6KLcy7qdDlSClnmnL8=", + "rev": "7d936359a27abb2d7cb14ecc102463bb15c11843", "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" }, "fetcher": "fetchFromGitiles" @@ -243,28 +291,36 @@ }, "src/third_party/libaom/source/libaom": { "args": { - "hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo=", - "rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226", + "hash": "sha256-s+fFufuRRGfItmd63IbHCR6ScANkJ49y+fsIGhTdwZE=", + "rev": "dcfc0bd1934130570d04597a3b75de0824dc434d", "url": "https://aomedia.googlesource.com/aom.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libc++/src": { "args": { - "hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M=", - "rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a", + "hash": "sha256-IemCFOw1X+Kcna6cuj9e29FUhitqvVGn1DeMCShkbOs=", + "rev": "b77132b512d5411f8393fd3decb3abaeaf1d3ec8", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libc++abi/src": { "args": { - "hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70=", - "rev": "a6c815c69d55ec59d020abde636754d120b402ad", + "hash": "sha256-7TUY05CW5OCyd1C1oq69rptr1RkvOMS+1CAJc7yKRFQ=", + "rev": "864f61dc9253d56586ada34c388278565ef513f6", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" }, "fetcher": "fetchFromGitiles" }, + "src/third_party/libgav1/src": { + "args": { + "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=", + "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "fetcher": "fetchFromGitiles" + }, "src/third_party/libjpeg_turbo": { "args": { "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=", @@ -273,6 +329,14 @@ }, "fetcher": "fetchFromGitiles" }, + "src/third_party/libpfm4/src": { + "args": { + "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ=", + "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064", + "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git" + }, + "fetcher": "fetchFromGitiles" + }, "src/third_party/libsrtp": { "args": { "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=", @@ -283,32 +347,32 @@ }, "src/third_party/libunwind/src": { "args": { - "hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw=", - "rev": "84c5262b57147e9934c0a8f2302d989b44ec7093", + "hash": "sha256-veSxr/ICnBsdP+3vWjCbPxduHiEzbT0DUdwfo0xcM30=", + "rev": "322be580a5a193a921c349a15747eeeb9a716ad1", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libvpx/source/libvpx": { "args": { - "hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8=", - "rev": "a985e5e847a2fe69bef3e547cf25088132194e39", + "hash": "sha256-44k28SJ7AbcABv1YV1tICtJ1II4AXTuvcAELSTUht6c=", + "rev": "8d00aca60b951444582b1373e4e47f0ca6e0871c", "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libyuv": { "args": { - "hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus=", - "rev": "cdd3bae84818e78466fec1ce954eead8f403d10c", + "hash": "sha256-9Qn1v9iUrk28bjW9HGepvzEM0wrpmCiA43+a/GPc9/s=", + "rev": "5b22f31cb5d39c1309a589f148678c2a217e75db", "url": "https://chromium.googlesource.com/libyuv/libyuv.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/llvm-libc/src": { "args": { - "hash": "sha256-MgOyCveySgpUoIj6jJGbDjzMVpPDbeKtvpFUC+ocdsY=", - "rev": "8ec6b26421b5fa7aa876fdab486fa1decc558326", + "hash": "sha256-U/ToyQwIzZlaPic6LAnR17ySrZ6eGhReJ6iKVFrIHPg=", + "rev": "0c61a55402c6a0d9d6ca2aeb3c6a2613a8bc8c55", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git" }, "fetcher": "fetchFromGitiles" @@ -329,6 +393,14 @@ }, "fetcher": "fetchFromGitiles" }, + "src/third_party/neon_2_sse/src": { + "args": { + "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=", + "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "fetcher": "fetchFromGitiles" + }, "src/third_party/openh264/src": { "args": { "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=", @@ -339,32 +411,64 @@ }, "src/third_party/perfetto": { "args": { - "hash": "sha256-JwoqF2VWrkwcokaGY6bo73YJWtO7lDnvOqFCBmIEBXY=", - "rev": "0c893ed6bf6b42e3fee58daf3380d301c72550ed", + "hash": "sha256-FfOCX3Z7aKGkMAf8hK5itt7+8N5kBRd9NJGjOLiUjQs=", + "rev": "d5bbee7afdf259af4212929ccbff467dd5349953", "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/protobuf-javascript/src": { "args": { - "hash": "sha256-c/aC+LZQtedL5oouUXw2eTF6xD7LN3J3C0q3D0wl+W0=", - "rev": "28bf5df73ef2f345a936d9cc95d64ba8ed426a53", + "hash": "sha256-1o6N9+1wsQSu1B4w5LlGlwzIUmuPCIYHPqwOyt234ZM=", + "rev": "e6d763860001ba1a76a63adcff5efb12b1c96024", "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" }, "fetcher": "fetchFromGitiles" }, + "src/third_party/pthreadpool/src": { + "args": { + "hash": "sha256-M9uMq/ZkvrWNep+CIFzx6xLfepLkfY8tjgL7ed2vjU0=", + "rev": "f5a07eddbf4be8f23e29e60a2ccf66b78b71f119", + "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git" + }, + "fetcher": "fetchFromGitiles" + }, "src/third_party/re2/src": { "args": { - "hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ=", - "rev": "8451125897dd7816a5c118925e8e42309d598ecc", + "hash": "sha256-e18aSNVEE42LNzCDMay/Fa3BNg36pBPeEtfNvWqlnWE=", + "rev": "6569a9a3df256f4c0c3813cb8ee2f8eef6e2c1fb", "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" }, "fetcher": "fetchFromGitiles" }, + "src/third_party/ruy/src": { + "args": { + "hash": "sha256-fV0El2ZgjxLqstKVN35SL72+diHNK0FkBmG5UwVZFrk=", + "rev": "9940fbf1e0c0863907e77e0600b99bb3e2bc2b9f", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/tflite/src": { + "args": { + "hash": "sha256-9RWrxIDA2vvobr9Cg13SkwfScw+Lk/NCeaPVIXTCKmY=", + "rev": "313f58ae85278ced9ccc7f90ee630bdf8735c52f", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/xnnpack/src": { + "args": { + "hash": "sha256-oxpMzIFwJ3L5cYLkwcSL7a8XS1AGHXKQjwtHoe/2mZw=", + "rev": "4d098efeac50c44a7c03e6feb1794908db4c3158", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "fetcher": "fetchFromGitiles" + }, "src/tools": { "args": { - "hash": "sha256-9CYGP9LI/fSHUAjqvXxyNZZVwxkr5TdEZME4l/7fizM=", - "rev": "ec8f1c6113753a31c55b6d6bddfbe198046029a8", + "hash": "sha256-a3sRfYOVGgroZu25lPS+jGN5Nf/lhfKvKhMl8WiAybs=", + "rev": "3b73a00861c1cc1d6308e20786f42045b77864cd", "url": "https://chromium.googlesource.com/chromium/src/tools" }, "fetcher": "fetchFromGitiles" diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix index b0f3968145b0..b4c02a195b94 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc.nix +++ b/pkgs/by-name/si/signal-desktop/webrtc.nix @@ -57,10 +57,6 @@ stdenv.mkDerivation (finalAttrs: { pulseaudio ]; - patches = [ - ./webrtc-fix-gcc-build.patch - ]; - postPatch = '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace-fail 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' diff --git a/pkgs/servers/mail/spf-engine/default.nix b/pkgs/by-name/sp/spf-engine/package.nix similarity index 79% rename from pkgs/servers/mail/spf-engine/default.nix rename to pkgs/by-name/sp/spf-engine/package.nix index a6b21036c141..2f948bf3178a 100644 --- a/pkgs/servers/mail/spf-engine/default.nix +++ b/pkgs/by-name/sp/spf-engine/package.nix @@ -1,15 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchurl, - flit-core, - pyspf, - dnspython, - authres, - pymilter, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "spf-engine"; version = "3.1.0"; pyproject = true; @@ -19,9 +14,11 @@ buildPythonApplication rec { hash = "sha256-HUuMxYFCqItLFgMSnrkwfmJWqgFGyI1RWgmljb+jkWk="; }; - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + python3Packages.flit-core + ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ pyspf dnspython authres diff --git a/pkgs/tools/games/steamback/default.nix b/pkgs/by-name/st/steamback/package.nix similarity index 79% rename from pkgs/tools/games/steamback/default.nix rename to pkgs/by-name/st/steamback/package.nix index 05f77f0e65a6..c60282daaf59 100644 --- a/pkgs/tools/games/steamback/default.nix +++ b/pkgs/by-name/st/steamback/package.nix @@ -1,19 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchPypi, - setuptools, - setuptools-scm, - wheel, - pillow, - psutil, - async-tkinter-loop, - timeago, - platformdirs, - sv-ttk, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "steamback"; version = "0.3.6"; format = "pyproject"; @@ -23,28 +14,25 @@ buildPythonApplication rec { hash = "sha256-hvMPSxIfwwQqo80JCpYhcbVY4kXs5jWtjjafVSMrw6o="; }; - build-system = [ + build-system = with python3Packages; [ + setuptools setuptools-scm wheel ]; - buildInputs = [ - setuptools - pillow - ]; - - dependencies = [ + dependencies = with python3Packages; [ psutil async-tkinter-loop timeago platformdirs sv-ttk + pillow ]; pythonRelaxDeps = [ "async-tkinter-loop" "platformdirs" - "Pillow" + "pillow" "psutil" ]; diff --git a/pkgs/by-name/sy/syncplay-nogui/package.nix b/pkgs/by-name/sy/syncplay-nogui/package.nix new file mode 100644 index 000000000000..f993c880f49d --- /dev/null +++ b/pkgs/by-name/sy/syncplay-nogui/package.nix @@ -0,0 +1,7 @@ +{ + syncplay, +}: + +syncplay.override { + enableGUI = false; +} diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/by-name/sy/syncplay/package.nix similarity index 75% rename from pkgs/applications/networking/syncplay/default.nix rename to pkgs/by-name/sy/syncplay/package.nix index 8ad4528894bf..98bec9f4b631 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/by-name/sy/syncplay/package.nix @@ -2,17 +2,12 @@ lib, stdenv, fetchFromGitHub, - buildPythonApplication, - pem, - pyside6, - twisted, - certifi, + python3Packages, qt6, - appnope, enableGUI ? true, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "syncplay"; version = "1.7.4"; @@ -32,14 +27,16 @@ buildPythonApplication rec { buildInputs = lib.optionals enableGUI [ (if stdenv.hostPlatform.isLinux then qt6.qtwayland else qt6.qtbase) ]; - propagatedBuildInputs = [ - certifi - pem - twisted - ] - ++ twisted.optional-dependencies.tls - ++ lib.optional enableGUI pyside6 - ++ lib.optional (stdenv.hostPlatform.isDarwin && enableGUI) appnope; + dependencies = + with python3Packages; + [ + certifi + pem + twisted + ] + ++ twisted.optional-dependencies.tls + ++ lib.optional enableGUI pyside6 + ++ lib.optional (stdenv.hostPlatform.isDarwin && enableGUI) appnope; nativeBuildInputs = lib.optionals enableGUI [ qt6.wrapQtAppsHook ]; makeFlags = [ diff --git a/pkgs/applications/networking/syncplay/trusted_certificates.patch b/pkgs/by-name/sy/syncplay/trusted_certificates.patch similarity index 100% rename from pkgs/applications/networking/syncplay/trusted_certificates.patch rename to pkgs/by-name/sy/syncplay/trusted_certificates.patch diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 171887124368..9b3b3a016568 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -7,13 +7,13 @@ }: buildGo125Module (finalAttrs: { pname = "terragrunt"; - version = "0.96.0"; + version = "0.97.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-KIfhgzPQwN3AieWexjiWOMrVNTyK0/kuubP2LQk10QE="; + hash = "sha256-LJGc85oCDEW/z9I4Mcr9Pyv9MLqqN4Zu/nJK1LTD9mk="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildGo125Module (finalAttrs: { make generate-mocks ''; - vendorHash = "sha256-cjbVE8b8CKSl7cRkMuHMKcRb/Yj26oLKU3rAdRCBbk0="; + vendorHash = "sha256-BXFtw7+f9Isnk6EB3U4eLlho5B3rTnofmWBDbbbroUs="; doCheck = false; diff --git a/pkgs/by-name/wo/workset/package.nix b/pkgs/by-name/wo/workset/package.nix index 78f18ad21b8b..ed5b10b1dac1 100644 --- a/pkgs/by-name/wo/workset/package.nix +++ b/pkgs/by-name/wo/workset/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "workset"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "fossable"; repo = "workset"; tag = "v${finalAttrs.version}"; - hash = "sha256-aLSpgxTnyloMbCAIf2Uk9w0niJcJ2XZvcIl+T8Dq40U="; + hash = "sha256-Ryi5zLlOVNVtHhMZ5PglNFKVrrSlrcj3TOoeHKjGAic="; }; - cargoHash = "sha256-5bOWtKpC4ZtU5gMvwErd7Xqy+awjp7QlnQIFQ+eHGoA="; + cargoHash = "sha256-VJ1vXEZkOYUGba8hfgdlNpT0QAvHDPdR+TNhDNprKNk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/wr/wrapWithXFileSearchPathHook/package.nix b/pkgs/by-name/wr/wrapWithXFileSearchPathHook/package.nix new file mode 100644 index 000000000000..aaf2c326aa05 --- /dev/null +++ b/pkgs/by-name/wr/wrapWithXFileSearchPathHook/package.nix @@ -0,0 +1,28 @@ +{ + makeBinaryWrapper, + makeSetupHook, + writeScript, + xbitmaps, +}: + +makeSetupHook + { + name = "wrapWithXFileSearchPathHook"; + propagatedBuildInputs = [ makeBinaryWrapper ]; + } + ( + writeScript "wrapWithXFileSearchPathHook.sh" '' + wrapWithXFileSearchPath() { + paths=( + "$out/share/X11/%T/%N" + "$out/include/X11/%T/%N" + "${xbitmaps}/include/X11/%T/%N" + ) + for exe in $out/bin/*; do + wrapProgram "$exe" \ + --suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}") + done + } + postInstallHooks+=(wrapWithXFileSearchPath) + '' + ) diff --git a/pkgs/by-name/xc/xcursor-viewer/package.nix b/pkgs/by-name/xc/xcursor-viewer/package.nix new file mode 100644 index 000000000000..5f3c20580090 --- /dev/null +++ b/pkgs/by-name/xc/xcursor-viewer/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + qt5, + unstableGitUpdater, +}: + +stdenv.mkDerivation { + pname = "xcursor-viewer"; + version = "0-unstable-2026-01-05"; + + src = fetchFromGitHub { + owner = "drizt"; + repo = "xcursor-viewer"; + rev = "216ed3b6b4694f75fc424862874dc5e2b66fb685"; + hash = "sha256-faQuxHrUAqqSODDKZrRlMnWRj0NeM8hSHSbec7KSo50="; + }; + + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ qt5.qtbase ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "A preview application for cursors in xcurosr format built in QT5"; + homepage = "https://github.com/drizt/xcursor-viewer/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ atemu ]; + mainProgram = "xcursor-viewer"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/xf/xf86-input-mouse/package.nix b/pkgs/by-name/xf/xf86-input-mouse/package.nix new file mode 100644 index 000000000000..4afdfd6bc0c7 --- /dev/null +++ b/pkgs/by-name/xf/xf86-input-mouse/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorgproto, + xorg-server, + nix-update-script, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xf86-input-mouse"; + version = "2.0.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-input-mouse"; + tag = "xf86-input-mouse-${finalAttrs.version}"; + hash = "sha256-qPP0u7k1g30vw4A1c0fuVbQ9HHovTqWy8OAQ8uMGGg0="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + ]; + + buildInputs = [ + util-macros + xorgproto + xorg-server + ]; + + configureFlags = [ "--with-sdkdir=${placeholder "out"}/include/xorg" ]; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-mouse-(.*)" ]; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Mouse input driver for non-Linux platforms for the Xorg X server"; + longDescription = '' + This driver is used on non-Linux operating systems such as BSD & Solaris, as modern Linux + systems use the xf86-input-evdev or xf86-input-libinput drivers instead. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse"; + license = with lib.licenses; [ + mit + hpndSellVariant + x11 + ]; + maintainers = [ ]; + pkgConfigModules = [ "xorg-mouse" ]; + # platforms according to the readme + platforms = with lib.platforms; freebsd ++ netbsd ++ openbsd ++ illumos; + }; +}) diff --git a/pkgs/by-name/xf/xf86-input-synaptics/package.nix b/pkgs/by-name/xf/xf86-input-synaptics/package.nix new file mode 100644 index 000000000000..264d4f3db8e4 --- /dev/null +++ b/pkgs/by-name/xf/xf86-input-synaptics/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorg-server, + xorgproto, + libevdev, + libx11, + libxi, + libxtst, + nix-update-script, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xf86-input-synaptics"; + version = "1.10.0"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-input-synaptics"; + tag = "xf86-input-synaptics-${finalAttrs.version}"; + hash = "sha256-IHkUxphSV6JOlTzIgXGl5hWb6OphJ9Lyzp/YS2phVQs="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + xorg-server + ]; + + buildInputs = [ + xorg-server + xorgproto + libevdev + libx11 + libxi + libxtst + ]; + + configureFlags = [ + "--with-sdkdir=${placeholder "dev"}/include/xorg" + "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d" + ]; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-synaptics-(.*)" ]; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Synaptics touchpad driver for the Xorg X server"; + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics"; + license = lib.licenses.mit; + maintainers = [ ]; + pkgConfigModules = [ "xorg-synaptics" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xf/xf86-input-vmmouse/package.nix b/pkgs/by-name/xf/xf86-input-vmmouse/package.nix new file mode 100644 index 000000000000..9b30f1bc861f --- /dev/null +++ b/pkgs/by-name/xf/xf86-input-vmmouse/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorg-server, + xorgproto, + udev, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xf86-input-vmmouse"; + version = "13.2.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-input-vmmouse"; + tag = "xf86-input-vmmouse-${finalAttrs.version}"; + hash = "sha256-SasWsIzq9s8i3dabRwKGZ0NSuFqnUu4WCWYTu/ZZpS8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + xorg-server # xorg-server defines autoconf macros that we need + ]; + + buildInputs = [ + xorg-server + xorgproto + udev + ]; + + configureFlags = [ + "--sysconfdir=${placeholder "out"}/etc" + "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d" + "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" + ]; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-vmmouse-(.*)" ]; }; + }; + + meta = { + description = "VMware guest mouse driver for the Xorg X server"; + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-vmmouse"; + license = with lib.licenses; [ + hpndSellVariant + x11 + ]; + maintainers = [ ]; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; + }; +}) diff --git a/pkgs/by-name/xf/xf86-input-void/package.nix b/pkgs/by-name/xf/xf86-input-void/package.nix new file mode 100644 index 000000000000..c52742e08170 --- /dev/null +++ b/pkgs/by-name/xf/xf86-input-void/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorg-server, + xorgproto, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xf86-input-void"; + version = "1.4.2"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-input-void"; + tag = "xf86-input-void-${finalAttrs.version}"; + hash = "sha256-R2c+FUBJQ9GfMcZ9NKSgT0lfOkqiCKrA+lFVu8l6e10="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + ]; + + buildInputs = [ + xorg-server + xorgproto + ]; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-void-(.*)" ]; }; + }; + + meta = { + description = "Null input driver for the Xorg X server"; + longDescription = '' + This is a null input driver for the Xorg X server. + It doesn't connect to any physical device, and it never delivers any events. + It functions as both a pointer and keyboard device, and may be used as the X server's core + pointer and/or core keyboard. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-void"; + license = with lib.licenses; [ + hpndSellVariant + mit + ]; + maintainers = [ ]; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin + }; +}) diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index 1d6aab973686..7249c1b43c9e 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2025.13"; + version = "2026.01"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-HYOfcANhOmngNxtMYT53N2aoAI/0n/n+WMyQfjkuqXg="; + hash = "sha256-injxqVC4NhlbnY2JHdNczlOZzKfFiwqAdUAdbPG5bKw="; }; meta = { diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix index bfede48f705a..cc8ac9b2e548 100644 --- a/pkgs/by-name/xo/xorg-server/package.nix +++ b/pkgs/by-name/xo/xorg-server/package.nix @@ -110,6 +110,8 @@ stdenv.mkDerivation (finalAttrs: { dri-pkgconfig-stub libdrm libgbm + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -160,6 +162,11 @@ stdenv.mkDerivation (finalAttrs: { "-Dapple-applications-dir=${placeholder "out"}/Applications" "-Dbundle-id-prefix=org.nixos.xquartz" "-Dsha1=CommonCrypto" + ] + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ + # fixed upstream (unreleased) + "-Dudev=false" + "-Dudev_kms=false" ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix index b1c392e3e037..e263c99526e4 100644 --- a/pkgs/development/python-modules/cleanlab/default.nix +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -5,7 +5,6 @@ # build-system setuptools, - setuptools-scm, # dependencies numpy, @@ -43,9 +42,13 @@ buildPythonPackage (finalAttrs: { hash = "sha256-sgDQJy0iNxs3bIVuqV7LVEFC0jjlWvnqFzKr7ZDGmPo="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools>=65.0,<70.0" "setuptools" + ''; + build-system = [ setuptools - setuptools-scm ]; dependencies = [ @@ -79,6 +82,9 @@ buildPythonPackage (finalAttrs: { # Requires the datasets we prevent from downloading "test_create_imagelab" + # AssertionError: assert np.int64(36) == 35 + "test_num_label_issues" + # Non-trivial numpy2 incompatibilities # assert np.float64(0.492) == 0.491 "test_duplicate_points_have_similar_scores" @@ -107,9 +113,5 @@ buildPythonPackage (finalAttrs: { changelog = "https://github.com/cleanlab/cleanlab/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ happysalada ]; - # cleanlab is incompatible with datasets>=4.0.0 - # cleanlab/datalab/internal/data.py:313: AssertionError - # https://github.com/cleanlab/cleanlab/issues/1244 - broken = lib.versionAtLeast datasets.version "4.0.0"; }; }) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index c8fd74940661..d2576871e319 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -6,16 +6,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lxmf"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; src = fetchFromGitHub { owner = "markqvist"; repo = "lxmf"; - tag = version; - hash = "sha256-bPRoKJGMy+JAyhKcRXKR3Jra5K1UAjRMg0lMt2lOvzA="; + tag = finalAttrs.version; + hash = "sha256-WeEGwdbW2hmN7sdMl8tR5pmaXGqRb6y5Zb536ty3eiY="; }; build-system = [ setuptools ]; @@ -30,11 +30,11 @@ buildPythonPackage rec { meta = { description = "Lightweight Extensible Message Format for Reticulum"; homepage = "https://github.com/markqvist/lxmf"; - changelog = "https://github.com/markqvist/LXMF/releases/tag/${src.tag}"; + changelog = "https://github.com/markqvist/LXMF/releases/tag/${finalAttrs.src.tag}"; # Reticulum License # https://github.com/markqvist/LXMF/blob/master/LICENSE license = lib.licenses.unfree; maintainers = with lib.maintainers; [ fab ]; mainProgram = "lxmd"; }; -} +}) diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index 16458648a37e..023d3ba1db08 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -5,16 +5,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mitogen"; - version = "0.3.36"; + version = "0.3.37"; pyproject = true; src = fetchFromGitHub { owner = "mitogen-hq"; repo = "mitogen"; - tag = "v${version}"; - hash = "sha256-bs00ibMHAhH9oIEoRndX3AMOHwayY5atS5Hi6mJGGJ4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LN4vm3VWt2pm0wljSgGxqH61B3RTsNDyA1SCnZqyoSo="; }; build-system = [ setuptools ]; @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "Python Library for writing distributed self-replicating programs"; homepage = "https://github.com/mitogen-hq/mitogen"; - changelog = "https://github.com/mitogen-hq/mitogen/blob/${src.tag}/docs/changelog.rst"; + changelog = "https://github.com/mitogen-hq/mitogen/blob/${finalAttrs.src.tag}/docs/changelog.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 45b4b62d451d..e2dfe466eb77 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -3,25 +3,22 @@ buildPythonPackage, fetchFromGitHub, lxmf, - pythonOlder, qrcode, rns, setuptools, urwid, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nomadnet"; - version = "0.9.1"; + version = "0.9.7"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "markqvist"; repo = "NomadNet"; - tag = version; - hash = "sha256-Rqs0x5KF3Nb/VMNBr6IriDWX7th4OrBj3x5tQhUIU3U="; + tag = finalAttrs.version; + hash = "sha256-IDEbyvTX5PLPqDQ8gj5UwNkGCn+5wJx2xkYJ8BIWmWI="; }; build-system = [ setuptools ]; @@ -41,9 +38,9 @@ buildPythonPackage rec { meta = { description = "Off-grid, resilient mesh communication"; homepage = "https://github.com/markqvist/NomadNet"; - changelog = "https://github.com/markqvist/NomadNet/releases/tag/${version}"; + changelog = "https://github.com/markqvist/NomadNet/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "nomadnet"; }; -} +}) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index fc3a5542c1f6..dbdb3cf9df5a 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -13,16 +13,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opower"; - version = "0.16.0"; + version = "0.16.1"; pyproject = true; src = fetchFromGitHub { owner = "tronikos"; repo = "opower"; - tag = "v${version}"; - hash = "sha256-UtIb0gSv3hyRDU2ZixSnfxU0eU80tkxsQJgOhnNk65Y="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+Jpse32N1D697jQnutEPvdcL/AmE0ntO1IGyG3qHN1w="; }; build-system = [ setuptools ]; @@ -56,8 +56,8 @@ buildPythonPackage rec { meta = { description = "Module for getting historical and forecasted usage/cost from utilities that use opower.com"; homepage = "https://github.com/tronikos/opower"; - changelog = "https://github.com/tronikos/opower/releases/tag/${src.tag}"; + changelog = "https://github.com/tronikos/opower/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 78ef71f85f3b..daf639a145e4 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20260108"; + version = "1.0.2.20260109"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Jrm70tRfc8kRf4K7+81yGFxBqfl0uyVaYLTNaE5kEQw="; + hash = "sha256-3fS1KZvzGyiYkt4GsYZ4zElGoazRiIeBTDuNbNQFjhk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index fff97993a3e4..574634b810b3 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -13,16 +13,16 @@ warrant-lite, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyoverkiz"; - version = "1.19.3"; + version = "1.19.4"; pyproject = true; src = fetchFromGitHub { owner = "iMicknl"; repo = "python-overkiz-api"; - tag = "v${version}"; - hash = "sha256-h7PGtcpBcYGlqdi4grbz7KG65zZO3x8Hf/J7n271sDs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-8MU+FH6fpQREpJ0x4OXh4BIlBtWEW+fL+oQCipTk4zg="; }; build-system = [ hatchling ]; @@ -46,8 +46,8 @@ buildPythonPackage rec { meta = { description = "Module to interact with the Somfy TaHoma API or other OverKiz APIs"; homepage = "https://github.com/iMicknl/python-overkiz-api"; - changelog = "https://github.com/iMicknl/python-overkiz-api/releases/tag/${src.tag}"; + changelog = "https://github.com/iMicknl/python-overkiz-api/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 4c3cb9c39068..c913bec5c7ca 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -12,16 +12,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyswitchbot"; - version = "0.75.0"; + version = "0.76.0"; pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; - tag = version; - hash = "sha256-fC5DVY3nGFJQg2uDfXqWjIgzr+pKLzt8mvX2azWCopM="; + tag = finalAttrs.version; + hash = "sha256-t5ij86Nq5BQONizKRFPeNyleFo7n4RD9pEglLPhS+Gk="; }; build-system = [ setuptools ]; @@ -44,9 +44,9 @@ buildPythonPackage rec { meta = { description = "Python library to control Switchbot IoT devices"; homepage = "https://github.com/Danielhiversen/pySwitchbot"; - changelog = "https://github.com/Danielhiversen/pySwitchbot/releases/tag/${src.tag}"; + changelog = "https://github.com/Danielhiversen/pySwitchbot/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index c188a00692b2..82d570be73a5 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -7,24 +7,21 @@ fetchFromGitHub, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, typing-extensions, voluptuous, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-otbr-api"; - version = "2.7.0"; + version = "2.7.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "python-otbr-api"; - tag = version; - hash = "sha256-irQ4QvpGIAYYKq0UqLuo7Nrnde905+GJFd4HkxsCDmQ="; + tag = finalAttrs.version; + hash = "sha256-hFWFi64mRJL5487N6Xm6EQVVaYEzsdg9P2QZYEn758k="; }; build-system = [ setuptools ]; @@ -47,8 +44,8 @@ buildPythonPackage rec { meta = { description = "Library for the Open Thread Border Router"; homepage = "https://github.com/home-assistant-libs/python-otbr-api"; - changelog = "https://github.com/home-assistant-libs/python-otbr-api/releases/tag/${version}"; + changelog = "https://github.com/home-assistant-libs/python-otbr-api/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 5343363b44c2..696144d28392 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -12,16 +12,16 @@ versionCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rns"; - version = "1.1.0"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "markqvist"; repo = "Reticulum"; - tag = version; - hash = "sha256-aoKiTdv5r3Z20D6znFLVf/8C4WpDBjKKnaYJQ8zaGVI="; + tag = finalAttrs.version; + hash = "sha256-KX6g9RGPHg3W/gzVaVoPBMpmPQs2jEJaDFDlA6D9Ql8="; }; patches = [ @@ -41,15 +41,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "RNS" ]; - nativeCheckInputs = [ - versionCheckHook - ]; + nativeCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/rncp"; meta = { description = "Cryptography-based networking stack for wide-area networks"; homepage = "https://reticulum.network"; - changelog = "https://github.com/markqvist/Reticulum/blob/${src.tag}/Changelog.md"; + changelog = "https://github.com/markqvist/Reticulum/blob/${finalAttrs.src.tag}/Changelog.md"; # Reticulum License # https://github.com/markqvist/Reticulum/blob/master/LICENSE license = lib.licenses.unfree; @@ -58,4 +57,4 @@ buildPythonPackage rec { qbit ]; }; -} +}) diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix index 22d199c71f94..07f8ce15efa4 100644 --- a/pkgs/development/python-modules/ruuvitag-ble/default.nix +++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix @@ -11,16 +11,16 @@ sensor-state-data, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ruuvitag-ble"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "ruuvitag-ble"; - tag = "v${version}"; - hash = "sha256-5hlO2/YCTc65ImwjJVyWhFe2PTPlQ33aNdqEIxH/lms="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/xtNT36s7vdU0+1QFW2Of6v3OIQ9e6ZA9K3t9rPw5o8="; }; build-system = [ hatchling ]; @@ -40,10 +40,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "ruuvitag_ble" ]; meta = { - changelog = "https://github.com/Bluetooth-Devices/ruuvitag-ble/releases/tag/${src.tag}"; description = "Library for Ruuvitag BLE devices"; homepage = "https://github.com/Bluetooth-Devices/ruuvitag-ble"; + changelog = "https://github.com/Bluetooth-Devices/ruuvitag-ble/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 79141d56bf1e..c450d989311e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -110,6 +110,7 @@ transset, util-macros, viewres, + wrapWithXFileSearchPathHook, x11perf, xauth, xbacklight, @@ -127,6 +128,10 @@ xdriinfo, xev, xeyes, + xf86-input-mouse, + xf86-input-synaptics, + xf86-input-vmmouse, + xf86-input-void, xfd, xfontsel, xfs, @@ -199,6 +204,7 @@ self: with self; { smproxy transset viewres + wrapWithXFileSearchPathHook x11perf xauth xbacklight @@ -331,8 +337,12 @@ self: with self; { xcbutil = libxcb-util; xcbutilrenderutil = libxcb-render-util; xcbutilwm = libxcb-wm; - xkeyboardconfig = xkeyboard-config; xcursorthemes = xcursor-themes; + xf86inputmouse = xf86-input-mouse; + xf86inputsynaptics = xf86-input-synaptics; + xf86inputvmmouse = xf86-input-vmmouse; + xf86inputvoid = xf86-input-void; + xkeyboardconfig = xkeyboard-config; xorgcffiles = xorg-cf-files; xorgdocs = xorg-docs; xorgserver = xorg-server; @@ -530,160 +540,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputmouse = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-mouse"; - version = "1.9.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.5.tar.xz"; - sha256 = "0s4rzp7aqpbqm4474hg4bz7i7vg3ir93ck2q12if4lj3nklqmpjg"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xorg-mouse" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputsynaptics = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libevdev, - libX11, - libXi, - xorgserver, - libXtst, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-synaptics"; - version = "1.10.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.10.0.tar.xz"; - sha256 = "1hmm3g6ab4bs4hm6kmv508fdc8kr2blzb1vsz1lhipcf0vdnmhp0"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libevdev - libX11 - libXi - xorgserver - libXtst - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xorg-synaptics" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputvmmouse = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - udev, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-vmmouse"; - version = "13.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz"; - sha256 = "1f1rlgp1rpsan8k4ax3pzhl1hgmfn135r31m80pjxw5q19c7gw2n"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - udev - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputvoid = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgserver, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-input-void"; - version = "1.4.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-void-1.4.2.tar.xz"; - sha256 = "11bqy2djgb82c1g8ylpfwp3wjw4x83afi8mqyn5fvqp03kidh4d2"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgserver - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoamdgpu = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9c2c32c17c80..a12a0f04a0aa 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -442,6 +442,7 @@ print OUT <