From 2cbada22bfa6ab73113425cb2934c5588c4c7c8d Mon Sep 17 00:00:00 2001 From: diamond-deluxe <112557036+diamond-deluxe@users.noreply.github.com> Date: Sat, 20 Jul 2024 03:19:54 +0100 Subject: [PATCH 01/50] maintainers: add diamond-deluxe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a02b6f0be78f..6fa4cabaa156 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5095,6 +5095,12 @@ githubId = 4490283; name = "diadatp"; }; + diamond-deluxe = { + email = "carbon_lattice@proton.me"; + github = "diamond-deluxe"; + githubId = 112557036; + name = "Diamond"; + }; DianaOlympos = { github = "DianaOlympos"; githubId = 15774340; From e4eea8374c31d5e8fff223bd6e2881a3a0e8f51e Mon Sep 17 00:00:00 2001 From: deinferno <14363193+deinferno@users.noreply.github.com> Date: Mon, 1 Jan 2024 14:41:32 +0500 Subject: [PATCH 02/50] pkgsStatic.openssh: fix build --- pkgs/tools/networking/openssh/common.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 17e228b041f3..6a75e47cae7e 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -29,13 +29,17 @@ , libxcrypt , hostname , nixosTests -, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl +, withSecurityKey ? !stdenv.hostPlatform.isStatic +, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl && withSecurityKey , withPAM ? stdenv.hostPlatform.isLinux , dsaKeysSupport ? false , linkOpenssl ? true , isNixos ? stdenv.hostPlatform.isLinux }: +# FIDO support requires SK support +assert withFIDO -> withSecurityKey; + stdenv.mkDerivation (finalAttrs: { inherit pname version src; @@ -96,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeature withPAM "pam") (lib.enableFeature dsaKeysSupport "dsa-keys") ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" + ++ lib.optional (!withSecurityKey) "--disable-security-key" ++ lib.optional withFIDO "--with-security-key-builtin=yes" ++ lib.optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") ++ lib.optional stdenv.isDarwin "--disable-libutil" @@ -103,7 +108,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withLdns "--with-ldns" ++ extraConfigureFlags; - ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null}= [ "-laudit" ] ++ lib.optionals withKerberos [ "-lkeyutils" ]; + ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null} = [ "-laudit" ] + ++ lib.optional withKerberos "-lkeyutils" + ++ lib.optional withLdns "-lcrypto"; buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ]; From 4106a208c2a415c7879a3b7f4c9956c1370e5e28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 18:25:20 +0000 Subject: [PATCH 03/50] corectrl: 1.4.1 -> 1.4.2 --- pkgs/applications/misc/corectrl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index eb0f2359cc29..fadb989bff4f 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - hash = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw="; + hash = "sha256-WOljOakh177om7tLlroFwWO4gYsarfTCeVXX6+dmZs4="; }; patches = [ ./polkit-dir.patch From 07e178e83f9902a5883691b6562d61eaf535f128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Oct 2024 21:48:50 +0000 Subject: [PATCH 04/50] python312Packages.peewee: 3.17.6 -> 3.17.7 --- pkgs/development/python-modules/peewee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index e1c9505b40df..422f427c6ed6 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.17.6"; + version = "3.17.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = "peewee"; rev = "refs/tags/${version}"; - hash = "sha256-HluoCXblqwaOb+gtAhvaYshTj9CtHoegn0QUaq0V+eA="; + hash = "sha256-j10c3mnrHISk04l65ieUB11jt3a3iiQsroTt/L0tKaw="; }; build-system = [ setuptools ]; From 57ea0caf6efb2492ff7853c4c5de72d7c23bd5b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Oct 2024 04:58:48 +0000 Subject: [PATCH 05/50] python312Packages.urwid: 2.6.15 -> 2.6.16 --- pkgs/development/python-modules/urwid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index f11af5836ca8..086c52f73d3a 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.6.15"; + version = "2.6.16"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-bBgzhNNYxNZKaSo43I3fMoR+j6XDV6UBNrZfQyZ/f7c="; + hash = "sha256-D5NHtU7XQRh8OqkwrN5r8U/VGF87LGwdnaqGhdjN8AE="; }; postPatch = '' From e402ee0294c45cdd4162459e2316b729eb93ece5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Oct 2024 16:39:48 +0000 Subject: [PATCH 06/50] python312Packages.flask-session-captcha: 1.4.2 -> 1.5.0 --- .../python-modules/flask-session-captcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-session-captcha/default.nix b/pkgs/development/python-modules/flask-session-captcha/default.nix index 675afdcb2b38..b1ef27fb3c67 100644 --- a/pkgs/development/python-modules/flask-session-captcha/default.nix +++ b/pkgs/development/python-modules/flask-session-captcha/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "flask-session-captcha"; - version = "1.4.2"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Tethik"; repo = "flask-session-captcha"; rev = "refs/tags/v${version}"; - hash = "sha256-hf6ifTrsWvgvUHFAPdS8ns8aKN02zquLGCq5ouQF0ck="; + hash = "sha256-2JPJx8yQIl0bbcbshONJtja7BnSiieHzHi64A6jLpc0="; }; build-system = [ setuptools ]; From d4e617aaad4dc338f3342387162495d1016bfc37 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 16 Oct 2024 19:54:09 +0300 Subject: [PATCH 07/50] dwmbar: use "0-unstable-DATE" format for `version` field --- pkgs/applications/misc/dwmbar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/dwmbar/default.nix b/pkgs/applications/misc/dwmbar/default.nix index 3f7e9c821a2e..e2fa8155edd7 100644 --- a/pkgs/applications/misc/dwmbar/default.nix +++ b/pkgs/applications/misc/dwmbar/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "dwmbar"; - version = "unstable-2021-12-22"; + version = "0-unstable-2021-12-22"; src = fetchFromGitHub { owner = "thytom"; From 6da2e6dd3fe0256e9094844f289d9f02ecf51bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 15 Mar 2024 00:34:12 +0100 Subject: [PATCH 08/50] mediawiki: fix displaying previews of SVGs --- pkgs/servers/web-apps/mediawiki/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 0bfed296331a..7b8b72f1af7b 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl, nixosTests }: +{ lib, stdenvNoCC, fetchurl, imagemagick, nixosTests }: stdenvNoCC.mkDerivation rec { pname = "mediawiki"; @@ -11,6 +11,10 @@ stdenvNoCC.mkDerivation rec { postPatch = '' sed -i 's|$vars = Installer::getExistingLocalSettings();|$vars = null;|' includes/installer/CliInstaller.php + + # fix generating previews for SVGs + substituteInPlace includes/config-schema.php \ + --replace-fail "\$path/convert" "${imagemagick}/bin/convert" ''; installPhase = '' From 62bc0c1f1852982a04810c49515669a6e4164f9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 15:46:59 +0000 Subject: [PATCH 09/50] python312Packages.djangorestframework-guardian2: 0.5.0 -> 0.7.0 --- .../djangorestframework-guardian2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix index 4356d8226235..ca83f6b889b5 100644 --- a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix +++ b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "djangorestframework-guardian2"; - version = "0.5.0"; + version = "0.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "johnthagen"; repo = "django-rest-framework-guardian2"; - rev = "v${version}"; - hash = "sha256-aW20xEmVTAgwayWMJsabmyKNW65NftJyQANtT6JV74U="; + rev = "refs/tags/v${version}"; + hash = "sha256-LrIhOoBWC3HttjAGbul4zof++OW35pGMyFGZzUpG1Tk="; }; postPatch = '' From 92321fcd6199bd2497e5803d1720bba5166bd710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Oct 2024 23:48:32 -0700 Subject: [PATCH 10/50] python312Packages.pylance: requires C++ protobuf rather than Python --- pkgs/development/python-modules/pylance/default.nix | 1 + pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index 1563bcf88dd4..d3c81344d2b9 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config + protobuf # for protoc rustPlatform.cargoSetupHook ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b4ce7eebdcc..f07f6f1346bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10254,7 +10254,9 @@ self: super: with self; { pykrakenapi = callPackage ../development/python-modules/pykrakenapi { }; - pylance = callPackage ../development/python-modules/pylance { }; + pylance = callPackage ../development/python-modules/pylance { + inherit (pkgs) protobuf; + }; pylddwrap = callPackage ../development/python-modules/pylddwrap { }; From bb63afcedadaa960d2a00cf0472f9a1451c46f33 Mon Sep 17 00:00:00 2001 From: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:15:04 +0530 Subject: [PATCH 11/50] maintainers: add reputable2772 Signed-off-by: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33c7084d0161..ed139b6ac837 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18110,6 +18110,11 @@ githubId = 3302; name = "Renzo Carbonara"; }; + reputable2772 = { + name = "Reputable2772"; + github = "Reputable2772"; + githubId = 153411261; + }; rettetdemdativ = { email = "michael@koeppl.dev"; github = "rettetdemdativ"; From 7bae2b0a89d2474af11dfd193ef834a5da9bbaf3 Mon Sep 17 00:00:00 2001 From: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:19:35 +0530 Subject: [PATCH 12/50] redact: init at 0.18.0 Signed-off-by: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> --- pkgs/by-name/re/redact/package.nix | 60 ++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/re/redact/package.nix diff --git a/pkgs/by-name/re/redact/package.nix b/pkgs/by-name/re/redact/package.nix new file mode 100644 index 000000000000..d922ce7e26c1 --- /dev/null +++ b/pkgs/by-name/re/redact/package.nix @@ -0,0 +1,60 @@ +{ + lib, + fetchurl, + appimageTools, + makeWrapper, + writeScript, +}: +let + pname = "redact"; + version = "0.18.0"; + src = fetchurl { + url = "https://update-desktop.redact.dev/build/Redact-${version}.AppImage"; + hash = "sha256-qqqf8BAwXEKgZwl6vsPw/0S+qItz5ZqB59DJkW9q1xc="; + }; + appimageContents = appimageTools.extractType2 { inherit pname src version; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + nativeBuildInputs = [ makeWrapper ]; + + extraInstallCommands = '' + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" + install -Dm444 ${appimageContents}/redact.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/redact.png -t $out/share/icons/hicolor/512x512/apps/redact.png + substituteInPlace $out/share/applications/redact.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=${pname}' + ''; + + passthru.updateScript = + writeScript "update.sh" + /** + Scraping the Windows URL for version is intentional, since + the download link for Linux on redact.dev points to an older version, + even though the Cloudflare bucket contains the latest Linux version. + */ + '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl coreutils gnused common-updater-scripts + set -eu -o pipefail + url="$(curl -ILs -w %{url_effective} -o /dev/null https://download.redact.dev/windows)" + version="$(echo $url | sed -n 's/.*Redact-Setup-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')" + currentVersion=$(nix-instantiate --eval -E "with import ./. {}; redact.version or (lib.getVersion redact)" | tr -d '"') + if [[ "$version" != "$currentVersion" ]]; then + hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$url")") + update-source-version redact "$version" "$hash" --print-changes + fi + ''; + + meta = { + description = "The only platform that allows you to automatically clean up your old posts from services like Twitter, Reddit, Facebook, Discord, and more, all in one place."; + homepage = "https://redact.dev/"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ reputable2772 ]; + mainProgram = "redact"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + }; +} From 7e9fedd76993de1bc46fa18cc68d3c2d61ab9217 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Thu, 24 Oct 2024 14:32:19 +0800 Subject: [PATCH 13/50] tdlib: 1.8.37 -> 1.8.38 --- pkgs/development/libraries/tdlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index e328a4c0f632..3ae5b281e1fb 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "tdlib"; - version = "1.8.37"; + version = "1.8.38"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "21e5ce0e977fe012e0cee4e6fcfe704b47b00774"; - hash = "sha256-gQFsdc/FXjuA1WdZ6iF7KxLQX/7+r1I5FcdEAyJSaqU="; + rev = "d321984b75fccdb76239529e8aadcf7f80b0e35a"; + hash = "sha256-5QNcpwW0viWUtsW7b5oSq6X0tRyup6V5CT/BNhdv6lw="; }; buildInputs = [ gperf openssl readline zlib ]; From aba41ae0d8872baad2e6e96da9a5b12d695dfd6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20S=C3=BCtter?= Date: Sat, 26 Oct 2024 13:54:29 +0200 Subject: [PATCH 14/50] dbus-broker: add meta information and license to c-util library --- pkgs/os-specific/linux/dbus-broker/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 784024f8754d..9414f4fb33fe 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -11,6 +11,10 @@ }: let + meta = { + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.linux; + }; dep = { pname, version, hash, rev ? "v${version}", buildInputs ? [ ] }: stdenv.mkDerivation { @@ -22,6 +26,14 @@ let }; nativeBuildInputs = [ meson ninja pkg-config ]; inherit buildInputs; + meta = meta // { + description = "The C-Util Project is a collection of utility libraries for the C11 language."; + homepage = "https://c-util.github.io/"; + license = [ + lib.licenses.asl20 + lib.licenses.lgpl21Plus + ]; + }; }; # These libraries are not used outside of dbus-broker. @@ -89,11 +101,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + meta = meta // { description = "Linux D-Bus Message Broker"; homepage = "https://github.com/bus1/dbus-broker/wiki"; - license = licenses.asl20; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + license = lib.licenses.asl20; }; }) From 51301ccb5ffab1167a43f597a9e79e44078f0362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20S=C3=BCtter?= Date: Sat, 26 Oct 2024 13:55:08 +0200 Subject: [PATCH 15/50] docker: add meta information and license to moby --- .../virtualization/docker/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1ffa016159aa..6c3347b24e9b 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -24,6 +24,16 @@ rec { , knownVulnerabilities ? [] }: let + docker-meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + offline + vdemeester + periklis + teutat3s + ]; + }; + docker-runc = runc.overrideAttrs { pname = "docker-runc"; inherit version; @@ -160,6 +170,11 @@ rec { ++ lib.optional (!withBtrfs) "exclude_graphdriver_btrfs" ++ lib.optional (!withLvm) "exclude_graphdriver_devicemapper" ++ lib.optional withSeccomp "seccomp"; + + meta = docker-meta // { + homepage = "https://mobyproject.org/"; + description = "A collaborative project for the container ecosystem to assemble container-based systems."; + }; }); plugins = lib.optional buildxSupport docker-buildx @@ -257,7 +272,7 @@ rec { tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; }; }; - meta = with lib; { + meta = docker-meta // { homepage = "https://www.docker.com/"; description = "Open source project to pack, ship and run any application as a lightweight container"; longDescription = '' @@ -265,8 +280,6 @@ rec { To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`. ''; - license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester periklis teutat3s ]; mainProgram = "docker"; inherit knownVulnerabilities; }; From ec99bd832d1907dd490ce6ff860a3f0c6d613c63 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 25 Oct 2024 20:50:13 +0200 Subject: [PATCH 16/50] sage: work around glpk aarch64 issue instead of disabling test --- .../sage/patches/disable-slow-glpk-test.patch | 17 ----------------- .../applications/science/math/sage/sage-src.nix | 13 ++++++------- 2 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch diff --git a/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch b/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch deleted file mode 100644 index 89f0613589d4..000000000000 --- a/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/sage/graphs/generic_graph.py b/src/sage/graphs/generic_graph.py -index 2deb533f7f..663ff2cd13 100644 ---- a/src/sage/graphs/generic_graph.py -+++ b/src/sage/graphs/generic_graph.py -@@ -6953,12 +6953,6 @@ class GenericGraph(GenericGraph_pyx): - sage: G = DiGraph(d6, format='dig6') - sage: G.edge_connectivity() - 5 -- sage: G.edge_disjoint_spanning_trees(5) # long time # needs sage.numerical.mip -- [Digraph on 28 vertices, -- Digraph on 28 vertices, -- Digraph on 28 vertices, -- Digraph on 28 vertices, -- Digraph on 28 vertices] - - Small cases:: - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index b8d9e3e903a6..bfdd925a7352 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -54,13 +54,12 @@ stdenv.mkDerivation rec { # fix those bugs themselves. This is for critical bugfixes, where "critical" # == "causes (transient) doctest failures / somebody complained". bugfixPatches = [ - # Sage uses mixed integer programs (MIPs) to find edge disjoint - # spanning trees. For some reason, aarch64 glpk takes much longer - # than x86_64 glpk to solve such MIPs. Since the MIP formulation - # has "numerous problems" and will be replaced by a polynomial - # algorithm soon, disable this test for now. - # https://github.com/sagemath/sage/issues/34575 - ./patches/disable-slow-glpk-test.patch + # https://github.com/sagemath/sage/pull/38851, landed in 10.5.beta8 + (fetchpatch { + name = "glpk-aarch64-hang-workaround.patch"; + url = "https://github.com/sagemath/sage/commit/ce4a78dcb4178f85273619cea076c97345977ee1.diff"; + hash = "sha256-TibTx5llkXjkEZB/MDy4hfGwKBmwtitEpWP6K/ykke0="; + }) # compile libs/gap/element.pyx with -O1 # a more conservative version of https://github.com/sagemath/sage/pull/37951 From 66d928e812e237967609679b3cc42df3f8f08db4 Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 23 Oct 2024 07:46:26 +0800 Subject: [PATCH 17/50] mumps: enable parallel building --- pkgs/by-name/mu/mumps/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index 7d0e3e154cb4..41894f9dcd0f 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation (finalAttrs: { cp Make.inc/Makefile.debian.SEQ ./Makefile.inc ''; + enableParallelBuilding = true; + makeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "SONAME=" From c9997c4e36c4193a883f555744adadad3692edc8 Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 23 Oct 2024 08:24:45 +0800 Subject: [PATCH 18/50] mumps: remove unnecessary patch from coin-or-mumps The coin-or project ipopt use a thirdparty-mumps, this variant renames `libseq/mpi.h` to `libseq/mumps_mpi.h` to avoid conflicts when building in a MPI environment. See https://github.com/coin-or/Ipopt/blob/stable/3.14/ChangeLog.md?plain=1#L582. Nix packagers don't need to worry about this cause we build in a sandbox environment. For parrallel version of mumps built with mpi support, libseq is not needed and there will be no conflicts. --- pkgs/by-name/mu/mumps/package.nix | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index 41894f9dcd0f..e031266cd857 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -18,25 +18,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZnIfAuvOBJDYqCtKGlWs0r39nG6X2lAVRuUmeIJenZw="; }; - patches = [ - # Compatibility with coin-or-mumps version - (fetchpatch { - url = "https://raw.githubusercontent.com/coin-or-tools/ThirdParty-Mumps/bd0bdf9baa3f3677bd34fb36ce63b2b32cc6cc7d/mumps_mpi.patch"; - hash = "sha256-70qZUKBVBpJOSRxYxng5Y6ct1fdCUQUGur3chDhGabQ="; - }) - ]; - - postPatch = - '' - # Compatibility with coin-or-mumps version - # https://github.com/coin-or-tools/ThirdParty-Mumps/blob/stable/3.0/get.Mumps#L66 - cp libseq/mpi.h libseq/mumps_mpi.h - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace src/Makefile --replace-fail \ - "-Wl,\''$(SONAME),libmumps_common" \ - "-Wl,-install_name,$out/lib/libmumps_common" - ''; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace src/Makefile --replace-fail \ + "-Wl,\''$(SONAME),libmumps_common" \ + "-Wl,-install_name,$out/lib/libmumps_common" + ''; configurePhase = '' cp Make.inc/Makefile.debian.SEQ ./Makefile.inc @@ -63,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { # Add some compatibility with coin-or-mumps ln -s $out/include $out/include/mumps - cp libseq/mumps_mpi.h $out/include + cp libseq/mpi.h $out/include/mumps_mpi.h ''; nativeBuildInputs = [ gfortran ]; From bf5d835e6e3593e0dca4926a70cc84f6b958dca5 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 24 Oct 2024 07:37:00 +0800 Subject: [PATCH 19/50] mumps: install mumps libseq headers to include/mumps_seq Directory libseq contains dummy MPI/BLACS/ScaLAPACK symbols to allow linking/running MUMPS on a platform where MPI is not installed. The install directory name mumps_seq comes from Debian source package and Aur pkgbuild. See - https://sources.debian.org/src/mumps/5.7.3-2/debian/libmumps-headers-dev.install - https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=mumps-seq --- pkgs/by-name/mu/mumps/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index e031266cd857..0b078b97d281 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -47,9 +47,12 @@ stdenv.mkDerivation (finalAttrs: { mkdir $out cp -r include lib $out + # Install mumps_seq headers + install -Dm 444 -t $out/include/mumps_seq libseq/*.h + # Add some compatibility with coin-or-mumps ln -s $out/include $out/include/mumps - cp libseq/mpi.h $out/include/mumps_mpi.h + ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h ''; nativeBuildInputs = [ gfortran ]; From e71b0de8c388988cdf9699d51934eb788813483d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 27 Oct 2024 15:16:16 +0100 Subject: [PATCH 20/50] slurm: 24.05.3.1 -> 24.05.4.1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index f7e792da825a..baf99a2633b6 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "24.05.3.1"; + version = "24.05.4.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - hash = "sha256-qYIpYBjbYgbYzPKEgKEEXEf/0bFyp1sFFl7A7mq6Nco="; + hash = "sha256-sviXuRJOpuSoOMNjGPRe11qlphk0Y1/YV/Y5M+QkWys="; }; outputs = [ "out" "dev" ]; From 0f8d273ca5ff7b3c4a1cc2a3effe2f53c472f8a1 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 24 Oct 2024 10:46:05 +0800 Subject: [PATCH 21/50] mumps: headers remove symlink to subdir With the upstream patch to casadi (https://github.com/casadi/casadi/pull/3899), There is no need for nixpkgs#mumps to symlink header files to subdir mumps. Nix packagers should manualy specify the include directory and link libraries for the coinmumps required project like nipxkgs#libopt. --- pkgs/by-name/ca/casadi/package.nix | 14 +++++++++----- pkgs/by-name/mu/mumps/package.nix | 1 - 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 5cd35b064342..891b423d9e7a 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -10,6 +10,7 @@ cplex, fatrop, fetchFromGitHub, + fetchpatch, gurobi, highs, hpipm, @@ -45,6 +46,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Mft0qhjdAbU82RgjYuKue5p7EqbTbt3ii5yXSsCFHrQ="; }; + patches = [ + (fetchpatch { + name = "fix-FindMUMPS.cmake.patch"; + url = "https://github.com/casadi/casadi/pull/3899/commits/274f4b23f73e60c5302bec0479fe1e92682b63d2.patch"; + hash = "sha256-3GWEWlN8dKLD6htpnOQLChldcT3hE09JWLeuCfAhY+4="; + }) + ]; + postPatch = '' # fix case of hpipmConfig.cmake @@ -57,11 +66,6 @@ stdenv.mkDerivation (finalAttrs: { '$'{CLANG_LLVM_LIB_DIR} \ ${llvmPackages_17.libclang.lib}/lib - # fix mumps lib name. No idea where this comes from. - substituteInPlace cmake/FindMUMPS.cmake --replace-fail \ - "mumps_seq" \ - "mumps" - # help casadi find its own libs substituteInPlace casadi/core/casadi_os.cpp --replace-fail \ "std::vector search_paths;" \ diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index 0b078b97d281..7c70fef7ad79 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { install -Dm 444 -t $out/include/mumps_seq libseq/*.h # Add some compatibility with coin-or-mumps - ln -s $out/include $out/include/mumps ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h ''; From 8f2c8168e749eb599e80224ac2c89e2ba5e10913 Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 25 Oct 2024 06:45:08 +0800 Subject: [PATCH 22/50] mumps: add some checks --- pkgs/by-name/mu/mumps/package.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index 7c70fef7ad79..7ed502b0fd32 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -112,6 +112,27 @@ stdenv.mkDerivation (finalAttrs: { $out/lib/libpord.dylib ''; + doInstallCheck = true; + installCheckPhase = + lib.optionalString stdenv.hostPlatform.isDarwin '' + export DYLD_LIBRARY_PATH=$out/lib + '' + + '' + cd examples + make all + ./ssimpletest Date: Fri, 25 Oct 2024 06:45:49 +0800 Subject: [PATCH 23/50] mumps: simplify fixupphase with fixDarwinDylibNames --- pkgs/by-name/mu/mumps/package.nix | 58 +++++-------------------------- 1 file changed, 8 insertions(+), 50 deletions(-) diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index 7ed502b0fd32..5c74e85b301b 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -8,6 +8,7 @@ metis, scotch, stdenv, + fixDarwinDylibNames, }: stdenv.mkDerivation (finalAttrs: { name = "mumps"; @@ -54,7 +55,13 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h ''; - nativeBuildInputs = [ gfortran ]; + nativeBuildInputs = + lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ] + ++ [ + gfortran + ]; buildInputs = [ blas @@ -63,55 +70,6 @@ stdenv.mkDerivation (finalAttrs: { scotch ]; - preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - install_name_tool \ - -change libmpiseq.dylib \ - $out/lib/libmpiseq.dylib \ - -change libpord.dylib \ - $out/lib/libpord.dylib \ - $out/lib/libmumps_common.dylib - install_name_tool \ - -change libmpiseq.dylib \ - $out/lib/libmpiseq.dylib \ - -change libpord.dylib \ - $out/lib/libpord.dylib \ - -id \ - $out/lib/libcmumps.dylib \ - $out/lib/libcmumps.dylib - install_name_tool \ - -change libmpiseq.dylib \ - $out/lib/libmpiseq.dylib \ - -change libpord.dylib \ - $out/lib/libpord.dylib \ - -id \ - $out/lib/libdmumps.dylib \ - $out/lib/libdmumps.dylib - install_name_tool \ - -change libmpiseq.dylib \ - $out/lib/libmpiseq.dylib \ - -change libpord.dylib \ - $out/lib/libpord.dylib \ - -id \ - $out/lib/libsmumps.dylib \ - $out/lib/libsmumps.dylib - install_name_tool \ - -change libmpiseq.dylib \ - $out/lib/libmpiseq.dylib \ - -change libpord.dylib \ - $out/lib/libpord.dylib \ - -id \ - $out/lib/libzmumps.dylib \ - $out/lib/libzmumps.dylib - install_name_tool \ - -id \ - $out/lib/libmpiseq.dylib \ - $out/lib/libmpiseq.dylib - install_name_tool \ - -id \ - $out/lib/libpord.dylib \ - $out/lib/libpord.dylib - ''; - doInstallCheck = true; installCheckPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' From 4df3489270545e5f152406ad86631ff322b3942f Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 27 Oct 2024 04:03:19 +0800 Subject: [PATCH 24/50] maintainers: add qbisi --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e201d359f1b1..882756c157e2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17629,6 +17629,12 @@ githubId = 12017109; name = "Rabindra Dhakal"; }; + qbisi = { + name = "qbisicwate"; + email = "qbisicwate@gmail.com"; + github = "qbisi"; + githubId = 84267544; + }; qbit = { name = "Aaron Bieber"; email = "aaron@bolddaemon.com"; From 0b324cc371152886eec3910c2ca77fb3dd9096ff Mon Sep 17 00:00:00 2001 From: qbisi Date: Sat, 26 Oct 2024 23:54:27 +0800 Subject: [PATCH 25/50] mumps: add variant mumps_par with mpi support --- pkgs/by-name/mu/mumps/package.nix | 149 +++++++++++++++++++++--------- pkgs/top-level/all-packages.nix | 2 + 2 files changed, 106 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index 5c74e85b301b..2620d5b602b5 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -6,10 +6,55 @@ lapack, lib, metis, + parmetis, + withParmetis ? false, # default to false due to unfree license scotch, + withPtScotch ? mpiSupport, stdenv, fixDarwinDylibNames, + mpi, + mpiSupport ? false, + mpiCheckPhaseHook, + scalapack, }: +assert withParmetis -> mpiSupport; +assert withPtScotch -> mpiSupport; +let + profile = if mpiSupport then "debian.PAR" else "debian.SEQ"; + metisFlags = + if withParmetis then + '' + IMETIS="-I${parmetis}/include -I${metis}/include" \ + LMETIS="-L${parmetis}/lib -lparmetis -L${metis}/lib -lmetis" + '' + else + '' + IMETIS=-I${metis}/include \ + LMETIS="-L${metis}/lib -lmetis" + ''; + scotchFlags = + if withPtScotch then + '' + ISCOTCH=-I${scotch.dev}/include \ + LSCOTCH="-L${scotch}/lib -lptscotch -lptesmumps -lptscotcherr" + '' + else + '' + ISCOTCH=-I${scotch.dev}/include \ + LSCOTCH="-L${scotch}/lib -lesmumps -lscotch -lscotcherr" + ''; + macroFlags = + "-Dmetis -Dpord -Dscotch" + + lib.optionalString withParmetis " -Dparmetis" + + lib.optionalString withPtScotch " -Dptscotch"; + # Optimized options + # Disable -fopenmp in lines below to benefit from OpenMP + optFlags = '' + OPTF="-O3 -fallow-argument-mismatch" \ + OPTL="-O3" \ + OPTC="-O3" + ''; +in stdenv.mkDerivation (finalAttrs: { name = "mumps"; version = "5.7.3"; @@ -26,75 +71,89 @@ stdenv.mkDerivation (finalAttrs: { ''; configurePhase = '' - cp Make.inc/Makefile.debian.SEQ ./Makefile.inc + cp Make.inc/Makefile.${profile} ./Makefile.inc ''; enableParallelBuilding = true; + preBuild = '' + makeFlagsArray+=(${metisFlags} ${scotchFlags} ORDERINGSF="${macroFlags}" ${optFlags}) + ''; + makeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "SONAME=" "LIBEXT_SHARED=.dylib" ] ++ [ - "LSCOTCHDIR=${scotch}/lib" - "ISCOTCH=-I${scotch.dev}/include" - "LMETISDIR=${metis}/lib" - "IMETIS=-I${metis}/include" + "SCALAP=-lscalapack" "allshared" ]; - installPhase = '' - mkdir $out - cp -r include lib $out + installPhase = + '' + mkdir $out + cp -r include lib $out + '' + + lib.optionalString (!mpiSupport) '' + # Install mumps_seq headers + install -Dm 444 -t $out/include/mumps_seq libseq/*.h - # Install mumps_seq headers - install -Dm 444 -t $out/include/mumps_seq libseq/*.h + # Add some compatibility with coin-or-mumps + ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h + ''; - # Add some compatibility with coin-or-mumps - ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h - ''; + nativeBuildInputs = [ + gfortran + ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ lib.optional mpiSupport mpi; - nativeBuildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - fixDarwinDylibNames - ] + # Parmetis should be placed before scotch to avoid conflict of header file "parmetis.h" + buildInputs = + lib.optional withParmetis parmetis + ++ lib.optional mpiSupport scalapack ++ [ - gfortran + blas + lapack + metis + scotch ]; - buildInputs = [ - blas - lapack - metis - scotch - ]; - doInstallCheck = true; - installCheckPhase = - lib.optionalString stdenv.hostPlatform.isDarwin '' - export DYLD_LIBRARY_PATH=$out/lib - '' - + '' - cd examples - make all - ./ssimpletest Date: Sun, 27 Oct 2024 17:16:04 +0200 Subject: [PATCH 26/50] darwin.xcode: add 16.1 --- pkgs/os-specific/darwin/xcode/default.nix | 1 + pkgs/top-level/darwin-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index dc097bfc9536..86a2255d657a 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -89,5 +89,6 @@ in lib.makeExtensible (self: { xcode_15_3 = requireXcode "15.3" "sha256-FyVA8EEPCI12Z4sJ4RQRZlMMpFmi7S8VYLcyvad3swM="; xcode_15_4 = requireXcode "15.4" "sha256-yeo+sf6bBIJy9/1sQiMuPEMPniwGXMB6/FXXL0UrI5U="; xcode_16 = requireXcode "16" "sha256-i/MMcEi5wCpe5+nGo6gUTsFFCoorORydAn7D/GClEdo="; + xcode_16_1 = requireXcode "16.1" "sha256-yYg6NRRnYM/5X3hhVMfcXcdoiOV36fIongJNQ5nviD8="; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index e0fa5d707843..cee645978641 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -198,7 +198,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { xcode_13 xcode_13_1 xcode_13_2 xcode_13_3 xcode_13_3_1 xcode_13_4 xcode_13_4_1 xcode_14 xcode_14_1 xcode_15 xcode_15_0_1 xcode_15_1 xcode_15_2 xcode_15_3 xcode_15_4 - xcode_16 + xcode_16 xcode_16_1 xcode; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { From b67280dd6fb1e4711e56bdc3f39e6a7f5f91d789 Mon Sep 17 00:00:00 2001 From: Josh Bode Date: Sun, 27 Oct 2024 12:32:47 +1100 Subject: [PATCH 27/50] fnlfmt: use included `Makefile` for build Solves missing `fnlfmt` pagkage error since it is not being inlined --- pkgs/development/tools/fnlfmt/default.nix | 34 +++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/development/tools/fnlfmt/default.nix index a5f325ebdab8..052068710cf3 100644 --- a/pkgs/development/tools/fnlfmt/default.nix +++ b/pkgs/development/tools/fnlfmt/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromSourcehut, luaPackages, lua }: +{ + lib, + stdenv, + fetchFromSourcehut, + lua, + luaPackages, +}: stdenv.mkDerivation rec { pname = "fnlfmt"; @@ -15,26 +21,26 @@ stdenv.mkDerivation rec { buildInputs = [ lua ]; - buildPhase = '' - runHook preBuild + makeFlags = [ + "PREFIX=$(out)" + "FENNEL=${luaPackages.fennel}/bin/fennel" + ]; + sourceRoot = [ "${src.name}/tags/${version}" ]; - echo "#!${lua}/bin/lua" > fnlfmt - ${luaPackages.fennel}/bin/fennel --require-as-include --compile tags/${version}/cli.fnl >> fnlfmt - chmod +x fnlfmt + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck - runHook postBuild - ''; + $out/bin/fnlfmt --help > /dev/null - installPhase = '' - runHook preInstall - install -D ./fnlfmt $out/bin/fnlfmt - runHook postInstall + runHook postInstallCheck ''; meta = with lib; { description = "Formatter for Fennel"; - homepage = "https://git.sr.ht/~technomancy/fnlfmt"; - license = licenses.lgpl3Plus; + homepage = src.meta.homepage; + changelog = "${src.meta.homepage}/tree/${version}/changelog.md"; + license = licenses.mit; platforms = lua.meta.platforms; maintainers = with maintainers; [ chiroptical ]; mainProgram = "fnlfmt"; From a160b5f31ac321dc367aa7c663c94563f67a4550 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 28 Oct 2024 09:49:49 -0400 Subject: [PATCH 28/50] hashrat: fix cross compilation --- pkgs/tools/security/hashrat/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/security/hashrat/default.nix b/pkgs/tools/security/hashrat/default.nix index c19f683f4bea..f7ebc1179093 100644 --- a/pkgs/tools/security/hashrat/default.nix +++ b/pkgs/tools/security/hashrat/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch }: stdenv.mkDerivation rec { @@ -14,6 +15,15 @@ stdenv.mkDerivation rec { hash = "sha256-mjjK315OUUFVdUY+zcCvm7yeo7XxourR1sghWbeFT7c="; }; + patches = [ + # fix cross compilation by replacing hardcoded ar with AC_PROG_AR + # https://github.com/ColumPaget/Hashrat/pull/27 + (fetchpatch { + url = "https://github.com/ColumPaget/Hashrat/commit/a82615e02021245850a1703e613055da2520c8fd.patch"; + hash = "sha256-tjyhM2ahZBRoRP8WjyQhrI3l20oaqMtfYmOeAZVEZqU="; + }) + ]; + configureFlags = [ "--enable-xattr" ]; makeFlags = [ "PREFIX=$(out)" ]; From e14a736b2ba3353f8a1b966e4ad65c8a82a0c62a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 28 Oct 2024 10:09:01 -0400 Subject: [PATCH 29/50] tomlcpp: fix cross compilation --- pkgs/by-name/to/tomlcpp/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/to/tomlcpp/package.nix b/pkgs/by-name/to/tomlcpp/package.nix index f782719f2b63..244b389a2a81 100644 --- a/pkgs/by-name/to/tomlcpp/package.nix +++ b/pkgs/by-name/to/tomlcpp/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "tomlcpp"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { hash = "sha256-PM3gURXhyTZr59BWuLHvltjKOlKUSBT9/rqTeX5V//k="; }; + patches = [ + (fetchpatch { + # Use implicit $AR variable in Makefile + # https://github.com/cktan/tomlcpp/pull/6 + url = "https://github.com/cktan/tomlcpp/commit/abdb4e0db8b27f719434f5a0d6ec0b1a6b086ded.patch"; + hash = "sha256-SurUKdAZNWqBC7ss5nv5mDnJyC3DqxG/Q/FweTrkLnk="; + }) + ]; + dontConfigure = true; installFlags = [ From 0972b99f5ad98377f32dcf8f12dd2b68aa2e0528 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 28 Oct 2024 10:09:44 -0400 Subject: [PATCH 30/50] tomlcpp: drop use of with lib --- pkgs/by-name/to/tomlcpp/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/to/tomlcpp/package.nix b/pkgs/by-name/to/tomlcpp/package.nix index 244b389a2a81..6f77fe1cc763 100644 --- a/pkgs/by-name/to/tomlcpp/package.nix +++ b/pkgs/by-name/to/tomlcpp/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { "prefix=${placeholder "out"}" ]; - meta = with lib;{ + meta = { homepage = "https://github.com/cktan/tomlcpp"; description = "No fanfare TOML C++ Library"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = with lib.platforms; unix; }; } From 06699fd8ef34fdcae7b016a0c6406553d76f5527 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Oct 2024 16:53:54 +0000 Subject: [PATCH 31/50] python312Packages.meilisearch: 0.31.5 -> 0.31.6 --- pkgs/development/python-modules/meilisearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index 59252dddc7c1..c0e12faa851f 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.31.5"; + version = "0.31.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-br+FnUnwDt64dvZAMEK/oqESCWZuOUt9Lp9HGcIPqxc="; + hash = "sha256-YMKspKryhcxecIDLg3PiKHJoRtQBsIi8N//ZtAMBvMg="; }; build-system = [ setuptools ]; From 0bce9e80c6828de1c0af63bc96ca2059b0652a16 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 28 Oct 2024 18:13:30 +0100 Subject: [PATCH 32/50] python312Packages.huggingface-hub: 0.26.1 -> 0.26.2 Diff: https://github.com/huggingface/huggingface_hub/compare/refs/tags/v0.26.1...v0.26.2 Changelog: https://github.com/huggingface/huggingface_hub/releases/tag/v0.26.2 --- pkgs/development/python-modules/huggingface-hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 4c2a46563665..00fab837e3ce 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.26.1"; + version = "0.26.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-tro4Cvjyjc1vfAvYnfeKjh8ej83Z8l4cKe8SqIBVLXg="; + hash = "sha256-F2E8P0Hq3Ee+RXUEN4t2JtfBtK36aMsHQCnid9VWdLk="; }; build-system = [ setuptools ]; From e3e9e9dcd08a7f19c6d5d6b45ab1110f1acb468a Mon Sep 17 00:00:00 2001 From: diamond-deluxe <112557036+diamond-deluxe@users.noreply.github.com> Date: Mon, 23 Sep 2024 20:03:11 +0100 Subject: [PATCH 33/50] yafc-ce: init at 2.0.1 Advances Factorio calculator with mod support. Community Edition of YAFC. https://github.com/shpaass/yafc-ce Release: https://github.com/shpaass/yafc-ce/releases/tag/2.0.1 Co-authored-by: TheColorman --- pkgs/by-name/ya/yafc-ce/deps.nix | 696 ++++++++++++++++++++++++++++ pkgs/by-name/ya/yafc-ce/package.nix | 58 +++ 2 files changed, 754 insertions(+) create mode 100644 pkgs/by-name/ya/yafc-ce/deps.nix create mode 100644 pkgs/by-name/ya/yafc-ce/package.nix diff --git a/pkgs/by-name/ya/yafc-ce/deps.nix b/pkgs/by-name/ya/yafc-ce/deps.nix new file mode 100644 index 000000000000..529913f5a3be --- /dev/null +++ b/pkgs/by-name/ya/yafc-ce/deps.nix @@ -0,0 +1,696 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: +[ + (fetchNuGet { + pname = "Google.OrTools"; + version = "9.10.4067"; + hash = "sha256-3iWcH1uKVOxrD6bL27TMVVNj5JX1fjdZ89d3Ddy8Fg0="; + }) + (fetchNuGet { + pname = "Google.OrTools.runtime.linux-arm64"; + version = "9.10.4067"; + hash = "sha256-6OE7+DFbLUqBKmw1t2wli//Y+EAy6o67jFtW2lhS0Hw="; + }) + (fetchNuGet { + pname = "Google.OrTools.runtime.linux-x64"; + version = "9.10.4067"; + hash = "sha256-vd5XqXkOlO8nik5od56x4tncUVJmqamU0CC2DVbEEvY="; + }) + (fetchNuGet { + pname = "Google.OrTools.runtime.osx-arm64"; + version = "9.10.4067"; + hash = "sha256-2eJVMi51PVat/CrQiW5BailiJQsvKk+ivpAu46S4lHE="; + }) + (fetchNuGet { + pname = "Google.OrTools.runtime.osx-x64"; + version = "9.10.4067"; + hash = "sha256-3o0Feg/t70gUmH5lAZzt+dClJkjzuz1e2Q/m8kjAhUo="; + }) + (fetchNuGet { + pname = "Google.OrTools.runtime.win-x64"; + version = "9.10.4067"; + hash = "sha256-7uLHbUEHu9BsC14FXikiApnruLZnMavyFPD+jSAU3XY="; + }) + (fetchNuGet { + pname = "Google.Protobuf"; + version = "3.26.1"; + hash = "sha256-1tHxDuJwwvJWZ3H9ooPFAKuaJIthSdTDlmjHlxH/euc="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; + version = "8.0.10"; + hash = "sha256-GL7OjLalZPKLsoheVJAmVStJFpJ7zTDJtikCP7fB3jU="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; + version = "8.0.10"; + hash = "sha256-u6/4q54irXtyKSSi1bH6HYrvcod7yfs5YdYD0NXeYbs="; + }) + (fetchNuGet { + pname = "Microsoft.CodeCoverage"; + version = "17.4.0"; + hash = "sha256-YDALPHtbD+zMN+Llm0aKSG1rp5adKZl7R14h8vdLlZ4="; + }) + (fetchNuGet { + pname = "Microsoft.NET.Test.Sdk"; + version = "17.4.0"; + hash = "sha256-jXKJwOZBy4NJtWwPRjw5wLmNGJD6Wr+YYCokIOIXONA="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.osx-arm64"; + version = "8.0.10"; + hash = "sha256-IZ59kjeU/mGHBVXtOO5AFK0ocxwFAkFqwtn99N+l0zw="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.osx-x64"; + version = "8.0.10"; + hash = "sha256-B4aqUvMpyewAwquTRVh+bs2RG875ZsveYQU89+4VFxw="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; + version = "8.0.10"; + hash = "sha256-0fH2KlzVL5ydblrVtBtAoHa5kNYY92Wzv8FCVqav3Mw="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.osx-x64"; + version = "8.0.10"; + hash = "sha256-XKUQ0DDWWbZNtgGPKhdI7ufpd9Ki1EcOcK9ojiaWEVM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; + }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.ObjectModel"; + version = "17.4.0"; + hash = "sha256-SyCFW5vyzm4/YSKogIhmYYUvWdS2pPRur17JMxMOiDY="; + }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.TestHost"; + version = "17.4.0"; + hash = "sha256-xPsmpE7pSfZonzvtMaJtVMCeszBqUPGzTWWSYpt65sY="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; + }) + (fetchNuGet { + pname = "NETStandard.Library"; + version = "1.6.1"; + hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "13.0.1"; + hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "13.0.3"; + hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; + }) + (fetchNuGet { + pname = "NuGet.Frameworks"; + version = "5.11.0"; + hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Collections"; + version = "4.3.0"; + hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Diagnostics.Tools"; + version = "4.3.0"; + hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; + }) + (fetchNuGet { + pname = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization"; + version = "4.3.0"; + hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; + }) + (fetchNuGet { + pname = "runtime.any.System.IO"; + version = "4.3.0"; + hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection"; + version = "4.3.0"; + hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; + }) + (fetchNuGet { + pname = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime"; + version = "4.3.0"; + hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Timer"; + version = "4.3.0"; + hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; + }) + (fetchNuGet { + pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; + }) + (fetchNuGet { + pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; + }) + (fetchNuGet { + pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; + }) + (fetchNuGet { + pname = "runtime.native.System"; + version = "4.3.0"; + hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; + }) + (fetchNuGet { + pname = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; + }) + (fetchNuGet { + pname = "runtime.native.System.Net.Http"; + version = "4.3.0"; + hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; + }) + (fetchNuGet { + pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; + }) + (fetchNuGet { + pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; + }) + (fetchNuGet { + pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; + }) + (fetchNuGet { + pname = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Console"; + version = "4.3.0"; + hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; + }) + (fetchNuGet { + pname = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Net.Sockets"; + version = "4.3.0"; + hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; + }) + (fetchNuGet { + pname = "SDL2-CS.NetCore"; + version = "2.0.8"; + hash = "sha256-8uz6Y2G9fLQkjs+7t7QPdUJFXs9bKAYeoGP+174OE/k="; + }) + (fetchNuGet { + pname = "Serilog"; + version = "4.0.0"; + hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="; + }) + (fetchNuGet { + pname = "Serilog.Enrichers.Thread"; + version = "4.0.0"; + hash = "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8="; + }) + (fetchNuGet { + pname = "Serilog.Sinks.Console"; + version = "6.0.0"; + hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="; + }) + (fetchNuGet { + pname = "Serilog.Sinks.File"; + version = "6.0.0"; + hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="; + }) + (fetchNuGet { + pname = "System.AppContext"; + version = "4.3.0"; + hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.3.0"; + hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; + }) + (fetchNuGet { + pname = "System.Collections"; + version = "4.3.0"; + hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; + }) + (fetchNuGet { + pname = "System.Collections.Concurrent"; + version = "4.3.0"; + hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; + }) + (fetchNuGet { + pname = "System.Console"; + version = "4.3.0"; + hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tools"; + version = "4.3.0"; + hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tracing"; + version = "4.3.0"; + hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.3.0"; + hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; + }) + (fetchNuGet { + pname = "System.Globalization.Calendars"; + version = "4.3.0"; + hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; + }) + (fetchNuGet { + pname = "System.Globalization.Extensions"; + version = "4.3.0"; + hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.3.0"; + hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; + }) + (fetchNuGet { + pname = "System.IO.Compression"; + version = "4.3.0"; + hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; + }) + (fetchNuGet { + pname = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem"; + version = "4.3.0"; + hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.3.0"; + hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; + }) + (fetchNuGet { + pname = "System.Linq.Expressions"; + version = "4.3.0"; + hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; + }) + (fetchNuGet { + pname = "System.Net.Http"; + version = "4.3.0"; + hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; + }) + (fetchNuGet { + pname = "System.Net.NameResolution"; + version = "4.3.0"; + hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; + }) + (fetchNuGet { + pname = "System.Net.Primitives"; + version = "4.3.0"; + hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; + }) + (fetchNuGet { + pname = "System.Net.Sockets"; + version = "4.3.0"; + hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; + }) + (fetchNuGet { + pname = "System.ObjectModel"; + version = "4.3.0"; + hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; + }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.3.0"; + hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit"; + version = "4.3.0"; + hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; + }) + (fetchNuGet { + pname = "System.Reflection.Extensions"; + version = "4.3.0"; + hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; + }) + (fetchNuGet { + pname = "System.Reflection.Metadata"; + version = "1.6.0"; + hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; + }) + (fetchNuGet { + pname = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.3.0"; + hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; + }) + (fetchNuGet { + pname = "System.Runtime.Numerics"; + version = "4.3.0"; + hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; + }) + (fetchNuGet { + pname = "System.Security.Claims"; + version = "4.3.0"; + hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; + }) + (fetchNuGet { + pname = "System.Security.Principal"; + version = "4.3.0"; + hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; + }) + (fetchNuGet { + pname = "System.Security.Principal.Windows"; + version = "4.3.0"; + hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; + }) + (fetchNuGet { + pname = "System.Text.RegularExpressions"; + version = "4.3.0"; + hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.3.0"; + hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; + }) + (fetchNuGet { + pname = "System.Threading.ThreadPool"; + version = "4.3.0"; + hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; + }) + (fetchNuGet { + pname = "System.Threading.Timer"; + version = "4.3.0"; + hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; + }) + (fetchNuGet { + pname = "System.Xml.ReaderWriter"; + version = "4.3.0"; + hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; + }) + (fetchNuGet { + pname = "System.Xml.XDocument"; + version = "4.3.0"; + hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; + }) + (fetchNuGet { + pname = "xunit"; + version = "2.4.2"; + hash = "sha256-tePXTtlRgTAhfnUzc13Y9MwowU/cKttl1qlzHLqhWS0="; + }) + (fetchNuGet { + pname = "xunit.abstractions"; + version = "2.0.3"; + hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; + }) + (fetchNuGet { + pname = "xunit.analyzers"; + version = "1.0.0"; + hash = "sha256-hZEaTaJN0bWw9q8tha5RziGlZ/lkDrj2S+QLQxgRjlw="; + }) + (fetchNuGet { + pname = "xunit.assert"; + version = "2.4.2"; + hash = "sha256-wMyRXZzDn9Se4c0Pzzn0U4YuKRiUtu6o4MoPjJPPzUU="; + }) + (fetchNuGet { + pname = "xunit.core"; + version = "2.4.2"; + hash = "sha256-jRFoW8LSuqDINuJlno3xT3VfdkHFVEbDKctU/mISIMc="; + }) + (fetchNuGet { + pname = "xunit.extensibility.core"; + version = "2.4.2"; + hash = "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA="; + }) + (fetchNuGet { + pname = "xunit.extensibility.execution"; + version = "2.4.2"; + hash = "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U="; + }) + (fetchNuGet { + pname = "xunit.runner.visualstudio"; + version = "2.4.5"; + hash = "sha256-Gv7U1VPKfNb7IOWrwUGUKAeurKtE3AtQmegDFNkYHHk="; + }) +] diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix new file mode 100644 index 000000000000..ea69b7154a50 --- /dev/null +++ b/pkgs/by-name/ya/yafc-ce/package.nix @@ -0,0 +1,58 @@ +{ + buildDotnetModule, + lib, + fetchFromGitHub, + dotnetCorePackages, + SDL2, + SDL2_image, + SDL2_ttf, +}: +let + dotnet = dotnetCorePackages.dotnet_8; +in +buildDotnetModule (finalAttrs: { + pname = "yafc-ce"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "shpaass"; + repo = "yafc-ce"; + rev = finalAttrs.version; + hash = "sha256-qJOEdP2jRqK0E9Q4n7YgO5jyHxztb8aVOTlLDq1VvMk="; + }; + + projectFile = [ "Yafc/Yafc.csproj" ]; + testProjectFile = [ "Yafc.Model.Tests/Yafc.Model.Tests.csproj" ]; + nugetDeps = ./deps.nix; + + dotnet-sdk = dotnet.sdk; + dotnet-runtime = dotnet.runtime; + + executables = [ "Yafc" ]; + + runtimeDeps = [ + SDL2 + SDL2_ttf + SDL2_image + ]; + + meta = { + description = "Powerful Factorio calculator/analyser that works with mods, Community Edition"; + longDescription = '' + Yet Another Factorio Calculator or YAFC is a planner and analyzer. + The main goal of YAFC is to help with heavily modded Factorio games. + + YAFC Community Edition is an updated and actively-maintained version of the original YAFC. + ''; + homepage = "https://github.com/shpaass/yafc-ce"; + downloadPage = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ + diamond-deluxe + TheColorman + ]; + platforms = with lib.platforms; x86_64 ++ darwin; + mainProgram = "Yafc"; + }; +}) From f3d87a4bdf431edeb01a1fb2da7dcc03d7d1f9d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Oct 2024 02:08:23 +0000 Subject: [PATCH 34/50] gau: 2.2.3 -> 2.2.4 --- pkgs/tools/security/gau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index 6e04afae53db..fca2c6963c69 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gau"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "lc"; repo = "gau"; rev = "refs/tags/v${version}"; - hash = "sha256-1sF33uat6nwtTaXbZzO8YF4jewyQJ6HvI2l/zyTrJsg="; + hash = "sha256-B2l5joHeFDjYmdb3F1FFDKjIKENZu92O2sMlkf3Sf6Y="; }; vendorHash = "sha256-nhsGhuX5AJMHg+zQUt1G1TwVgMCxnuJ2T3uBrx7bJNs="; From e21d95ab7b998497b4cb9227a9ce031c50af71b7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 29 Oct 2024 16:08:31 +0900 Subject: [PATCH 35/50] python312Packages.djangorestframework-guardian2: switch to pypa builder --- .../djangorestframework-guardian2/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix index ca83f6b889b5..60991060b328 100644 --- a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix +++ b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix @@ -4,12 +4,13 @@ fetchFromGitHub, django-guardian, djangorestframework, + setuptools, }: buildPythonPackage rec { pname = "djangorestframework-guardian2"; version = "0.7.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "johnthagen"; @@ -23,7 +24,9 @@ buildPythonPackage rec { patchShebangs manage.py ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django-guardian djangorestframework ]; From 1c95812eddd7e5451ca168ca83b535042f5508a1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 29 Oct 2024 09:19:19 +0100 Subject: [PATCH 36/50] python312Packages.cohere: 5.11.1 -> 5.11.2 Diff: https://github.com/cohere-ai/cohere-python/compare/refs/tags/5.11.1...5.11.2 Changelog: https://github.com/cohere-ai/cohere-python/releases/tag/5.11.2 --- pkgs/development/python-modules/cohere/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 9c28b1abc040..283997da023f 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.11.1"; + version = "5.11.2"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; rev = "refs/tags/${version}"; - hash = "sha256-3fYc0jOfmQ8wnKb5JZY+fXoN+8dXhJi5bj2TJHJaOEo="; + hash = "sha256-QwloUY22Zy+gu8ggpLReXHXw11sZ/P0/Ao75a85MKN4="; }; build-system = [ poetry-core ]; From d349e94fe13e383492c9c7ee913c516aa9c1483c Mon Sep 17 00:00:00 2001 From: a-kenji Date: Tue, 29 Oct 2024 09:47:00 +0100 Subject: [PATCH 37/50] theattyr: remove leading indefinite article in description --- pkgs/by-name/th/theattyr/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/th/theattyr/package.nix b/pkgs/by-name/th/theattyr/package.nix index d23a00943eb2..baf3252e4399 100644 --- a/pkgs/by-name/th/theattyr/package.nix +++ b/pkgs/by-name/th/theattyr/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; meta = { - description = "A terminal theater for playing VT100 art and animations"; + description = "Terminal theater for playing VT100 art and animations"; homepage = "https://github.com/orhun/theattyr"; changelog = "https://github.com/orhun/theattyr/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; From b9c31d0b255f06d5d6f4c9318f2371cadf957a08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Oct 2024 09:00:08 +0000 Subject: [PATCH 38/50] prometheus-borgmatic-exporter: 0.2.5 -> 0.2.7 --- pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix index 9aef55d3ae19..c5fc4c0eb530 100644 --- a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "prometheus-borgmatic-exporter"; - version = "0.2.5"; + version = "0.2.7"; pyproject = true; src = fetchFromGitHub { owner = "maxim-mityutko"; repo = "borgmatic-exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-SgP1utu4Eqs9214pYOT9wP0Ms7AUQH1A3czQF8+qBRo="; + hash = "sha256-ZZdCuIavJrIHO/ayMnirNRYyqovKQaW5jTRRrSOhofQ="; }; pythonRelaxDeps = [ "prometheus-client" ]; From e5fa3b0726d6e200bffc00a3a02c211002e91676 Mon Sep 17 00:00:00 2001 From: genga Date: Tue, 29 Oct 2024 07:47:41 +0300 Subject: [PATCH 39/50] mud: init at 1.0.1 mud: update --- pkgs/by-name/mu/mud/package.nix | 48 +++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/mu/mud/package.nix diff --git a/pkgs/by-name/mu/mud/package.nix b/pkgs/by-name/mu/mud/package.nix new file mode 100644 index 000000000000..6114eb39d735 --- /dev/null +++ b/pkgs/by-name/mu/mud/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "mud"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jasursadikov"; + repo = "mud"; + rev = "refs/tags/v${version}"; + hash = "sha256-pW4B4+RN7hKtG2enJ33OHBeGsLj8w20ylvjcOL6owAk="; + }; + + build-system = with python3Packages; [ + hatchling + ]; + + dependencies = with python3Packages; [ + prettytable + ]; + + pythonImportsCheck = [ "mud" ]; + + # Version checking fails on darwin with: + # PermissionError: [Errno 1] Operation not permitted: '/var/empty/.mudsettings' + # despite adding `export HOME=$(mktemp -d)` in the `preVersionCheck` phase. + # The tool + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + + meta = { + description = "multi-directory git runner which allows you to run git commands in a multiple repositories"; + homepage = "https://github.com/jasursadikov/mud"; + license = lib.licenses.mit; + changelog = "https://github.com/jasursadikov/mud/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "mud"; + }; +} From cf3f6beff7f7705fe1b1454ffedf0fccf4fb7aa1 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 29 Oct 2024 18:07:10 +0800 Subject: [PATCH 40/50] fetchFromSavannah: add passthru.gitRepoUrl This can be used by update scripts such as unstableGitUpdater[1]. [1]: https://github.com/NixOS/nixpkgs/blob/1dcca7a82a44651ad3ab19b83b4e2bc7c4f661f6/pkgs/common-updater/unstable-updater.nix#L15 --- pkgs/build-support/fetchsavannah/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchsavannah/default.nix b/pkgs/build-support/fetchsavannah/default.nix index e75e25fc1e70..0849323d582c 100644 --- a/pkgs/build-support/fetchsavannah/default.nix +++ b/pkgs/build-support/fetchsavannah/default.nix @@ -8,5 +8,6 @@ lib.makeOverridable ( inherit name; url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; meta.homepage = "https://git.savannah.gnu.org/cgit/${repo}.git/"; + passthru.gitRepoUrl = "https://git.savannah.gnu.org/git/${repo}.git"; } // removeAttrs args [ "repo" "rev" ]) // { inherit rev; } ) From 94ddf41af79f8505bd4ae7c00d4e9dca82ed6207 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 24 Oct 2024 14:17:16 +0200 Subject: [PATCH 41/50] python312Packages.mizani: 0.12.2 -> 0.13.0 Diff: https://github.com/has2k1/mizani/compare/refs/tags/v0.12.2...v0.13.0 Changelog: https://github.com/has2k1/mizani/releases/tag/v0.13.0 --- pkgs/development/python-modules/mizani/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 92ced96774e0..4e985885890a 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -13,22 +12,20 @@ pandas, scipy, - # checks + # tests pytestCheckHook, }: buildPythonPackage rec { pname = "mizani"; - version = "0.12.2"; + version = "0.13.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "has2k1"; repo = "mizani"; rev = "refs/tags/v${version}"; - hash = "sha256-aTc8LC/2zLrrTfOXABWs049m752PctpvlguA6qhyhp8="; + hash = "sha256-UzedAhYGgGLOMUyZe3ew4a2gh1UgYHaLsIe9k85rOkg="; }; build-system = [ setuptools-scm ]; From 383f702435c5fc227d2d5d053d45ce5423ecb558 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 29 Oct 2024 12:02:00 +0100 Subject: [PATCH 42/50] python312Packages.plotnine: 0.13.6 -> 0.14.0 Diff: https://github.com/has2k1/plotnine/compare/refs/tags/v0.13.6...v0.14.0 Changelog: https://github.com/has2k1/plotnine/releases/tag/v0.14.0 --- .../python-modules/plotnine/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index f94ac77898f3..a402babb71bc 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -2,31 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, - geopandas, + + # build-system + setuptools-scm, + + # dependencies matplotlib, mizani, pandas, patsy, - pytestCheckHook, - pythonOlder, - scikit-misc, scipy, - setuptools-scm, statsmodels, + + # tests + geopandas, + pytestCheckHook, + scikit-misc, }: buildPythonPackage rec { pname = "plotnine"; - version = "0.13.6"; + version = "0.14.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "has2k1"; repo = "plotnine"; rev = "refs/tags/v${version}"; - hash = "sha256-/yxRYK3ZTrYj+l3TQhFllyICnJjCZPd4ebNurCLZAYg="; + hash = "sha256-4x7euxf+G/HaqC3LVD7TCQEVcihdb/FSMqRvMWAqhgo="; }; postPatch = '' @@ -36,8 +39,6 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - pythonRelaxDeps = [ "mizani" ]; - dependencies = [ matplotlib mizani From 000902047cb737ce584bf6aefaccf5ff0c767182 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Tue, 29 Oct 2024 11:22:35 +0000 Subject: [PATCH 43/50] lightning-loop: 0.24.1 -> 0.28.8 --- pkgs/applications/blockchains/lightning-loop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix index 3dc1356c90cb..e257c581fd51 100644 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.24.1-beta"; + version = "0.28.8-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - hash = "sha256-gPWiKSwXS1eSuHss+hkiqqxqonGYSGmSh3/jL+NlqEg="; + hash = "sha256-zgKKYHDRYXPslPHay/V2DAL1jQfeX5qPWUQQtuvp1M0="; }; - vendorHash = "sha256-6bRg6is1g/eRCr82tHMXTWVFv2S0d2h/J3w1gpentjo="; + vendorHash = "sha256-v7zSvCp63z+xZIuXbqHueamEBN/jZBr2Kysvq03e8L0="; subPackages = [ "cmd/loop" "cmd/loopd" ]; From 1dabfe2c81b7401f377d451c6565b1139a768f27 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 29 Oct 2024 05:37:54 +0800 Subject: [PATCH 44/50] emacs30: 30.0.91 -> 30.0.92 --- pkgs/applications/editors/emacs/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 2ad51433e215..521a3d83a097 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -114,10 +114,10 @@ in emacs30 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "30.0.91"; + version = "30.0.92"; variant = "mainline"; - rev = "30.0.91"; - hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ="; + rev = "30.0.92"; + hash = "sha256-V2TXLemSCIPTpg6RDChv4va7pHfVcqSMw/EWqvlRQ1o="; }); emacs28-macport = import ./make-emacs.nix (mkArgs { From 7134b584217549a15ffb67317a8201e6e706476c Mon Sep 17 00:00:00 2001 From: BOHverkill Date: Wed, 7 Feb 2024 20:21:44 +0100 Subject: [PATCH 45/50] nixos/doc: fix package extension links The package extension links point to a blank page, because the package query is set as a path instead of a query parameter. --- .../doc/manual/configuration/customizing-packages.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/configuration/customizing-packages.section.md b/nixos/doc/manual/configuration/customizing-packages.section.md index 074932b3f110..db7a6c60fade 100644 --- a/nixos/doc/manual/configuration/customizing-packages.section.md +++ b/nixos/doc/manual/configuration/customizing-packages.section.md @@ -33,8 +33,8 @@ Unfortunately, Nixpkgs currently lacks a way to query available package configur ::: {.note} For example, many packages come with extensions one might add. Examples include: -- [`passExtensions.pass-otp`](https://search.nixos.org/packages/query=passExtensions.pass-otp) -- [`python310Packages.requests`](https://search.nixos.org/packages/query=python310Packages.requests) +- [`passExtensions.pass-otp`](https://search.nixos.org/packages?query=passExtensions.pass-otp) +- [`python312Packages.requests`](https://search.nixos.org/packages?query=python312Packages.requests) You can use them like this: ```nix From ba41beae23cab3393f85612824188df59009d825 Mon Sep 17 00:00:00 2001 From: Joshua Trees Date: Tue, 29 Oct 2024 13:49:52 +0100 Subject: [PATCH 46/50] next-ls: 0.23.1 -> 0.23.2 --- pkgs/by-name/ne/next-ls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/next-ls/package.nix b/pkgs/by-name/ne/next-ls/package.nix index 662c289d0a1a..07e4b8cb7b40 100644 --- a/pkgs/by-name/ne/next-ls/package.nix +++ b/pkgs/by-name/ne/next-ls/package.nix @@ -12,13 +12,13 @@ in beamPackages.mixRelease rec { pname = "next-ls"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "elixir-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jI7/BcS9CimCQskXd7Cq3EGPuc9l4L7Gre8hor58ags="; + hash = "sha256-2KzBOzrfoQQIqjEtYufvhT9bBibfEjNDiC+d3l5eaUc="; }; mixFodDeps = beamPackages.fetchMixDeps { From 35071f05d29159a4018d3a74af20fa635b56df42 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 29 Oct 2024 12:39:28 +0000 Subject: [PATCH 47/50] audiobookshelf: 2.16.0 -> 2.16.1 https://github.com/advplyr/audiobookshelf/releases/tag/v2.16.1 --- pkgs/by-name/au/audiobookshelf/source.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index c478742a9876..9fd9317d4640 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "fba9cce82ec1a94e002d34a6b012eadf34c759a0", - "hash": "sha256-BoNveMooYfRPKUJK5aqzeKVmY4MNyH9FwO0/EON2cZY=", - "version": "2.16.0", - "depsHash": "sha256-yr5k151jGGT3O2CfDfdKfN7s2e8tUdrS8PWA5tX1BMA=", - "clientDepsHash": "sha256-LJk+cbW3JTzUl6M0PqWj3tLWx29bGYgG+HohCiFoaME=" + "rev": "50fd659749128a321ecc3284e128d014433145a9", + "hash": "sha256-lYzzzH2heSj0doPfAEWL+pTP9wTsTzLb3+Fu0DHD1w0=", + "version": "2.16.1", + "depsHash": "sha256-7kA1AusnF7iDMACd9lQ8wbdbtjtouh9qu1J8EzzYUrQ=", + "clientDepsHash": "sha256-NwOkMdlmh+tQCWKrbKBbf9XPA3mtz7S3VrGwvpBS0Rc=" } From 454faa381584dc79ff68841f07984d21e1819f47 Mon Sep 17 00:00:00 2001 From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com> Date: Tue, 29 Oct 2024 13:26:22 +0000 Subject: [PATCH 48/50] python3Packages.stix2-patterns: fix dependency on incorrect version of antlr4 --- .../python-modules/stix2-patterns/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/stix2-patterns/default.nix b/pkgs/development/python-modules/stix2-patterns/default.nix index 4ca5ee040a75..16898cb624d4 100644 --- a/pkgs/development/python-modules/stix2-patterns/default.nix +++ b/pkgs/development/python-modules/stix2-patterns/default.nix @@ -1,5 +1,6 @@ { lib, + antlr4_9, antlr4-python3-runtime, buildPythonPackage, fetchFromGitHub, @@ -23,15 +24,10 @@ buildPythonPackage rec { hash = "sha256-lFgnvI5a7U7/Qj4Pqjr3mx4TNDnC2/Ru7tVG7VggR7Y="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "antlr4-python3-runtime~=" "antlr4-python3-runtime>=" - ''; - build-system = [ setuptools ]; dependencies = [ - antlr4-python3-runtime + (antlr4-python3-runtime.override { antlr4 = antlr4_9; }) six ]; @@ -39,14 +35,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "stix2patterns" ]; - disabledTestPaths = [ - # Exception: Could not deserialize ATN with version (expected 4) - "stix2patterns/test/v20/test_inspector.py" - "stix2patterns/test/v21/test_inspector.py" - "stix2patterns/test/v20/test_validator.py" - "stix2patterns/test/v21/test_validator.py" - ]; - meta = with lib; { description = "Validate patterns used to express cyber observable content in STIX Indicators"; mainProgram = "validate-patterns"; From 213114ad2348506cbe29bcce79ca0a4c29a52bd5 Mon Sep 17 00:00:00 2001 From: Pablo Fraile Alonso Date: Tue, 29 Oct 2024 14:29:54 +0100 Subject: [PATCH 49/50] python312Packages.insightface: disable tests on aarch64 (#351917) * python312Packages.insightface: enable package for aarch64-linux * python312Packages.insightface: disable passhtru tests for aarch64 * python312Packages.insightface: refactor --- .../im/immich-machine-learning/package.nix | 5 ++++ .../python-modules/insightface/default.nix | 24 +++++++++++-------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index e9f74898a776..1ca2fa06ed36 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -4,6 +4,7 @@ immich, python3, nixosTests, + stdenv, }: let python = python3.override { @@ -58,6 +59,10 @@ python.pkgs.buildPythonApplication rec { ] ++ uvicorn.optional-dependencies.standard; + # aarch64-linux tries to get cpu information from /sys, which isn't available + # inside the nix build sandbox. + doCheck = stdenv.buildPlatform.system != "aarch64-linux"; + nativeCheckInputs = with python.pkgs; [ httpx pytest-asyncio diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix index 4b4787d0a418..534149a1dd97 100644 --- a/pkgs/development/python-modules/insightface/default.nix +++ b/pkgs/development/python-modules/insightface/default.nix @@ -58,20 +58,26 @@ buildPythonPackage rec { tqdm ]; + # aarch64-linux tries to get cpu information from /sys, which isn't available + # inside the nix build sandbox. + dontUsePythonImportsCheck = stdenv.buildPlatform.system == "aarch64-linux"; + + passthru.tests = lib.optionalAttrs (stdenv.buildPlatform.system != "aarch64-linux") { + version = testers.testVersion { + package = insightface; + command = "insightface-cli --help"; + # Doesn't support --version but we still want to make sure the cli is executable + # and returns the help output + version = "help"; + }; + }; + pythonImportsCheck = [ "insightface" "insightface.app" "insightface.data" ]; - passthru.tests.version = testers.testVersion { - package = insightface; - command = "insightface-cli --help"; - # Doesn't support --version but we still want to make sure the cli is executable - # and returns the help output - version = "help"; - }; - doCheck = false; # Upstream has no tests meta = { @@ -80,7 +86,5 @@ buildPythonPackage rec { homepage = "https://github.com/deepinsight/insightface"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ oddlama ]; - # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' - broken = stdenv.system == "aarch64-linux"; }; } From 46143dd712f3cd0c53ffd481becdfa38e05785cc Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 29 Oct 2024 11:27:07 +0100 Subject: [PATCH 50/50] Fix coqPackages.mathcomp-altreals dependencies --- pkgs/development/coq-modules/mathcomp-analysis/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 97f2add33aae..191972664b33 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -62,6 +62,7 @@ let mathcomp_ = package: let classical-deps = [ mathcomp.algebra mathcomp-finmap ]; + altreals-deps = [ mathcomp-bigenough ]; analysis-deps = [ mathcomp.field mathcomp-bigenough ]; intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package}); pkgpath = lib.switch package [ @@ -80,6 +81,7 @@ let propagatedBuildInputs = intra-deps ++ lib.optionals (lib.elem package [ "classical" "single" ]) classical-deps + ++ lib.optionals (lib.elem package [ "altreals" "single" ]) altreals-deps ++ lib.optionals (lib.elem package [ "analysis" "single" ]) analysis-deps; preBuild = ''