From dba4f38d34c801052143c71fe772cde4e17b2330 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 14 Aug 2024 08:59:00 +0200 Subject: [PATCH 01/97] nixos/renovate: set service type to simple By setting `Type=oneshot` for longer running services like Renovate, the unit remains in the `activating` state during the whole lifetime of the main process. This is probably desirable for short scripts/programs that run setup tasks for other services, like setting up network interfaces. In those cases one can also make use of `RemainAfterExit` to treat the service as `active` once the main process exits. In the case of Renovate we do not make use of `RemainAfterExit` and we have a longer running task, so `Type=simple` works better here. Signed-off-by: Sefa Eyeoglu --- nixos/modules/services/misc/renovate.nix | 2 -- nixos/tests/renovate.nix | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/renovate.nix b/nixos/modules/services/misc/renovate.nix index 9062b7424b68..9fbd8ec9e1ac 100644 --- a/nixos/modules/services/misc/renovate.nix +++ b/nixos/modules/services/misc/renovate.nix @@ -100,12 +100,10 @@ in ] ++ cfg.runtimePackages; serviceConfig = { - Type = "oneshot"; User = "renovate"; Group = "renovate"; DynamicUser = true; LoadCredential = lib.mapAttrsToList (name: value: "SECRET-${name}:${value}") cfg.credentials; - RemainAfterExit = false; Restart = "on-failure"; CacheDirectory = "renovate"; StateDirectory = "renovate"; diff --git a/nixos/tests/renovate.nix b/nixos/tests/renovate.nix index a30b5b3d60b9..deaac4faa5ce 100644 --- a/nixos/tests/renovate.nix +++ b/nixos/tests/renovate.nix @@ -58,12 +58,12 @@ import ./make-test-python.nix ( machine.succeed("git -C /tmp/kitty push origin") machine.succeed(f"echo '{accessToken}' > /etc/renovate-token") - machine.systemctl("start renovate.service") + machine.systemctl("start --wait renovate.service") machine.succeed("tea pulls list --repo meow/kitty | grep 'Configure Renovate'") machine.succeed("tea pulls merge --repo meow/kitty 1") - machine.systemctl("start renovate.service") + machine.systemctl("start --wait renovate.service") ''; } ) From 4949d0bc84ca86a031de99246bda1c4af45d0a21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 17:23:38 +0000 Subject: [PATCH 02/97] python312Packages.h5netcdf: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/h5netcdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index cc43f6d6dff2..522dd4fb1cd2 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "h5netcdf"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-oXHAJ9rrNLJMJKO2MEGVuOq7tvEMdIJW7Tz+GYBjg88="; + hash = "sha256-6VnDtb08p5Zc5fQ4Ok4Dj/y1UDTGPXkYKb0zpaw4qWI="; }; nativeBuildInputs = [ From 4e063a0511ad910b7c1a6bcba324ffce9efe3047 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Oct 2024 22:57:26 +0000 Subject: [PATCH 03/97] os-prober: 1.81 -> 1.83 --- pkgs/tools/misc/os-prober/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index f48aae8e6df5..cfe673bd58f6 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -11,14 +11,14 @@ lvm2 # lvs }: stdenv.mkDerivation rec { - version = "1.81"; + version = "1.83"; pname = "os-prober"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = pname; rev = version; - sha256 = "sha256-3FXfGadIcmKp4qn6ZDcOSQHYsUNP2ObL1cJesNle+8A="; + sha256 = "sha256-cTufM82YE1L7d3kIOtncICInBPEw4o4NzQXB4uDrMKI="; }; nativeBuildInputs = [ makeWrapper ]; From 739f62465206a75be4128c7cf54e7ffa62fe63af Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 19 Oct 2024 12:00:00 +0000 Subject: [PATCH 04/97] nixosTests.os-prober: fix --- nixos/tests/os-prober.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 034de0620d88..18b646c80890 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -84,6 +84,10 @@ in { docbook5 docbook_xsl_ns grub2 + nixos-artwork.wallpapers.simple-dark-gray-bootloader + perlPackages.FileCopyRecursive + perlPackages.XMLSAX + perlPackages.XMLSAXBase kbd kbd.dev kmod.dev @@ -92,16 +96,20 @@ in { libxml2.bin libxslt.bin nixos-artwork.wallpapers.simple-dark-gray-bottom - ntp + perlPackages.ConfigIniFiles + perlPackages.FileSlurp + perlPackages.JSON perlPackages.ListCompare perlPackages.XMLLibXML - python3 + # make-options-doc/default.nix + (python3.withPackages (p: [ p.mistune ])) shared-mime-info - stdenv sudo + switch-to-configuration-ng texinfo unionfs-fuse xorg.lndir + os-prober # add curl so that rather than seeing the test attempt to download # curl's tarball, we see what it's trying to download From 2d69ebbc4ec95f0b5b2cd4fca76cb20ff7e15996 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 21 Oct 2024 16:59:00 +0200 Subject: [PATCH 05/97] mysql84: 8.4.2 -> 8.4.3 Fixes: * CVE-2024-21230 * CVE-2024-7264 * CVE-2024-21196 * CVE-2024-21238 * CVE-2024-21194 * CVE-2024-21199 * CVE-2024-21218 * CVE-2024-21236 * CVE-2024-21239 * CVE-2024-21198 * CVE-2024-21219 * CVE-2024-21203 * CVE-2024-21197 * CVE-2024-21201 * CVE-2024-21241 * CVE-2024-21193 * CVE-2024-21212 * CVE-2024-21213 * CVE-2024-21247 * CVE-2024-21231 * CVE-2024-21237 * CVE-2024-21232 * CVE-2024-21243 * CVE-2024-21244 * CVE-2024-21209 https://www.oracle.com/security-alerts/cpuoct2024.html#AppendixMSQL Changes: https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-3.html --- pkgs/by-name/my/mysql84/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix index 1c4d655efd4b..4e2128a3ef1b 100644 --- a/pkgs/by-name/my/mysql84/package.nix +++ b/pkgs/by-name/my/mysql84/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.4.2"; + version = "8.4.3"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-Vlenjchr8L8iJ+CwX43losRHqBahEv+ib6cAg7y+mBQ="; + hash = "sha256-eslWTEeAIvcwBf+Ju7QPZ7OB/AbVUYQWvf/sdeYluBg="; }; nativeBuildInputs = [ bison cmake pkg-config ] From f2b58efde482848e9b3bb40ca85a1113ed924502 Mon Sep 17 00:00:00 2001 From: Victor Duarte Date: Thu, 24 Oct 2024 11:48:59 +0200 Subject: [PATCH 06/97] fix links to `specifications.freedesktop.org` --- doc/languages-frameworks/gnome.section.md | 2 +- nixos/modules/config/xdg/autostart.nix | 2 +- nixos/modules/config/xdg/icons.nix | 2 +- nixos/modules/config/xdg/menus.nix | 2 +- nixos/modules/config/xdg/mime.nix | 10 +++++----- .../build-fhsenv-bubblewrap/buildFHSEnv.nix | 2 +- pkgs/build-support/build-fhsenv-chroot/env.nix | 2 +- pkgs/build-support/make-desktopitem/default.nix | 2 +- .../setup-hooks/desktop-to-darwin-bundle.sh | 2 +- pkgs/tools/graphics/goverlay/default.nix | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 02dfa3508c4f..8374d55ac2f7 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -64,7 +64,7 @@ To avoid costly file system access when locating icons, GTK, [as well as Qt](htt ### Packaging icon themes {#ssec-icon-theme-packaging} -Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the [icon theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html), icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used. +Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the [icon theme specification](https://specifications.freedesktop.org/icon-theme-spec/latest), icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used. The package `hicolor-icon-theme` provides a setup hook which makes symbolic links for the parent themes into the directory `share/icons` of the current theme directory in the nix store, making sure they can be found at runtime. For that to work the packages providing parent icon themes should be listed as propagated build dependencies, together with `hicolor-icon-theme`. diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix index 6f33f592cf57..8fc3cb9920fa 100644 --- a/nixos/modules/config/xdg/autostart.nix +++ b/nixos/modules/config/xdg/autostart.nix @@ -10,7 +10,7 @@ default = true; description = '' Whether to install files to support the - [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html). + [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest). ''; }; }; diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix index b0267d21d3eb..5fc7b3506a1d 100644 --- a/nixos/modules/config/xdg/icons.nix +++ b/nixos/modules/config/xdg/icons.nix @@ -10,7 +10,7 @@ default = true; description = '' Whether to install files to support the - [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html). + [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/latest). ''; }; xdg.icons.fallbackCursorThemes = lib.mkOption { diff --git a/nixos/modules/config/xdg/menus.nix b/nixos/modules/config/xdg/menus.nix index a71a46dd36cc..6c05d49189ad 100644 --- a/nixos/modules/config/xdg/menus.nix +++ b/nixos/modules/config/xdg/menus.nix @@ -10,7 +10,7 @@ default = true; description = '' Whether to install files to support the - [XDG Desktop Menu specification](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html). + [XDG Desktop Menu specification](https://specifications.freedesktop.org/menu-spec/latest). ''; }; }; diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index 9bd1af397002..20a49a5346e2 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -17,8 +17,8 @@ in default = true; description = '' Whether to install files to support the - [XDG Shared MIME-info specification](https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html) and the - [XDG MIME Applications specification](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html). + [XDG Shared MIME-info specification](https://specifications.freedesktop.org/shared-mime-info-spec/latest) and the + [XDG MIME Applications specification](https://specifications.freedesktop.org/mime-apps-spec/latest). ''; }; @@ -32,7 +32,7 @@ in description = '' Adds associations between mimetypes and applications. See the [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations) for more information. + specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information. ''; }; @@ -46,7 +46,7 @@ in description = '' Sets the default applications for given mimetypes. See the [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#default) for more information. + specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/default) for more information. ''; }; @@ -60,7 +60,7 @@ in description = '' Removes associations between mimetypes and applications. See the [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations) for more information. + specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information. ''; }; }; diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index f80807cc1e41..7dcb9f0baf1b 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -97,7 +97,7 @@ let # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share". # In nix, it is commonly set without containing these values, so we add them as fallback. # - # [1] + # [1] case ":$XDG_DATA_DIRS:" in *:/usr/local/share:*) ;; *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;; diff --git a/pkgs/build-support/build-fhsenv-chroot/env.nix b/pkgs/build-support/build-fhsenv-chroot/env.nix index 105e2975f433..9f8bc07a94ad 100644 --- a/pkgs/build-support/build-fhsenv-chroot/env.nix +++ b/pkgs/build-support/build-fhsenv-chroot/env.nix @@ -67,7 +67,7 @@ let # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share". # In nix, it is commonly set without containing these values, so we add them as fallback. # - # [1] + # [1] case ":$XDG_DATA_DIRS:" in *:/usr/local/share:*) ;; *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;; diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 9cae8204c6a8..10caac3a935a 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -3,7 +3,7 @@ # All possible values as defined by the spec, version 1.4. # Please keep in spec order for easier maintenance. # When adding a new value, don't forget to update the Version field below! -# See https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html +# See https://specifications.freedesktop.org/desktop-entry-spec/latest lib.makeOverridable ({ name # The name of the desktop file , type ? "Application" # version is hardcoded diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 5b38f4376070..cfb7bbd844ce 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -37,7 +37,7 @@ convertIconTheme() { local -ra scales=([1]="" [2]="@2") # Based loosely on the algorithm at: - # https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#icon_lookup + # https://specifications.freedesktop.org/icon-theme-spec/latest/icon_lookup # Assumes threshold = 2 for ease of implementation. function findIcon() { local -r iconSize=$1 diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index 01e6b80efafc..3a80670c67ff 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -26,7 +26,7 @@ let # Finds data files using the XDG Base Directory Specification - # See https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html + # See https://specifications.freedesktop.org/basedir-spec/latest find-xdg-data-files = writeScriptBin "find-xdg-data-files" '' #!${bash}/bin/sh IFS=: From a4da81bfacf61703a178c37d70a4dbabf81db3d5 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Mon, 28 Oct 2024 22:30:34 +0100 Subject: [PATCH 07/97] libsfdo: init at 0.1.3 --- pkgs/by-name/li/libsfdo/package.nix | 51 +++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/li/libsfdo/package.nix diff --git a/pkgs/by-name/li/libsfdo/package.nix b/pkgs/by-name/li/libsfdo/package.nix new file mode 100644 index 000000000000..2095b8a4efce --- /dev/null +++ b/pkgs/by-name/li/libsfdo/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + testers, + validatePkgConfig, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libsfdo"; + version = "0.1.3"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "vyivel"; + repo = "libsfdo"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-9jCfCIB07mmJ6aWQHvXaxYhEMNikUw/W1xrpmh6FKbo="; + }; + + strictDeps = true; + doCheck = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + validatePkgConfig + ]; + + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + + meta = { + description = "Collection of libraries which implement some of the freedesktop.org specifications"; + homepage = "https://gitlab.freedesktop.org/vyivel/libsfdo"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.zi3m5f ]; + pkgConfigModules = [ + "libsfdo-basedir" + "libsfdo-desktop-file" + "libsfdo-desktop" + "libsfdo-icon" + ]; + platforms = lib.platforms.all; + }; +}) From 46175cc857eb307cd3fc51d00c4b1cc4fcb8a0c9 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 28 Oct 2024 23:27:14 +0100 Subject: [PATCH 08/97] devpi-server: 6.10.0 -> 6.14.0 add updateScript for automatic updating --- pkgs/development/tools/devpi-server/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index c1dfc4841931..e32f0702e2aa 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,5 @@ { lib, fetchFromGitHub, buildPythonApplication +, gitUpdater , pythonOlder , aiohttp , appdirs @@ -29,7 +30,7 @@ buildPythonApplication rec { pname = "devpi-server"; - version = "6.10.0"; + version = "6.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -38,7 +39,7 @@ buildPythonApplication rec { owner = "devpi"; repo = "devpi"; rev = "server-${version}"; - hash = "sha256-JqYWWItdAgtUtiYSqxUd40tT7ON4oHiDA4/3Uhb01b8="; + hash = "sha256-j8iILbptUw8DUE9lFpjDp/VYzdJzmOYqM/RCnkpWdcA="; }; sourceRoot = "${src.name}/server"; @@ -116,6 +117,11 @@ buildPythonApplication rec { }; }; + # devpi uses a monorepo for server,common,client and web + passthru.updateScript = gitUpdater { + rev-prefix = "server-"; + }; + meta = with lib;{ homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; From 4042fbb1597e1bfc70843b3e2f6e9720efc9e79b Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 28 Oct 2024 23:43:08 +0100 Subject: [PATCH 09/97] devpi-client: 7.1.0 -> 7.2.0 add passthru.updateScript --- pkgs/development/tools/devpi-client/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index b24300558958..ef2584ab99e9 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -5,17 +5,18 @@ glibcLocales, python3, fetchPypi, + nix-update-script, }: python3.pkgs.buildPythonApplication rec { pname = "devpi-client"; - version = "7.1.0"; + version = "7.2.0"; pyproject = true; src = fetchPypi { - pname = "devpi_client"; + pname = "devpi-client"; inherit version; - hash = "sha256-NwbhrojxOJSpDvMk0MbAGCbjmS8z2g1ynW6zzgVvy/M="; + hash = "sha256-wUM2hFjDh4unvuah2bQY4uZZVxo4VmFPWNdriigmnXs="; }; build-system = with python3.pkgs; [ @@ -66,6 +67,8 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "devpi" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Client for devpi, a pypi index server and packaging meta tool"; homepage = "http://doc.devpi.net"; From 61226d1338eefe31c064d0584dd97a138bfb248c Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 28 Oct 2024 23:46:25 +0100 Subject: [PATCH 10/97] devpi-common: add nix-update-script --- pkgs/development/python-modules/devpi-common/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 218db0fe558d..7197be7d2336 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -10,6 +10,7 @@ setuptools-changelog-shortener, setuptools, tomli, + nix-update-script, }: buildPythonPackage rec { @@ -41,6 +42,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "devpi_common" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/devpi/devpi"; description = "Utilities jointly used by devpi-server and devpi-client"; From 96d23f8b562125e697d7e62ac8c53a7497efc294 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Mon, 28 Oct 2024 23:23:38 +0100 Subject: [PATCH 11/97] labwc: 0.8.0 -> 0.8.1 add libsfdo (https://github.com/labwc/labwc/blob/master/NEWS.md#081) and versionCheckHook --- pkgs/by-name/la/labwc/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 594a255bb989..2e610c83647a 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -8,6 +8,7 @@ libinput, libpng, librsvg, + libsfdo, libxcb, libxkbcommon, libxml2, @@ -17,6 +18,7 @@ pkg-config, scdoc, stdenv, + versionCheckHook, wayland, wayland-protocols, wayland-scanner, @@ -27,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-1PyPk6r/hXkC0EfOIeDqNGrrpvo616derD9u7i3XjkA="; + hash = "sha256-TXxdjMkzZQoCqkZBqus5eCBEhA/nvxNNXaNHUTGFQDQ="; }; outputs = [ @@ -58,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { libinput libpng librsvg + libsfdo libxcb libxkbcommon libxml2 @@ -69,10 +72,15 @@ stdenv.mkDerivation (finalAttrs: { xwayland ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + mesonFlags = [ (lib.mesonEnable "xwayland" true) ]; strictDeps = true; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + passthru = { providedSessions = [ "labwc" ]; }; @@ -80,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/labwc/labwc"; description = "Wayland stacking compositor, inspired by Openbox"; + changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "labwc"; maintainers = with lib.maintainers; [ AndersonTorres ]; From e3510c096c43c35b55f1ab791dd935c26ef2576a Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 29 Oct 2024 15:09:30 +0800 Subject: [PATCH 12/97] python3Packages.pillow-jpls: fix pypaBuildFlags --- pkgs/development/python-modules/pillow-jpls/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pillow-jpls/default.nix b/pkgs/development/python-modules/pillow-jpls/default.nix index 7aebaf432c00..a55d6d6740e6 100644 --- a/pkgs/development/python-modules/pillow-jpls/default.nix +++ b/pkgs/development/python-modules/pillow-jpls/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { pypaBuildFlags = [ "-C" - "cmake.args='--preset=sysdeps'" + "cmake.args=--preset=sysdeps" ]; nativeCheckInputs = [ pytestCheckHook ]; From b43baf6f3b218a23a6fae47910b825284ed6168a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Oct 2024 09:02:07 +0000 Subject: [PATCH 13/97] oidc-agent: 5.2.2 -> 5.2.3 --- pkgs/by-name/oi/oidc-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix index 60d0c2b972a7..5f2eeb6492b2 100644 --- a/pkgs/by-name/oi/oidc-agent/package.nix +++ b/pkgs/by-name/oi/oidc-agent/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "oidc-agent"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "indigo-dc"; repo = pname; rev = "v${version}"; - hash = "sha256-OW0hCDVC+AqmXP1dQK/7lnXeG8RbXzFLbKLEvc/8spY="; + hash = "sha256-Vj/YoZpbiV8psU70i3SIKJM/qPQYuy96ogEhT8cG7RU="; }; nativeBuildInputs = [ From 4bbec8c443077492947a54e25411718457284a80 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 23 Sep 2024 15:39:04 +0800 Subject: [PATCH 14/97] gmt: move to by-name; run nixfmt; dcw-gmt: move to by-name; run nixfmt; gshhg-gis: move to by-name; run nixfmt --- .../dc/dcw-gmt/package.nix} | 12 ++-- .../gm/gmt/package.nix} | 66 +++++++++---------- .../gs/gshhg-gmt/package.nix} | 12 ++-- pkgs/top-level/all-packages.nix | 9 --- 4 files changed, 47 insertions(+), 52 deletions(-) rename pkgs/{applications/gis/gmt/dcw.nix => by-name/dc/dcw-gmt/package.nix} (87%) rename pkgs/{applications/gis/gmt/default.nix => by-name/gm/gmt/package.nix} (65%) rename pkgs/{applications/gis/gmt/gshhg.nix => by-name/gs/gshhg-gmt/package.nix} (86%) diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/by-name/dc/dcw-gmt/package.nix similarity index 87% rename from pkgs/applications/gis/gmt/dcw.nix rename to pkgs/by-name/dc/dcw-gmt/package.nix index 092e86edcb66..efa697b2926a 100644 --- a/pkgs/applications/gis/gmt/dcw.nix +++ b/pkgs/by-name/dc/dcw-gmt/package.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dcw-gmt"; version = "2.1.2"; src = fetchurl { - url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz"; + url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${finalAttrs.version}.tar.gz"; sha256 = "sha256-S7hA0HXIuj4UrrQc8XwkI2v/eHVmMU+f91irmXd0XZk="; }; @@ -29,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; -} +}) diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/by-name/gm/gmt/package.nix similarity index 65% rename from pkgs/applications/gis/gmt/default.nix rename to pkgs/by-name/gm/gmt/package.nix index 2f2528ff5bb9..afd1464aeba6 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/by-name/gm/gmt/package.nix @@ -1,15 +1,12 @@ { lib, stdenv, - fetchFromGitHub, + fetchurl, cmake, curl, - Accelerate, - CoreGraphics, - CoreVideo, + darwin, fftwSinglePrec, netcdf, - libxml2, pcre, gdal, blas, @@ -19,46 +16,34 @@ dcw-gmt, gshhg-gmt, }: - /* The onus is on the user to also install: - ffmpeg for webm or mp4 output - graphicsmagick for gif output */ -let - # Certainly not an ideal situation, See: - # https://github.com/NixOS/nixpkgs/pull/340707#issuecomment-2361894717 - netcdf' = netcdf.override { - libxml2 = libxml2.override { - enableHttp = true; - }; - }; -in stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "gmt"; - version = "6.5.0"; - src = fetchFromGitHub { - owner = "GenericMappingTools"; - repo = "gmt"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI="; + version = "6.4.0"; + src = fetchurl { + url = "https://github.com/GenericMappingTools/gmt/releases/download/${finalAttrs.version}/gmt-${finalAttrs.version}-src.tar.gz"; + sha256 = "sha256-0mfAx9b7MMnqfgKe8n2tsm/9e5LLS0cD+aO6Do85Ohs="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ curl gdal - netcdf' + netcdf pcre dcw-gmt gshhg-gmt ] ++ ( - if stdenv.hostPlatform.isDarwin then + if stdenv.isDarwin then + with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics @@ -73,9 +58,7 @@ in stdenv.mkDerivation (finalAttrs: { ] ); - propagatedBuildInputs = [ - ghostscript - ]; + propagatedBuildInputs = [ ghostscript ]; cmakeFlags = [ @@ -86,13 +69,24 @@ in stdenv.mkDerivation (finalAttrs: { "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" "-DCOPY_DCW:BOOL=FALSE" "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" + "-DGDAL_ROOT=${gdal.out}" + "-DNETCDF_ROOT=${netcdf.out}" + "-DPCRE_ROOT=${pcre.out}" "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" "-DGMT_ENABLE_OPENMP:BOOL=TRUE" "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid - ]; + ] + ++ ( + with stdenv; + lib.optionals (!isDarwin) [ + "-DFFTW3_ROOT=${fftwSinglePrec.dev}" + "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so" + "-DBLAS_LIBRARY=${blas}/lib/libblas.so" + ] + ); - meta = { + meta = with lib; { homepage = "https://www.generic-mapping-tools.org"; description = "Tools for manipulating geographic and cartesian data sets"; longDescription = '' @@ -104,9 +98,11 @@ in stdenv.mkDerivation (finalAttrs: { transformations and includes supporting data such as coastlines, rivers, and political boundaries and optionally country polygons. ''; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl3Plus; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ tviti ]; }; - }) diff --git a/pkgs/applications/gis/gmt/gshhg.nix b/pkgs/by-name/gs/gshhg-gmt/package.nix similarity index 86% rename from pkgs/applications/gis/gmt/gshhg.nix rename to pkgs/by-name/gs/gshhg-gmt/package.nix index d51f1dbbcb5a..c17378d5ec1b 100644 --- a/pkgs/applications/gis/gmt/gshhg.nix +++ b/pkgs/by-name/gs/gshhg-gmt/package.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gshhg-gmt"; version = "2.3.7"; src = fetchurl { - url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${version}.tar.gz"; + url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${finalAttrs.version}.tar.gz"; sha256 = "9bb1a956fca0718c083bef842e625797535a00ce81f175df08b042c2a92cfe7f"; }; @@ -28,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 082c351099b5..bd496238d27c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27779,15 +27779,6 @@ with pkgs; ### APPLICATIONS / GIS - gmt = callPackage ../applications/gis/gmt { - inherit (darwin.apple_sdk.frameworks) - Accelerate CoreGraphics CoreVideo; - }; - - gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; - - dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { }; - grass = callPackage ../applications/gis/grass { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; From fafffddcf966213b6cf62f05c78f77ee53c3b58f Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 23 Sep 2024 15:47:44 +0800 Subject: [PATCH 15/97] gmt: 6.4.0 -> 6.5.0; fix build --- pkgs/by-name/gm/gmt/package.nix | 84 ++++++++++++++++----------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/gm/gmt/package.nix b/pkgs/by-name/gm/gmt/package.nix index afd1464aeba6..381fd67aa4f1 100644 --- a/pkgs/by-name/gm/gmt/package.nix +++ b/pkgs/by-name/gm/gmt/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, cmake, curl, darwin, @@ -11,27 +11,34 @@ gdal, blas, lapack, - glibc, ghostscript, dcw-gmt, gshhg-gmt, + libxml2, }: -/* - The onus is on the user to also install: - - ffmpeg for webm or mp4 output - - graphicsmagick for gif output -*/ - stdenv.mkDerivation (finalAttrs: { pname = "gmt"; - version = "6.4.0"; - src = fetchurl { - url = "https://github.com/GenericMappingTools/gmt/releases/download/${finalAttrs.version}/gmt-${finalAttrs.version}-src.tar.gz"; - sha256 = "sha256-0mfAx9b7MMnqfgKe8n2tsm/9e5LLS0cD+aO6Do85Ohs="; + version = "6.5.0"; + + src = fetchFromGitHub { + owner = "GenericMappingTools"; + repo = "gmt"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI="; }; nativeBuildInputs = [ cmake ]; + env = { + NIX_LDFLAGS = "-lxml2 -L${lib.getLib (libxml2.override { enableHttp = true; })}/lib"; + NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration " + + lib.optionalString ( + stdenv.isDarwin + && lib.versionOlder (darwin.apple_sdk.MacOSX-SDK.version or darwin.apple_sdk.sdk.version) "13.3" + ) "-D__LAPACK_int=int"; + }; + buildInputs = [ curl @@ -51,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { ] else [ - glibc fftwSinglePrec blas lapack @@ -62,31 +68,28 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ - "-DGMT_DOCDIR=share/doc/gmt" - "-DGMT_MANDIR=share/man" - "-DGMT_LIBDIR=lib" - "-DCOPY_GSHHG:BOOL=FALSE" - "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" - "-DCOPY_DCW:BOOL=FALSE" - "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" - "-DGDAL_ROOT=${gdal.out}" - "-DNETCDF_ROOT=${netcdf.out}" - "-DPCRE_ROOT=${pcre.out}" - "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" - "-DGMT_ENABLE_OPENMP:BOOL=TRUE" - "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" - "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid + (lib.cmakeFeature "GMT_DOCDIR" "share/doc/gmt") + (lib.cmakeFeature "GMT_MANDIR" "share/man") + (lib.cmakeFeature "GMT_LIBDIR" "lib") + (lib.cmakeBool "COPY_GSHHG" false) + (lib.cmakeFeature "GSHHG_ROOT" "${gshhg-gmt.out}/share/gshhg-gmt") + (lib.cmakeBool "COPY_DCW" false) + (lib.cmakeFeature "DCW_ROOT" "${dcw-gmt.out}/share/dcw-gmt") + (lib.cmakeFeature "GDAL_ROOT" "${gdal.out}") + (lib.cmakeFeature "NETCDF_ROOT" "${netcdf.out}") + (lib.cmakeFeature "PCRE_ROOT" "${pcre.out}") + (lib.cmakeBool "GMT_INSTALL_TRADITIONAL_FOLDERNAMES" false) + (lib.cmakeBool "GMT_ENABLE_OPENMP" true) + (lib.cmakeBool "GMT_INSTALL_MODULE_LINKS" false) + (lib.cmakeFeature "LICENSE_RESTRICTED" "LGPL") ] - ++ ( - with stdenv; - lib.optionals (!isDarwin) [ - "-DFFTW3_ROOT=${fftwSinglePrec.dev}" - "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so" - "-DBLAS_LIBRARY=${blas}/lib/libblas.so" - ] - ); + ++ (lib.optionals (!stdenv.isDarwin) [ + (lib.cmakeFeature "FFTW3_ROOT" "${fftwSinglePrec.dev}") + (lib.cmakeFeature "LAPACK_LIBRARY" "${lib.getLib lapack}/lib/liblapack.so") + (lib.cmakeFeature "BLAS_LIBRARY" "${lib.getLib blas}/lib/libblas.so") + ]); - meta = with lib; { + meta = { homepage = "https://www.generic-mapping-tools.org"; description = "Tools for manipulating geographic and cartesian data sets"; longDescription = '' @@ -98,11 +101,8 @@ stdenv.mkDerivation (finalAttrs: { transformations and includes supporting data such as coastlines, rivers, and political boundaries and optionally country polygons. ''; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ tviti ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ tviti ]; }; }) From 7e2ce73bbd7e0e0678b4a9402d215bf1b26f6745 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 1 Nov 2024 23:00:35 +0800 Subject: [PATCH 16/97] valent: move to pkgs/by-name --- .../misc/valent/default.nix => by-name/va/valent/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/valent/default.nix => by-name/va/valent/package.nix} (100%) diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/by-name/va/valent/package.nix similarity index 100% rename from pkgs/applications/misc/valent/default.nix rename to pkgs/by-name/va/valent/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 364bf2acce85..0a6bc6873f6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37828,8 +37828,6 @@ with pkgs; unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; - valent = callPackage ../applications/misc/valent { }; - vault-medusa = callPackage ../tools/security/vault-medusa { }; vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { }; From 74d7928a957526155bf5b77955461e23910cd059 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 1 Nov 2024 23:01:05 +0800 Subject: [PATCH 17/97] valent: format with nixfmt-rfc-style --- pkgs/by-name/va/valent/package.nix | 53 ++++++++++++++++-------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/va/valent/package.nix b/pkgs/by-name/va/valent/package.nix index 2b3ad209759a..da08ac7a7dd5 100644 --- a/pkgs/by-name/va/valent/package.nix +++ b/pkgs/by-name/va/valent/package.nix @@ -1,26 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, desktop-file-utils -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, vala -, evolution-data-server-gtk4 -, gdk-pixbuf -, glib -, glib-networking -, gnutls -, gst_all_1 -, json-glib -, libadwaita -, libpeas2 -, libphonenumber -, libportal-gtk4 -, pipewire -, pulseaudio -, tinysparql +{ + lib, + stdenv, + fetchFromGitHub, + desktop-file-utils, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + vala, + evolution-data-server-gtk4, + gdk-pixbuf, + glib, + glib-networking, + gnutls, + gst_all_1, + json-glib, + libadwaita, + libpeas2, + libphonenumber, + libportal-gtk4, + pipewire, + pulseaudio, + tinysparql, }: stdenv.mkDerivation (finalAttrs: { @@ -88,7 +89,11 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://valent.andyholmes.ca"; changelog = "https://github.com/andyholmes/valent/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; + license = with lib.licenses; [ + gpl3Plus + cc0 + cc-by-sa-30 + ]; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; From 7d7b8f81897ea212703abd9fec4167d853221d62 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 1 Nov 2024 23:15:19 +0800 Subject: [PATCH 18/97] valent: 1.0.0.alpha.46 -> 1.0.0.alpha.46-unstable-2024-10-26 --- pkgs/by-name/va/valent/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/va/valent/package.nix b/pkgs/by-name/va/valent/package.nix index da08ac7a7dd5..951ebb5a6069 100644 --- a/pkgs/by-name/va/valent/package.nix +++ b/pkgs/by-name/va/valent/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "valent"; - version = "1.0.0.alpha.46"; + version = "1.0.0.alpha.46-unstable-2024-10-26"; src = fetchFromGitHub { owner = "andyholmes"; repo = "valent"; - rev = "v${finalAttrs.version}"; - hash = "sha256-DpDHU1l8Pot0RwVR1rL9fIhMHo18eo7nTecnSa3hG2E="; + rev = "165a2791d4bf3e7dee69e3dd7885dbe4948265b9"; + hash = "sha256-7klvOvwyAg+Xno6zWo8UByjaS9OkOuCceuZcAIEgdyU="; fetchSubmodules = true; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - "-Dplugin_bluez=true" + (lib.mesonBool "plugin_bluez" true) ]; meta = { From 702f6e3ce4d1632700fc3fdc03c5699ef720c6c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 20:00:23 +0100 Subject: [PATCH 19/97] python312Packages.sensoterra: init at 2.0.1 Query Sensoterra probes using the Customer API https://pypi.org/project/sensoterra/ --- .../python-modules/sensoterra/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/sensoterra/default.nix diff --git a/pkgs/development/python-modules/sensoterra/default.nix b/pkgs/development/python-modules/sensoterra/default.nix new file mode 100644 index 000000000000..a592bd652fc3 --- /dev/null +++ b/pkgs/development/python-modules/sensoterra/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + requests, + setuptools, +}: + +buildPythonPackage rec { + pname = "sensoterra"; + version = "2.0.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WfjTOns5OPU8+ufDeFdDGjURhBWUFfw/qRSHQazBL04="; + }; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + # Test require network access + doCheck = false; + + pythonImportsCheck = [ "sensoterra" ]; + + meta = { + description = "Query Sensoterra probes using the Customer API"; + homepage = "https://gitlab.com/sensoterra/public/python"; + changelog = "https://gitlab.com/sensoterra/public/python/-/blob/main/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f201fad95c5f..d9dac75cb925 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14217,6 +14217,8 @@ self: super: with self; { sensorpush-ble = callPackage ../development/python-modules/sensorpush-ble { }; + sensoterra = callPackage ../development/python-modules/sensoterra { }; + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece; }; From 37c20e81270e52e9b62a3422fc22a7e891033294 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 20:12:58 +0100 Subject: [PATCH 20/97] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c6a244127429..e56fd3d365d7 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3824,7 +3824,8 @@ zeroconf ]; "sensoterra" = ps: with ps; [ - ]; # missing inputs: sensoterra + sensoterra + ]; "sentry" = ps: with ps; [ sentry-sdk ]; @@ -5652,6 +5653,7 @@ "sensor" "sensorpro" "sensorpush" + "sensoterra" "sentry" "senz" "seventeentrack" From 20eaafab5e4de972a8a5d96d9c6400724e97a7e5 Mon Sep 17 00:00:00 2001 From: DaRacci Date: Fri, 1 Nov 2024 04:43:25 +0000 Subject: [PATCH 21/97] universal-pidff: 0.0.8 -> 0.0.10 --- pkgs/os-specific/linux/universal-pidff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/universal-pidff/default.nix b/pkgs/os-specific/linux/universal-pidff/default.nix index 3325735c279b..eefa7a01deca 100644 --- a/pkgs/os-specific/linux/universal-pidff/default.nix +++ b/pkgs/os-specific/linux/universal-pidff/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "universal-pidff"; - version = "0.0.8"; + version = "0.0.10"; src = fetchFromGitHub { owner = "JacKeTUs"; repo = "universal-pidff"; rev = "refs/tags/${version}"; - hash = "sha256-DptLqyjfRCpkbyFAQI8sylyKu2XyZZGrSITva9vcXGQ="; + hash = "sha256-BViobWl+9ypTcQJWtZ9pbeU4cmHcFNZWlsmQUOO64Vc="; }; postPatch = '' From 010ee56428f826669940a75391c1ccdd3a387e4e Mon Sep 17 00:00:00 2001 From: amesgen Date: Sat, 2 Nov 2024 14:59:44 +0100 Subject: [PATCH 22/97] bao: fix tests --- pkgs/tools/security/bao/default.nix | 7 ++++- pkgs/tools/security/bao/test-exe.patch | 40 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/security/bao/test-exe.patch diff --git a/pkgs/tools/security/bao/default.nix b/pkgs/tools/security/bao/default.nix index 5531b7c3323c..c36a1f34e96d 100644 --- a/pkgs/tools/security/bao/default.nix +++ b/pkgs/tools/security/bao/default.nix @@ -13,7 +13,12 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+MjfqIg/aKPWhzxbPJ0dnS4egCj50Ib7ob3zXUSBXRg="; }; - cargoHash = "sha256-SNsRN5XgchZq6/BZnMeahIqnkP4Jq6bZxbE5cDVpsQA="; + cargoPatches = [ + # https://github.com/oconnor663/bao/pull/55 + ./test-exe.patch + ]; + + cargoHash = "sha256-mmhTG3WXVjIKtaz2xP9aYI9GQNTbx4l3c6UgKSMgQJU="; meta = { description = "Implementation of BLAKE3 verified streaming"; diff --git a/pkgs/tools/security/bao/test-exe.patch b/pkgs/tools/security/bao/test-exe.patch new file mode 100644 index 000000000000..0dd08724b53a --- /dev/null +++ b/pkgs/tools/security/bao/test-exe.patch @@ -0,0 +1,40 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 2f66e42..34240e8 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -26,6 +26,9 @@ path = "src/main.rs" + [dependencies.arrayref] + version = "0.3.5" + ++[dependencies.assert_cmd] ++version = "2.0.16" ++ + [dependencies.bao] + version = "0.12" + +diff --git a/tests/test.rs b/tests/test.rs +index f9427bd..48aabca 100644 +--- a/tests/test.rs ++++ b/tests/test.rs +@@ -1,8 +1,7 @@ + use duct::cmd; + use rand::prelude::*; +-use std::env::consts::EXE_EXTENSION; + use std::fs; +-use std::path::{Path, PathBuf}; ++use std::path::PathBuf; + use std::sync::Once; + use tempfile::tempdir; + +@@ -15,10 +14,7 @@ pub fn bao_exe() -> PathBuf { + .expect("build failed"); + }); + +- Path::new("target") +- .join("debug") +- .join("bao") +- .with_extension(EXE_EXTENSION) ++ assert_cmd::cargo::cargo_bin("bao") + } + + #[test] From db8c8b5413f3169f04b092353bd2a9f5d6c1663e Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 2 Nov 2024 08:30:38 +0800 Subject: [PATCH 23/97] python3Packages.daltonlens: init at 0.1.5 --- .../python-modules/daltonlens/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/daltonlens/default.nix diff --git a/pkgs/development/python-modules/daltonlens/default.nix b/pkgs/development/python-modules/daltonlens/default.nix new file mode 100644 index 000000000000..5410f4d2ab2e --- /dev/null +++ b/pkgs/development/python-modules/daltonlens/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + setuptools-git, + numpy, + pillow, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "daltonlens"; + version = "0.1.5"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-T7fXlRdFtcVw5WURPqZhCmulUi1ZnCfCXgcLtTHeNas="; + }; + + build-system = [ + setuptools + setuptools-git + ]; + + dependencies = [ + numpy + pillow + ]; + + pythonImportsCheck = [ + "daltonlens" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/" + ]; + + disabledTestPaths = [ + "tests/test_generate.py" + ]; + + meta = { + description = "R&D companion package for the desktop application DaltonLens"; + homepage = "https://github.com/DaltonLens/DaltonLens-Python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae8070db1bb9..9f95f067f063 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2844,6 +2844,8 @@ self: super: with self; { dalle-mini = callPackage ../development/python-modules/dalle-mini { }; + daltonlens = callPackage ../development/python-modules/daltonlens { }; + daphne = callPackage ../development/python-modules/daphne { }; daqp = callPackage ../development/python-modules/daqp { }; From 48351d1a115a43d0083563da6991508c96d527a7 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 2 Nov 2024 08:32:41 +0800 Subject: [PATCH 24/97] python3Packages.python-lorem: init at 1.3.0.post3 --- .../python-modules/python-lorem/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/python-lorem/default.nix diff --git a/pkgs/development/python-modules/python-lorem/default.nix b/pkgs/development/python-modules/python-lorem/default.nix new file mode 100644 index 000000000000..e60991c79357 --- /dev/null +++ b/pkgs/development/python-modules/python-lorem/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "python-lorem"; + version = "1.3.0.post3"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "python_lorem"; + hash = "sha256-Vw1TKheXg+AkhksnmWUfdIo+Jt7X7m1pS2f0Kfe8pv0="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "lorem" + ]; + + meta = { + description = "Pythonic lorem ipsum generator"; + homepage = "https://github.com/JarryShaw/lorem"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f95f067f063..dcda69d72705 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9193,6 +9193,8 @@ self: super: with self; { python-hcl2 = callPackage ../development/python-modules/python-hcl2 { }; + python-lorem = callPackage ../development/python-modules/python-lorem { }; + python-ndn = callPackage ../development/python-modules/python-ndn { }; python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; From 2d1b8b66767f3b4a0d59fe6ef59f4ccfd5d45b2e Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 2 Nov 2024 08:34:22 +0800 Subject: [PATCH 25/97] python3Packages.textstat: init at 0.7.4 --- .../python-modules/textstat/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/textstat/default.nix diff --git a/pkgs/development/python-modules/textstat/default.nix b/pkgs/development/python-modules/textstat/default.nix new file mode 100644 index 000000000000..127c6f453a92 --- /dev/null +++ b/pkgs/development/python-modules/textstat/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pyphen, + pytestCheckHook, + pytest, +}: +buildPythonPackage rec { + version = "0.7.4"; + pname = "textstat"; + pyproject = true; + + src = fetchFromGitHub { + owner = "textstat"; + repo = "textstat"; + rev = version; + hash = "sha256-UOCWsIdoVGxmkro4kNBYNMYhA3kktngRDxKjo6o+GXY="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest + ]; + + dependencies = [ + setuptools + pyphen + ]; + + pythonImportsCheck = [ + "textstat" + ]; + + pytestFlagsArray = [ + "test.py" + ]; + + meta = { + description = "Python package to calculate readability statistics of a text object"; + homepage = "https://textstat.org"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcda69d72705..f7c77ff849da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15616,6 +15616,8 @@ self: super: with self; { textparser = callPackage ../development/python-modules/textparser { }; + textstat = callPackage ../development/python-modules/textstat { }; + textual = callPackage ../development/python-modules/textual { }; textual-dev = callPackage ../development/python-modules/textual-dev { }; From d5eb164726f12b348ef761a26d4dba999d230062 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 2 Nov 2024 08:36:31 +0800 Subject: [PATCH 26/97] python3Packages.uuid6: init at 2024.7.10 --- .../python-modules/uuid6/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/uuid6/default.nix diff --git a/pkgs/development/python-modules/uuid6/default.nix b/pkgs/development/python-modules/uuid6/default.nix new file mode 100644 index 000000000000..e8ca415443cb --- /dev/null +++ b/pkgs/development/python-modules/uuid6/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "uuid6"; + version = "2024.7.10"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LSnX9j9ZPKruoODQ3QrYEpycZjsp4ZvfiC6GS+3xj7A="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "test/" + ]; + + disabledTestPaths = [ + "test/test_uuid6.py" + ]; + + pythonImportsCheck = [ + "uuid6" + ]; + + meta = { + description = "New time-based UUID formats which are suited for use as a database key"; + homepage = "https://github.com/oittaa/uuid6-python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7c77ff849da..13617be81bb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17226,6 +17226,8 @@ self: super: with self; { utils = callPackage ../development/python-modules/utils { }; + uuid6 = callPackage ../development/python-modules/uuid6 { }; + uv = toPythonModule (pkgs.uv.override { python3Packages = self; }); From 507bd0ac7bc31224f7aa2e4eb52ed13f35d40de7 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 2 Nov 2024 08:37:45 +0800 Subject: [PATCH 27/97] devtoolbox: init at 1.2 --- pkgs/by-name/de/devtoolbox/package.nix | 118 +++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 pkgs/by-name/de/devtoolbox/package.nix diff --git a/pkgs/by-name/de/devtoolbox/package.nix b/pkgs/by-name/de/devtoolbox/package.nix new file mode 100644 index 000000000000..c058aa36e3ec --- /dev/null +++ b/pkgs/by-name/de/devtoolbox/package.nix @@ -0,0 +1,118 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + blueprint-compiler, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + gtksourceview5, + webkitgtk_6_0, + gcr_4, + gdk-pixbuf, +}: +python3Packages.buildPythonApplication rec { + pname = "devtoolbox"; + version = "1.2"; + pyproject = false; # uses meson + + src = fetchFromGitHub { + owner = "aleiepure"; + repo = "devtoolbox"; + rev = "v${version}"; + hash = "sha256-tSH7H2Y/+8EpuM4+Fa0iL/pSJSVtFDXlO2w/xwpzps0="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + gtksourceview5 + webkitgtk_6_0 + gcr_4 + gdk-pixbuf + ]; + + dependencies = with python3Packages; [ + pygobject3 + ruamel-yaml + lxml + python-crontab + jwt + jsonschema + pytz + tzlocal + python-lorem + uuid6 + textstat + markdown2 + daltonlens + asn1crypto + qrcode + sqlparse + jsbeautifier + cssbeautifier + humanize + croniter + python-dateutil + rcssmin + rjsmin + ]; + + dontWrapGApps = true; + + # Contains an unusable devtoolbox-run-script + postInstall = '' + rm -r $out/devtoolbox + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "Development tools at your fingertips"; + longDescription = '' + If you're tired of endlessly looking online for the right + tool, or to find again that website of which you don't + recall the name to do a quick conversion, this is the + right app for you. This is a collection of powerful yet + simple-to-use tools and utilities to solve the most common + daily development problems: + - JSON to YAML converter and vice-versa + - CRON expressions parser + - Formatters for common languages + - Hash generators + - Regex tester + - Markdown Previewer + - Image converters + - Much more... + ''; + homepage = "https://github.com/aleiepure/devtoolbox"; + license = with lib.licenses; [ + gpl3Plus + cc0 + lgpl3Only + mit + unlicense + ]; + mainProgram = "devtoolbox"; + maintainers = with lib.maintainers; [ + aleksana + aucub + ]; + platforms = lib.platforms.linux; + }; +} From e620644e104a08ef6e7798b88fbe70022083b114 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 15:37:44 +0000 Subject: [PATCH 28/97] tailor: drop Unmaintained package that no longer builds; last upstream update was three years ago. Signed-off-by: Fernando Rodrigues --- .../version-management/tailor/default.nix | 38 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/applications/version-management/tailor/default.nix diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix deleted file mode 100644 index a195c51358ef..000000000000 --- a/pkgs/applications/version-management/tailor/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, python3 -, fetchurl -}: - -python3.pkgs.buildPythonApplication rec { - pname = "tailor"; - version = "0.9.37"; - - src = fetchurl { - url = "https://gitlab.com/ports1/tailor/-/archive/0.937/tailor-0.937.tar.gz"; - hash = "sha256-Bdf8ZCRsbCsFz1GRxyQxxndXSsm8oOL2738m9UxOTVc="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - future - ]; - - # AssertionError: Tailor Darcs repository not found! - doCheck = false; - - meta = with lib; { - description = "Tool to migrate changesets between various kinds of version control system"; - longDescription = '' - With its ability to "translate the history" from one VCS kind to another, - this tool makes it easier to keep the upstream changes merged in - a own branch of a product. - - Tailor is able to fetch the history from Arch, Bazaar, CVS, Darcs, Monotone, - Perforce or Subversion and rewrite it over Aegis, Bazaar, CVS, Darcs, Git, - Mercurial, Monotone and Subversion. - ''; - homepage = "https://gitlab.com/ports1/tailor"; - license = licenses.gpl1Plus; - platforms = platforms.unix; - mainProgram = "tailor"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cfbc05fa7739..a3a8d4ad7fbf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1145,6 +1145,7 @@ mapAliases { ### T ### tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 + tailor = throw "'tailor' has been removed from nixpkgs, as it was unmaintained upstream."; # Added 2024-11-02 tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2024-10-17 taskwarrior = lib.warn "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; taplo-cli = taplo; # Added 2022-07-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c64bfa6a756a..fce375d1b02d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32541,8 +32541,6 @@ with pkgs; tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs { }; - tailor = callPackage ../applications/version-management/tailor { }; - tailor-gui = callPackage ../os-specific/linux/tailor-gui { }; taizen = callPackage ../applications/misc/taizen { }; From 5ed2ec9d1bfd65c4afd4affb0dd6a430ccea1c27 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 19:35:28 +0900 Subject: [PATCH 29/97] python312Packages.taxi: 6.2.0 -> 6.3.1 Diff: https://github.com/sephii/taxi/compare/6.2.0...6.3.1 --- pkgs/development/python-modules/taxi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix index 92a389512cad..6b7523b30174 100644 --- a/pkgs/development/python-modules/taxi/default.nix +++ b/pkgs/development/python-modules/taxi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "taxi"; - version = "6.2.0"; + version = "6.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "sephii"; repo = "taxi"; rev = version; - hash = "sha256-wtLlO/W+39kTPjb2U6c54bxWxAQB7CxGxBh8gur+RCQ="; + hash = "sha256-QB88RpgzrQy7DGeRdMHC2SV5Esp/r5LZtlaY5C8vJxw="; }; propagatedBuildInputs = [ From 0d0d64b185526f22920e276a1f7c90e04bb82657 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 3 Nov 2024 00:54:15 +0900 Subject: [PATCH 30/97] python312Packages.taxi: switch to pypa builder --- pkgs/development/python-modules/taxi/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix index 6b7523b30174..6fd45eef85eb 100644 --- a/pkgs/development/python-modules/taxi/default.nix +++ b/pkgs/development/python-modules/taxi/default.nix @@ -3,9 +3,8 @@ buildPythonPackage, fetchFromGitHub, appdirs, - requests, click, - setuptools, + flit-core, pytestCheckHook, freezegun, }: @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "taxi"; version = "6.3.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "sephii"; @@ -22,11 +21,11 @@ buildPythonPackage rec { hash = "sha256-QB88RpgzrQy7DGeRdMHC2SV5Esp/r5LZtlaY5C8vJxw="; }; - propagatedBuildInputs = [ + build-system = [ flit-core ]; + + dependencies = [ appdirs - requests click - setuptools ]; nativeCheckInputs = [ From ab28c94a5bdf7f9d72b910e0c966f036ff55e7e7 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 16:01:16 +0000 Subject: [PATCH 31/97] distrho: move to by-name Signed-off-by: Fernando Rodrigues --- .../default.nix => by-name/di/distrho-ports/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/distrho/default.nix => by-name/di/distrho-ports/package.nix} (100%) diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/by-name/di/distrho-ports/package.nix similarity index 100% rename from pkgs/applications/audio/distrho/default.nix rename to pkgs/by-name/di/distrho-ports/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c64bfa6a756a..d2c274e980ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28582,8 +28582,6 @@ with pkgs; dirt = callPackage ../applications/audio/dirt { }; - distrho = callPackage ../applications/audio/distrho { }; - dit = callPackage ../applications/editors/dit { }; djvulibre = callPackage ../applications/misc/djvulibre { }; From 1c7f59847f56487d5d535d7980d9df2fe662c0f9 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 16:06:39 +0000 Subject: [PATCH 32/97] distrho-ports: format with nixfmt-rfc-style Signed-off-by: Fernando Rodrigues --- pkgs/by-name/di/distrho-ports/package.nix | 51 ++++++++++++++--------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix index 1da0b6ee0d22..3c007ca05335 100644 --- a/pkgs/by-name/di/distrho-ports/package.nix +++ b/pkgs/by-name/di/distrho-ports/package.nix @@ -1,22 +1,24 @@ -{ lib -, stdenv -, alsa-lib -, fetchFromGitHub -, fftwFloat -, freetype -, libGL -, libX11 -, libXcursor -, libXext -, libXrender -, meson -, ninja -, pkg-config +{ + lib, + stdenv, + alsa-lib, + fetchFromGitHub, + fftwFloat, + freetype, + libGL, + libX11, + libXcursor, + libXext, + libXrender, + meson, + ninja, + pkg-config, }: -let rpathLibs = [ - fftwFloat -]; +let + rpathLibs = [ + fftwFloat + ]; in stdenv.mkDerivation rec { pname = "distrho-ports"; @@ -29,7 +31,11 @@ stdenv.mkDerivation rec { sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf"; }; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; buildInputs = rpathLibs ++ [ alsa-lib @@ -91,7 +97,14 @@ stdenv.mkDerivation rec { vitalium wolpertinger ''; - license = with licenses; [ gpl2Only gpl3Only gpl2Plus lgpl2Plus lgpl3Only mit ]; + license = with licenses; [ + gpl2Only + gpl3Only + gpl2Plus + lgpl2Plus + lgpl3Only + mit + ]; maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; From 22d8686e66ebfed9336756399cc9941bcf2d14b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 2 Nov 2024 17:12:44 +0100 Subject: [PATCH 33/97] dosbox-staging: fix on x86_64-darwin --- pkgs/by-name/do/dosbox-staging/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index d23466447ecc..43d4377d614a 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -4,7 +4,6 @@ SDL2_image, SDL2_net, alsa-lib, - darwin, fetchFromGitHub, fetchpatch, fluidsynth, @@ -30,6 +29,8 @@ stdenv, testers, zlib-ng, + apple-sdk_15, + darwinMinVersionHook, }: stdenv.mkDerivation (finalAttrs: { @@ -81,14 +82,10 @@ stdenv.mkDerivation (finalAttrs: { zlib-ng ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AudioUnit - Carbon - Cocoa - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + (darwinMinVersionHook "10.15") # from https://www.dosbox-staging.org/releases/macos/ + ]; outputs = [ "out" "man" ]; From f2ae6d269e664a8bbd7aeeed1509726819db6870 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 15:33:51 +0000 Subject: [PATCH 34/97] bloom: drop Leaf package with no maintainers; no longer builds on Hydra; last version was released over a year ago with no commit activity since then. Seems to want very specific library versions, so future maintainers of this package if it's re-added will have a tough time keeping it working with Nixpkgs' fast-paced development workflow: https://github.com/bloombloombloom/Bloom#building-bloom-from-source Signed-off-by: Fernando Rodrigues --- pkgs/development/tools/bloom/default.nix | 55 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 pkgs/development/tools/bloom/default.nix diff --git a/pkgs/development/tools/bloom/default.nix b/pkgs/development/tools/bloom/default.nix deleted file mode 100644 index e870371c0ebe..000000000000 --- a/pkgs/development/tools/bloom/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, yaml-cpp -, qtbase -, qtsvg -, wrapQtAppsHook -, qttools -, libusb1 -, php -, hidapi -, procps -}: - -stdenv.mkDerivation rec { - pname = "bloom"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "bloombloombloom"; - repo = "Bloom"; - rev = "v${version}"; - hash = "sha256-ZZfclZwxsCgApUII79bJVyT5V/dF9jm7l8ynRWCh0UU="; - }; - - nativeBuildInputs = [ - cmake - php - wrapQtAppsHook - ]; - - buildInputs = [ - hidapi - libusb1 - procps - qtbase - qtsvg - qttools - yaml-cpp - ]; - - postPatch = '' - sed -i 's|/usr|${placeholder "out"}|' cmake/Installing.cmake - ''; - - meta = { - description = "Debug interface for AVR-based embedded systems development on GNU/Linux"; - homepage = "https://bloom.oscillate.io/"; - license = lib.licenses.lgpl3Only; - maintainers = [ ]; - mainProgram = "bloom"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a3a8d4ad7fbf..10368aee84e6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -145,6 +145,7 @@ mapAliases { (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 bless = throw "'bless' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'imhex' or 'ghex' instead"; # Added 2024-09-15 blockbench-electron = blockbench; # Added 2024-03-16 + bloom = throw "'bloom' has been removed because it was unmaintained upstream."; # Added 2024-11-02 bmap-tools = bmaptool; # Added 2024-08-05 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fce375d1b02d..c5727b5f521c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -341,8 +341,6 @@ with pkgs; blst = callPackage ../development/libraries/blst { }; - bloom = qt6Packages.callPackage ../development/tools/bloom { }; - bloodhound-py = with python3Packages; toPythonApplication bloodhound-py; bodyclose = callPackage ../development/tools/bodyclose { }; From 6ee0f3669d0cf572cb0859119657f1a8c0c0b323 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 16:43:41 +0000 Subject: [PATCH 35/97] music-player: remove nested `with lib;` in meta Signed-off-by: Fernando Rodrigues --- pkgs/by-name/mu/music-player/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix index 2f2a54d36fca..25d8ccb797b5 100644 --- a/pkgs/by-name/mu/music-player/package.nix +++ b/pkgs/by-name/mu/music-player/package.nix @@ -40,11 +40,11 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.AudioUnit ]; - meta = with lib; { + meta = { description = "Extensible music player daemon written in Rust"; homepage = "https://github.com/tsirysndr/music-player"; changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "music-player"; }; From 96b8e958efb52ecfb4c90d1b9e4941574e273725 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 16:44:18 +0000 Subject: [PATCH 36/97] music-player: 0.2.0-alpha.14-unstable-2024-08-24 -> 0.2.0-alpha.14-unstable-2024-10-02 Signed-off-by: Fernando Rodrigues --- pkgs/by-name/mu/music-player/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix index 25d8ccb797b5..1aaf189dc2c1 100644 --- a/pkgs/by-name/mu/music-player/package.nix +++ b/pkgs/by-name/mu/music-player/package.nix @@ -11,17 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "music-player"; - version = "0.2.0-alpha.14-unstable-2024-08-24"; + version = "0.2.0-alpha.14-unstable-2024-10-02"; src = fetchFromGitHub { owner = "tsirysndr"; repo = "music-player"; - # No patch for 0.2.0, diff patch has a big size, temporarily until the next release - rev = "cf01ae4d2dcf5c804559250f2c7f922d870ae26d"; - hash = "sha256-8C8uFnXSBalLD2MUgzzfg4ylvTVecyPJOSUri5jbvkM="; + rev = "cbf03c3f2f0f9baca831b08ec27d9b31438faa3d"; + hash = "sha256-BG0MU6IdFQX+C4BxTZlq5I7a4BQmUTvwAQALw5/UPBE="; }; - cargoHash = "sha256-JmyuA5p6/7jtNuOMWuAuspYYid+dGOeollIlS0DRCIE="; + cargoHash = "sha256-t/jdVTdmaJk8Sb43XEuVCKa4kSR+ZrIEmMQKWeVpB70="; nativeBuildInputs = [ From ce0110db43890330c6a3bb509624c93d3e91252b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 19:34:20 +0900 Subject: [PATCH 37/97] python312Packages.svg-path: 6.2 -> 6.3 Diff: https://github.com/regebro/svg.path/compare/6.2...6.3 --- pkgs/development/python-modules/svg-path/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index 9f9cca8b929d..1d2ff7122d27 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "svg.path"; - version = "6.2"; + version = "6.3"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-GiFZ+duJjfk8RjfP08yvfaH9Bz9Z+ppZUMc+RtSqGso="; + hash = "sha256-6Td0CjFqf+yGrNIXq2Im4RL1EygHhSQSa7fqnb57Gt4="; }; nativeCheckInputs = [ From 51a85e0829f07633c65489db4af1195eb10489f6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 3 Nov 2024 02:09:36 +0900 Subject: [PATCH 38/97] python312Packages.svg-path: refactor --- .../python-modules/svg-path/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index 1d2ff7122d27..093970206927 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, pillow, pytestCheckHook, pythonOlder, @@ -10,15 +11,19 @@ buildPythonPackage rec { pname = "svg.path"; version = "6.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-6Td0CjFqf+yGrNIXq2Im4RL1EygHhSQSa7fqnb57Gt4="; + src = fetchFromGitHub { + owner = "regebro"; + repo = "svg.path"; + rev = "refs/tags/${version}"; + hash = "sha256-qes6cKw/Ok0WgcPO/NPuREVNUbnlhm82jF90dK7Ay8U="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pillow pytestCheckHook @@ -34,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "SVG path objects and parser"; homepage = "https://github.com/regebro/svg.path"; + changelog = "https://github.com/regebro/svg.path/blob/${version}/CHANGES.txt"; license = licenses.mit; maintainers = [ ]; }; From 12aa98067d6954db645201c477f1e25eeb49b9bc Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 17:19:28 +0000 Subject: [PATCH 39/97] libsnark: move to by-name Signed-off-by: Fernando Rodrigues --- .../libsnark/default.nix => by-name/li/libsnark/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libsnark/default.nix => by-name/li/libsnark/package.nix} (100%) diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/by-name/li/libsnark/package.nix similarity index 100% rename from pkgs/development/libraries/libsnark/default.nix rename to pkgs/by-name/li/libsnark/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d66ad450ec82..57858f714ae4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21396,8 +21396,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; }; - libsnark = callPackage ../development/libraries/libsnark { }; - libsodium = callPackage ../development/libraries/libsodium { }; libsoup = callPackage ../development/libraries/libsoup { }; From 8e1ecbc05d9a99222d78d7c9b7d1a85a8644675d Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 17:19:39 +0000 Subject: [PATCH 40/97] libsnark: format with nixfmt-rfc-style Signed-off-by: Fernando Rodrigues --- pkgs/by-name/li/libsnark/package.nix | 36 +++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/li/libsnark/package.nix b/pkgs/by-name/li/libsnark/package.nix index 54360cad4ed9..5a3b36989f7e 100644 --- a/pkgs/by-name/li/libsnark/package.nix +++ b/pkgs/by-name/li/libsnark/package.nix @@ -1,21 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + openssl, + boost, + gmp, + procps, +}: stdenv.mkDerivation rec { pname = "libsnark"; version = "unstable-2018-01-15"; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + openssl + boost + gmp + ] ++ lib.optional stdenv.hostPlatform.isLinux procps; - cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ "-DWITH_SUPERCOP=OFF" ] + cmakeFlags = + lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ + "-DWITH_SUPERCOP=OFF" + ] ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ]; src = fetchFromGitHub { rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; - owner = "scipr-lab"; - repo = "libsnark"; - sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; + owner = "scipr-lab"; + repo = "libsnark"; + sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; fetchSubmodules = true; }; From 44b6270df6ede9b6e1d17c0c41223566f0c3e9ca Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 17:20:39 +0000 Subject: [PATCH 41/97] libsnark: unstable-2018-01-15 -> 20140603-unstable-2024-02-23 Signed-off-by: Fernando Rodrigues --- pkgs/by-name/li/libsnark/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libsnark/package.nix b/pkgs/by-name/li/libsnark/package.nix index 5a3b36989f7e..2c070639b055 100644 --- a/pkgs/by-name/li/libsnark/package.nix +++ b/pkgs/by-name/li/libsnark/package.nix @@ -10,9 +10,9 @@ procps, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libsnark"; - version = "unstable-2018-01-15"; + version = "20140603-unstable-2024-02-23"; nativeBuildInputs = [ cmake @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ]; src = fetchFromGitHub { - rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; owner = "scipr-lab"; repo = "libsnark"; - sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; + rev = "6c705e3135f585c222813654caedc86520fda1f6"; + hash = "sha256-5Gk24fwVaXBWEFmhTsN9Qm8x/Qpr1KjavI3staJidxQ="; fetchSubmodules = true; }; From a8873dec444ccfcf47caf0afc5e65031bb737101 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 17:21:05 +0000 Subject: [PATCH 42/97] libsnark: remove nested `with lib;` in meta Signed-off-by: Fernando Rodrigues --- pkgs/by-name/li/libsnark/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libsnark/package.nix b/pkgs/by-name/li/libsnark/package.nix index 2c070639b055..9fe0ae7e5e5f 100644 --- a/pkgs/by-name/li/libsnark/package.nix +++ b/pkgs/by-name/li/libsnark/package.nix @@ -39,10 +39,10 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - meta = with lib; { + meta = { description = "C++ library for zkSNARKs"; homepage = "https://github.com/scipr-lab/libsnark"; - license = licenses.mit; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } From e79ff6a49d302b2e064135f611c5ffc821b95eed Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 17:22:01 +0000 Subject: [PATCH 43/97] libsnark: mark broken if procps is used CMake can't find procps' pkg-config file, leading to a build failure. It's an optional feature which is already disabled in Darwin, so it's probably not that much of an issue to remove it. Signed-off-by: Fernando Rodrigues --- pkgs/by-name/li/libsnark/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsnark/package.nix b/pkgs/by-name/li/libsnark/package.nix index 9fe0ae7e5e5f..199ab79c169b 100644 --- a/pkgs/by-name/li/libsnark/package.nix +++ b/pkgs/by-name/li/libsnark/package.nix @@ -7,6 +7,7 @@ openssl, boost, gmp, + withProcps ? false, procps, }: @@ -22,10 +23,10 @@ stdenv.mkDerivation { openssl boost gmp - ] ++ lib.optional stdenv.hostPlatform.isLinux procps; + ] ++ lib.optional withProcps procps; cmakeFlags = - lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ] + lib.optionals (!withProcps) [ "-DWITH_PROCPS=OFF" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ "-DWITH_SUPERCOP=OFF" ] @@ -40,6 +41,7 @@ stdenv.mkDerivation { }; meta = { + broken = withProcps; # Despite procps having a valid pkg-config file, CMake doesn't seem to be able to find it. description = "C++ library for zkSNARKs"; homepage = "https://github.com/scipr-lab/libsnark"; license = lib.licenses.mit; From 863a15c6c9fca9ec68619366762b8d6ab7871707 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 17:44:40 +0000 Subject: [PATCH 44/97] distrho: remove nested `with lib;` from meta, turn the longDescription into a markdown list, and use the new style for the platform Signed-off-by: Fernando Rodrigues --- pkgs/by-name/di/distrho-ports/package.nix | 74 +++++++++++------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix index 3c007ca05335..4ba3a9c9fb3d 100644 --- a/pkgs/by-name/di/distrho-ports/package.nix +++ b/pkgs/by-name/di/distrho-ports/package.nix @@ -57,47 +57,47 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { homepage = "http://distrho.sourceforge.net/ports"; description = "Linux audio plugins and LV2 ports"; longDescription = '' Includes: - arctican-function - arctican-pilgrim - dexed - drowaudio-distortion - drowaudio-distortionshaper - drowaudio-flanger - drowaudio-reverb - drowaudio-tremolo - drumsynth - easySSP - eqinox - HiReSam - juce-opl - klangfalter - LUFSMeter - LUFSMeter-Multi - luftikus - obxd - pitchedDelay - refine - stereosourceseparation - swankyamp - tal-dub-3 - tal-filter - tal-filter-2 - tal-noisemaker - tal-reverb - tal-reverb-2 - tal-reverb-3 - tal-vocoder-2 - temper - vex - vitalium - wolpertinger + - arctican-function + - arctican-pilgrim + - dexed + - drowaudio-distortion + - drowaudio-distortionshaper + - drowaudio-flanger + - drowaudio-reverb + - drowaudio-tremolo + - drumsynth + - easySSP + - eqinox + - HiReSam + - juce-opl + - klangfalter + - LUFSMeter + - LUFSMeter-Multi + - luftikus + - obxd + - pitchedDelay + - refine + - stereosourceseparation + - swankyamp + - tal-dub-3 + - tal-filter + - tal-filter-2 + - tal-noisemaker + - tal-reverb + - tal-reverb-2 + - tal-reverb-3 + - tal-vocoder-2 + - temper + - vex + - vitalium + - wolpertinger ''; - license = with licenses; [ + license = with lib.licenses; [ gpl2Only gpl3Only gpl2Plus @@ -106,6 +106,6 @@ stdenv.mkDerivation rec { mit ]; maintainers = [ ]; - platforms = [ "x86_64-linux" ]; + platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isLinux lib.systems.inspect.patterns.isx86; }; } From 5be13c7eadfac346d2f78863db2d95c34d11ddf7 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 17:44:56 +0000 Subject: [PATCH 45/97] distrho: 2021-03-15 -> 2021-03-15-unstable-2024-05-01, fix build Signed-off-by: Fernando Rodrigues --- pkgs/by-name/di/distrho-ports/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix index 4ba3a9c9fb3d..dcee3bbadd74 100644 --- a/pkgs/by-name/di/distrho-ports/package.nix +++ b/pkgs/by-name/di/distrho-ports/package.nix @@ -20,14 +20,14 @@ let fftwFloat ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "distrho-ports"; - version = "2021-03-15"; + version = "2021-03-15-unstable-2024-05-01"; src = fetchFromGitHub { owner = "DISTRHO"; repo = "DISTRHO-Ports"; - rev = version; + rev = "b3596e6a690eb0556e69e8b6d943fee2dfbb04fb"; sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf"; }; @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { libXrender ]; + env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ]; + postFixup = '' for file in \ $out/lib/lv2/vitalium.lv2/vitalium.so \ From baf7402ce61ac31aa15d966459b632d90e60e7e4 Mon Sep 17 00:00:00 2001 From: sarahec Date: Sat, 2 Nov 2024 12:25:13 -0700 Subject: [PATCH 46/97] scalene: 1.5.45 -> 1.5.46 --- pkgs/development/python-modules/scalene/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 7040e8d57256..159a2dc7090a 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -39,7 +39,7 @@ in buildPythonPackage rec { pname = "scalene"; - version = "1.5.45"; + version = "1.5.46"; pyproject = true; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "plasma-umass"; repo = "scalene"; rev = "v${version}"; - hash = "sha256-0DhoLsXv2tUEkynMkoA14pNxF6GGLe30bfUOii7+PYE="; + hash = "sha256-G+fX0D70aGOmXr/SqaBKkOz3CEHpGqClFFdTeOzRpaw="; }; patches = [ From 8484c379eddba7b7404b6e3873f9190173772058 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 2 Nov 2024 21:44:12 +0200 Subject: [PATCH 47/97] musescore: 4.4.2 -> 4.4.3 Diff: https://github.com/musescore/MuseScore/compare/v4.4.2...v4.4.3 --- pkgs/applications/audio/musescore/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 6f28bf98a1b1..bd6513e4e4f7 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -50,27 +50,14 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-wgujiFvaWejSEXTbq/Re/7Ca1jIqso2uZej3Lb3V4I8="; + sha256 = "sha256-bHpPhav9JBPkwJA9o+IFHRWbvxWnGkD1wHBHS4XJ/YE="; }; - patches = [ - # https://github.com/musescore/MuseScore/pull/24326 - (fetchpatch { - name = "fix-menubar-with-qt6.5+.patch"; - url = "https://github.com/musescore/MuseScore/pull/24326/commits/b274f13311ad0b2bce339634a006ba22fbd3379e.patch"; - hash = "sha256-ZGmjRa01CBEIxJdJYQMhdg4A9yjWdlgn0pCPmENBTq0="; - }) - (fetchpatch { - name = "fix-crash-accessing-uninitialized-properties.patch"; - url = "https://github.com/musescore/MuseScore/pull/24714.patch"; - hash = "sha256-ErrCU/U+wyfD7R8kiZTifGIeuCAdKi1q7uxYsoE/OLA="; - }) - ]; cmakeFlags = [ "-DMUSE_APP_BUILD_MODE=release" From 4244afa4f632b8f9572e3dfb17d6da9f9442426b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 2 Nov 2024 21:26:54 +0100 Subject: [PATCH 48/97] python312Packages.h5netcdf: drop support for Python 3.6-3.8 Co-authored-by: Nick Cao --- pkgs/development/python-modules/h5netcdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 522dd4fb1cd2..1af2e93f7bc6 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "1.4.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; From 5872c0aba742041be96c10e4edcc480b7811564d Mon Sep 17 00:00:00 2001 From: tu-maurice Date: Sat, 2 Nov 2024 21:24:16 +0100 Subject: [PATCH 49/97] perlPackages.ProtocolHTTP2: 1.10 -> 1.11 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d703f43124e..cc04a184a476 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21351,14 +21351,14 @@ with self; { ProtocolHTTP2 = buildPerlModule { pname = "Protocol-HTTP2"; - version = "1.10"; - + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CR/CRUX/Protocol-HTTP2-1.10.tar.gz"; - hash = "sha256-wmoAWPtK+ul+S/DbxkGJ9nEURRXERH89y1l+zQOWpko="; + url = "mirror://cpan/authors/id/C/CR/CRUX/Protocol-HTTP2-1.11.tar.gz"; + hash = "sha256-Vp8Fsavpl7UHyCUVMMyB0e6WvZMsxoJTS2zkhlNQCRM="; }; buildInputs = [ AnyEvent ModuleBuildTiny NetSSLeay TestLeakTrace TestSharedFork TestTCP ]; meta = { + homepage = "https://github.com/vlet/p5-Protocol-HTTP2"; description = "HTTP/2 protocol implementation (RFC 7540)"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; From 6fde6162a2daae62f2e5808918ea19c1c97b51d2 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 23:19:51 +0200 Subject: [PATCH 50/97] vesktop: fix darwin extension `.App` -> `.app` --- pkgs/by-name/ve/vesktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index bfe935453489..aa43c93ba98e 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} - mv dist/mac*/Vesktop.App $out/Applications + mv dist/mac*/Vesktop.app $out/Applications/Vesktop.app '' + '' runHook postInstall From 729859dd6a12cc53171c93c79b60f836eef8a13d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 2 Nov 2024 22:27:00 +0100 Subject: [PATCH 51/97] openroad: mark as broken --- pkgs/applications/science/electronics/openroad/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index cae21d7bba4b..05e9e6eb64f1 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -128,5 +128,6 @@ mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ trepetti ]; platforms = platforms.linux; + broken = true; # last successful build 2024-06-30 }; } From 592e58c50a2c29d1e738b363b8a8c46aa68568bb Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 3 Nov 2024 01:21:49 +0400 Subject: [PATCH 52/97] telegram-desktop.tg_owt: 0-unstable-2024-08-04 -> 0-unstable-2024-10-28 --- .../telegram/kotatogram-desktop/default.nix | 10 ++++++++++ .../telegram/telegram-desktop/tg_owt.nix | 19 +++---------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index ad1173be2ed1..a569bfca534d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -24,6 +24,16 @@ fetchSubmodules = true; }; + patches = (oldAttrs.patches or []) ++ [ + (fetchpatch { + url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; + decode = "base64 -d"; + stripLen = 1; + extraPrefix = "src/"; + hash = "sha256-goxnuRRbwcdfIk1jFaKGiKCTCYn2saEj7En1Iyglzko="; + }) + ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ yasm ]; }); diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index a0847b98139e..ab0719f27206 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, pkg-config, cmake, ninja, @@ -34,28 +33,16 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2024-08-04"; + version = "0-unstable-2024-10-28"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8"; - hash = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o="; + rev = "8198c4d8b91e22d68eb5c7327fd408e3b6abcc79"; + hash = "sha256-3sLa3Px0VWgRYqnnLlwLnx+WWnneqZyhQPrRMBriXQA="; fetchSubmodules = true; }; - patches = [ - # Remove usage of AVCodecContext::reordered_opaque - (fetchpatch2 { - name = "webrtc-ffmpeg-7.patch"; - url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; - decode = "base64 -d"; - stripLen = 1; - extraPrefix = "src/"; - hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU="; - }) - ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \ From bbe2ab8f35a9ec33dc53658c37343a2bd6d9ed62 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 2 Nov 2024 23:09:34 +0100 Subject: [PATCH 53/97] eg25-manager: 0.5.0 -> 0.5.2 https://gitlab.com/mobian1/eg25-manager/-/tags/0.5.2 https://gitlab.com/mobian1/eg25-manager/-/tags/0.5.1 --- pkgs/by-name/eg/eg25-manager/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/eg/eg25-manager/package.nix b/pkgs/by-name/eg/eg25-manager/package.nix index 35514cf558eb..f76b07173fc9 100644 --- a/pkgs/by-name/eg/eg25-manager/package.nix +++ b/pkgs/by-name/eg/eg25-manager/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eg25-manager"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitLab { owner = "mobian1"; repo = "eg25-manager"; rev = finalAttrs.version; - hash = "sha256-hOOYrEM+W7nHc6AQMYg6XQj4dgkLoBQe9S1F65TWPUI="; + hash = "sha256-Zna+JplmYrxPYsXToJ3vKOPzPMZYB3bEdfT8GIAHATs="; }; postPatch = '' From f6296625b0f89627261344894df6df7633882b1c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 2 Nov 2024 18:00:53 -0400 Subject: [PATCH 54/97] python312Packages.pyscard: 2.1.1 -> 2.2.0 Diff: https://github.com/LudovicRousseau/pyscard/compare/refs/tags/2.1.1...2.2.0 Changelog: https://github.com/LudovicRousseau/pyscard/releases/tag/2.2.0 --- .../python-modules/pyscard/default.nix | 53 +++++++++---------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 4392b3cb6012..a5b4d28b4a7d 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -18,14 +18,14 @@ in buildPythonPackage rec { pname = "pyscard"; - version = "2.1.1"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "LudovicRousseau"; repo = "pyscard"; rev = "refs/tags/${version}"; - hash = "sha256-wlw2QL1vfhXba8ok/URcd9M+F7Sa+ZtekV1w5X24owE="; + hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0="; }; build-system = [ setuptools ]; @@ -37,36 +37,31 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postPatch = - if withApplePCSC then - '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \ - "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" - '' - else - '' - substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" - substituteInPlace smartcard/scard/winscarddll.c \ - --replace-fail "libpcsclite.so.1" \ - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" - ''; + '' + substituteInPlace pyproject.toml \ + --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]' + '' + + ( + if withApplePCSC then + '' + substituteInPlace src/smartcard/scard/winscarddll.c \ + --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \ + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + '' + else + '' + substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG" + substituteInPlace src/smartcard/scard/winscarddll.c \ + --replace-fail "libpcsclite.so.1" \ + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + '' + ); - preCheck = '' - # remove src module, so tests use the installed module instead - rm -r smartcard - ''; - - disabledTests = [ - # AssertionError - "test_hresult" - "test_low_level" - ]; - - meta = with lib; { + meta = { description = "Smartcard library for python"; homepage = "https://pyscard.sourceforge.io/"; changelog = "https://github.com/LudovicRousseau/pyscard/releases/tag/${version}"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ layus ]; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ layus ]; }; } From 6766fc6a24157c262042993812e33a4018cbda4d Mon Sep 17 00:00:00 2001 From: hlad Date: Sat, 2 Nov 2024 23:14:56 +0100 Subject: [PATCH 55/97] ejabberd: typo acme -> mysql --- pkgs/by-name/ej/ejabberd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index cee3ef9d13fc..f5be02e864cd 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -115,7 +115,7 @@ let buildInputs = [ sqlite ]; buildPlugins = [ beamPackages.pc ]; }; - p1_mysql = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; }; + p1_mysql = prev.p1_mysql.override { buildPlugins = [ beamPackages.pc ]; }; epam = prev.epam.override { buildInputs = [ pam ]; buildPlugins = [ beamPackages.pc ]; From 4c788162b1c4e755adf59c5cc27918d822b4c3de Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 2 Nov 2024 23:59:15 +0100 Subject: [PATCH 56/97] slweb: 0.10.1 -> 0.10.2 --- pkgs/by-name/sl/slweb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slweb/package.nix b/pkgs/by-name/sl/slweb/package.nix index ceabcd001d1b..337d8a8e454d 100644 --- a/pkgs/by-name/sl/slweb/package.nix +++ b/pkgs/by-name/sl/slweb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "slweb"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromSourcehut { owner = "~strahinja"; repo = "slweb"; rev = "v${finalAttrs.version}"; - hash = "sha256-AJg8qgbNUKizU0uyTnq9EviIXOUuaGvQowLAyTWhGTY="; + hash = "sha256-TS87rFmK6IZbyj+11Oi/lHepa3MDebYILVLLLAgNEdc="; }; postPatch = '' From 3b9a51a06fa4184131b794a41c95b7fe431d4191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 2 Nov 2024 16:44:30 -0700 Subject: [PATCH 57/97] python312Packages.stringzilla: 3.10.5 -> 3.10.7 Diff: https://github.com/ashvardanian/stringzilla/compare/refs/tags/v3.10.5...v3.10.7 Changelog: https://github.com/ashvardanian/StringZilla/releases/tag/v3.10.6 https://github.com/ashvardanian/StringZilla/releases/tag/v3.10.7 --- pkgs/development/python-modules/stringzilla/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix index 7fc432e3ea19..e806a6cc5895 100644 --- a/pkgs/development/python-modules/stringzilla/default.nix +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -13,20 +13,20 @@ buildPythonPackage rec { pname = "stringzilla"; - version = "3.10.5"; + version = "3.10.7"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "stringzilla"; rev = "refs/tags/v${version}"; - hash = "sha256-E7w6s813OGCld/GRTHMbjVAReTGb37HlB687gP9N9FA="; + hash = "sha256-36W7/PL8nRty8cHuMoTr73tQ4uvtjkwP9lyzNLCuhv0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-36LN9AoAWA//pldmQZtKMrck4EoGUW9G2vzdsRw08SA="; + hash = "sha256-qa03Jd0MMtDwkp2E81MacRMbzD/O7E29BT0tc2OjLiY="; }; build-system = [ From 96c0e7ffa0b460c2829e6b8f07fab23de94ee870 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 3 Nov 2024 01:10:15 +0400 Subject: [PATCH 58/97] telegram-desktop: port to new darwin SDK handling --- .../telegram/kotatogram-desktop/default.nix | 1 - .../telegram/kotatogram-desktop/macos.patch | 171 ------------------ .../telegram/telegram-desktop/default.nix | 50 +---- .../telegram/telegram-desktop/macos.patch | 145 --------------- .../telegram/telegram-desktop/tg_owt.nix | 25 +-- pkgs/top-level/all-packages.nix | 8 +- 6 files changed, 10 insertions(+), 390 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index ad1173be2ed1..8b0e8c386c9f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -41,7 +41,6 @@ }; patches = [ - ./macos.patch ./macos-opengl.patch ./macos-qt5.patch (fetchpatch { diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch deleted file mode 100644 index 941e5f80526b..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch +++ /dev/null @@ -1,171 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -index ef544803e9..69c61b3139 100644 ---- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { - [window setTitleVisibility:NSWindowTitleHidden]; - [window setTitlebarAppearsTransparent:YES]; - [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; -+#if 0 - if (@available(macOS 12.0, *)) { - _data->topNotchSkip = [[window screen] safeAreaInsets].top; - } -+#endif - } - - void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -index 7ce90d3..dac3c2c 100644 ---- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; - - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; -+#if 0 - if (@available(macOS 12.0, *)) { - [center - addObserver: _observer -@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - name: NSProcessInfoPowerStateDidChangeNotification - object: nil]; - } -+#endif - [center - addObserver: _observer - selector: @selector(powerStateChanged:) -@@ -178,11 +180,13 @@ std::optional BatterySaving::enabled() const { - return std::nullopt; - } - NSProcessInfo *info = [NSProcessInfo processInfo]; -+#if 0 - if (@available(macOS 12.0, *)) { - if ([info isLowPowerModeEnabled]) { - return true; - } - } -+#endif - const auto state = DetectBatteryState(); - if (!state.has || !state.draining) { - return false; -Submodule Telegram/lib_webrtc contains modified content -diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -index 7521c08..5e22da2 100644 ---- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -+++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - DefaultCaptureDeviceChangedMonitor.registerEnvironment(this); - AudioDeviceListChangedMonitor.registerEnvironment(this); - -+#if 0 - if (@available(macOS 14.0, *)) { - const auto weak = base::make_weak(this); - id block = [^(BOOL shouldBeMuted){ -@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - setInputMuteStateChangeHandler:block - error:nil]; - } -+#endif - } - - EnvironmentMac::~EnvironmentMac() { -@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) { - } - - void EnvironmentMac::setCaptureMuted(bool muted) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (!_captureMuteNotification) { - const auto value = muted ? YES : NO; - [[AVAudioApplication sharedInstance] setInputMuted:value error:nil]; - } - } -+#endif - } - - void EnvironmentMac::captureMuteSubscribe() { -+#if 0 - if (@available(macOS 14.0, *)) { - id observer = [[InputMuteObserver alloc] init]; - [[[NSWorkspace sharedWorkspace] notificationCenter] -@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() { - [observer release]; - }); - } -+#endif - } - - void EnvironmentMac::captureMuteUnsubscribe() { -@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() { - void EnvironmentMac::setCaptureMuteTracker( - not_null tracker, - bool track) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (track) { - if (!_captureMuteTracker) { -@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker( - } - } - } -+#endif - } - - std::unique_ptr CreateEnvironment( -Submodule Telegram/lib_webview contains modified content -diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -index e7808fc..34020f0 100644 ---- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -@@ -334,6 +334,7 @@ Instance::Instance(Config config) { - _handler = [[Handler alloc] initWithMessageHandler:config.messageHandler navigationStartHandler:config.navigationStartHandler navigationDoneHandler:config.navigationDoneHandler dialogHandler:config.dialogHandler dataRequested:handleDataRequest]; - _dataRequestHandler = std::move(config.dataRequestHandler); - [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; -+#if 0 - if (@available(macOS 14, *)) { - if (config.userDataToken != LegacyStorageIdToken().toStdString()) { - NSUUID *uuid = UuidFromToken(config.userDataToken); -@@ -341,10 +342,13 @@ Instance::Instance(Config config) { - [uuid release]; - } - } -+#endif - _webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]; -+#if 0 - if (@available(macOS 13.3, *)) { - _webview.inspectable = config.debug ? YES : NO; - } -+#endif - [_manager addScriptMessageHandler:_handler name:@"external"]; - [_webview setNavigationDelegate:_handler]; - [_webview setUIDelegate:_handler]; -@@ -700,10 +704,12 @@ void *Instance::winId() { - } - - void Instance::setOpaqueBg(QColor opaqueBg) { -+#if 0 - if (@available(macOS 12.0, *)) { - [_webview setValue: @NO forKey: @"drawsBackground"]; - [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; - } -+#endif - } - - void Instance::resizeToWindow() { -@@ -739,6 +745,7 @@ std::string GenerateStorageToken() { - } - - void ClearStorageDataByToken(const std::string &token) { -+#if 0 - if (@available(macOS 14, *)) { - if (!token.empty() && token != LegacyStorageIdToken().toStdString()) { - if (NSUUID *uuid = UuidFromToken(token)) { -@@ -754,6 +761,7 @@ void ClearStorageDataByToken(const std::string &token) { - } - } - } -+#endif - } - - } // namespace Webview diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index c4de1b979195..3f177b0fab17 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -6,7 +6,6 @@ , cmake , ninja , clang -, lld , python3 , wrapQtAppsHook , tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; } @@ -38,7 +37,7 @@ , glib-networking , webkitgtk_4_1 , libicns -, darwin +, apple-sdk_15 , nix-update-script }: @@ -61,10 +60,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-frz425V5eRulNVxCf457TWQAzU/f9/szD/sx3/LYQ2Y="; }; - patches = [ - ./macos.patch - ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' @@ -98,8 +93,6 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [ wrapGAppsHook3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - lld ]; buildInputs = [ @@ -130,45 +123,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [ glib-networking webkitgtk_4_1 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Cocoa - CoreFoundation - CoreServices - CoreText - CoreGraphics - CoreMedia - OpenGL - AudioUnit - ApplicationServices - Foundation - AGL - Security - SystemConfiguration - Carbon - AudioToolbox - VideoToolbox - VideoDecodeAcceleration - AVFoundation - CoreAudio - CoreVideo - CoreMediaIO - QuartzCore - AppKit - CoreWLAN - WebKit - IOKit - GSS - MediaPlayer - IOSurface - Metal - NaturalLanguage - LocalAuthentication + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 libicns - ]); - - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; + ]; cmakeFlags = [ # We're allowed to used the API ID of the Snap package: diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch deleted file mode 100644 index 37b13b6844f3..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -index ef544803e9..69c61b3139 100644 ---- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { - [window setTitleVisibility:NSWindowTitleHidden]; - [window setTitlebarAppearsTransparent:YES]; - [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; -+#if 0 - if (@available(macOS 12.0, *)) { - _data->topNotchSkip = [[window screen] safeAreaInsets].top; - } -+#endif - } - - void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -index 7ce90d3..dac3c2c 100644 ---- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; - - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; -+#if 0 - if (@available(macOS 12.0, *)) { - [center - addObserver: _observer -@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - name: NSProcessInfoPowerStateDidChangeNotification - object: nil]; - } -+#endif - [center - addObserver: _observer - selector: @selector(powerStateChanged:) -@@ -178,11 +180,13 @@ std::optional BatterySaving::enabled() const { - return std::nullopt; - } - NSProcessInfo *info = [NSProcessInfo processInfo]; -+#if 0 - if (@available(macOS 12.0, *)) { - if ([info isLowPowerModeEnabled]) { - return true; - } - } -+#endif - const auto state = DetectBatteryState(); - if (!state.has || !state.draining) { - return false; -Submodule Telegram/lib_webrtc contains modified content -diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -index 7521c08..5e22da2 100644 ---- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -+++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - DefaultCaptureDeviceChangedMonitor.registerEnvironment(this); - AudioDeviceListChangedMonitor.registerEnvironment(this); - -+#if 0 - if (@available(macOS 14.0, *)) { - const auto weak = base::make_weak(this); - id block = [^(BOOL shouldBeMuted){ -@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - setInputMuteStateChangeHandler:block - error:nil]; - } -+#endif - } - - EnvironmentMac::~EnvironmentMac() { -@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) { - } - - void EnvironmentMac::setCaptureMuted(bool muted) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (!_captureMuteNotification) { - const auto value = muted ? YES : NO; - [[AVAudioApplication sharedInstance] setInputMuted:value error:nil]; - } - } -+#endif - } - - void EnvironmentMac::captureMuteSubscribe() { -+#if 0 - if (@available(macOS 14.0, *)) { - id observer = [[InputMuteObserver alloc] init]; - [[[NSWorkspace sharedWorkspace] notificationCenter] -@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() { - [observer release]; - }); - } -+#endif - } - - void EnvironmentMac::captureMuteUnsubscribe() { -@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() { - void EnvironmentMac::setCaptureMuteTracker( - not_null tracker, - bool track) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (track) { - if (!_captureMuteTracker) { -@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker( - } - } - } -+#endif - } - - std::unique_ptr CreateEnvironment( -Submodule Telegram/lib_webview contains modified content -diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -index 738e574..80ff5f0 100644 ---- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -@@ -314,9 +314,11 @@ Instance::Instance(Config config) { - _dataRequestHandler = std::move(config.dataRequestHandler); - [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; - _webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]; -+#if 0 - if (@available(macOS 13.3, *)) { - _webview.inspectable = config.debug ? YES : NO; - } -+#endif - [_manager addScriptMessageHandler:_handler name:@"external"]; - [_webview setNavigationDelegate:_handler]; - [_webview setUIDelegate:_handler]; -@@ -658,10 +660,12 @@ void *Instance::winId() { - } - - void Instance::setOpaqueBg(QColor opaqueBg) { -+#if 0 - if (@available(macOS 12.0, *)) { - [_webview setValue: @NO forKey: @"drawsBackground"]; - [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; - } -+#endif - } - - void Instance::resizeToWindow() { diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index a0847b98139e..8fa88295de93 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -28,7 +28,7 @@ mesa, libdrm, libGL, - darwin, + apple-sdk_15, unstableGitUpdater, }: @@ -102,26 +102,9 @@ stdenv.mkDerivation { libdrm libGL ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - AppKit - IOKit - IOSurface - Foundation - AVFoundation - CoreMedia - VideoToolbox - CoreGraphics - CoreVideo - OpenGL - Metal - MetalKit - CoreFoundation - ApplicationServices - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + ]; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 866d077c45e2..48080f4cd306 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30264,11 +30264,7 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; - kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { - stdenv = if stdenv.hostPlatform.isDarwin - then overrideSDK stdenv "11.0" - else stdenv; - }; + kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix { }; @@ -32579,7 +32575,7 @@ with pkgs; telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { stdenv = if stdenv.hostPlatform.isDarwin - then overrideSDK stdenv "11.0" + then llvmPackages_19.stdenv else stdenv; }; From 503038867e968b87da255d6c348c535701739c9c Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 3 Nov 2024 01:10:31 +0400 Subject: [PATCH 59/97] kotatogram-desktop: remove macos-opengl.patch There should be no need in it since the package has switched to Qt 5 --- .../telegram/kotatogram-desktop/default.nix | 1 - .../kotatogram-desktop/macos-opengl.patch | 66 ------------------- 2 files changed, 67 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 8b0e8c386c9f..689e8d6fd12e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -41,7 +41,6 @@ }; patches = [ - ./macos-opengl.patch ./macos-qt5.patch (fetchpatch { url = "https://gitlab.com/mnauw/cppgir/-/commit/c8bb1c6017a6f7f2e47bd10543aea6b3ec69a966.patch"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch deleted file mode 100644 index e81bd53b440c..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp -index 655e7cf410..c356acbffe 100644 ---- a/Telegram/SourceFiles/media/view/media_view_pip.cpp -+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp -@@ -1333,7 +1333,7 @@ void Pip::setupStreaming() { - Ui::GL::ChosenRenderer Pip::chooseRenderer( - Ui::GL::Capabilities capabilities) { - const auto use = Platform::IsMac() -- ? true -+ ? false - : capabilities.transparency; - LOG(("OpenGL: %1 (PipPanel)").arg(Logs::b(use))); - if (use) { -Submodule Telegram/lib_ui contains modified content -diff --git a/Telegram/lib_ui/ui/gl/gl_detection.cpp b/Telegram/lib_ui/ui/gl/gl_detection.cpp -index 150eb8b..c7ce9f9 100644 ---- a/Telegram/lib_ui/ui/gl/gl_detection.cpp -+++ b/Telegram/lib_ui/ui/gl/gl_detection.cpp -@@ -236,7 +236,7 @@ Capabilities CheckCapabilities(QWidget *widget, bool avoidWidgetCreation) { - - Backend ChooseBackendDefault(Capabilities capabilities) { - const auto use = ::Platform::IsMac() -- ? true -+ ? false - : ::Platform::IsWindows() - ? capabilities.supported - : capabilities.transparency; -diff --git a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -index 7b29363..22c4fb3 100644 ---- a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -+++ b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -@@ -16,7 +16,6 @@ - #include - #include - #include --#include - #include - - @interface WindowObserver : NSObject { -@@ -138,7 +137,6 @@ public: - - private: - void init(); -- void initOpenGL(); - void resolveWeakPointers(); - void revalidateWeakPointers() const; - void initCustomTitle(); -@@ -272,10 +270,6 @@ void WindowHelper::Private::enforceStyle() { - } - } - --void WindowHelper::Private::initOpenGL() { -- auto forceOpenGL = std::make_unique(_owner->window()); --} -- - void WindowHelper::Private::resolveWeakPointers() { - if (!_owner->window()->winId()) { - _owner->window()->createWinId(); -@@ -338,7 +332,6 @@ void WindowHelper::Private::initCustomTitle() { - } - - void WindowHelper::Private::init() { -- initOpenGL(); - resolveWeakPointers(); - initCustomTitle(); - } From dc76e53a5b129b5f9783164634a49855c49930be Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 3 Nov 2024 01:11:50 +0400 Subject: [PATCH 60/97] _64gram: unbreak on darwin --- pkgs/by-name/_6/_64gram/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index b921efbf2dbc..5681c03a92b4 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -41,7 +41,6 @@ telegram-desktop.overrideAttrs (old: rec { homepage = "https://github.com/TDesktop-x64/tdesktop"; changelog = "https://github.com/TDesktop-x64/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ clot27 ]; - mainProgram = "telegram-desktop"; - broken = stdenv.hostPlatform.isDarwin; + mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; }; }) From cd092d19199be4b7469d9b381ae61a813a155de8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 00:06:21 +0000 Subject: [PATCH 61/97] sec: 2.9.2 -> 2.9.3 --- pkgs/tools/admin/sec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index 4a769dbf56cb..8a1f83ba6793 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sec"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "simple-evcorr"; repo = "sec"; rev = version; - sha256 = "sha256-s5xalQfZIrvj8EcLvN0swpYBgRhE1YUoPmQYVFB0lWA="; + sha256 = "sha256-iK2v/qCWw4jdSEpx6cwSB98n5iFmbCyJH0lIpUG8pAU="; }; buildInputs = [ perl ]; From f7ed01934984ad9552708635ea2d081a1a85900c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 00:19:12 +0000 Subject: [PATCH 62/97] melodeon: 0.4.1 -> 0.4.2 --- pkgs/by-name/me/melodeon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/melodeon/package.nix b/pkgs/by-name/me/melodeon/package.nix index b7df31cebf79..9deee8e44707 100644 --- a/pkgs/by-name/me/melodeon/package.nix +++ b/pkgs/by-name/me/melodeon/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "melodeon"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "CDrummond"; repo = "melodeon"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-k74iJ3tmkMGUh4f538tjD7cv4ZXxm3x6M/d5HU25yPQ="; + hash = "sha256-CwJd77FAEcfCvxHeh3V1SIsgSam3S5WtpSLj9WrOOyI="; fetchSubmodules = true; }; From 52ad5f81f7f09c864cda83b09ec0e8b7df16ec25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 01:50:07 +0000 Subject: [PATCH 63/97] python312Packages.pytado: 0.17.6 -> 0.17.7 --- pkgs/development/python-modules/pytado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index 13e41ed77a5e..0e396cd4f85c 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytado"; - version = "0.17.6"; + version = "0.17.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "wmalgadey"; repo = "PyTado"; rev = "refs/tags/${version}"; - hash = "sha256-KcYxUKQuO7TLS4YPg2mrBjP+DMnvZeJokGzwmeM/CvE="; + hash = "sha256-WpGznYNVpis1pM9PRXHnQVev3JW6baUT5J9iPxwd0Uk="; }; nativeBuildInputs = [ setuptools ]; From 783303dc312420a21bc7c364f360dbdff120eee8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 03:09:15 +0000 Subject: [PATCH 64/97] python312Packages.cronsim: 2.5 -> 2.6 --- pkgs/development/python-modules/cronsim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cronsim/default.nix b/pkgs/development/python-modules/cronsim/default.nix index 2ecb45c3a73a..f924a13dc253 100644 --- a/pkgs/development/python-modules/cronsim/default.nix +++ b/pkgs/development/python-modules/cronsim/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cronsim"; - version = "2.5"; + version = "2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cuu508"; repo = "cronsim"; rev = "refs/tags/${version}"; - hash = "sha256-TSVFkMCMmrMXaPJPPNjIML+z98i1iIYuKH7hHiZnJkg="; + hash = "sha256-WJ3v2cqAKZkXp1u8xJ0aFuyHPq0gn24DRxpnq5cH/90="; }; nativeCheckInputs = [ pytestCheckHook ]; From 30b324db6d5e2cb63e440508f2cb1c66e78dc6fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 03:16:02 +0000 Subject: [PATCH 65/97] parallel-disk-usage: 0.9.3 -> 0.10.0 --- pkgs/by-name/pa/parallel-disk-usage/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix index 03396d94b1a6..ddfa5723bbbb 100644 --- a/pkgs/by-name/pa/parallel-disk-usage/package.nix +++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "parallel-disk-usage"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "KSXGitHub"; repo = pname; rev = version; - hash = "sha256-2w+A2ZpmLPBSj9odGh8QWAadE6e2XPJmBZwl6ZT6bSc="; + hash = "sha256-BeTidzXcCSe2IEXHAPpG9ZZJV/l/g09gtlZ9JNOuvsw="; }; - cargoHash = "sha256-WwWNAF0iKFZJ8anvXUJwXo8xw5pCNVO7RcAMyA1R4wE="; + cargoHash = "sha256-rATv8Bg9g2vVyTWCjGPaBtvVgtqQCSs/RurvKmafG/8="; meta = with lib; { description = "Highly parallelized, blazing fast directory tree analyzer"; From 2f7b6eba4cf10bdebfbd3add70bbc2c0b36f64b6 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 3 Nov 2024 02:23:43 +0000 Subject: [PATCH 66/97] _7zz: disable UASM properly Closes: #353119 --- pkgs/tools/archivers/7zz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index ca8f8366f7f6..d23ec4af02ee 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { "CXX=${stdenv.cc.targetPrefix}c++" ] ++ lib.optionals useUasm [ "MY_ASM=uasm" ] + ++ lib.optionals (!useUasm && stdenv.hostPlatform.isx86) [ "USE_ASM=" ] # We need at minimum 10.13 here because of utimensat, however since # we need a bump anyway, let's set the same minimum version as the one in # aarch64-darwin so we don't need additional changes for it From e9a7eb4bcc634508ca1aedd13feb11a7aa08cc37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 05:13:57 +0000 Subject: [PATCH 67/97] flashmq: 1.17.1 -> 1.17.2 --- pkgs/by-name/fl/flashmq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index d282c2f02483..dabcb321bb54 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-T9ecw+UHe/DM8TSDda140lxG3oaf/wf+TEySOz6tboA="; + hash = "sha256-9PZ0niX7VQzoJ6JE50NOU2es8PyBt7ECENvr2lDpb7Y="; }; nativeBuildInputs = [ cmake installShellFiles ]; From 7f95375e0e64888651a524242c8aa76f2ff22502 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 05:48:36 +0000 Subject: [PATCH 68/97] pgweb: 0.16.1 -> 0.16.2 --- pkgs/development/tools/database/pgweb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/development/tools/database/pgweb/default.nix index b7ae5487d215..ed539899ba3d 100644 --- a/pkgs/development/tools/database/pgweb/default.nix +++ b/pkgs/development/tools/database/pgweb/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "pgweb"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "sosedoff"; repo = pname; rev = "v${version}"; - hash = "sha256-lQc1ELeH2i9tate47rdHxFnvjQQUdg1B0CXcr5YGC+g="; + hash = "sha256-gZK8+H3dBMzSVyE96E7byihKMR4+1YlVFZJtCTGUZwI="; }; postPatch = '' From e58f6070aeb05baaf2cc03cce53f4ec4a88306d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 06:36:50 +0000 Subject: [PATCH 69/97] python312Packages.pytorch-metric-learning: 2.6.0 -> 2.7.0 --- .../python-modules/pytorch-metric-learning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 19678c01938e..6c110d8fb35e 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; disabled = isPy27; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xlTqUUF+tUIbULd1B8XR18Kxd7kl2TRKdbp0GoAfi4g="; + hash = "sha256-mxAl4GMyAWtvocc68Ac3z1+W13k9OOK7aQFfB7X0f9c="; }; build-system = [ From 38621583334042d8b37ae2eb9cf7360333f36eaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 06:40:36 +0000 Subject: [PATCH 70/97] python312Packages.autarco: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/autarco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix index c6afff489d65..50b7f6602fe5 100644 --- a/pkgs/development/python-modules/autarco/default.nix +++ b/pkgs/development/python-modules/autarco/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "autarco"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-autarco"; rev = "refs/tags/v${version}"; - hash = "sha256-7Q6kvJxhds0myu3pMOLSCJKwoGPzHjNSo8H3ctgFvjM="; + hash = "sha256-zSqIEtQucrrAFEY7pBJ14Cevq8xbcGOheEmEE7Jd4qk="; }; pythonRelaxDeps = [ "orjson" ]; From bd053ba86b7ce6ea7f6bc0c996a13b3b72cdd17b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 07:08:35 +0000 Subject: [PATCH 71/97] ctlptl: 0.8.34 -> 0.8.35 --- pkgs/development/tools/ctlptl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index ccd57d05895c..d75c57300204 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.34"; + version = "0.8.35"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-Fmv6hq7t0ZrlWIbK8ahCXzgNI8Mg94nTmb9rgd5KEEY="; + hash = "sha256-JFHPwda1p3xIfbQqnl3tI7Z/LhAB1U2VtLvT2DlyQMo="; }; vendorHash = "sha256-d9TijRzBpMvRrOMexGtewtAA9XpLwDTjPnPzt7G67Cs="; From 9b6ffcbe02303bae093555ab70bcbb2a875d6d3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 08:02:25 +0000 Subject: [PATCH 72/97] hyprland-activewindow: 1.0.4 -> 1.0.5 --- pkgs/by-name/hy/hyprland-activewindow/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprland-activewindow/package.nix b/pkgs/by-name/hy/hyprland-activewindow/package.nix index 13f9920c23f5..522c451fd676 100644 --- a/pkgs/by-name/hy/hyprland-activewindow/package.nix +++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-activewindow"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "FieldOfClay"; repo = "hyprland-activewindow"; rev = "v${version}"; - hash = "sha256-2pIOZMBPqheqAz3YEvHP2ehLXhqIclOXXAFa5EXXZPk="; + hash = "sha256-oH3BsS0KqnNdYe7HWHlfRSiUJx+vC3IveN+mcEgwZLs="; }; - cargoHash = "sha256-5JhNBgP6VQX7TVPaFUGvknDWrn6F06Mm3mGfuajg9yQ="; + cargoHash = "sha256-B9ZOz4U6tvUfFzI5pOuhazTZJH89jpxwRc+tbfNEZAk="; meta = with lib; { description = "Multi-monitor-aware Hyprland workspace widget helper"; From d1c9a2f3ffac8de2cec620703982a6038f28a223 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 08:02:44 +0000 Subject: [PATCH 73/97] hyprland-workspaces: 2.0.2 -> 2.0.3 --- pkgs/by-name/hy/hyprland-workspaces/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix index dd96593d5d18..6b925c199ddd 100644 --- a/pkgs/by-name/hy/hyprland-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-workspaces"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "FieldofClay"; repo = "hyprland-workspaces"; rev = "v${version}"; - hash = "sha256-cTIh/UwtVVAWdJEcwOxKmYHBA6XXAaAQz/yW0Xs0y1k="; + hash = "sha256-P+EJoZJqSlpMX1bWOkQYlKR577nTTe1luWKK5GS9Pn4="; }; - cargoHash = "sha256-NPphNQ2FLUrYLbquc2IzxuEjfmov+IPa1ixS6VGomPs="; + cargoHash = "sha256-vUlr12K/vYJE+HlSgulE2aSowU+pT9VPCaCp7Ix9ChM="; meta = with lib; { description = "Multi-monitor aware Hyprland workspace widget"; From 79d5c27eaea5bdd8d91ba10bbc455c2a06c965ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 08:08:00 +0000 Subject: [PATCH 74/97] python312Packages.bring-api: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/bring-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index eb38597a222f..feb21946c0ec 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bring-api"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "miaucl"; repo = "bring-api"; rev = "refs/tags/${version}"; - hash = "sha256-eXT7H2GGNpSo58eK5f6b5eLWYgjxEV8iLgaVTpkt9EU="; + hash = "sha256-wPplw1yYJ5xR2CzhDXXjhMFJ7swGf2AARI4a1kE8MRw="; }; build-system = [ setuptools ]; From ae530a24a1c51673eba15ed0adbe3939a78dc508 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 3 Nov 2024 09:56:51 +0100 Subject: [PATCH 75/97] typstyle: 0.12.0 -> 0.12.1 Diff: https://github.com/Enter-tainer/typstyle/compare/refs/tags/v0.12.0...v0.12.1 Changelog: https://github.com/Enter-tainer/typstyle/blob/refs/tags/v0.12.1/CHANGELOG.md --- pkgs/by-name/ty/typstyle/Cargo.lock | 2 +- pkgs/by-name/ty/typstyle/package.nix | 25 ++----------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/Cargo.lock b/pkgs/by-name/ty/typstyle/Cargo.lock index 95e6754fefa7..e56057a5e1dc 100644 --- a/pkgs/by-name/ty/typstyle/Cargo.lock +++ b/pkgs/by-name/ty/typstyle/Cargo.lock @@ -3915,7 +3915,7 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.12.0" +version = "0.12.1" dependencies = [ "anyhow", "clap", diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index cbd73dfc8ef7..665bb01daf05 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -2,24 +2,19 @@ lib, rustPlatform, fetchFromGitHub, - pkg-config, - libgit2, - zlib, - stdenv, - darwin, nix-update-script, versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "refs/tags/v${version}"; - hash = "sha256-jrhxOtaawZ2vCiK8BQ9G09HTC5F6cnEK/Ji567xYfXw="; + hash = "sha256-liGGnaUhi3/d4SxpiG/P1wp89brqUJaLyo9/KJvPf9I="; }; cargoLock = { @@ -29,22 +24,6 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = - [ - libgit2 - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - # Disabling tests requiring network access checkFlags = [ "--skip=e2e" From ce19b1aa4dd56f9fc18e544bb225dd8646d7b00d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 3 Nov 2024 10:20:22 +0100 Subject: [PATCH 76/97] python312Packages.autarco: 3.0.0 -> 3.1.0 Diff: https://github.com/klaasnicolaas/python-autarco/compare/refs/tags/v3.0.0...v3.1.0 Changelog: https://github.com/klaasnicolaas/python-autarco/releases/tag/v3.1.0 --- pkgs/development/python-modules/autarco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix index c6afff489d65..50b7f6602fe5 100644 --- a/pkgs/development/python-modules/autarco/default.nix +++ b/pkgs/development/python-modules/autarco/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "autarco"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-autarco"; rev = "refs/tags/v${version}"; - hash = "sha256-7Q6kvJxhds0myu3pMOLSCJKwoGPzHjNSo8H3ctgFvjM="; + hash = "sha256-zSqIEtQucrrAFEY7pBJ14Cevq8xbcGOheEmEE7Jd4qk="; }; pythonRelaxDeps = [ "orjson" ]; From 2a93222e48b0edd5fc9e58a12cfccd8ff9fdd91a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 09:26:13 +0000 Subject: [PATCH 77/97] faudio: 24.10 -> 24.11 --- pkgs/development/libraries/faudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index b7f766825106..b0cf041a07b8 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "24.10"; + version = "24.11"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-BUR/zFYOaEoa4pUUgzIcrWrpDX4AP9cySIelralb/t0="; + sha256 = "sha256-fmJh2DZNAjqqTDFt5b2HZ5oeS7VkvPy1a8gr59OQSUo="; }; nativeBuildInputs = [cmake]; From f789130a8b0673ceb4430cb7a45b5b9471e6e728 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 09:28:25 +0000 Subject: [PATCH 78/97] cri-o-unwrapped: 1.31.1 -> 1.31.2 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 47b574d415dc..9461b311c8da 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.31.1"; + version = "1.31.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-0IPQsCLiL0Q15pq89qToMfw6mDwmMZroNBkTCfgqx6s="; + hash = "sha256-xTMQ7YVZ4tKQxaAsH9EVa7W2rTcxP//P3NUgYHojdmw="; }; vendorHash = null; From 6ef37813430bf40e3062955bb64c281d9d6e481b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 09:43:46 +0000 Subject: [PATCH 79/97] rspamd: 3.10.0 -> 3.10.2 --- pkgs/servers/mail/rspamd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 2aeebb203b4b..ea0768433325 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -33,13 +33,13 @@ assert withHyperscan -> stdenv.hostPlatform.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.10.0"; + version = "3.10.2"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - hash = "sha256-fsxeTgciZb0HqvRWoUjwe/mrRZPW23hOwx7PJBSlBSo="; + hash = "sha256-x0Mw2ug5H6BZI6LKOjFufYzGVxZIkgxXHeIX7Emsj8A="; }; hardeningEnable = [ "pie" ]; From 674b79e33dd9ee161030e9797765a8a39c6b538f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 09:53:08 +0000 Subject: [PATCH 80/97] xpano: 0.19.2 -> 0.19.3 --- pkgs/applications/graphics/xpano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix index 35df09c2032c..44a2c8c5c1d8 100644 --- a/pkgs/applications/graphics/xpano/default.nix +++ b/pkgs/applications/graphics/xpano/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xpano"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "krupkat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CgUiZHjWQSoAam2Itan3Zadt8+w6j9W5KGMZ5f6bHiQ="; + sha256 = "sha256-f2qoBpZ5lPBocPas8KMsY5bSYL20gO+ZHLz2R66qSig="; fetchSubmodules = true; }; From 3da18c398d5e111c05624ba9cc3ab7c1725a7fdb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 3 Nov 2024 11:20:16 +0100 Subject: [PATCH 81/97] python312Packages.photutils: 2.0.0 -> 2.0.2 Diff: https://github.com/astropy/photutils/compare/refs/tags/2.0.0...2.0.2 Changelog: https://github.com/astropy/photutils/blob/2.0.2/CHANGES.rst --- pkgs/development/python-modules/photutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index dec5ef583222..f81ba4f5ec4d 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "photutils"; - version = "2.0.0"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "photutils"; rev = "refs/tags/${version}"; - hash = "sha256-slrg1iByOhW1jiSG7nKHWj0ZSOP8v3LhCCr+DLLspKM="; + hash = "sha256-gXtC6O8rXBBa8VMuqxshnJieAahv3bCY2C1BXNmJxb4="; }; postPatch = '' From 13e0ed494f7d09ddbce7c66f63380af55dd25806 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 3 Nov 2024 11:20:57 +0100 Subject: [PATCH 82/97] python312Packages.spotifyaio: 0.8.1 -> 0.8.2 Diff: https://github.com/joostlek/python-spotify/compare/refs/tags/v0.8.1...v0.8.2 Changelog: https://github.com/joostlek/python-spotify/releases/tag/v0.8.2 --- pkgs/development/python-modules/spotifyaio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix index 2e2640d4d71b..53be565a94ee 100644 --- a/pkgs/development/python-modules/spotifyaio/default.nix +++ b/pkgs/development/python-modules/spotifyaio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "spotifyaio"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-spotify"; rev = "refs/tags/v${version}"; - hash = "sha256-R77bdJidZrsaQZjgCr7OLDab2NpJ10575j8rgmFjn2g="; + hash = "sha256-GSUIotR1uB+KjuVIjsJIIaUFfg9gJ8aIYm+aR8iJT9Y="; }; build-system = [ poetry-core ]; From 022d4463b63bba1a0471602f70b49b8d97030b6a Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 3 Nov 2024 13:29:36 +0300 Subject: [PATCH 83/97] neatvnc: fix build with latest ffmpeg --- pkgs/development/libraries/neatvnc/default.nix | 7 +++++++ pkgs/development/libraries/neatvnc/fix-ffmpeg.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/neatvnc/fix-ffmpeg.patch diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index dbed519662fe..bb42421c96d8 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { hash = "sha256-2gPDcFcu1kGIDubguL38Z0K+k7WGFf7DX8yZteedcNg="; }; + patches = [ + # Fix build with latest ffmpeg + # Backport of https://github.com/any1/neatvnc/commit/7e008743bf872598b4fcdb2a821041064ce5dd01 + # FIXME: remove in next update + ./fix-ffmpeg.patch + ]; + strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/neatvnc/fix-ffmpeg.patch b/pkgs/development/libraries/neatvnc/fix-ffmpeg.patch new file mode 100644 index 000000000000..f4839945d104 --- /dev/null +++ b/pkgs/development/libraries/neatvnc/fix-ffmpeg.patch @@ -0,0 +1,13 @@ +diff --git a/src/h264-encoder.c b/src/h264-encoder.c +index 6ad0262..f4a4421 100644 +--- a/src/h264-encoder.c ++++ b/src/h264-encoder.c +@@ -547,7 +547,7 @@ struct h264_encoder* h264_encoder_create(uint32_t width, uint32_t height, + goto codec_context_failure; + + self->codec_ctx->hw_frames_ctx = +- av_buffer_ref(self->filter_out->inputs[0]->hw_frames_ctx); ++ av_buffer_ref(av_buffersink_get_hw_frames_ctx(self->filter_out)); + + AVDictionary *opts = NULL; + av_dict_set_int(&opts, "async_depth", 1, 0); From 1da9bad1a2136516be58c1f72551009b967d51a8 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 1 Nov 2024 13:26:35 +0100 Subject: [PATCH 84/97] nixos-rebuild: run systemd-run with / as the working directory Before we would run systemd-run with the user's home dir as the working directory, but this causes issues when the home dir is on a separate partition and that partition cannot be mounted, as the transient unit created by systemd-run would gain a dependency on the home mount and fail. Since the root partition is guaranteed to be mounted, using that as the working directory avoids this issue and allows doing a remote nixos-rebuild to fix the issue preventing /home from being mounted. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 6236c923c8a9..8ac445b53b50 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -898,7 +898,6 @@ elif [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" "--no-ask-password" "--pipe" "--quiet" - "--same-dir" "--service-type=exec" "--unit=nixos-rebuild-switch-to-configuration" "--wait" From 43012d1e358c9a7d86dbd8769ed14a6dc5292115 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 10:49:12 +0000 Subject: [PATCH 85/97] telepresence2: 2.20.1 -> 2.20.2 --- pkgs/tools/networking/telepresence2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index a9179fd4548f..1b37d7e2c65f 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -27,13 +27,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.20.1"; + version = "2.20.2"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-ubMlCN7dGCKxBCFNzfnpaDzKCYUNwWwj/84gq/tbw9o="; + hash = "sha256-MwAet+UJ6BNEj6/NYN9HBxTGbw2CS2ASUJQrKtpoV1I="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-pz0a0w4SBPJVLWlZi6tsWysiJmwSzroF61nsFxg3R4g="; + vendorHash = "sha256-i9quHeAb8PCG1KQGKaOkxTxjImiuK6oMJcRI443/mkI="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" From b6d2d45b027ddecd9a0c3016226c6f0245c3ccc3 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:03:56 +0100 Subject: [PATCH 86/97] go-chromecast: 0.3.1 -> 0.3.2 Switch `buildGo122Module` back to `buildGoModule` as version 0.3.2 works with and requires go 1.23. --- pkgs/by-name/go/go-chromecast/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix index 52a8321c300e..8dda0c17d6bb 100644 --- a/pkgs/by-name/go/go-chromecast/package.nix +++ b/pkgs/by-name/go/go-chromecast/package.nix @@ -1,25 +1,24 @@ { lib, - buildGo122Module, + buildGoModule, fetchFromGitHub, installShellFiles, stdenvNoCC, versionCheckHook, }: -# "go test" fails with go 1.23 -buildGo122Module rec { +buildGoModule rec { pname = "go-chromecast"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "vishen"; repo = "go-chromecast"; rev = "refs/tags/v${version}"; - hash = "sha256-Kzo8iWj4mtnX1Jxm2sLsnmEOmpzScxWHZ/sLYYm3vQI="; + hash = "sha256-R1VGgustsKRoVZFiH2wuYRRSOolWIYq33H0DyQXHDvg="; }; - vendorHash = "sha256-cEUlCR/xtPJJSWplV1COwV6UfzSmVArF4V0pJRk+/Og="; + vendorHash = "sha256-EI37KPdNxPXdgmxvawTiRQ516dLxt5o0iYvGcAHXdUw="; CGO_ENABLED = 0; From 0b5869c91b913698a2455a75357c1fe8824b2ac6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 11:05:10 +0000 Subject: [PATCH 87/97] python312Packages.gspread: 6.1.3 -> 6.1.4 --- pkgs/development/python-modules/gspread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 034300b2b318..b6c427894587 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "6.1.3"; + version = "6.1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-ZMzgIRLwMXvJ+JIz3BUps7CTaV/MhfjZYqkEbgHQh+A="; + hash = "sha256-xW0PoWMLOtg6+0oqRJxhraNrkndvlbSzyActxjnvUmw="; }; nativeBuildInputs = [ flit-core ]; From 256c9472428c1f1d445875017f252292836d6e97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 11:11:25 +0000 Subject: [PATCH 88/97] twemoji-color-font: 15.0.3 -> 15.1.0 --- pkgs/data/fonts/twemoji-color-font/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index 20f071050dff..ca1ecd8f8bf9 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "twemoji-color-font"; - version = "15.0.3"; + version = "15.1.0"; # We fetch the prebuilt font because building it takes 1.5 hours on hydra. # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 src = fetchurl { url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-3mpcuQ3BaEyPmCMOrfWLA4XE9UkfbAgoIwF9nKHT7Ho="; + sha256 = "sha256-yKUwLuTkwhiM54Xt2ExQxhagf26Z/huRrsuk4ds0EpU="; }; dontBuild = true; From b194995ca20b7247ede77ced01cfc18f0d2efdfc Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 3 Nov 2024 12:22:30 +0100 Subject: [PATCH 89/97] home-assistant-custom-components.solax_modbus: 2024.10.4 -> 2024.11.1 https://github.com/wills106/homeassistant-solax-modbus/releases/tag/2024.11.1 --- .../home-assistant/custom-components/solax_modbus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix index 4db100a94f9a..28aa6d3c84a4 100644 --- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2024.10.4"; + version = "2024.11.1"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; rev = "refs/tags/${version}"; - hash = "sha256-EeFDUxZ7/W5Ng+d56mOCeRntga0uU55OQsaPWzM/bcY="; + hash = "sha256-AzzTJ1W1lwLkewanVC2HxC89Zg1OyLRJ2xPtHWXVr6c="; }; dependencies = [ pymodbus ]; From a943734ddb7c68beaf08f478800027192a6581e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 12:18:37 +0000 Subject: [PATCH 90/97] python312Packages.recurring-ical-events: 3.3.2 -> 3.3.3 --- .../python-modules/recurring-ical-events/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index de3e2f377d88..0b4776b0f383 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "3.3.2"; + version = "3.3.3"; disabled = pythonOlder "3.8"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; - rev = "v${version}"; - hash = "sha256-1cWjOaL+STrHMux/fc+FaRVQIOMcseznNRcghsV+DtM="; + rev = "refs/tags/v${version}"; + hash = "sha256-gEatTTpRiqtDAn+JtoJuVHPYKmEkc5saw3hy4ZYZfX8="; }; build-system = [ setuptools ]; From 1122e3a74f43aba87e55a6a3bc6af027ff602015 Mon Sep 17 00:00:00 2001 From: lenny Date: Sun, 3 Nov 2024 14:29:45 +0100 Subject: [PATCH 91/97] ghbackup: init at 1.13.0 Applied patch from https://github.com/voiapp/ghbackup/pull/1 to fix pagination. --- pkgs/by-name/gh/ghbackup/package.nix | 44 +++++++++++++ .../patches/fix-next-page-logic.patch | 66 +++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 pkgs/by-name/gh/ghbackup/package.nix create mode 100644 pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch diff --git a/pkgs/by-name/gh/ghbackup/package.nix b/pkgs/by-name/gh/ghbackup/package.nix new file mode 100644 index 000000000000..4bdacd3044eb --- /dev/null +++ b/pkgs/by-name/gh/ghbackup/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + makeWrapper, +}: + +buildGoModule rec { + pname = "ghbackup"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "qvl"; + repo = "ghbackup"; + rev = "v${version}"; + hash = "sha256-3LSe805VrbUGjqjnhTJD2KBVZ4rq+4Z3l4d0I1MrBMA="; + }; + + patches = [ ./patches/fix-next-page-logic.patch ]; + + postPatch = '' + go mod init qvl.io/ghbackup + ''; + + nativeBuildInputs = [ makeWrapper ]; + + vendorHash = null; + + postFixup = '' + wrapProgram $out/bin/${meta.mainProgram} \ + --prefix PATH : "${lib.makeBinPath [ git ]}" + ''; + + doCheck = false; # tests want to actually download from github + + meta = with lib; { + description = "Backup your GitHub repositories with a simple command-line application written in Go."; + homepage = "https://github.com/qvl/ghbackup"; + license = licenses.mit; + mainProgram = "ghbackup"; + maintainers = with maintainers; [ lenny ]; + }; +} diff --git a/pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch b/pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch new file mode 100644 index 000000000000..346807a3a6d0 --- /dev/null +++ b/pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch @@ -0,0 +1,66 @@ +From 9825efc51387fef14fdb184e7061b313a54fcb86 Mon Sep 17 00:00:00 2001 +From: Ronan Barrett +Date: Mon, 8 May 2023 15:54:39 +0200 +Subject: [PATCH 1/2] fix next page logic + +--- + ghbackup/fetch.go | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/ghbackup/fetch.go b/ghbackup/fetch.go +index 93cce1c..bcef8ad 100644 +--- a/ghbackup/fetch.go ++++ b/ghbackup/fetch.go +@@ -126,11 +126,17 @@ func getNextURL(header http.Header) string { + if len(parts) == 0 { + return "" + } +- firstLink := parts[0] +- if !strings.Contains(firstLink, "rel=\"next\"") { ++ var nextLink string ++ for _, v := range parts { ++ if strings.Contains(v, "rel=\"next\"") { ++ nextLink = strings.TrimSpace(v) ++ } ++ } ++ if nextLink == "" { + return "" + } +- parts = strings.Split(firstLink, ";") ++ ++ parts = strings.Split(nextLink, ";") + if len(parts) == 0 { + return "" + } +@@ -140,3 +146,4 @@ func getNextURL(header http.Header) string { + } + return urlInBrackets[1 : len(urlInBrackets)-1] + } ++ + +From 5f696939f668cd88c59c05fd8e0d6ad9f236dea5 Mon Sep 17 00:00:00 2001 +From: Ronan Barrett +Date: Mon, 8 May 2023 16:44:47 +0200 +Subject: [PATCH 2/2] add break + +--- + ghbackup/fetch.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ghbackup/fetch.go b/ghbackup/fetch.go +index bcef8ad..b045c38 100644 +--- a/ghbackup/fetch.go ++++ b/ghbackup/fetch.go +@@ -130,6 +130,7 @@ func getNextURL(header http.Header) string { + for _, v := range parts { + if strings.Contains(v, "rel=\"next\"") { + nextLink = strings.TrimSpace(v) ++ break + } + } + if nextLink == "" { +@@ -146,4 +147,3 @@ func getNextURL(header http.Header) string { + } + return urlInBrackets[1 : len(urlInBrackets)-1] + } +- From f3c7acc49f9e8d8a3cf3aa9be92b2ef47a5b9830 Mon Sep 17 00:00:00 2001 From: lenny Date: Sun, 3 Nov 2024 14:30:42 +0100 Subject: [PATCH 92/97] maintainers: add lenny --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 638ef6ea7125..8c1b474b231b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12193,6 +12193,11 @@ github = "lenivaya"; githubId = 49302467; }; + lenny = { + name = "Lenny."; + matrix = "lenny@flipdot.org"; + keys = [ { fingerprint = "6D63 2D4D 0CFE 8D53 F5FD C7ED 738F C800 6E9E A634"; } ]; + }; leo248 = { github = "leo248"; githubId = 95365184; From b6d90530d088e5f65a382d3beda111f687b2df17 Mon Sep 17 00:00:00 2001 From: Konstantin Bogdanov Date: Sun, 3 Nov 2024 14:39:37 +0100 Subject: [PATCH 93/97] factorio: 2.0.13 -> 2.0.14 --- pkgs/by-name/fa/factorio/versions.json | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 64f337f14b42..539f31d6f00d 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -14,14 +14,14 @@ }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.13.tar.xz" + "factorio_linux_2.0.14.tar.xz" ], - "name": "factorio_alpha_x64-2.0.13.tar.xz", + "name": "factorio_alpha_x64-2.0.14.tar.xz", "needsAuth": true, - "sha256": "25fc4c8b0c0b63d8024e1e76efda50e6f8348e967e03c2770eb8a867494b9c98", + "sha256": "8853ce1cdea0c142f78c3ebb3b7d51420f9eb28e9113f2be08a12d4e476dcadc", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.13/alpha/linux64", - "version": "2.0.13" + "url": "https://factorio.com/get-download/2.0.14/alpha/linux64", + "version": "2.0.14" } }, "demo": { @@ -62,14 +62,14 @@ }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.13.tar.xz" + "factorio-space-age_linux_2.0.14.tar.xz" ], - "name": "factorio_expansion_x64-2.0.13.tar.xz", + "name": "factorio_expansion_x64-2.0.14.tar.xz", "needsAuth": true, - "sha256": "5834dc11791aa24c0edc6ecfdd223f80af9c6842c39be0fb8c3b188463ec0f54", + "sha256": "7878444d65dc12815d7ce4d2c941441b8b7e05605e3f0bd69d45d02b3aa8f81a", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.13/expansion/linux64", - "version": "2.0.13" + "url": "https://factorio.com/get-download/2.0.14/expansion/linux64", + "version": "2.0.14" } }, "headless": { @@ -87,15 +87,15 @@ }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.13.tar.xz", - "factorio_headless_x64_2.0.13.tar.xz" + "factorio-headless_linux_2.0.14.tar.xz", + "factorio_headless_x64_2.0.14.tar.xz" ], - "name": "factorio_headless_x64-2.0.13.tar.xz", + "name": "factorio_headless_x64-2.0.14.tar.xz", "needsAuth": false, - "sha256": "27b36901a39e593adf28418c0286142c6c7a9f83d156963c7369bd405a25c7d1", + "sha256": "5a4bc4c3b2a97ed1fc58eb796321e848dcc64435bd91013dd9c78a14a8ce8815", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.13/headless/linux64", - "version": "2.0.13" + "url": "https://factorio.com/get-download/2.0.14/headless/linux64", + "version": "2.0.14" } } } From 047916da43cb552008bab1600e230646bf8ec286 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 3 Nov 2024 15:49:19 +0800 Subject: [PATCH 94/97] frozen-bubble: move to by-name --- pkgs/{games => by-name/fr}/frozen-bubble/fix-compilation.patch | 0 .../default.nix => by-name/fr/frozen-bubble/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{games => by-name/fr}/frozen-bubble/fix-compilation.patch (100%) rename pkgs/{games/frozen-bubble/default.nix => by-name/fr/frozen-bubble/package.nix} (100%) diff --git a/pkgs/games/frozen-bubble/fix-compilation.patch b/pkgs/by-name/fr/frozen-bubble/fix-compilation.patch similarity index 100% rename from pkgs/games/frozen-bubble/fix-compilation.patch rename to pkgs/by-name/fr/frozen-bubble/fix-compilation.patch diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/by-name/fr/frozen-bubble/package.nix similarity index 100% rename from pkgs/games/frozen-bubble/default.nix rename to pkgs/by-name/fr/frozen-bubble/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 128b443e2df8..6f0e10d9db31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34419,8 +34419,6 @@ with pkgs; frogatto = callPackage ../games/frogatto { }; - frozen-bubble = callPackage ../games/frozen-bubble { }; - fsg = callPackage ../games/fsg { }; gambit-chess = callPackage ../games/gambit { }; From d72fb11bd20ce17976b365ba8aa75d8238cb5539 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 3 Nov 2024 15:49:30 +0800 Subject: [PATCH 95/97] frozen-bubble: nixfmt --- pkgs/by-name/fr/frozen-bubble/package.nix | 39 +++++++++++++++++++---- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/fr/frozen-bubble/package.nix b/pkgs/by-name/fr/frozen-bubble/package.nix index 72d0be794449..d08b5c1ae1ba 100644 --- a/pkgs/by-name/fr/frozen-bubble/package.nix +++ b/pkgs/by-name/fr/frozen-bubble/package.nix @@ -1,5 +1,14 @@ -{ lib, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib -, copyDesktopItems, makeDesktopItem +{ + lib, + fetchurl, + perlPackages, + pkg-config, + SDL, + SDL_mixer, + SDL_Pango, + glib, + copyDesktopItems, + makeDesktopItem, }: perlPackages.buildPerlModule { pname = "frozen-bubble"; @@ -7,14 +16,32 @@ perlPackages.buildPerlModule { src = fetchurl { url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz"; - sha256 = "721e04ff69c5233060656bfbf4002aa1aeadd96c95351f0c57bb85b6da35a305"; + hash = "sha256-ch4E/2nFIzBgZWv79AAqoa6t2WyVNR8MV7uFtto1owU="; }; + patches = [ ./fix-compilation.patch ]; - nativeBuildInputs = [ copyDesktopItems pkg-config ]; + nativeBuildInputs = [ + copyDesktopItems + pkg-config + ]; - buildInputs = [ glib SDL SDL_mixer SDL_Pango perlPackages.SDL perlPackages.FileSlurp ]; - propagatedBuildInputs = with perlPackages; [ AlienSDL CompressBzip2 FileShareDir FileWhich IPCSystemSimple LocaleMaketextLexicon ]; + buildInputs = [ + glib + SDL + SDL_mixer + SDL_Pango + perlPackages.SDL + perlPackages.FileSlurp + ]; + propagatedBuildInputs = with perlPackages; [ + AlienSDL + CompressBzip2 + FileShareDir + FileWhich + IPCSystemSimple + LocaleMaketextLexicon + ]; perlPreHook = "export LD=$CC"; From 9eea3cbd0f791fa7f67ffe14c13298fd52b0483f Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 3 Nov 2024 20:59:29 +0800 Subject: [PATCH 96/97] frozen-bubble: fix build --- pkgs/by-name/fr/frozen-bubble/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fr/frozen-bubble/package.nix b/pkgs/by-name/fr/frozen-bubble/package.nix index d08b5c1ae1ba..40610b9c1ddb 100644 --- a/pkgs/by-name/fr/frozen-bubble/package.nix +++ b/pkgs/by-name/fr/frozen-bubble/package.nix @@ -9,7 +9,9 @@ glib, copyDesktopItems, makeDesktopItem, + fetchpatch, }: + perlPackages.buildPerlModule { pname = "frozen-bubble"; version = "2.212"; @@ -19,7 +21,14 @@ perlPackages.buildPerlModule { hash = "sha256-ch4E/2nFIzBgZWv79AAqoa6t2WyVNR8MV7uFtto1owU="; }; - patches = [ ./fix-compilation.patch ]; + patches = [ + ./fix-compilation.patch + (fetchpatch { + # https://github.com/kthakore/frozen-bubble/pull/82 + url = "https://github.com/kthakore/frozen-bubble/commit/1aacc67254a0aafd856086cc306e9f7b389c6bf4.patch?full_index=1"; + hash = "sha256-RqJ+/UFv4esKWZBk0fttsEXhPMislEBTAl2oj4pLAZY="; + }) + ]; nativeBuildInputs = [ copyDesktopItems @@ -34,6 +43,7 @@ perlPackages.buildPerlModule { perlPackages.SDL perlPackages.FileSlurp ]; + propagatedBuildInputs = with perlPackages; [ AlienSDL CompressBzip2 From 85f4044fc30fc5d12c074a3662c48cda907b225f Mon Sep 17 00:00:00 2001 From: Victor Duarte Date: Sun, 3 Nov 2024 17:39:02 +0100 Subject: [PATCH 97/97] Update pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh --- pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index cfb7bbd844ce..d7cab0e81a60 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -37,7 +37,7 @@ convertIconTheme() { local -ra scales=([1]="" [2]="@2") # Based loosely on the algorithm at: - # https://specifications.freedesktop.org/icon-theme-spec/latest/icon_lookup + # https://specifications.freedesktop.org/icon-theme-spec/latest/#icon_lookup # Assumes threshold = 2 for ease of implementation. function findIcon() { local -r iconSize=$1