From d66d778a2261e80a505910edb45965ec14e9a04c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 18 Jun 2022 14:59:23 +0100 Subject: [PATCH 001/159] sharpsat-td: init at unstable-2021-09-05 --- .../science/logic/sharpsat-td/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/science/logic/sharpsat-td/default.nix diff --git a/pkgs/applications/science/logic/sharpsat-td/default.nix b/pkgs/applications/science/logic/sharpsat-td/default.nix new file mode 100644 index 00000000000..de9e212d8cc --- /dev/null +++ b/pkgs/applications/science/logic/sharpsat-td/default.nix @@ -0,0 +1,64 @@ +{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, gmp, mpfr }: + +let + satlib-bmc = fetchzip { + url = "https://www.cs.ubc.ca/~hoos/SATLIB/Benchmarks/SAT/BMC/bmc.tar.gz"; + stripRoot = false; + sha256 = "sha256-F1Jfrj4iMMf/3LFCShIDMs4JfLkJ51Z4wkL1FDT9b/A="; + }; + +in stdenv.mkDerivation rec { + pname = "sharpsat-td"; + version = "unstable-2021-09-05"; + + src = fetchFromGitHub { + owner = "Laakeri"; + repo = pname; + rev = "b9bb015305ea5d4e1ac7141691d0fe55ca983d31"; + sha256 = "sha256-FE+DUd58eRr5w9RFw0fMHfjIiNDWIcG7XbyWJ/pI28U="; + }; + + postPatch = '' + # just say no to bundled binaries + rm bin/* + + # ensure resultant build calls its own binaries + substituteInPlace src/decomposition.cpp \ + --replace '"../../../flow-cutter-pace17/flow_cutter_pace17"' '"'"$out"'/bin/flow_cutter_pace17"' + substituteInPlace src/preprocessor/treewidth.cpp \ + --replace '"./flow_cutter_pace17"' '"'"$out"'/bin/flow_cutter_pace17"' + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ gmp mpfr ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 sharpSAT $out/bin/sharpSAT-td + install -Dm755 flow_cutter_pace17 $out/bin/flow_cutter_pace17 + + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # "correct" answer from https://sites.google.com/site/marcthurley/sharpsat/benchmarks/collected-model-counts + $out/bin/sharpSAT-td -decot 1 -decow 100 -cs 3500 -tmpdir "$TMPDIR" \ + ${satlib-bmc}/bmc-ibm-1.cnf | grep -F 'c s exact arb int 7333984412904350856728851870196181665291102236046537207120878033973328441091390427157620940515935993557837912658856672133150412904529478729364681871717139154252602322050981277183916105207406949425074710972297902317183503443350157267211568852295978718386711142950559533715161449971311118966214098944000' + + runHook postInstallCheck + ''; + + meta = { + description = "A fast solver for the #SAT model counting problem"; + homepage = "https://github.com/Laakeri/sharpsat-td"; + license = with lib.licenses; [ mit asl20 ]; + maintainers = with lib.maintainers; [ ris ]; + # uses clhash, which is non-portable + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d525f2e5da0..9be479d8611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29813,6 +29813,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices CoreMIDI; }; + sharpsat-td = callPackage ../applications/science/logic/sharpsat-td { }; + shntool = callPackage ../applications/audio/shntool { }; sipp = callPackage ../development/tools/misc/sipp { }; From 6c30280f3b6d7698139efae646d101d11d8a895c Mon Sep 17 00:00:00 2001 From: V Date: Tue, 20 Dec 2022 01:21:50 +0100 Subject: [PATCH 002/159] par: 1.52 -> 1.53.0 Change-Id: I7d5b110ea0fa627953c29015ae8cd71978e8b524 --- pkgs/tools/text/par/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index e4c6c5d0c08..49994d2dfa4 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -1,23 +1,14 @@ {lib, stdenv, fetchurl, fetchpatch}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "par"; - version = "1.52"; + version = "1.53.0"; src = fetchurl { - url = "http://www.nicemice.net/par/Par152.tar.gz"; - sha256 = "33dcdae905f4b4267b4dc1f3efb032d79705ca8d2122e17efdecfd8162067082"; + url = "http://www.nicemice.net/par/Par-${version}.tar.gz"; + sha256 = "sha256-yAnGIOuCtYlVOsVLmJjI2lUZbSYjOdE8BG8r5ErEeAQ="; }; - patches = [ - # A patch by Jérôme Pouiller that adds support for multibyte - # charsets (like UTF-8), plus Debian packaging. - (fetchpatch { - url = "http://sysmic.org/dl/par/par-1.52-i18n.4.patch"; - sha256 = "0alw44lf511jmr38jnh4j0mpp7vclgy0grkxzqf7q158vzdb6g23"; - }) - ]; - makefile = "protoMakefile"; preBuild = '' makeFlagsArray+=(CC="${stdenv.cc.targetPrefix}cc -c" LINK1=${stdenv.cc.targetPrefix}cc) From 4e925deb4b45a01e99951745b5ca7a4b6078b352 Mon Sep 17 00:00:00 2001 From: obadz Date: Mon, 25 May 2020 18:32:31 +0100 Subject: [PATCH 003/159] pythonPackages.torrent_parser: init at 0.4.1 --- .../python-modules/torrent_parser/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/torrent_parser/default.nix diff --git a/pkgs/development/python-modules/torrent_parser/default.nix b/pkgs/development/python-modules/torrent_parser/default.nix new file mode 100644 index 00000000000..f60300086f2 --- /dev/null +++ b/pkgs/development/python-modules/torrent_parser/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, lib, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "torrent_parser"; + version = "0.4.1"; + + # No tarballs on Pypi + src = fetchFromGitHub { + owner = "7sDream"; + repo = "torrent_parser"; + rev = "v${version}"; + sha256 = "sha256-zM738r3o9dGZYoWLN7fM4E06m6YPcAODEkgDS6wU/Sc="; + }; + + meta = { + description = "A .torrent file parser and creator for both Python 2 and 3"; + homepage = "https://github.com/7sDream/torrent_parser"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cf195fda32..6c42cf276d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11351,6 +11351,8 @@ self: super: with self; { torpy = callPackage ../development/python-modules/torpy { }; + torrent_parser = callPackage ../development/python-modules/torrent_parser { }; + torrequest = callPackage ../development/python-modules/torrequest { }; total-connect-client = callPackage ../development/python-modules/total-connect-client { }; From f09bffe4d78b7f4377e1405e74d296c7e0ca44be Mon Sep 17 00:00:00 2001 From: Vanilla Date: Wed, 17 May 2023 10:45:32 +0800 Subject: [PATCH 004/159] linuxPackages.rtl8821cu: unstable-2022-12-07 -> unstable-2023-04-28 --- pkgs/os-specific/linux/rtl8821cu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 35b068fd8d0..d8518630107 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8821cu"; - version = "${kernel.version}-unstable-2022-12-07"; + version = "${kernel.version}-unstable-2023-04-28"; src = fetchFromGitHub { owner = "morrownr"; - repo = "8821cu-20210118"; - rev = "7b8c45a270454f05e2dbf3beeb4afcf817db65da"; - hash = "sha256-Dg+At0iHvi4pl8umhQyml1bODhkeK8YWYpEckqqzNcQ="; + repo = "8821cu-20210916"; + rev = "e49409f22ceea0d5b5ef431e6170580028b84c9d"; + hash = "sha256-mElZRr4RkRFiraBM8BxT8yesYgvDaj6xP+9T3P+0Ns4="; }; hardeningDisable = [ "pic" ]; From cff728d7d528a25775743e3320c60019f6d49c83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 04:22:50 +0000 Subject: [PATCH 005/159] python310Packages.textual: 0.24.1 -> 0.26.0 --- pkgs/development/python-modules/textual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index c4f6d46b172..3da9319e241 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.24.1"; + version = "0.26.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nFio45LxoVQK/IzVo2ZHGYzG6bHHr3yvA7P3kMZOUso="; + hash = "sha256-l4zSSROeI55hFnf0C64bbAB+1cATUkS59Uybf7ZmSfs="; }; nativeBuildInputs = [ From 28ac9c2cf1d4a85f84a3bcf90b621b2e7dc97794 Mon Sep 17 00:00:00 2001 From: mangoiv Date: Tue, 23 May 2023 11:30:02 +0200 Subject: [PATCH 006/159] adds mangoiv to maintainers --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 047fe343043..7ec3578c3eb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9609,6 +9609,12 @@ githubId = 346094; name = "Michael Alyn Miller"; }; + mangoiv = { + email = "contact@mangoiv.com"; + github = "mangoiv"; + githubId = 40720523; + name = "MangoIV"; + }; manojkarthick = { email = "smanojkarthick@gmail.com"; github = "manojkarthick"; From f5c317d5ac5e1c992c84e8956994e63f78997854 Mon Sep 17 00:00:00 2001 From: mangoiv Date: Tue, 23 May 2023 11:30:19 +0200 Subject: [PATCH 007/159] bkt: init at version 0.6.1 - packages https://github.com/dimo414/bkt - release notes for version 0.6.1 can be found at https://github.com/dimo414/bkt/releases/tag/0.6.1 --- pkgs/tools/misc/bkt/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/bkt/default.nix diff --git a/pkgs/tools/misc/bkt/default.nix b/pkgs/tools/misc/bkt/default.nix new file mode 100644 index 00000000000..e359ab2fd33 --- /dev/null +++ b/pkgs/tools/misc/bkt/default.nix @@ -0,0 +1,25 @@ +{ rustPlatform +, fetchFromGitHub +, lib +}: rustPlatform.buildRustPackage rec { + + pname = "bkt"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "dimo414"; + repo = pname; + rev = version; + sha256 = "sha256-NgNXuTpI1EzgmxKRsqzxTOlQi75BHCcbjFnouhnfDDM="; + }; + + cargoSha256 = "sha256-PvcKviyXtiHQCHgJLGR2Mr+mPpTd06eKWQ5h6eGdl40="; + + meta = { + description = "A subprocess caching utility"; + homepage = "https://github.com/dimo414/bkt"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.mangoiv ]; + mainProgram = "bkt"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2246de4b9d1..780a4e7e23b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3120,6 +3120,8 @@ with pkgs; bklk = callPackage ../applications/misc/bklk { }; + bkt = callPackage ../tools/misc/bkt { }; + bkyml = callPackage ../tools/misc/bkyml { }; blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; From 2e5597d571948911ed00e664752beebea4d5f6dc Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 24 May 2023 15:45:00 +0200 Subject: [PATCH 008/159] makeself: use installManPage --- pkgs/applications/misc/makeself/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index bd197395e85..3226797ca4b 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, which, zstd, pbzip2 }: +{ lib, stdenv, fetchFromGitHub, which, zstd, pbzip2, installShellFiles }: stdenv.mkDerivation rec { version = "2.4.5"; @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-15lUtErGsbXF2Gn0f0rvA18mMuVMmkKrGO2poeYZU9g="; }; + nativeBuildInputs = [ installShellFiles ]; + postPatch = "patchShebangs test"; # Issue #110149: our default /bin/sh apparently has 32-bit math only @@ -22,11 +24,11 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ which zstd pbzip2 ]; installPhase = '' - mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} - cp makeself.lsm README.md $out/share/${pname}-${version} - cp makeself.sh $out/bin/makeself - cp makeself.1 $out/share/man/man1/ - cp makeself-header.sh $out/share/${pname}-${version} + runHook preInstall + installManPage makeself.1 + install -Dm555 makeself.sh $out/bin/makeself + install -Dm444 -t $out/share/${pname}/ makeself.lsm README.md makeself-header.sh + runHook postInstall ''; fixupPhase = '' From c7bd5289d67278ac6b82614deaef94940f89de96 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 15 May 2023 13:45:09 +0200 Subject: [PATCH 009/159] nixos/programs: factor out wayland-session common options --- nixos/modules/module-list.nix | 5 +- nixos/modules/programs/{ => wayland}/sway.nix | 62 +++++++++---------- .../modules/programs/{ => wayland}/waybar.nix | 0 .../programs/wayland/wayland-session.nix | 26 ++++++++ 4 files changed, 57 insertions(+), 36 deletions(-) rename nixos/modules/programs/{ => wayland}/sway.nix (71%) rename nixos/modules/programs/{ => wayland}/waybar.nix (100%) create mode 100644 nixos/modules/programs/wayland/wayland-session.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ff06a72ff9d..2a34c01b999 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -241,7 +241,6 @@ ./programs/starship.nix ./programs/steam.nix ./programs/streamdeck-ui.nix - ./programs/sway.nix ./programs/sysdig.nix ./programs/system-config-printer.nix ./programs/systemtap.nix @@ -256,7 +255,8 @@ ./programs/usbtop.nix ./programs/vim.nix ./programs/wavemon.nix - ./programs/waybar.nix + ./programs/wayland/sway.nix + ./programs/wayland/waybar.nix ./programs/weylus.nix ./programs/wireshark.nix ./programs/xastir.nix @@ -1308,7 +1308,6 @@ ./services/x11/window-managers/default.nix ./services/x11/window-managers/fluxbox.nix ./services/x11/window-managers/icewm.nix - ./services/x11/window-managers/bspwm.nix ./services/x11/window-managers/katriawm.nix ./services/x11/window-managers/metacity.nix ./services/x11/window-managers/nimdow.nix diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/wayland/sway.nix similarity index 71% rename from nixos/modules/programs/sway.nix rename to nixos/modules/programs/wayland/sway.nix index 3b2e69bd37c..897166058c5 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -123,41 +123,37 @@ in { }; - config = mkIf cfg.enable { - assertions = [ + config = mkIf cfg.enable + (mkMerge [ { - assertion = cfg.extraSessionCommands != "" -> cfg.wrapperFeatures.base; - message = '' - The extraSessionCommands for Sway will not be run if - wrapperFeatures.base is disabled. - ''; + assertions = [ + { + assertion = cfg.extraSessionCommands != "" -> cfg.wrapperFeatures.base; + message = '' + The extraSessionCommands for Sway will not be run if + wrapperFeatures.base is disabled. + ''; + } + ]; + environment = { + systemPackages = optional (cfg.package != null) cfg.package ++ cfg.extraPackages; + # Needed for the default wallpaper: + pathsToLink = optionals (cfg.package != null) [ "/share/backgrounds/sway" ]; + etc = { + "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" '' + # Import the most important environment variables into the D-Bus and systemd + # user environments (e.g. required for screen sharing and Pinentry prompts): + exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP + ''; + } // optionalAttrs (cfg.package != null) { + "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config"; + }; + }; + # To make a Sway session available if a display manager like SDDM is enabled: + services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; } - ]; - environment = { - systemPackages = optional (cfg.package != null) cfg.package ++ cfg.extraPackages; - # Needed for the default wallpaper: - pathsToLink = optionals (cfg.package != null) [ "/share/backgrounds/sway" ]; - etc = { - "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" '' - # Import the most important environment variables into the D-Bus and systemd - # user environments (e.g. required for screen sharing and Pinentry prompts): - exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP - ''; - } // optionalAttrs (cfg.package != null) { - "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config"; - }; - }; - security.polkit.enable = true; - security.pam.services.swaylock = {}; - hardware.opengl.enable = mkDefault true; - fonts.enableDefaultFonts = mkDefault true; - programs.dconf.enable = mkDefault true; - # To make a Sway session available if a display manager like SDDM is enabled: - services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; - programs.xwayland.enable = mkDefault true; - # For screen sharing (this option only has an effect with xdg.portal.enable): - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; - }; + (import ./wayland-session.nix { inherit lib; }) + ]); meta.maintainers = with lib.maintainers; [ primeos colemickens ]; } diff --git a/nixos/modules/programs/waybar.nix b/nixos/modules/programs/wayland/waybar.nix similarity index 100% rename from nixos/modules/programs/waybar.nix rename to nixos/modules/programs/wayland/waybar.nix diff --git a/nixos/modules/programs/wayland/wayland-session.nix b/nixos/modules/programs/wayland/wayland-session.nix new file mode 100644 index 00000000000..d58eb39b79a --- /dev/null +++ b/nixos/modules/programs/wayland/wayland-session.nix @@ -0,0 +1,26 @@ +{ lib, ... }: with lib; { + + security = { + polkit.enable = true; + pam.services.swaylock = {}; + }; + + hardware.opengl.enable = mkDefault true; + + fonts.enableDefaultFonts = mkDefault true; + + programs = { + dconf.enable = mkDefault true; + xwayland.enable = mkDefault true; + }; + + + xdg.portal = { + enable = mkDefault true; + + extraPortals = [ + # For screen sharing + pkgs.xdg-desktop-portal-wlr + ]; + }; +} From 8f421acbc5916f627761ccbc050bcbf39358c2e4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 15 May 2023 13:45:23 +0200 Subject: [PATCH 010/159] nixos/river: init module --- .../manual/release-notes/rl-2311.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/wayland/river.nix | 59 +++++++++++++++++++ nixos/modules/programs/wayland/sway.nix | 5 +- .../programs/wayland/wayland-session.nix | 5 +- 5 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 nixos/modules/programs/wayland/river.nix diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index d99f4c6ce11..e20fc0ea29c 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -10,6 +10,8 @@ +- [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as [programs.river](#opt-programs.river.enable). + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} - The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2a34c01b999..e5b66619f97 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -255,6 +255,7 @@ ./programs/usbtop.nix ./programs/vim.nix ./programs/wavemon.nix + ./programs/wayland/river.nix ./programs/wayland/sway.nix ./programs/wayland/waybar.nix ./programs/weylus.nix diff --git a/nixos/modules/programs/wayland/river.nix b/nixos/modules/programs/wayland/river.nix new file mode 100644 index 00000000000..20a786ba3c6 --- /dev/null +++ b/nixos/modules/programs/wayland/river.nix @@ -0,0 +1,59 @@ +{ + config, + pkgs, + lib, + ... +}: +with lib; let + cfg = config.programs.river; +in { + options.programs.river = { + enable = mkEnableOption (lib.mdDoc "river, a dynamic tiling Wayland compositor"); + + package = mkOption { + type = with types; nullOr package; + default = pkgs.river; + defaultText = literalExpression "pkgs.river"; + description = lib.mdDoc '' + River package to use. + Set to `null` to not add any River package to your path. + This should be done if you want to use the Home Manager River module to install River. + ''; + }; + + extraPackages = mkOption { + type = with types; listOf package; + default = with pkgs; [ + swaylock + foot + dmenu + ]; + defaultText = literalExpression '' + with pkgs; [ swaylock foot dmenu ]; + ''; + example = literalExpression '' + with pkgs; [ + termite rofi light + ] + ''; + description = lib.mdDoc '' + Extra packages to be installed system wide. See + [Common X11 apps used on i3 with Wayland alternatives](https://github.com/swaywm/sway/wiki/i3-Migration-Guide#common-x11-apps-used-on-i3-with-wayland-alternatives) + for a list of useful software. + ''; + }; + }; + + config = + mkIf cfg.enable (mkMerge [ + { + environment.systemPackages = optional (cfg.package != null) cfg.package ++ cfg.extraPackages; + + # To make a river session available if a display manager like SDDM is enabled: + programs.xwayland.enable = mkDefault true; + } + (import ./wayland-session.nix { inherit lib pkgs; }) + ]); + + meta.maintainers = with lib.maintainers; [ GaetanLepage ]; +} diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index 897166058c5..c699c21bd10 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -150,9 +150,8 @@ in { }; }; # To make a Sway session available if a display manager like SDDM is enabled: - services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; - } - (import ./wayland-session.nix { inherit lib; }) + services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; } + (import ./wayland-session.nix { inherit lib pkgs; }) ]); meta.maintainers = with lib.maintainers; [ primeos colemickens ]; diff --git a/nixos/modules/programs/wayland/wayland-session.nix b/nixos/modules/programs/wayland/wayland-session.nix index d58eb39b79a..3cbfef4d61d 100644 --- a/nixos/modules/programs/wayland/wayland-session.nix +++ b/nixos/modules/programs/wayland/wayland-session.nix @@ -1,12 +1,10 @@ -{ lib, ... }: with lib; { - +{ lib, pkgs, ... }: with lib; { security = { polkit.enable = true; pam.services.swaylock = {}; }; hardware.opengl.enable = mkDefault true; - fonts.enableDefaultFonts = mkDefault true; programs = { @@ -14,7 +12,6 @@ xwayland.enable = mkDefault true; }; - xdg.portal = { enable = mkDefault true; From 2b74773c6b5324b5d6d699c429f7adcd71eab3d0 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 26 May 2023 00:35:11 +0200 Subject: [PATCH 011/159] exiftool: 12.55 -> 12.62 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3a6a76c5a02..515c5b9b6aa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12593,11 +12593,11 @@ with self; { ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.55"; + version = "12.62"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-CFgb16GnYPIKG0PLbTiSfm7FRdWZBtroXH32c5Ru6gg="; + hash = "sha256-SZCkbGm2VoiNfVcyuvQDnalkaI7d33ocLutRQEmZ7B0="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; From 11596df9490e936378b38d9ef470567c68459a7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 May 2023 05:01:55 +0000 Subject: [PATCH 012/159] netmaker-full: 0.19.0 -> 0.20.0 --- pkgs/applications/networking/netmaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index df7de73a0f1..2ad0e4996ff 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-wiexultPliYD3WrLVtWUdLs762OzLAmoH66phwjOuUw="; + hash = "sha256-pzU9MiUL5M7EkGIXjZ0VqJmk4qOlbgCLCg84iPIXG70="; }; - vendorHash = "sha256-Msvonap1soJExzBymouY8kZJnHT4SIwpfJjBgpkO2Rw="; + vendorHash = "sha256-euqQztEUEejCWy7WqtzMEIZrBDZpD/6dqnFsYhXajdE="; inherit subPackages; From e29436ee4df21ca8386a3fa3f350093c3181b45a Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Fri, 26 May 2023 09:39:48 +0200 Subject: [PATCH 013/159] python3Packages.uptime-kuma-api: 0.13.0 -> 1.0.1 --- pkgs/development/python-modules/uptime-kuma-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uptime-kuma-api/default.nix b/pkgs/development/python-modules/uptime-kuma-api/default.nix index 48bbbf84aa1..f9de280dad4 100644 --- a/pkgs/development/python-modules/uptime-kuma-api/default.nix +++ b/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "uptime-kuma-api"; - version = "0.13.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "uptime_kuma_api"; inherit version; - hash = "sha256-MoHE6Y7x1F1l70tuCHNIPt+vpqfJ00EUIMHnE4476Co="; + hash = "sha256-6Cwo71pgwBk5B6MaFFs9XlbocJLL/s4+7m7Gi13ddlM="; }; propagatedBuildInputs = [ From 3579ce8c72be41faf0dff2282d8274d3c1143eb2 Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Fri, 26 May 2023 13:18:24 +0300 Subject: [PATCH 014/159] python3Packages.fenics: fixed tests for FIAT --- pkgs/development/python-modules/fenics/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/fenics/default.nix b/pkgs/development/python-modules/fenics/default.nix index 277d28997e6..edb726a0997 100644 --- a/pkgs/development/python-modules/fenics/default.nix +++ b/pkgs/development/python-modules/fenics/default.nix @@ -73,6 +73,12 @@ let rm test/unit/test_quadrature.py rm test/unit/test_reference_element.py rm test/unit/test_fiat.py + + # Fix `np.float` deprecation in Numpy 1.20 + grep -lr 'np.float(' test/ | while read -r fn; do + substituteInPlace "$fn" \ + --replace "np.float(" "np.float64(" + done ''; checkPhase = '' runHook preCheck From 461711cb4b0ba9c99ee83048f8fbb05ed06a2a1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 18:20:42 +0200 Subject: [PATCH 015/159] python311Packages.acquire: 3.5 -> 3.6 Diff: https://github.com/fox-it/acquire/compare/refs/tags/3.5...3.6 Changelog: https://github.com/fox-it/acquire/releases/tag/3.6 --- pkgs/development/python-modules/acquire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 581bd0a0111..b96250df8ee 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-F0kKydFDL2XafK7A66qn3Ad/mGZU8x3UKtXtKpxHZqU="; + hash = "sha256-oH+uxu61+d6qEQmT7joxwlyfpv7mF8ug6OzHmyUa95Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b9fce90144fb5f16b152d8e99342bfdc5e430ce2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 18:25:28 +0200 Subject: [PATCH 016/159] python311Packages.adafruit-pureio: 1.1.10 -> 1.1.11 Changelog: https://github.com/adafruit/Adafruit_Python_PureIO/releases/tag/1.1.11 --- pkgs/development/python-modules/adafruit-pureio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-pureio/default.nix b/pkgs/development/python-modules/adafruit-pureio/default.nix index 6d32b953052..82d39fa23ab 100644 --- a/pkgs/development/python-modules/adafruit-pureio/default.nix +++ b/pkgs/development/python-modules/adafruit-pureio/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "adafruit-pureio"; - version = "1.1.10"; - format = "setuptools"; + version = "1.1.11"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Adafruit_PureIO"; inherit version; - hash = "sha256-EgaIN1PAlmMJ5tAtqXBnbpvHtQO7Sib3NuAXOfVqZLk="; + hash = "sha256-xM+7NlcxlC0fEJKhFvR9/a4K7xjFsn8QcrWCStXqjHw="; }; nativeBuildInputs = [ From 2d000936a4976b8675ee5a8beabb2ad51c7be9a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 18:26:52 +0200 Subject: [PATCH 017/159] python311Packages.aliyun-python-sdk-config: 2.2.8 -> 2.2.9 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-config/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix index 2fb0ab8331b..ab3402f1e8a 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-config"; - version = "2.2.8"; + version = "2.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0rGI2YMT78gstfHmQD63hdvICQ3WlKgkx8unsDegaXw="; + hash = "sha256-5uRiOJAxq1zcJX+CyDnTG5BG1eFcJ43HdfpWUoZ5FSM="; }; propagatedBuildInputs = [ From 5242aea64f6820d615b406c69f5f2c6ba0ca732b Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Fri, 26 May 2023 12:39:37 -0400 Subject: [PATCH 018/159] nixos.mautrix-facebook: Fix appservice name It appears that newer mautrix-facebook versions default to the appservice name `facebook`. This was breaking our registration and causing mautrix-facebook to fail to start. This changes the name back and makes the registration generated match whatever the setting in the app is. --- nixos/modules/services/matrix/mautrix-facebook.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/matrix/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix index e995f1aecf2..bab6865496d 100644 --- a/nixos/modules/services/matrix/mautrix-facebook.nix +++ b/nixos/modules/services/matrix/mautrix-facebook.nix @@ -29,6 +29,7 @@ in { }; appservice = rec { + id = "facebook"; address = "http://${hostname}:${toString port}"; hostname = "localhost"; port = 29319; @@ -171,7 +172,7 @@ in { services.mautrix-facebook = { registrationData = { - id = "mautrix-facebook"; + id = cfg.settings.appservice.id; namespaces = { users = [ From 32bce83e4014fbdb5c3e89a6ff5c0638f0ead417 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 18:40:12 +0200 Subject: [PATCH 019/159] python311Packages.onvif-zeep-async: 3.1.7 -> 3.1.8 --- pkgs/development/python-modules/onvif-zeep-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix index 7befaec42b3..c396941723b 100644 --- a/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "onvif-zeep-async"; - version = "3.1.7"; + version = "3.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ra/1qKKmuWWvJCrr1uTCU5Awv5+GShgDHlHw0igLc4c="; + hash = "sha256-UiONj4ANsB5l2/ypWWfUK5ELoLsnUuyrFeldgITwIo4="; }; propagatedBuildInputs = [ From 8f84341c90f3b20f506e54cf45a6e106379d0741 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 19 May 2023 15:58:26 -0400 Subject: [PATCH 020/159] pinentry-mac: fix build with Darwin sandbox enabled --- pkgs/tools/security/pinentry/mac.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index daf2d82d66b..d824a816dc9 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { chmod -R u+w macosx/*.nib ''; + # Unfortunately, PlistBuddy from xcbuild is not compatible enough pinentry-mac’s build process. + sandboxProfile = '' + (allow process-exec (literal "/usr/libexec/PlistBuddy")) + ''; + nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ libassuan libgpg-error libiconv Cocoa ]; From bd54c7251283a3a35d634363adc486e621fff041 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 18:43:05 +0200 Subject: [PATCH 021/159] python311Packages.reolink-aio: 0.5.15 -> 0.5.16 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.5.15...0.5.16 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.5.16 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 65b38637cc3..3b2a6c86135 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.15"; + version = "0.5.16"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-YTBx0tMWSyy6A1OuTBmfEpRnZE4gHLIY5qFH9YL+YEo="; + hash = "sha256-FyrTZqp4h4GOCxld+y3wDEfLOl6a6dCgs/LJetjmr8I="; }; postPatch = '' From 7aa999a7215f1e7624176005f5301d1d5e974d67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 18:43:57 +0200 Subject: [PATCH 022/159] python311Packages.python-otbr-api: 1.1.0 -> 1.2.0 Diff: https://github.com/home-assistant-libs/python-otbr-api/compare/refs/tags/1.1.0...1.2.0 Changelog: https://github.com/home-assistant-libs/python-otbr-api/releases/tag/1.2.0 --- pkgs/development/python-modules/python-otbr-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index f4840bba20d..723a4ebe02f 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0JPniehl4cnoTWgqmq1fMZwU8FFl2Zx4CF81az6iaxQ="; + hash = "sha256-IPglUB+Xla+IjWzHhfG+SDHY/jucg46ppnhHBHKTEiE="; }; nativeBuildInputs = [ From 48bfaeb87cfc209b0d2f77bcec1e6c7d0a33320e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 18:46:04 +0200 Subject: [PATCH 023/159] python311Packages.pydeps: 1.12.7 -> 1.12.8 Diff: https://github.com/thebjorn/pydeps/compare/refs/tags/v1.12.7...v1.12.8 Changelog: https://github.com/thebjorn/pydeps/releases/tag/v1.12.8 --- pkgs/development/python-modules/pydeps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 450920a2470..ac00f09a9ec 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.7"; + version = "1.12.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-D57IO+1KS/budIjScEjVKP/5IbEx9KSDS46URuymC4s="; + hash = "sha256-6NxI67K1gw6VRO10T2o+5pwMsvCqIgMnHueLbg88XSQ="; }; buildInputs = [ From b447d9bb53d7e47aae0d370d47d21f99dba6d51d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 18:57:05 +0200 Subject: [PATCH 024/159] python311Packages.pysigma-backend-insightidr: 0.1.8 -> 0.1.9 Diff: https://github.com/SigmaHQ/pySigma-backend-insightidr/compare/refs/tags/v0.1.8...v0.1.9 --- .../python-modules/pysigma-backend-insightidr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index 41c0e2723f5..18b85d41939 100644 --- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-insightidr"; - version = "0.1.8"; + version = "0.1.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-insightidr"; rev = "refs/tags/v${version}"; - hash = "sha256-3Tr6WvYuHddc0vGb8li6hZLk2GgfXr67/T2AnYQ7qeo="; + hash = "sha256-/oHwWe8EcE1CS/hOmzJm9smfRLS/wShfbSGqOuvp8rU="; }; nativeBuildInputs = [ From a9a080a60b4c205df4fe98e27b07dde8689f4f6d Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Fri, 26 May 2023 11:43:30 -0600 Subject: [PATCH 025/159] jetbrains: add python3 to PATH --- pkgs/applications/editors/jetbrains/linux.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index 7443842e7bf..117a261e957 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText , coreutils, gnugrep, which, git, unzip, libsecret, libnotify, e2fsprogs -, vmopts ? null +, python3, vmopts ? null }: { pname, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: @@ -71,7 +71,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { item=${desktopItem} makeWrapper "$out/$pname/bin/${loName}.sh" "$out/bin/${pname}" \ - --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git python3 ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret e2fsprogs From 5dbd4f32433b4f8511c702ee8bb66e8b4fff7b87 Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 26 May 2023 19:43:58 +0200 Subject: [PATCH 026/159] nixos/qemu-vm: add `virtualisation.memorySize < 2048` assertion on 32bit --- nixos/modules/virtualisation/qemu-vm.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 5f6bf4b39e9..5dfc77cb428 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -863,7 +863,13 @@ in The address must be in the default VLAN (10.0.2.0/24). ''; } - ])); + ])) ++ [ + { assertion = pkgs.stdenv.hostPlatform.is32bit && cfg.memorySize < 2047; + message = '' + virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max. + ''; + } + ]; warnings = optional ( From 69bb0f94dee27c8beddcf786beb89148c51e2e8c Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 5 Mar 2023 18:13:27 +0100 Subject: [PATCH 027/159] nixos/nginx: first-class PROXY protocol support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PROXY protocol is a convenient way to carry information about the originating address/port of a TCP connection across multiple layers of proxies/NAT, etc. Currently, it is possible to make use of it in NGINX's NixOS module, but is painful when we want to enable it "globally". Technically, this is achieved by reworking the defaultListen options and the objective is to have a coherent way to specify default listeners in the current API design. See `mkDefaultListenVhost` and `defaultListen` for the details. It adds a safeguard against running a NGINX with no HTTP listeners (e.g. only PROXY listeners) while asking for ACME certificates over HTTP-01. An interesting usecase of PROXY protocol is to enable seamless IPv4 to IPv6 proxy with origin IPv4 address for IPv6-only NGINX servers, it is demonstrated how to achieve this in the tests, using sniproxy. Finally, the tests covers: - NGINX `defaultListen` mechanisms are not broken by these changes; - NGINX PROXY protocol listeners are working in a final usecase (sniproxy); - uses snakeoil TLS certs from ACME setup with wildcard certificates; In the future, it is desirable to spoof-attack NGINX in this scenario to ascertain that `set_real_ip_from` and all the layers are working as intended and preventing any user from setting their origin IP address to any arbitrary, opening up the NixOS module to bad™ vulnerabilities. For now, it is quite hard to achieve while being minimalistic about the tests dependencies. --- .../manual/release-notes/rl-2311.section.md | 2 + .../services/web-servers/nginx/default.nix | 100 +++++++++++- .../web-servers/nginx/vhost-options.nix | 37 ++++- nixos/tests/all-tests.nix | 1 + .../nginx-proxyprotocol/_.test.nix.cert.pem | 20 +++ .../nginx-proxyprotocol/_.test.nix.key.pem | 27 ++++ nixos/tests/nginx-proxyprotocol/ca.cert.pem | 20 +++ nixos/tests/nginx-proxyprotocol/ca.key.pem | 27 ++++ nixos/tests/nginx-proxyprotocol/default.nix | 144 ++++++++++++++++++ .../nginx-proxyprotocol/generate-certs.nix | 30 ++++ .../nginx-proxyprotocol/snakeoil-certs.nix | 14 ++ pkgs/servers/http/nginx/generic.nix | 2 +- 12 files changed, 410 insertions(+), 14 deletions(-) create mode 100644 nixos/tests/nginx-proxyprotocol/_.test.nix.cert.pem create mode 100644 nixos/tests/nginx-proxyprotocol/_.test.nix.key.pem create mode 100644 nixos/tests/nginx-proxyprotocol/ca.cert.pem create mode 100644 nixos/tests/nginx-proxyprotocol/ca.key.pem create mode 100644 nixos/tests/nginx-proxyprotocol/default.nix create mode 100644 nixos/tests/nginx-proxyprotocol/generate-certs.nix create mode 100644 nixos/tests/nginx-proxyprotocol/snakeoil-certs.nix diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 972a3777bb7..69b7aeb64de 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -17,3 +17,5 @@ ## Other Notable Changes {#sec-release-23.11-notable-changes} - A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant. + +- `services.nginx` gained a `defaultListen` option at server-level with support for PROXY protocol listeners, also `proxyProtocol` is now exposed in `services.nginx.virtualHosts..listen` option. It is now possible to run PROXY listeners and non-PROXY listeners at a server-level, see [#213510](https://github.com/NixOS/nixpkgs/pull/213510/) for more details. diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index f5fa2ef5f86..12ccba16473 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -309,36 +309,54 @@ let onlySSL = vhost.onlySSL || vhost.enableSSL; hasSSL = onlySSL || vhost.addSSL || vhost.forceSSL; + # First evaluation of defaultListen based on a set of listen lines. + mkDefaultListenVhost = listenLines: + # If this vhost has SSL or is a SSL rejection host. + # We enable a TLS variant for lines without explicit ssl or ssl = true. + optionals (hasSSL || vhost.rejectSSL) + (map (listen: { port = cfg.defaultSSLListenPort; ssl = true; } // listen) + (filter (listen: !(listen ? ssl) || listen.ssl) listenLines)) + # If this vhost is supposed to serve HTTP + # We provide listen lines for those without explicit ssl or ssl = false. + ++ optionals (!onlySSL) + (map (listen: { port = cfg.defaultHTTPListenPort; ssl = false; } // listen) + (filter (listen: !(listen ? ssl) || !listen.ssl) listenLines)); + defaultListen = if vhost.listen != [] then vhost.listen + else + if cfg.defaultListen != [] then mkDefaultListenVhost + # Cleanup nulls which will mess up with //. + # TODO: is there a better way to achieve this? i.e. mergeButIgnoreNullPlease? + (map (listenLine: filterAttrs (_: v: (v != null)) listenLine) cfg.defaultListen) else let addrs = if vhost.listenAddresses != [] then vhost.listenAddresses else cfg.defaultListenAddresses; - in optionals (hasSSL || vhost.rejectSSL) (map (addr: { inherit addr; port = cfg.defaultSSLListenPort; ssl = true; }) addrs) - ++ optionals (!onlySSL) (map (addr: { inherit addr; port = cfg.defaultHTTPListenPort; ssl = false; }) addrs); + in mkDefaultListenVhost (map (addr: { inherit addr; }) addrs); + hostListen = if vhost.forceSSL then filter (x: x.ssl) defaultListen else defaultListen; - listenString = { addr, port, ssl, extraParameters ? [], ... }: + listenString = { addr, port, ssl, proxyProtocol ? false, extraParameters ? [], ... }: # UDP listener for QUIC transport protocol. (optionalString (ssl && vhost.quic) (" listen ${addr}:${toString port} quic " + optionalString vhost.default "default_server " + optionalString vhost.reuseport "reuseport " - + optionalString (extraParameters != []) (concatStringsSep " " ( - let inCompatibleParameters = [ "ssl" "proxy_protocol" "http2" ]; + + optionalString (extraParameters != []) (concatStringsSep " " + (let inCompatibleParameters = [ "ssl" "proxy_protocol" "http2" ]; isCompatibleParameter = param: !(any (p: p == param) inCompatibleParameters); in filter isCompatibleParameter extraParameters)) + ";")) + " - listen ${addr}:${toString port} " + optionalString (ssl && vhost.http2) "http2 " + optionalString ssl "ssl " + optionalString vhost.default "default_server " + optionalString vhost.reuseport "reuseport " + + optionalString proxyProtocol "proxy_protocol " + optionalString (extraParameters != []) (concatStringsSep " " extraParameters) + ";"; @@ -539,6 +557,49 @@ in ''; }; + defaultListen = mkOption { + type = with types; listOf (submodule { + options = { + addr = mkOption { + type = str; + description = lib.mdDoc "IP address."; + }; + port = mkOption { + type = nullOr port; + description = lib.mdDoc "Port number."; + default = null; + }; + ssl = mkOption { + type = nullOr bool; + default = null; + description = lib.mdDoc "Enable SSL."; + }; + proxyProtocol = mkOption { + type = bool; + description = lib.mdDoc "Enable PROXY protocol."; + default = false; + }; + extraParameters = mkOption { + type = listOf str; + description = lib.mdDoc "Extra parameters of this listen directive."; + default = [ ]; + example = [ "backlog=1024" "deferred" ]; + }; + }; + }); + default = []; + example = literalExpression ''[ + { addr = "10.0.0.12"; proxyProtocol = true; ssl = true; } + { addr = "0.0.0.0"; } + { addr = "[::0]"; } + ]''; + description = lib.mdDoc '' + If vhosts do not specify listen, use these addresses by default. + This option takes precedence over {option}`defaultListenAddresses` and + other listen-related defaults options. + ''; + }; + defaultListenAddresses = mkOption { type = types.listOf types.str; default = [ "0.0.0.0" ] ++ optional enableIPv6 "[::0]"; @@ -546,6 +607,7 @@ in example = literalExpression ''[ "10.0.0.12" "[2002:a00:1::]" ]''; description = lib.mdDoc '' If vhosts do not specify listenAddresses, use these addresses by default. + This is akin to writing `defaultListen = [ { addr = "0.0.0.0" } ]`. ''; }; @@ -1078,6 +1140,32 @@ in which can be achieved by setting `services.nginx.package = pkgs.nginxQuic;`. ''; } + + { + # The idea is to understand whether there is a virtual host with a listen configuration + # that requires ACME configuration but has no HTTP listener which will make deterministically fail + # this operation. + # Options' priorities are the following at the moment: + # listen (vhost) > defaultListen (server) > listenAddresses (vhost) > defaultListenAddresses (server) + assertion = + let + hasAtLeastHttpListener = listenOptions: any (listenLine: if listenLine ? proxyProtocol then !listenLine.proxyProtocol else true) listenOptions; + hasAtLeastDefaultHttpListener = if cfg.defaultListen != [] then hasAtLeastHttpListener cfg.defaultListen else (cfg.defaultListenAddresses != []); + in + all (host: + let + hasAtLeastVhostHttpListener = if host.listen != [] then hasAtLeastHttpListener host.listen else (host.listenAddresses != []); + vhostAuthority = host.listen != [] || (cfg.defaultListen == [] && host.listenAddresses != []); + in + # Either vhost has precedence and we need a vhost specific http listener + # Either vhost set nothing and inherit from server settings + host.enableACME -> ((vhostAuthority && hasAtLeastVhostHttpListener) || (!vhostAuthority && hasAtLeastDefaultHttpListener)) + ) (attrValues virtualHosts); + message = '' + services.nginx.virtualHosts..enableACME requires a HTTP listener + to answer to ACME requests. + ''; + } ] ++ map (name: mkCertOwnershipAssertion { inherit (cfg) group user; cert = config.security.acme.certs.${name}; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 5b33694cf2d..7636c1b2611 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -27,12 +27,35 @@ with lib; }; listen = mkOption { - type = with types; listOf (submodule { options = { - addr = mkOption { type = str; description = lib.mdDoc "IP address."; }; - port = mkOption { type = port; description = lib.mdDoc "Port number."; default = 80; }; - ssl = mkOption { type = bool; description = lib.mdDoc "Enable SSL."; default = false; }; - extraParameters = mkOption { type = listOf str; description = lib.mdDoc "Extra parameters of this listen directive."; default = []; example = [ "backlog=1024" "deferred" ]; }; - }; }); + type = with types; listOf (submodule { + options = { + addr = mkOption { + type = str; + description = lib.mdDoc "IP address."; + }; + port = mkOption { + type = port; + description = lib.mdDoc "Port number."; + default = 80; + }; + ssl = mkOption { + type = bool; + description = lib.mdDoc "Enable SSL."; + default = false; + }; + proxyProtocol = mkOption { + type = bool; + description = lib.mdDoc "Enable PROXY protocol."; + default = false; + }; + extraParameters = mkOption { + type = listOf str; + description = lib.mdDoc "Extra parameters of this listen directive."; + default = [ ]; + example = [ "backlog=1024" "deferred" ]; + }; + }; + }); default = []; example = [ { addr = "195.154.1.1"; port = 443; ssl = true; } @@ -45,7 +68,7 @@ with lib; and `onlySSL`. If you only want to set the addresses manually and not - the ports, take a look at `listenAddresses` + the ports, take a look at `listenAddresses`. ''; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a4e4679a2cc..49a7db012a1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -521,6 +521,7 @@ in { nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nginx-variants = handleTest ./nginx-variants.nix {}; + nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {}; nifi = handleTestOn ["x86_64-linux"] ./web-apps/nifi.nix {}; nitter = handleTest ./nitter.nix {}; nix-ld = handleTest ./nix-ld.nix {}; diff --git a/nixos/tests/nginx-proxyprotocol/_.test.nix.cert.pem b/nixos/tests/nginx-proxyprotocol/_.test.nix.cert.pem new file mode 100644 index 00000000000..e5cea72610b --- /dev/null +++ b/nixos/tests/nginx-proxyprotocol/_.test.nix.cert.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDLjCCAhagAwIBAgIIP2+4GFxOYMgwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE +AxMVbWluaWNhIHJvb3QgY2EgNGU3NTJiMB4XDTIzMDEzMDAzNDExOFoXDTQzMDEz +MDAzNDExOFowFTETMBEGA1UEAwwKKi50ZXN0Lm5peDCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAMarJSCzelnzTMT5GMoIKA/MXBNk5j277uI2Gq2MCky/ +DlBpx+tjSsKsz6QLBduKMF8OH5AgjrVAKQAtsVPDseY0Qcyx/5dgJjkdO4on+DFb +V0SJ3ZhYPKACrqQ1SaoG+Xup37puw7sVR13J7oNvP6fAYRcjYqCiFC7VMjJNG4dR +251jvWWidSc7v5CYw2AxrngtBgHeQuyG9QCJ1DRH8h6ioV7IeonwReN7noYtTWh8 +NDjGnw9HH2nYMcL91E+DWCxWVmbC9/orvYOT7u0Orho0t1w9BB0/zzcdojwQpMCv +HahEmFQmdGbWTuI4caBeaDBJVsSwKlTcxLSS4MAZ0c8CAwEAAaN3MHUwDgYDVR0P +AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB +Af8EAjAAMB8GA1UdIwQYMBaAFGyXySYI3gL88d7GHnGMU6wpiBf2MBUGA1UdEQQO +MAyCCioudGVzdC5uaXgwDQYJKoZIhvcNAQELBQADggEBAJ/DpwiLVBgWyozsn++f +kR4m0dUjnuCgpHo2EMoMZh+9og+OC0vq6WITXHaJytB3aBMxFOUTim3vwxPyWPXX +/vy+q6jJ6QMLx1J3VIWZdmXsT+qLGbVzL/4gNoaRsLPGO06p3yVjhas+OBFx1Fee +6kTHb82S/dzBojOJLRRo18CU9yw0FUXOPqN7HF7k2y+Twe6+iwCuCKGSFcvmRjxe +bWy11C921bTienW0Rmq6ppFWDaUNYP8kKpMN2ViAvc0tyF6wwk5lyOiqCR+pQHJR +H/J4qSeKDchYLKECuzd6SySz8FW/xPKogQ28zba+DBD86hpqiEJOBzxbrcN3cjUn +7N4= +-----END CERTIFICATE----- diff --git a/nixos/tests/nginx-proxyprotocol/_.test.nix.key.pem b/nixos/tests/nginx-proxyprotocol/_.test.nix.key.pem new file mode 100644 index 00000000000..ed2b17af0bf --- /dev/null +++ b/nixos/tests/nginx-proxyprotocol/_.test.nix.key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAxqslILN6WfNMxPkYyggoD8xcE2TmPbvu4jYarYwKTL8OUGnH +62NKwqzPpAsF24owXw4fkCCOtUApAC2xU8Ox5jRBzLH/l2AmOR07iif4MVtXRInd +mFg8oAKupDVJqgb5e6nfum7DuxVHXcnug28/p8BhFyNioKIULtUyMk0bh1HbnWO9 +ZaJ1Jzu/kJjDYDGueC0GAd5C7Ib1AInUNEfyHqKhXsh6ifBF43uehi1NaHw0OMaf +D0cfadgxwv3UT4NYLFZWZsL3+iu9g5Pu7Q6uGjS3XD0EHT/PNx2iPBCkwK8dqESY +VCZ0ZtZO4jhxoF5oMElWxLAqVNzEtJLgwBnRzwIDAQABAoIBAFuNGOH184cqKJGI +3RSVJ6kIGtJRKA0A4vfZyPd61nBBhx4lcRyXOCd4LYPCFKP0DZBwWLk5V6pM89gC +NnqMbxnPsRbcXBVtGJAvWXW0L5rHJfMOuVBwMRfnxIUljVnONv/264PlcUtwZd/h +o4lsJeBvNg7MnrG5nyVp1+T4RZxYm1P86HLp5zyT+fdj4Cr82b9j6QpxGXEfm1jV +QA1xr1ZkrV8fgETyaE0TBIKcdt6xNfv1mpI1RE5gaP/YzcCs/mL+G0kMar4l7pO/ +6OHXTvHz+W3G6Xlha7Wq1ADoqYz2K7VoL/OgSQhIxRNujyWR6lir7eladVrKkCzu +uzFi/HECgYEA0vSNCIK3useSypMPHhYUVNbZ4hbK0WgqSAxfJQtL3nC7KviVMAXj +IKVR90xuzJB+ih88KCJpH84JH90paMpW0Gq1yEae90bnWa8Nj7ULLS/Zuj0WrelU ++DEGbx47IUPOtiLBxooxFKyIVhX3hWRwZ0pokSQzbgb5zYnlM6tqZ3cCgYEA8Rb2 +wtt0XmqEQedFacs4fobJoVWMcETjpuxYp0m5Kje/4QkptZIbspXGBgNtPBBRGg51 +AYSu8wYkGEueI77KiFDgY8AAkpOk2MrMVPszjOhUiO1oEfbT6ynOY5RDOuXcY6jo +8RpSk46VkfVxt6LVmappqcVFtVWcAjdGfXeSLmkCgYAWP7SgMSkvidzxgJEXmzyJ +th9EuSKq81GCR8vBHG/kBf+3iIAzkGtkBgufCXCmIpc1+hVeJkLwF8rekXTMmIqP +cLG7bbdWXSQJUW0cuvtyyJkuC0NZFELh6knDbmzOFVi33PKS/gAvLgMzER4J843n +VvGwXSEPeazfAKwrxuhyAQKBgQCOm5TPYlyNVNhy20h18d2zCivOoPn3luhKXtd5 +7OP4kw2PIYpoesqjcnC2MeS1eLlgfli70y5hVqqXLHOYlUzcIWr51iMAkREbo6oG +QqkVmoAWlsfOiICGRC5vPM4f0sPwt4NCyt05p0fWFKd1hn5u7Ryfba90OfWUYfny +UX5IsQKBgQCswer4Qc3UepkiYxGwSTxgIh4kYlmamU2I00Kar4uFAr9JsCbk98f0 +kaCUNZjrrvTwgRmdhwcpMDiMW/F4QkNk0I2unHcoAvzNop6c22VhHJU2XJhrQ57h +n1iPiw0NLXiA4RQwMUMjtt3nqlpLOTXGtsF8TmpWPcAN2QcTxOutzw== +-----END RSA PRIVATE KEY----- diff --git a/nixos/tests/nginx-proxyprotocol/ca.cert.pem b/nixos/tests/nginx-proxyprotocol/ca.cert.pem new file mode 100644 index 00000000000..c0b2cc8f3df --- /dev/null +++ b/nixos/tests/nginx-proxyprotocol/ca.cert.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDSzCCAjOgAwIBAgIITnUr3xFw4oEwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE +AxMVbWluaWNhIHJvb3QgY2EgNGU3NTJiMCAXDTIzMDEzMDAzNDExOFoYDzIxMjMw +MTMwMDM0MTE4WjAgMR4wHAYDVQQDExVtaW5pY2Egcm9vdCBjYSA0ZTc1MmIwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1SrJT9k3zXIXApEyL5UDlw7F6 +MMOqE5d+8ZwMccHbEKLu0ssNRY+j31tnNYQ/r5iCNeNgUZccKBgzdU0ysyw5n4tw +0y+MTD9fCfUXYcc8pJRPRolo6zxYO9W7WJr0nfJZ+p7zFRAjRCmzXdnZjKz0EGcg +x9mHwn//3SuLt1ItK1n3aZ6im9NlcVtunDe3lCSL0tRgy7wDGNvWDZMO49jk4AFU +BlMqScuiNpUzYgCxNaaGMuH3M0f0YyRAxSs6FWewLtqTIaVql7HL+3PcGAhvlKEZ +fvfaf80F9aWI88sbEddTA0s5837zEoDwGpZl3K5sPU/O3MVEHIhAY5ICG0IBAgMB +AAGjgYYwgYMwDgYDVR0PAQH/BAQDAgKEMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr +BgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBRsl8kmCN4C/PHe +xh5xjFOsKYgX9jAfBgNVHSMEGDAWgBRsl8kmCN4C/PHexh5xjFOsKYgX9jANBgkq +hkiG9w0BAQsFAAOCAQEAmvgpU+q+TBbz+9Y2rdiIeTfeDXtMNPf+nKI3zxYztRGC +MoKP6jCQaFSQra4BVumFLV38DoqR1pOV1ojkiyO5c/9Iym/1Wmm8LeqgsHNqSgyS +C7wvBcb/N9PzIBQFq/RiboDoC7bqK/0zQguCmBtGceH+AVpQyfXM+P78B1EkHozu +67igP8GfouPp2s4Vd5P2XGkA6vMgYCtFEnCbtmmo7C8B+ymhD/D9axpMKQ1OaBg9 +jfqLOlk+Rc2nYZuaDjnUmlTkYjC6EwCNe9weYkSJgQ9QzoGJLIRARsdQdsp3C2fZ +l2UZKkDJ2GPrrc+TdaGXZTYi0uMmvQsEKZXtqAzorQ== +-----END CERTIFICATE----- diff --git a/nixos/tests/nginx-proxyprotocol/ca.key.pem b/nixos/tests/nginx-proxyprotocol/ca.key.pem new file mode 100644 index 00000000000..717948f5b87 --- /dev/null +++ b/nixos/tests/nginx-proxyprotocol/ca.key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAtUqyU/ZN81yFwKRMi+VA5cOxejDDqhOXfvGcDHHB2xCi7tLL +DUWPo99bZzWEP6+YgjXjYFGXHCgYM3VNMrMsOZ+LcNMvjEw/Xwn1F2HHPKSUT0aJ +aOs8WDvVu1ia9J3yWfqe8xUQI0Qps13Z2Yys9BBnIMfZh8J//90ri7dSLStZ92me +opvTZXFbbpw3t5Qki9LUYMu8Axjb1g2TDuPY5OABVAZTKknLojaVM2IAsTWmhjLh +9zNH9GMkQMUrOhVnsC7akyGlapexy/tz3BgIb5ShGX732n/NBfWliPPLGxHXUwNL +OfN+8xKA8BqWZdyubD1PztzFRByIQGOSAhtCAQIDAQABAoIBAQCLeAWs1kWtvTYg +t8UzspC0slItAKrmgt//hvxYDoPmdewC8yPG+AbDOSfmRKOTIxGeyro79UjdHnNP +0yQqpvCU/AqYJ7/inR37jXuCG3TdUHfQbSF1F9N6xb1tvYKoQYKaelYiB8g8eUnj +dYYM+U5tDNlpvJW6/YTfYFUJzWRo3i8jj5lhbkjcJDvdOhVxMXNXJgJAymu1KysE +N1da2l4fzmuoN82wFE9KMyYSn+LOLWBReQQmXHZPP+2LjRIVrWoFoV49k2Ylp9tH +yeaFx1Ya/wVx3PRnSW+zebWDcc0bAua9XU3Fi42yRq5iXOyoXHyefDfJoId7+GAO +IF2qRw9hAoGBAM1O1l4ceOEDsEBh7HWTvmfwVfkXgT6VHeI6LGEjb88FApXgT+wT +1s1IWVVOigLl9OKQbrjqlg9xgzrPDHYRwu5/Oz3X2WaH6wlF+d+okoqls6sCEAeo +GfzF3sKOHQyIYjttCXE5G38uhIgVFFFfK97AbUiY8egYBr0zjVXK7xINAoGBAOIN +1pDBFBQIoKj64opm/G9lJBLUpWLBFdWXhXS6q2jNsdY1mLMRmu/RBaKSfGz7W1a/ +a2WBedjcnTWJ/84tBsn4Qj5tLl8xkcXiN/pslWzg724ZnVsbyxM9KvAdXAma3F0g +2EsYq8mhvbAEkpE+aoM6jwOJBnMhTRZrNMKN2lbFAoGAHmZWB4lfvLG3H1FgmehO +gUVs9X0tff7GdgD3IUsF+zlasKaOLv6hB7R2xdLjTJqQMBwCyQ6zOYYtUD/oMHNg +0b+1HesgHbZybuUVorBrQmxWtjOP/BJABtWlrlkso/Zt1S7H/yPdlm9k4GF+qK3W +6RzFEcLTzvH/zXQcsV9jFuECgYEAhaX+1KiC0XFkY2OpaoCHAOlAUa3NdjyIRzcF +XUU8MINkgCxB8qUXAHCJL1wCGoDluL0FpwbM3m1YuR200tYGLIUNzVDJ2Ng6wk8E +H5fxJGU8ydB1Gzescdx5NWt2Tet0G89ecc/NSTHKL3YUnbDUUm/dvA5YdNscc4PA +tsIdc60CgYEArvU1MwqGQUTDKUmaM2t3qm70fbwmOViHfyTWpn4aAQR3sK16iJMm +V+dka62L/VYs5CIbzXvCioyugUMZGJi/zIwrViRzqJQbNnPADAW4lG88UxXqHHAH +q33ivjgd9omGFb37saKOmR44KmjUIDvSIZF4W3EPwAMEyl5mM31Ryns= +-----END RSA PRIVATE KEY----- diff --git a/nixos/tests/nginx-proxyprotocol/default.nix b/nixos/tests/nginx-proxyprotocol/default.nix new file mode 100644 index 00000000000..9ef5d01cd65 --- /dev/null +++ b/nixos/tests/nginx-proxyprotocol/default.nix @@ -0,0 +1,144 @@ +let + certs = import ./snakeoil-certs.nix; +in +import ../make-test-python.nix ({ pkgs, ... }: { + name = "nginx-proxyprotocol"; + + nodes = { + webserver = { pkgs, lib, ... }: { + environment.systemPackages = [ pkgs.netcat ]; + security.pki.certificateFiles = [ + certs.ca.cert + ]; + + networking.extraHosts = '' + 127.0.0.5 proxy.test.nix + 127.0.0.5 noproxy.test.nix + 127.0.0.3 direct-nossl.test.nix + 127.0.0.4 unsecure-nossl.test.nix + 127.0.0.2 direct-noproxy.test.nix + 127.0.0.1 direct-proxy.test.nix + ''; + services.nginx = { + enable = true; + defaultListen = [ + { addr = "127.0.0.1"; proxyProtocol = true; ssl = true; } + { addr = "127.0.0.2"; } + { addr = "127.0.0.3"; ssl = false; } + { addr = "127.0.0.4"; ssl = false; proxyProtocol = true; } + ]; + commonHttpConfig = '' + log_format pcombined '(proxy_protocol=$proxy_protocol_addr) - (remote_addr=$remote_addr) - (realip=$realip_remote_addr) - (upstream=) - (remote_user=$remote_user) [$time_local] ' + '"$request" $status $body_bytes_sent ' + '"$http_referer" "$http_user_agent"'; + access_log /var/log/nginx/access.log pcombined; + error_log /var/log/nginx/error.log; + ''; + virtualHosts = + let + commonConfig = { + locations."/".return = "200 '$remote_addr'"; + extraConfig = '' + set_real_ip_from 127.0.0.5/32; + real_ip_header proxy_protocol; + ''; + }; + in + { + "*.test.nix" = commonConfig // { + sslCertificate = certs."*.test.nix".cert; + sslCertificateKey = certs."*.test.nix".key; + forceSSL = true; + }; + "direct-nossl.test.nix" = commonConfig; + "unsecure-nossl.test.nix" = commonConfig // { + extraConfig = '' + real_ip_header proxy_protocol; + ''; + }; + }; + }; + + services.sniproxy = { + enable = true; + config = '' + error_log { + syslog daemon + } + access_log { + syslog daemon + } + listener 127.0.0.5:443 { + protocol tls + source 127.0.0.5 + } + table { + ^proxy\.test\.nix$ 127.0.0.1 proxy_protocol + ^noproxy\.test\.nix$ 127.0.0.2 + } + ''; + }; + }; + }; + + testScript = '' + def check_origin_ip(src_ip: str, dst_url: str, failure: bool = False, proxy_protocol: bool = False, expected_ip: str | None = None): + check = webserver.fail if failure else webserver.succeed + if expected_ip is None: + expected_ip = src_ip + + return check(f"curl {'--haproxy-protocol' if proxy_protocol else '''} --interface {src_ip} --fail -L {dst_url} | grep '{expected_ip}'") + + webserver.wait_for_unit("nginx") + webserver.wait_for_unit("sniproxy") + # This should be closed by virtue of ssl = true; + webserver.wait_for_closed_port(80, "127.0.0.1") + # This should be open by virtue of no explicit ssl + webserver.wait_for_open_port(80, "127.0.0.2") + # This should be open by virtue of ssl = true; + webserver.wait_for_open_port(443, "127.0.0.1") + # This should be open by virtue of no explicit ssl + webserver.wait_for_open_port(443, "127.0.0.2") + # This should be open by sniproxy + webserver.wait_for_open_port(443, "127.0.0.5") + # This should be closed by sniproxy + webserver.wait_for_closed_port(80, "127.0.0.5") + + # Sanity checks for the NGINX module + # direct-HTTP connection to NGINX without TLS, this checks that ssl = false; works well. + check_origin_ip("127.0.0.10", "http://direct-nossl.test.nix/") + # webserver.execute("openssl s_client -showcerts -connect direct-noproxy.test.nix:443") + # direct-HTTP connection to NGINX with TLS + check_origin_ip("127.0.0.10", "http://direct-noproxy.test.nix/") + check_origin_ip("127.0.0.10", "https://direct-noproxy.test.nix/") + # Well, sniproxy is not listening on 80 and cannot redirect + check_origin_ip("127.0.0.10", "http://proxy.test.nix/", failure=True) + check_origin_ip("127.0.0.10", "http://noproxy.test.nix/", failure=True) + + # Actual PROXY protocol related tests + # Connecting through sniproxy should passthrough the originating IP address. + check_origin_ip("127.0.0.10", "https://proxy.test.nix/") + # Connecting through sniproxy to a non-PROXY protocol enabled listener should not pass the originating IP address. + check_origin_ip("127.0.0.10", "https://noproxy.test.nix/", expected_ip="127.0.0.5") + + # Attack tests against spoofing + # Let's try to spoof our IP address by connecting direct-y to the PROXY protocol listener. + # FIXME(RaitoBezarius): rewrite it using Python + (Scapy|something else) as this is too much broken unfortunately. + # Or wait for upstream curl patch. + # def generate_attacker_request(original_ip: str, target_ip: str, dst_url: str): + # return f"""PROXY TCP4 {original_ip} {target_ip} 80 80 + # GET / HTTP/1.1 + # Host: {dst_url} + + # """ + # def spoof(original_ip: str, target_ip: str, dst_url: str, tls: bool = False, expect_failure: bool = True): + # method = webserver.fail if expect_failure else webserver.succeed + # port = 443 if tls else 80 + # print(webserver.execute(f"cat < {}, + minica ? pkgs.minica, + runCommandCC ? pkgs.runCommandCC, +}: +let + conf = import ./snakeoil-certs.nix; + domain = conf.domain; + domainSanitized = pkgs.lib.replaceStrings ["*"] ["_"] domain; +in + runCommandCC "generate-tests-certs" { + buildInputs = [ (minica.overrideAttrs (old: { + postPatch = '' + sed -i 's_NotAfter: time.Now().AddDate(2, 0, 30),_NotAfter: time.Now().AddDate(20, 0, 0),_' main.go + ''; + })) ]; + + } '' + minica \ + --ca-key ca.key.pem \ + --ca-cert ca.cert.pem \ + --domains "${domain}" + + mkdir -p $out + mv ca.*.pem $out/ + mv ${domainSanitized}/key.pem $out/${domainSanitized}.key.pem + mv ${domainSanitized}/cert.pem $out/${domainSanitized}.cert.pem + '' diff --git a/nixos/tests/nginx-proxyprotocol/snakeoil-certs.nix b/nixos/tests/nginx-proxyprotocol/snakeoil-certs.nix new file mode 100644 index 00000000000..61af6351ca6 --- /dev/null +++ b/nixos/tests/nginx-proxyprotocol/snakeoil-certs.nix @@ -0,0 +1,14 @@ +let + domain = "*.test.nix"; + domainSanitized = "_.test.nix"; +in { + inherit domain; + ca = { + cert = ./ca.cert.pem; + key = ./ca.key.pem; + }; + "${domain}" = { + cert = ./. + "/${domainSanitized}.cert.pem"; + key = ./. + "/${domainSanitized}.key.pem"; + }; +} diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index b740747975c..63ce7f75906 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -178,7 +178,7 @@ stdenv.mkDerivation { passthru = { inherit modules; tests = { - inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-pubhtml nginx-sandbox nginx-sso; + inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-pubhtml nginx-sandbox nginx-sso nginx-proxyprotocol; variants = lib.recurseIntoAttrs nixosTests.nginx-variants; acme-integration = nixosTests.acme; } // passthru.tests; From 854214ec56853be850830a1ee6c59bb5899728a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 20:31:40 +0200 Subject: [PATCH 028/159] python311Packages.faraday-plugins: 1.11.0 -> 1.12.0 Changelog: https://github.com/infobyte/faraday_plugins/releases/tag/1.12.0 --- pkgs/development/python-modules/faraday-plugins/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 2a1e0f7afc9..4da7851a147 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -6,6 +6,7 @@ , fetchFromGitHub , html2text , lxml +, markdown , pytestCheckHook , python-dateutil , pythonOlder @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.11.0"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-rbmD+UeMzsccYq7AzANziUZCgKtShRe/fJersODMrF8="; + hash = "sha256-dtSGNLQUG4Co+p/sPBgKxMhB7drZAMxUas+eH6g/cS8="; }; postPatch = '' @@ -40,6 +41,7 @@ buildPythonPackage rec { colorama html2text lxml + markdown python-dateutil pytz requests From fa10919cd027b5535fda6c5a7269bdd863e209ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 21:26:47 +0200 Subject: [PATCH 029/159] python3Packages.uptime-kuma-api: update disabled --- pkgs/development/python-modules/uptime-kuma-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/uptime-kuma-api/default.nix b/pkgs/development/python-modules/uptime-kuma-api/default.nix index f9de280dad4..613d9f75e84 100644 --- a/pkgs/development/python-modules/uptime-kuma-api/default.nix +++ b/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "1.0.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "uptime_kuma_api"; From 45b47f0c99f1211522b6aa77f607ae0ab7734b08 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 26 May 2023 22:30:53 +0200 Subject: [PATCH 030/159] coreboot-utils: support subset on aarch64-linux --- pkgs/tools/misc/coreboot-utils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 029880de2cb..252d3e6d4f0 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -54,8 +54,8 @@ let intelmetool = generic { pname = "intelmetool"; meta.description = "Dump interesting things about Management Engine"; - buildInputs = [ pciutils zlib ]; meta.platforms = [ "x86_64-linux" "i686-linux" ]; + buildInputs = [ pciutils zlib ]; }; cbfstool = generic { pname = "cbfstool"; @@ -68,6 +68,7 @@ let superiotool = generic { pname = "superiotool"; meta.description = "User-space utility to detect Super I/O of a mainboard and provide detailed information about the register contents of the Super I/O"; + meta.platforms = [ "x86_64-linux" "i686-linux" ]; buildInputs = [ pciutils zlib ]; }; ectool = generic { @@ -79,8 +80,8 @@ let inteltool = generic { pname = "inteltool"; meta.description = "Provides information about Intel CPU/chipset hardware configuration (register contents, MSRs, etc)"; - buildInputs = [ pciutils zlib ]; meta.platforms = [ "x86_64-linux" "i686-linux" ]; + buildInputs = [ pciutils zlib ]; }; amdfwtool = generic { pname = "amdfwtool"; @@ -119,7 +120,7 @@ in utils // { coreboot-utils = (buildEnv { name = "coreboot-utils-${version}"; - paths = lib.attrValues utils; + paths = lib.filter (lib.meta.availableOn stdenv.hostPlatform) (lib.attrValues utils); postBuild = "rm -rf $out/sbin"; }) // { inherit version; From 9aa6989b6454585650d7376f74151cf0dad1b11c Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 3 May 2022 22:08:43 +0200 Subject: [PATCH 031/159] avrdude: always build documentation on Linux Make texlive a build-time dependency to always build the docs on Linux. --- pkgs/development/embedded/avrdude/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index fd54383f9ef..dfd0f027d6b 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -1,9 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb-compat-0_1, libelf, libftdi1, readline -# docSupport is a big dependency, disabled by default -, docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null -}: - -assert docSupport -> texLive != null && texinfo != null && texi2html != null; +{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb-compat-0_1, libelf +, libftdi1, readline +# documentation building is broken on darwin +, docSupport ? (!stdenv.isDarwin), texlive, texinfo, texi2html, unixtools }: stdenv.mkDerivation rec { pname = "avrdude"; @@ -16,10 +14,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-pGjOefWnf11kG/zFGwYGet1OjAhKsULNGgh6vqvIQ7c="; }; - nativeBuildInputs = [ cmake bison flex ]; + nativeBuildInputs = [ cmake bison flex ] ++ lib.optionals docSupport [ + unixtools.more + texlive.combined.scheme-medium + texinfo + texi2html + ]; - buildInputs = [ libusb-compat-0_1 libelf libftdi1 readline ] - ++ lib.optionals docSupport [ texLive texinfo texi2html ]; + buildInputs = [ libusb-compat-0_1 libelf libftdi1 readline ]; cmakeFlags = lib.optionals docSupport [ "-DBUILD_DOC=ON" From 829648e5e43b7703f6e42a84dbef6cdbe04f2d9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 May 2023 23:13:30 +0000 Subject: [PATCH 032/159] snapmaker-luban: 4.7.3 -> 4.8.0 --- pkgs/applications/misc/snapmaker-luban/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index 615cf28103a..8f2437e9de2 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "snapmaker-luban"; - version = "4.7.3"; + version = "4.8.0"; src = fetchurl { url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; - sha256 = "sha256-CPeTTnwykaa58tpA7Aznrvrs0DqxOKjspZjHrT+e9tw="; + sha256 = "sha256-uY8MlLIZrbds5/QdYZFTLSSis0BwRU19XfLiBX+2VCY="; }; nativeBuildInputs = [ From 597e12678616e5f2fde25c089d6872820e96c547 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 02:26:12 +0300 Subject: [PATCH 033/159] linuxPackages.system76-scheduler: migrate to bindgenHook --- pkgs/os-specific/linux/system76-scheduler/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/system76-scheduler/default.nix b/pkgs/os-specific/linux/system76-scheduler/default.nix index 1ca4fa27610..99c54900cf7 100644 --- a/pkgs/os-specific/linux/system76-scheduler/default.nix +++ b/pkgs/os-specific/linux/system76-scheduler/default.nix @@ -1,9 +1,6 @@ { lib , fetchFromGitHub , rustPlatform -, llvm -, clang -, libclang , pipewire , pkg-config , bcc @@ -22,10 +19,9 @@ in rustPlatform.buildRustPackage { }; cargoSha256 = "sha256-hpFDAhOzm4v3lBWwAl/10pS5xvKCScdKsp5wpCeQ+FE="; - nativeBuildInputs = [ pkg-config llvm clang ]; + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ dbus pipewire ]; - LIBCLANG_PATH = "${libclang.lib}/lib"; EXECSNOOP_PATH = "${bcc}/bin/execsnoop"; # tests don't build From 223edbb43496cd36c7d6694dc772dc1709bcd52e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 May 2023 23:28:05 +0000 Subject: [PATCH 034/159] orbiton: 2.61.0 -> 2.62.0 --- pkgs/applications/editors/orbiton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 59723a04325..840fc180e62 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.61.0"; + version = "2.62.0"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-GknQXHwpdIRzSjIc1ITsoiaks4Vi5KmVqL7sHzmfnmQ="; + hash = "sha256-DmS0rn1v9zksSzO7FVl5YsIIXvhQ3zhSBC/i7tosdag="; }; vendorHash = null; From db7ee2e5deb3af6657ad9d79301af89aad67fc81 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 02:32:57 +0300 Subject: [PATCH 035/159] rdedup: migrate to bindgenHook --- pkgs/tools/backup/rdedup/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index a922dcda9e4..c9b59782a58 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium -, llvmPackages, clang, xz +, xz , Security }: rustPlatform.buildRustPackage rec { @@ -15,14 +15,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-I6d3IyPBcUsrvlzF7W0hFM4hcXi4wWro9bCeP4eArHI="; - nativeBuildInputs = [ pkg-config llvmPackages.libclang clang ]; + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ openssl libsodium xz ] ++ (lib.optional stdenv.isDarwin Security); - configurePhase = '' - export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" - ''; - meta = with lib; { description = "Data deduplication with compression and public key encryption"; homepage = "https://github.com/dpc/rdedup"; From 657eab915c35af0ffd1ee5026dc4f3593e4467cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 May 2023 23:33:31 +0000 Subject: [PATCH 036/159] flintlock: 0.4.0 -> 0.6.0 --- pkgs/applications/virtualization/flintlock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/flintlock/default.nix b/pkgs/applications/virtualization/flintlock/default.nix index 982530dad74..21413fde6e1 100644 --- a/pkgs/applications/virtualization/flintlock/default.nix +++ b/pkgs/applications/virtualization/flintlock/default.nix @@ -10,16 +10,16 @@ buildGoModule rec{ pname = "flintlock"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flintlock"; rev = "v${version}"; - sha256 = "sha256-kHrVpQ4E8b1YV+ofZwd4iGJ9ucVUUam6rxdpOGmvRR4="; + sha256 = "sha256-jZi58mewQ2hlH/9H4iAF4Mvf9UK4F7sUR0xcCEaLzX0="; }; - vendorSha256 = "sha256-A3LrikB2KrnSI+OREiLmlkTFpRKQWRB8w4OJ6ApX7oY="; + vendorHash = "sha256-IGfNMe1fQfAGAOVsxmn/oxleHfniqL1TJKllCwpuWOU="; subPackages = [ "cmd/flintlock-metrics" "cmd/flintlockd" ]; From 81c82de9fa0a37e966e6a41c567288ca027c0af3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 May 2023 23:39:01 +0000 Subject: [PATCH 037/159] coreth: 0.12.1 -> 0.12.2 --- pkgs/applications/networking/coreth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index c45ca464a17..f5c00a2257e 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "coreth"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-Wf4abvBOX98A2IjALkMMOAqDvEtXtLddxhrV2LQM1dU="; + hash = "sha256-WkSZ+7ygg2dkotv3vwTrWaVsSQvgmPJ0xhPCqZdQit8="; }; # go mod vendor has a bug, see: golang/go#57529 From 6b024e4eff1315e63310e00bc825e16e60720a95 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 02:44:51 +0300 Subject: [PATCH 038/159] parinfer-rust: migrate to bindgenHook --- pkgs/development/tools/parinfer-rust/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index 61fa49b0adb..ade168b8161 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -13,9 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1lam4gwzcj6w0pyxf61l2cpbvvf5gmj2gwi8dangnhd60qhlnvrx"; - nativeBuildInputs = [ llvmPackages.clang ]; - buildInputs = [ llvmPackages.libclang ]; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + nativeBuildInputs = [ llvmPackages.clang rustPlatform.bindgenHook ]; postInstall = '' mkdir -p $out/share/kak/autoload/plugins From 2c62cc62cc1f681704d46a67ea2768b7e9c83fb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 May 2023 23:50:45 +0000 Subject: [PATCH 039/159] easyrsa: 3.1.2 -> 3.1.4 --- pkgs/tools/networking/easyrsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index b69906a3431..c5fe610aa42 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "easyrsa"; - version = "3.1.2"; + version = "3.1.4"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - sha256 = "sha256-nZjEBAJnho2Qis5uzQs1sVZVFHHSgJVa5aJS+dAfFCg="; + sha256 = "sha256-2UIeHc5I6cvuD9DAFxwFbWOKNjV1StIBItxARohe0qk="; }; nativeBuildInputs = [ makeWrapper ]; From cbb545fbba21d23e53872d9c6e1465d6d6157094 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 02:56:05 +0300 Subject: [PATCH 040/159] sonic-server: migrate to bindgenHook --- pkgs/servers/search/sonic-server/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/servers/search/sonic-server/default.nix index 4eb88b7f04f..7d39d8cc759 100644 --- a/pkgs/servers/search/sonic-server/default.nix +++ b/pkgs/servers/search/sonic-server/default.nix @@ -1,7 +1,5 @@ { lib , rustPlatform -, llvmPackages -, clang , fetchFromGitHub }: @@ -21,12 +19,8 @@ rustPlatform.buildRustPackage { doCheck = false; nativeBuildInputs = [ - llvmPackages.libclang - llvmPackages.libcxxClang - clang + rustPlatform.bindgenHook ]; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion clang}/include"; postPatch = '' substituteInPlace src/main.rs --replace "./config.cfg" "$out/etc/sonic/config.cfg" From 4ac9973f4fae165b5937cec2e2bd131acf1754bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 00:28:26 +0000 Subject: [PATCH 041/159] frugal: 3.16.19 -> 3.16.21 --- pkgs/development/tools/frugal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index c6c548414af..91d90044b5a 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.16.19"; + version = "3.16.21"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PEWjZeFIEfnAGVsv+oyF4R08FI+LzKBWlrlBmiXhJCQ="; + sha256 = "sha256-iNj3E5JtvOHAiEC+81KnAb32TWi+Zq8Av24oLm01ty4="; }; subPackages = [ "." ]; - vendorHash = "sha256-OnPQZk+VpOx97mSNRx9lGtC03OXGGz9JwUSZYX0Ofkc="; + vendorHash = "sha256-29LwvekhevOn/1zrtQEZWqeQMEAN2xPxSRzas/5EhVM="; meta = with lib; { description = "Thrift improved"; From 5685291a7b5a9968f7e79e25cccce89e8670bb99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 00:35:11 +0000 Subject: [PATCH 042/159] sentry-cli: 2.18.0 -> 2.18.1 --- pkgs/development/tools/sentry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index a4cf6984e4b..519aefd496d 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.18.0"; + version = "2.18.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-ZHhx31V67cZEusbOKFfgNWxXlriS9brlExYG6Z3JjlE="; + sha256 = "sha256-RIZLXJIc5a8jgJ2snos6AOqnWmbiKiRlFomvsKg/9rw="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-ovRdso1ke4e4rQijORxMixSDdjns6tEIK+SLjLv+AV4="; + cargoHash = "sha256-b4WKszoxBlm0fZzK4YkwwY3+Jff8mXxxoyqwepg1MLo="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; From 1429ce227ad8326f7e1f095b424d1b0b766ea8e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 00:51:37 +0000 Subject: [PATCH 043/159] netdata-go-plugins: 0.52.2 -> 0.53.0 --- pkgs/tools/system/netdata/go.d.plugin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 35a7cf3d13e..1ce1d4974c6 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "netdata-go-plugins"; - version = "0.52.2"; + version = "0.53.0"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - hash = "sha256-/oDUB6EGRq26cRdHwkuTgCRZ+XtNy238TnOYMX1H22s="; + hash = "sha256-FHcETEAQArzNyvlzEaOYzwtXk6jPA2b6Kp8pI7FeTo8="; }; - vendorHash = "sha256-hxsLCiti/IiTjYPKm/9fWk3CNzDM1+gRgncFXgB/whk="; + vendorHash = "sha256-8JpeP2p09j45dkuQMtBj1j0C5CjNMshofHFVnvZvNQY="; doCheck = false; From 442a6dbd36aa50e043353fe9ff3f530a74a7b38a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 02:18:35 +0300 Subject: [PATCH 044/159] surrealdb: fix build on aarch64-linux --- pkgs/servers/nosql/surrealdb/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/surrealdb/default.nix b/pkgs/servers/nosql/surrealdb/default.nix index 356903aabef..0983664c630 100644 --- a/pkgs/servers/nosql/surrealdb/default.nix +++ b/pkgs/servers/nosql/surrealdb/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , pkg-config , openssl -, llvmPackages , rocksdb , testers , surrealdb @@ -25,7 +24,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-eLJ+sxsK45pkgNUYrNuUOAqutwIjvEhGGjsvwGzfVKI="; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config.toml + ''; PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; @@ -35,8 +37,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - # needed on top of LIBCLANG_PATH to compile rquickjs - llvmPackages.clang + rustPlatform.bindgenHook ]; buildInputs = [ openssl ] From fe53f2096b74e8f5c853a23436b041a0dcdf4c2b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 02:18:49 +0300 Subject: [PATCH 045/159] surrealdb-migrations: cleanup --- .../tools/database/surrealdb-migrations/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index 79711bc2a2d..cc7254345d9 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -24,13 +24,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-1+cvOhDeH9vx/8J1RwKLPdkBmqBKFmbNXv3H44pZfj0="; - - # nativeBuildInputs = [ - # pkg-config - # # needed on top of LIBCLANG_PATH to compile rquickjs - # llvmPackages.clang - # ]; - buildInputs = [ ] ++ lib.optionals stdenv.isDarwin [ Security ]; From 3a8f1f3d303c3375438c081db13561366c1be7c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 01:01:06 +0000 Subject: [PATCH 046/159] godot_4: 4.0.2-stable -> 4.0.3-stable --- pkgs/development/tools/godot/4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 2ca785fbcc2..87145c9f398 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -53,13 +53,13 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.0.2-stable"; + version = "4.0.3-stable"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = version; - hash = "sha256-kFIpY8kHa8ds/JgYWcUMB4RhwcJDebfeWFnI3BkFWiI="; + hash = "sha256-g9+CV3HsiJqiSJpZvK0N7BqKzp2Pvi6otjRLsFdmWGk="; }; nativeBuildInputs = [ From d6a1aea19bddac079efbfde6c373dff8709739cd Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 27 May 2023 00:02:15 +0200 Subject: [PATCH 047/159] vector: enable sources-dnstap feature This feature is enabled in the official build: https://github.com/vectordotdev/vector/blob/v0.30.0/Cargo.toml#L376 --- pkgs/tools/misc/vector/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 1bf5b659511..87a1710882f 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -24,7 +24,7 @@ # TODO investigate adding "vrl-cli" and various "vendor-*" # "disk-buffer" is using leveldb TODO: investigate how useful # it would be, perhaps only for massive scale? -, features ? ([ "api" "api-client" "enrichment-tables" "sinks" "sources" "transforms" "vrl-cli" ] +, features ? ([ "api" "api-client" "enrichment-tables" "sinks" "sources" "sources-dnstap" "transforms" "vrl-cli" ] # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ] From c1b7ab81b8e92f12cbe48365738e532bbdc64284 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 01:22:02 +0000 Subject: [PATCH 048/159] kaniko: 1.9.2 -> 1.10.0 --- pkgs/applications/networking/cluster/kaniko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 923d07af1b1..1dd2e9649fa 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.9.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-dXQ0/o1qISv+sjNVIpfF85bkbM9sGOGwqVbWZpMWfMY="; + hash = "sha256-SPHayFfYFpg1AOoe003xh7NGQLpvhd1C2k4IilgMqSw="; }; vendorHash = null; From ab303ea94d2d56e9070eb259c8828dcf062a3243 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 01:41:55 +0000 Subject: [PATCH 049/159] cubiomes-viewer: 3.2.1 -> 3.3.0 --- pkgs/applications/misc/cubiomes-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 3b247379508..4cc4b910758 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-67augXXZsriXdndrCFUFWZbL+rVKgTPAyqlbZua2Ul4="; + sha256 = "sha256-V6zPbL1/tP2B38wo4a05+vXCSjPE1YKpMR3zl/BbnY8="; fetchSubmodules = true; }; From dfa7b1e0542b47916e23bc75ed7002aecd2ecdaa Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 27 May 2023 10:05:16 +1000 Subject: [PATCH 050/159] terraform-providers: drop outdated aliases and throws --- .../cluster/terraform-providers/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 773cc4dab69..2f222b9f60e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -19,8 +19,8 @@ let , rev , spdx ? "UNSET" , version ? lib.removePrefix "v" rev - , hash ? throw "use hash instead of sha256" # added 2202/09 - , vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09 + , hash + , vendorHash , deleteVendor ? false , proxyVendor ? false , mkProviderFetcher ? fetchFromGitHub @@ -88,22 +88,10 @@ let removed-providers = let archived = name: date: throw "the ${name} terraform provider has been archived by upstream on ${date}"; - license = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date} because of unclear licensing"; removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}"; in lib.optionalAttrs config.allowAliases { - b2 = removed "b2" "2022/06"; - checkpoint = removed "checkpoint" "2022/11"; - dome9 = removed "dome9" "2022/08"; ksyun = removed "ksyun" "2023/04"; - logicmonitor = license "logicmonitor" "2022/11"; - ncloud = removed "ncloud" "2022/08"; - nsxt = license "nsxt" "2022/11"; - opc = archived "opc" "2022/05"; - oraclepaas = archived "oraclepaas" "2022/05"; - panos = removed "panos" "2022/05"; - template = archived "template" "2022/05"; - vercel = license "vercel" "2022/11"; }; # excluding aliases, used by terraform-full From 517da6a94abf564ee0251cb5e0516dae55f6fc34 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 26 May 2023 22:18:04 -0400 Subject: [PATCH 051/159] cargo-binstall: 0.23.0 -> 0.23.1 Diff: https://github.com/cargo-bins/cargo-binstall/compare/v0.23.0...v0.23.1 Changelog: https://github.com/cargo-bins/cargo-binstall/releases/tag/v0.23.1 --- pkgs/development/tools/rust/cargo-binstall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 6c972a68a56..dabfff611af 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-PB7EZMJ9wXVneLTc8wiZVxeyE/XybuwUvcVkN6q04lo="; + hash = "sha256-Dpo/J6FTW95rODWeIqD+8YnN4dt5yhLPxoezA1CTM4A="; }; - cargoHash = "sha256-SxQSzY31m3eTDO38jRpvzwmV9d6puIZ3DwBlC2Zb4b0="; + cargoHash = "sha256-Nc/kdrLsAooM41pwlkZ3zWsLvFlnxHG/2ZQhPsEyPkI="; nativeBuildInputs = [ pkg-config From 6e634db53ba225739e2a7e5056d067d8fe775a07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 02:31:08 +0000 Subject: [PATCH 052/159] python310Packages.pyatv: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/pyatv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 0a4dc46f368..b8f5e1c6d7a 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,8 +31,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "postlund"; repo = pname; - rev = "v${version}"; - hash = "sha256-HWr+Pu/tMuCDFC2mV3R/Wqe0PfVw/DDgEIYBRnfYx/I="; + rev = "refs/tags/v${version}"; + hash = "sha256-t7H4ut4atc2XDnpBzV03Q/OrCHMVmZk38r/iWcLKL7Q="; }; postPatch = '' From c5ad96f040cc6e754907b07eed1d246a28bf2cdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 02:46:39 +0000 Subject: [PATCH 053/159] terracognita: 0.8.3 -> 0.8.4 --- pkgs/development/tools/misc/terracognita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 26f3b86326d..55b13dad748 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - hash = "sha256-ipPJMh88R9Ddo1QzN+No9H2bBsLSPARUI2HRaYvK6jc="; + hash = "sha256-pPY8y+pQdk9/F7dnUBz/y4lvcR1k/EClywcZATArZVA="; }; - vendorHash = "sha256-7fGqChud9dcgA9BXyJysUgvvG7zI+ByA0oFlSMd+rps="; + vendorHash = "sha256-ApnJH0uIClXbfXK+k4t9Tcayc2mfndoG9iMqZY3iWys="; doCheck = false; From 8c3d981fe8c727cc6f9716cffbd363db3476fd7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 03:00:37 +0000 Subject: [PATCH 054/159] automatic-timezoned: 1.0.91 -> 1.0.92 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 9e21d9defd5..5c5649a0b8e 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.91"; + version = "1.0.92"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kXpOJPlsfmpTAUkgNsFb7OZWCAok7i/ku+3u2XHwQV8="; + sha256 = "sha256-4axtrwCmtc33pInOsb1W3VIfXmUP59j0mFByCl//1z0="; }; - cargoHash = "sha256-5XGrFgv9XLEQGfzkUpg7o6Czb4Ha/45nNZ9OCkZAmzo="; + cargoHash = "sha256-V/6SaSk10LLuyPuf3fnyqF2rQlZwG9FRGcQ+3Ao4xQs="; meta = with lib; { description = "Automatically update system timezone based on location"; From c256f09dac1039e1b83c3f0e7246f2487108b83f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 03:05:34 +0000 Subject: [PATCH 055/159] mediamtx: 0.23.0 -> 0.23.3 --- pkgs/servers/mediamtx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 2e55b14b367..1c1952f9661 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "0.23.0"; + version = "0.23.3"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-wqTES0E8HMBxMAmOiewSne1p9/ZI/Ikf1cr34lTqjwI="; + hash = "sha256-z9fqR2iK7HOpWNFnrIkNzy0peY6v9QLOyUYbVXp1aNU="; }; - vendorHash = "sha256-C7j5jvRB4/GS0A05YZX8u62xvjevcKHpJFxuhzUX1+M="; + vendorHash = "sha256-az2jHhd3YzI7phRRXBWRcAsISgipPN20SRncsfu58fM="; # Tests need docker doCheck = false; From 4f604fcf65d90e44c7e0357a566ef9a238146e21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 03:18:50 +0000 Subject: [PATCH 056/159] cnspec: 8.10.0 -> 8.11.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index b1615fc8e93..d77e501559b 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "8.10.0"; + version = "8.11.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-xgDHpLnbTAC0OL7Z5JQsOWlarIHqvr7xrDBg6hlWRRw="; + hash = "sha256-ypDosK+vA7EEQsfZh9PUZrXY0uO+mPI1GC6RS80gP1o="; }; proxyVendor = true; - vendorHash = "sha256-LlLnkJc+bIRG1s6AHBYL6r5guYXPDo0moQwMSmHX3Zg="; + vendorHash = "sha256-Iyi1OoJEHHeCS+W922e+3o+pru/UhTUWwkkY2nurRGY="; subPackages = [ "apps/cnspec" From 165431b546e3339049c9a75b14aef7816367418d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 03:23:23 +0000 Subject: [PATCH 057/159] okteto: 2.15.2 -> 2.15.3 --- pkgs/development/tools/okteto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index b76ed98c305..3e30b14f9b4 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.15.2"; + version = "2.15.3"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-PxCVBi/GMzyTs9GfIAAPHNbinexw4guSO8ZsyZIOmr4="; + hash = "sha256-BzyKmM5Yp9zdNonkDZoJBAmy8jSDwt85Wr9/1nbD7V8="; }; vendorHash = "sha256-dZ6gzW5R5na5qcHFQqQvKfYb0Bu0kVvVMOaRdtTgkhE="; From 768241916fbe3452ccb335e29447b1397b2e6e87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 04:09:09 +0000 Subject: [PATCH 058/159] kubeshark: 40.2 -> 40.5 --- pkgs/applications/networking/cluster/kubeshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 7643748f158..808d0208989 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "40.2"; + version = "40.5"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = version; - sha256 = "sha256-E39Hr39fPiRKElploh2EEE35x0vnyAf2eWHr8Ifx0l0="; + sha256 = "sha256-Xm8Tx1m3k+Vz5GlSIGJw8W2PVkZav9U5A52X9HUJFno="; }; vendorHash = "sha256-ckIjmrXkn1AVBQRwM6+wdRwwYHytxKm3rKEe+csORdU="; From dd82e5716f14dea69d09885540178afe5f20fb6b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 May 2023 04:20:00 +0000 Subject: [PATCH 059/159] opam: 2.1.4 -> 2.1.5 Changelog: https://github.com/ocaml/opam/releases/tag/2.1.5 Diff: https://github.com/ocaml/opam/compare/2.1.4...2.1.5 --- pkgs/development/tools/ocaml/opam/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 1db7ea151fa..0463db7482b 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -71,13 +71,13 @@ let sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.1.4.zip"; - sha256 = "0zp8sb75pw1kyqlm7bsiagfwq46mv41mxh5q2prn2cwg6xri2wrg"; + url = "https://github.com/ocaml/opam/archive/2.1.5.zip"; + sha256 = "0s8r5gfs2zsyfn3jzqnvns3g0rkik3pw628n0dik55fwq3zjgg4a"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.1.4"; + version = "2.1.5"; strictDeps = true; @@ -144,4 +144,4 @@ in stdenv.mkDerivation { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.1.4 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.1.5 -p opam-shebangs.patch From ca372d8df86f4e8ea81969e9bfec3f95abb3150b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 May 2023 04:20:00 +0000 Subject: [PATCH 060/159] gallery-dl: 1.25.4 -> 1.25.5 Changelog: https://github.com/mikf/gallery-dl/raw/v1.25.5/CHANGELOG.md --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 29ee4e0f93e..f0e5994a23c 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.25.4"; + version = "1.25.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-4x0XjXriEAJWSmbGjBWxZ5WJW9ruGE9wVrdZYTe6wE4="; + sha256 = "sha256-IFzKVHIuZZ2WLk23ZqyxvwxXF45f2O/VAqQ/j98x4ag="; }; propagatedBuildInputs = [ From f398af926ccb3778a907faaf8943b1236f3e112c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 May 2023 04:20:00 +0000 Subject: [PATCH 061/159] flexget: 3.7.0 -> 3.7.2 Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.7.0...v3.7.2 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.7.2 --- .../networking/flexget/default.nix | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 0052caa3ef8..6a0687ae17a 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -4,23 +4,9 @@ , fetchFromGitHub }: -let - python = python3.override { - packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { - version = "1.4.48"; - src = fetchPypi { - pname = "SQLAlchemy"; - inherit version; - hash = "sha256-tHvChwltmJoIOM6W99jpZpFKJNqHftQadTHUS1XNuN8="; - }; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.7.0"; + version = "3.7.2"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -28,22 +14,18 @@ python.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-H+R2NPHJbpQToKI1Op+DqPt82+w2xHxHC9NPpiF3aF0="; + hash = "sha256-K71nawQhFYLPRg79rcZKJ+US+3M5JAU0eg+ZiFwB6n8="; }; postPatch = '' # remove dependency constraints but keep environment constraints sed 's/[~<>=][^;]*//' -i requirements.txt - - # "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in - # nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110 - substituteInPlace requirements.txt --replace "zxcvbn-python" "zxcvbn" ''; # ~400 failures doCheck = false; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.txt apscheduler beautifulsoup4 From 4ae024e5fe3ecd09202c8531c441313110e61042 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 May 2023 04:20:00 +0000 Subject: [PATCH 062/159] resvg: 0.33.0 -> 0.34.0 Diff: https://github.com/RazrFalcon/resvg/compare/v0.33.0...v0.34.0 Changelog: https://github.com/RazrFalcon/resvg/raw/v0.34.0/CHANGELOG.md --- pkgs/tools/graphics/resvg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 8d2f1a61b60..6624d16243a 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-x2lsEYPv6FtARdRd5r+vvV+/S4uZkRXPhsoXmplgIAM="; + hash = "sha256-S0HhaZ8zHcuMmo9mSJwmUXnDExMBsv176lrM9YmSEg8="; }; - cargoHash = "sha256-toUS1JAbJ8gbOsi87SXiqoaW0X7enAh4Iha3VeCa3WY="; + cargoHash = "sha256-SFQ2w/Um1hgpy+cz+OZoaLjvJPcOa5Wc29v66pt+k3g="; cargoBuildFlags = [ "--package=resvg" From 568f92cbff307adeefb31cead4c8a5cadfdf797a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 04:36:26 +0000 Subject: [PATCH 063/159] python310Packages.subarulink: 0.7.6 -> 0.7.6-1 --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 42af75533dd..a73ad1bc1c6 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.6"; + version = "0.7.6-1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-D2nwzj7uYL/v5Ew2+LfJBLH904Htam4Fa3Gs6t8Hbyo="; + hash = "sha256-/VaGiOnPyTHSwkxlQtwyIZohD3QK897kapmM3S8bHtM="; }; propagatedBuildInputs = [ From 465abd47ea592fbe0507ae828acbde342c41b901 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 04:36:53 +0000 Subject: [PATCH 064/159] lldpd: 1.0.16 -> 1.0.17 --- pkgs/tools/networking/lldpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 6107efff787..d480b3e01c7 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.16"; + version = "1.0.17"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-47ORZQx7pnzqL+hNZ/201/yKoexc+G64u5hHEd+EZak="; + sha256 = "sha256-k0MXfxRdK8pm7wPVlSgHnT8WY8YkseK50IJo79xhJ84="; }; configureFlags = [ From 769483f12a86a78adc27a04d4cb95ef5cdb80a1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 04:54:49 +0000 Subject: [PATCH 065/159] stm32cubemx: 6.8.0 -> 6.8.1 --- pkgs/development/embedded/stm32/stm32cubemx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index 28019c99fdd..ffd922c20df 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.8.0"; + version = "6.8.1"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-jJeJTg2cCO6fqQ4vFq2dXsfsWmlN5ncZJWMoekJXkLQ="; + sha256 = "sha256-0WzdyRP09rRZzVZhwMOxA/SwHrQOYGBnv8UwvjMT22Q="; stripRoot = false; }; From 45e210ece2a2a114ced5abcacfc17d682b029af6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 May 2023 03:25:43 +0000 Subject: [PATCH 066/159] terraform-providers.azurerm: 3.57.0 -> 3.58.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cdf0021bfa1..a6492a11566 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-4gNXamhda8EyEyOQXnxYNy+S5SyGqtYaxRk/fAG7vvA=", + "hash": "sha256-GVxIr57y5tlOrZYtu09FI0IYG2cLkHkYMMofdqdCans=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.57.0", + "rev": "v3.58.0", "spdx": "MPL-2.0", "vendorHash": null }, From 50e18c957025014fa5cc037a0050c1c6a9b13f23 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 May 2023 03:34:11 +0000 Subject: [PATCH 067/159] terraform-providers.linode: 2.2.0 -> 2.3.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a6492a11566..cebf8aad516 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -665,13 +665,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-4cUmKscy0KrhG3CbQo/Uz0BI3tq/MUyDtzNqeXwUtxg=", + "hash": "sha256-dVoITwVwvWX6gXNgNv8fpCT2d19nYN893L8CL/TvcPc=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.2.0", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-MsVYFt8u9czVs1vGCqBrw3BZ5C4OFNrEuZZ57GEVBqE=" + "vendorHash": "sha256-a8IjMAojj15yl1sh/6r5WJsuqzWqHeDZLEqib7xOCw0=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", From 317bcc15c0bcd451f4fbd99be9bb009699d55e57 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 May 2023 03:37:28 +0000 Subject: [PATCH 068/159] terraform-providers.nutanix: 1.8.1 -> 1.9.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cebf8aad516..d7d8cbfd17a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -801,11 +801,11 @@ }, "nutanix": { "deleteVendor": true, - "hash": "sha256-szqvEU1cxEIBKIeHmeqT6YAEsXZDvINxfDyp76qswzw=", + "hash": "sha256-kxLsQeseSncGRJCeh/1yD7oouS5OYwo5N5YorzwQdBs=", "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.8.1", + "rev": "v1.9.0", "spdx": "MPL-2.0", "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, From 7fa6787c6671bc06e7fe5116e88907050dc7b0b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 May 2023 03:39:25 +0000 Subject: [PATCH 069/159] terraform-providers.opsgenie: 0.6.22 -> 0.6.23 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d7d8cbfd17a..dd748850427 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -864,11 +864,11 @@ "vendorHash": "sha256-2EuGZxHrpPwDicSrIf/Jx/c4LhOtE5HvTz9LkJ4xCSY=" }, "opsgenie": { - "hash": "sha256-vwHymj6kNTfxpqLEJixB55SeET1wtlkoN8RH8Uw0iPA=", + "hash": "sha256-fcQChRIwxAeAdYPTYC9rPSdbrmXaBIOotF7vQhO9Sl0=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.22", + "rev": "v0.6.23", "spdx": "MPL-2.0", "vendorHash": null }, From ba93231494e109399c29761a101ce5cb343e9a72 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 May 2023 03:43:40 +0000 Subject: [PATCH 070/159] terraform-providers.spotinst: 1.119.1 -> 1.120.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index dd748850427..813552b4c3a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1044,13 +1044,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-fNJhshwaMX0w5SuL/B8MDMrUN/que8H8UXqiPfKuIVg=", + "hash": "sha256-VzIQqxEZl3+cRk19vxJGF0DbzutrfOWeP27TMat//Es=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.119.1", + "rev": "v1.120.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-VZlTrUcfE7ZoAU3wWrM31pZbKSsUc1Oph7b8wb6k8cY=" + "vendorHash": "sha256-/sXd/qAChMpVTY/JN45fb2XFG0nsqc1ytC2FjXpva3c=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", From 160cc272655b8fa5def2d582d80558068b45a389 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 May 2023 03:51:45 +0000 Subject: [PATCH 071/159] terraform-providers.aws: 5.0.0 -> 5.0.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 813552b4c3a..711257f1d75 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,11 +110,11 @@ "vendorHash": null }, "aws": { - "hash": "sha256-I0iGgrvgjdqjeoiRMzItg2FELC/X2ACP5qLW5HguP78=", + "hash": "sha256-eHU3dsu/aJ72BTwe4CAWhf29ZueUhyg10Ncs9yUxi80=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.0.0", + "rev": "v5.0.1", "spdx": "MPL-2.0", "vendorHash": "sha256-53BHSeRBgnT5LuSuTUA5R/bbeozd2gOxsXd/2tlrbYU=" }, From 8d908a2ed404652abaaa48ac2a438955a1f57af9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 May 2023 03:51:48 +0000 Subject: [PATCH 072/159] terraform-providers.tencentcloud: 1.81.1 -> 1.81.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 711257f1d75..9ea196eaff4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1098,11 +1098,11 @@ "vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24=" }, "tencentcloud": { - "hash": "sha256-fHcEVQZLLmtaKsAaeFcnRxzPBcGv/UUZOpNHsB9VGXA=", + "hash": "sha256-2xyJ6rrgQKIhdtGNSnSYbL+fQhaqlEsWfGA2vYZeQBQ=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.1", + "rev": "v1.81.2", "spdx": "MPL-2.0", "vendorHash": null }, From bee7cb59046bbb5ff9d4ad21ffbd97c56fd56862 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 05:09:39 +0000 Subject: [PATCH 073/159] powerstat: 0.03.01 -> 0.03.03 --- pkgs/os-specific/linux/powerstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index bee805c57bc..901a522fe8f 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.03.01"; + version = "0.03.03"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-+3b6yH5CuFdtjjTmW2mwuvNyhO8/8N7vv6st+ttztBQ="; + hash = "sha256-D8VwczXHUHQ8p03IgYW3t8hOIGHKp0n1c7FpAUWua74="; }; installFlags = [ From decb072d37813bb3e37246530a0aa7656829c70f Mon Sep 17 00:00:00 2001 From: SnO2WMaN Date: Sat, 27 May 2023 14:28:12 +0900 Subject: [PATCH 074/159] killport: 0.8.0 -> 0.9.0 --- pkgs/tools/misc/killport/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/killport/default.nix b/pkgs/tools/misc/killport/default.nix index 4a13e423229..44484c17ef5 100644 --- a/pkgs/tools/misc/killport/default.nix +++ b/pkgs/tools/misc/killport/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "killport"; - version = "0.8.0"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - hash = "sha256-ip7Ndy4i4P6n20COfSL/EtG1Y+xoab8Gox4gcNHH1/o="; + hash = "sha256-aGnjLgDn86OUFQGj7K7+DUSGJuNEIL52yXJz/Mt5DT0="; }; - cargoHash = "sha256-M4riyvGueCQDKOj+lgYPm2lZ8UjCp1y/SyG692vZbS4="; + cargoHash = "sha256-Z3+hqssm5g7rl3XCnrmjuPhsG8E0Yc2Qg8/mjGlnaT4="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; From eedd40fc42a278f71f0cff2a5be729166e40e46e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 05:42:44 +0000 Subject: [PATCH 075/159] fio: 3.34 -> 3.35 --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 49707d1530b..00c5b6c68fa 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.34"; + version = "3.35"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-+csIerzwYOmXfmykYI0DHzbJf4iUCkEy1f7SFmAiuv4="; + sha256 = "sha256-8LMpgayxBebHb0MXYmjlqqtndSiL42/yEQpgamxt9kI="; }; buildInputs = [ python3 zlib ] From 6e14cc0d55bf1fbd6ca750ad8214b9325b6ec8d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 06:07:18 +0000 Subject: [PATCH 076/159] vtm: 0.9.9i -> 0.9.9k --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 75c57fefd49..9fc677cb250 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.9i"; + version = "0.9.9k"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-pkso0Bpb+0Zua3MIXXEbaJDl/oENa51157mXTJXJC/A="; + sha256 = "sha256-vmgjonMjhVEfsujWUuX+50NPAzgIfJADp8qjnDmfV1E="; }; nativeBuildInputs = [ cmake ]; From d24e607c22632356ffef69178092c43e13064b1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 07:32:44 +0000 Subject: [PATCH 077/159] python310Packages.miniaudio: 1.57 -> 1.58 --- pkgs/development/python-modules/miniaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index f82f91f303a..ded724b095a 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.57"; + version = "1.58"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "irmen"; repo = "pyminiaudio"; rev = "refs/tags/v${version}"; - hash = "sha256-jAGJEXNDclcGHnoDYMjQXz5ZS9U9pmIWEHzgYKp49/o="; + hash = "sha256-uIjQerxMU4hMCJtpqYPt2kicql3s7jyho9r6/kRHTbk="; }; postPatch = '' From 949a550d0b949947c8b2f75f32368175ea6a8e97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 07:35:25 +0000 Subject: [PATCH 078/159] python310Packages.nbsphinx: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/nbsphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 398303b6369..5b19602f92d 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Wbv7e8Z2pmR4Bfs8qDSQM4rn+WwWdKnl5wfwVcJyxZ0="; + hash = "sha256-VA239AZjR/I9BlDEro59hTNMaa33SeAwr2TBLplv+I4="; }; propagatedBuildInputs = [ From 7c085290c07cb508759d0e28446f05f8adf4db29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 07:50:55 +0000 Subject: [PATCH 079/159] argo-rollouts: 1.5.0 -> 1.5.1 --- .../applications/networking/cluster/argo-rollouts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix index c10391c5bfc..4c5a1b21130 100644 --- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-bOGC4RAeydPCvqyQZE+K0N01xRIGsoiwKJ4lMwVVgGk="; + sha256 = "sha256-ODcT7dc4xBHOKYTP2pUTq2z3GMUEpZ9OUKKxlbd+Vvk="; }; vendorHash = "sha256-IxSLlRsOz/Xamguxm+7jy8qAAEZZFm/NHDIBjm5tnCs="; From 00cb60ebb4ac62279ccbc88ff0a362279dd39565 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 08:00:52 +0000 Subject: [PATCH 080/159] go-toml: 2.0.7 -> 2.0.8 --- pkgs/development/tools/go-toml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 96de13ace3e..563c3462622 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-toml"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bGLJSzSwcoKRMRwLSmGEWoQaC9NVwcKyFKpcEw+/Nag="; + sha256 = "sha256-pMy/cYyB9ncOuYysX0a9PmTuJdIrMcKL///57bniixI="; }; - vendorHash = "sha256-MMCyFKqsL9aSQqK9VtPzUbgfLTFpzD5g8QYx8qIwktg="; + vendorHash = "sha256-44mxDswHIfVfAyvtyDHS4MnHCTPRlUvdhzHALICUJR4="; excludedPackages = [ "cmd/gotoml-test-decoder" "cmd/tomltestgen" ]; From e1e943023f942cd06f34c0df68c6fd8a0cd87af6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 27 May 2023 18:02:10 +1000 Subject: [PATCH 081/159] fzf: 0.41.0 -> 0.41.1 Diff: https://github.com/junegunn/fzf/compare/0.41.0...0.41.1 Changelog: https://github.com/junegunn/fzf/blob/0.41.1/CHANGELOG.md --- pkgs/tools/misc/fzf/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d2dc331ff03..37b96766743 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -10,6 +10,7 @@ , glibcLocales , testers , fzf +, fetchpatch }: let @@ -24,15 +25,23 @@ let in buildGoModule rec { pname = "fzf"; - version = "0.41.0"; + version = "0.41.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-NUaGuRfXtt/kY4u5uxM30Blg+ngkcvS2/2rcGP/WNtE="; + hash = "sha256-YnWc+yStyoZoCKxEMhQC6Z4FZ/OVRaVsAJPtAzGiJVk="; }; + patches = [ + (fetchpatch { + name = "update-test-case.patch"; + url = "https://github.com/junegunn/fzf/commit/448d7e0c5a717128d499f6a09a978b7addd1d925.patch"; + hash = "sha256-54UYW8x78ZcjPwDWmGLVLxw2E910wme2TkBN7YAr1L8="; + }) + ]; + vendorHash = "sha256-O6OjBbrVAxDQd27ar2mmFkU1XyVM2C8SJWJ54rgaf2s="; outputs = [ "out" "man" ]; From 91dc753211caa5dd717878ac775e5e6bd3d0f03b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 08:13:31 +0000 Subject: [PATCH 082/159] zsh-nix-shell: 0.6.0 -> 0.7.0 --- pkgs/shells/zsh/zsh-nix-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/shells/zsh/zsh-nix-shell/default.nix index 211c18edf7b..8ae87386c25 100644 --- a/pkgs/shells/zsh/zsh-nix-shell/default.nix +++ b/pkgs/shells/zsh/zsh-nix-shell/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zsh-nix-shell"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; rev = "v${version}"; - sha256 = "sha256-B0mdmIqefbm5H8wSG1h41c/J4shA186OyqvivmSK42Q="; + sha256 = "sha256-oQpYKBt0gmOSBgay2HgbXiDoZo5FoUKwyHSlUrOAP5E="; }; strictDeps = true; From d6b2c1c0df99cc813b4a02cb21ac71f85ce0f558 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 08:22:38 +0000 Subject: [PATCH 083/159] supabase-cli: 1.63.1 -> 1.64.2 --- pkgs/development/tools/supabase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index b6214f16b04..54d3149b1d4 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.63.1"; + version = "1.64.2"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-wFWILST5PYvs1bXWK44yiRWVidwZcczLVdtEI418+F8="; + sha256 = "sha256-xqH4twh65nOcB+IqqYjGRdbCYC7MZjAVKeIJARGTG3U="; }; - vendorSha256 = "sha256-fRocOWnjYocTUXnTOvzTosdgKlQGfgyPLVN7FVGnW2o="; + vendorSha256 = "sha256-sQ4lJKQaSUWlet3dEnD8bKLYtkEtdnLuGHVfqCTdFyg="; ldflags = [ "-s" From 0c0d57d79de06b36286b8c7551dc173e372b86ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 08:37:29 +0000 Subject: [PATCH 084/159] opentelemetry-collector-contrib: 0.77.0 -> 0.78.0 --- pkgs/tools/misc/opentelemetry-collector/contrib.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index a544dbd44bc..66967b9213c 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.77.0"; + version = "0.78.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-9OFNJgzMiTNRXuK4joPxnVfCI5mVGqgfKBGI1xpnhCY="; + sha256 = "sha256-5oTXPQU1aT8Xm1bTjbnauBUqzBqBH+yBzC1tmLHA0v0="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-1an0PB2CV83DDWcw+1irT2gFLKuMkXYok5uglyyrprs="; + vendorHash = "sha256-ABaRedZXPr2q2AmslVNIJUvONZa4tv7OkxBLR9GuBRE="; # there is a nested go.mod sourceRoot = "source/cmd/otelcontribcol"; From 60bcbec0719c32d56db5c1817c93d1cbcf092d0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 09:14:39 +0000 Subject: [PATCH 085/159] shopware-cli: 0.1.71 -> 0.1.73 --- pkgs/tools/misc/shopware-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/shopware-cli/default.nix b/pkgs/tools/misc/shopware-cli/default.nix index dbaea41066e..59f8af85e9d 100644 --- a/pkgs/tools/misc/shopware-cli/default.nix +++ b/pkgs/tools/misc/shopware-cli/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.1.71"; + version = "0.1.73"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-prn/22H2fVXJF/4YjrjyMoyD8JbhayXdPX06ea6VnFE="; + hash = "sha256-yjWLWTM6ybrNUMTMHQ3oHXTEp8MGI/qH7Y+gft5RXY8="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-yQM0nRbrKvopIl78YKIF7mc5jLQ/02vVKTzE+rO6/QU="; + vendorHash = "sha256-eaD2vdiAmP2/cMtc1wN0qaMBRvrEckGBf0p5MI1T4gI="; postInstall = '' export HOME="$(mktemp -d)" From 12be07b11c114e5c08d1231cb76709093f78c5a4 Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Sat, 27 May 2023 11:18:34 +0200 Subject: [PATCH 086/159] teleport: mark as broken on <64 bit platforms --- pkgs/servers/teleport/generic.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 80a419cd706..8ff61ce862b 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -160,5 +160,8 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ arianvp justinas sigma tomberek freezeboy ]; platforms = platforms.unix; + # go-libfido2 is broken on platforms with less than 64-bit because it defines an array + # which occupies more than 31 bits of address space. + broken = stdenv.hostPlatform.parsed.cpu.bits < 64; }; } From 3908d1362fcf36e6df37beb619cd1f2beead17d6 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Sat, 27 May 2023 11:31:29 +0200 Subject: [PATCH 087/159] dotnet-sdk_7: 7.0.203 -> 7.0.302 --- .../compilers/dotnet/versions/7.0.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index c28987f141a..8dd267be55a 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -47,23 +47,23 @@ }; sdk_7_0 = buildNetSdk { - version = "7.0.203"; + version = "7.0.302"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ebfd0bf8-79bd-480a-9e81-0b217463738d/9adc6bf0614ce02670101e278a2d8555/dotnet-sdk-7.0.203-linux-x64.tar.gz"; - sha512 = "ed1ae7cd88591ec52e1515c4a25d9a832eca29e8a0889549fea35a320e6e356e3806a17289f71fc0b04c36b006ae74446c53771d976c170fcbe5977ac7db1cb6"; + url = "https://download.visualstudio.microsoft.com/download/pr/351400ef-f2e6-4ee7-9d1b-4c246231a065/9f7826270fb36ada1bdb9e14bc8b5123/dotnet-sdk-7.0.302-linux-x64.tar.gz"; + sha512 = "9387bd804ed980ba1bc33093598ddbafa3a761e07d28916c94442cc329533d78a03bfc59d3066a1a861244302414e7e658b4e721b5bc825f623f8f908e748b7e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6cd2eaa7-4c06-4168-b90b-ee2d6bb40b10/4a8387eb07e17d262bfb9965f6d34462/dotnet-sdk-7.0.203-linux-arm64.tar.gz"; - sha512 = "f5e1b5a63b51af664b852435fc5631ff3fbeafbfac9f34c025da016218b0e6fb9a24e816035a44f4b4a16f28bc696821b1aa6f181966754318bc45cde7f439bf"; + url = "https://download.visualstudio.microsoft.com/download/pr/142603ad-0df5-4aef-bdc2-87b6140c90ed/2cce467e6c954d01024942b8370aaf70/dotnet-sdk-7.0.302-linux-arm64.tar.gz"; + sha512 = "7f6372faa348c84560e3f1139605dc08d888b14b98c400724f628b52156fe31c20a50dc2a2f8673e29239d04ef06744e16c6f8bd8eb1756f99274c73eda74621"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/de3e24bd-f677-4d9e-9717-859ce6659b5d/80c21bb06ca64d9408d11a32f858c7c6/dotnet-sdk-7.0.203-osx-x64.tar.gz"; - sha512 = "a69ec597bc5b0a59ccfc9cc63c4883037eb9293600e98ea420c879242ec6c3fae6a81a3a08bf7d5d2ab93f750debffb224ad5628c9abd53bc44cfcb02ca77136"; + url = "https://download.visualstudio.microsoft.com/download/pr/34ce4803-1444-48a2-9955-e2a9b9061b03/e18c978b55226240ca037cf8b1770064/dotnet-sdk-7.0.302-osx-x64.tar.gz"; + sha512 = "cafb8e2839a8c91f58e8bda519d27f622a7a4062aea9247d743d64a3de3acad6ddd4f80d011fd416a3e3622f0ece8cd2e70e65f48331ae321b5ff23d282787b3"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ad0ad533-6970-4099-a0c6-ee1d089a381d/2d7ea966c6d032111389b7686ccc0d9a/dotnet-sdk-7.0.203-osx-arm64.tar.gz"; - sha512 = "e41de76f6be00de587cedaed2b0c6e2c2871b2ebf03c89375b4c69cd3fdd14df0dc49b5fe83970868a25d14aa19deafbfe66ee6790383b77f7da3d8dea939664"; + url = "https://download.visualstudio.microsoft.com/download/pr/fc7ed56d-3afe-4aa6-81bb-b4b0f5df56b5/d199f43f7421c6677ba25544b442b6b7/dotnet-sdk-7.0.302-osx-arm64.tar.gz"; + sha512 = "28cc5fcc9651fc75f9b2f864672e5fdaead28feb262696c305d00a71c828004e46f0b9b4a6bb6b21b9ea475b1c601e1724df302eea4d63f604e4fcdc9c97dd63"; }; }; packages = { fetchNuGet }: [ From 70dea8c226a68a6b0bdd1b8709e835ebc2b34289 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 09:32:47 +0000 Subject: [PATCH 088/159] werf: 1.2.235 -> 1.2.238 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index dcbc02d6282..acc4cf4324b 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.235"; + version = "1.2.238"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-fEo/hHVV+xv60VNe9AqjrP4JGzGXcM8yr/KjhRfOAhk="; + hash = "sha256-cMjekqIZnZMcDEEdeBs/jkPh/mqgox4gV+LkqP3IR5g="; }; - vendorHash = "sha256-1r32uT98I/pd6lxCb3bKy6uxJJodsaslwy9wynE4Pmg="; + vendorHash = "sha256-67J7AaS0kUu42BqFWMsC+ZXL2DnrBWwhz/oGmyMvpyo="; proxyVendor = true; From 5f2ffeeef3847ae618399516bb822aecb8892079 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 09:42:17 +0000 Subject: [PATCH 089/159] quick-lint-js: 2.12.0 -> 2.14.0 --- pkgs/development/tools/quick-lint-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix index 922b58f43db..15f5b05a131 100644 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.12.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-OxzemfWYItYb4XWpW2tNUn4yZHUIpS8MJXaP8+3z4YY="; + sha256 = "sha256-TzkJupn2oy7zUZybAuTnXZXVLSe72GM7XByo0Kd66Qs="; }; nativeBuildInputs = [ cmake ninja ]; From 92d15cf5f0d4a975cbc3ee8f28767937fe1be217 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 12:54:39 +0300 Subject: [PATCH 090/159] vtm: extend platforms --- pkgs/tools/misc/vtm/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 9fc677cb250..35e4e5b6741 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Terminal multiplexer with window manager and session sharing"; homepage = "https://vtm.netxs.online/"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; maintainers = with maintainers; [ ahuzik ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 373e4f383ed..f3d55f4c87e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13559,7 +13559,9 @@ with pkgs; SDL = SDL_sixel; }; - vtm = callPackage ../tools/misc/vtm { }; + vtm = callPackage ../tools/misc/vtm { + stdenv = if stdenv.isDarwin then clang16Stdenv else stdenv; + }; witness = callPackage ../tools/security/witness { }; From 15fd3a1603cd76678bd4c70bb25767e886e07ddf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 08:50:01 +0000 Subject: [PATCH 091/159] libcpr: 1.10.3 -> 1.10.4 --- pkgs/development/libraries/libcpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcpr/default.nix b/pkgs/development/libraries/libcpr/default.nix index 7eb882f1638..9652b4a67f9 100644 --- a/pkgs/development/libraries/libcpr/default.nix +++ b/pkgs/development/libraries/libcpr/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, curl }: -let version = "1.10.3"; in +let version = "1.10.4"; in stdenv.mkDerivation { pname = "libcpr"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "libcpr"; repo = "cpr"; rev = version; - hash = "sha256-NueZPBiICrh8GXXdCqNtVaB7PfqwtQ0WolvRij8SYbE="; + hash = "sha256-8qRNlZgBB71t/FSFPnxFhr02OuD2erLVeoc6wAx3LKk="; }; nativeBuildInputs = [ cmake ]; From 3eefbfb3a989e6fa82e7f7b0230e2961b8464b8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 10:05:20 +0000 Subject: [PATCH 092/159] ls-lint: 1.11.2 -> 2.0.0 --- pkgs/development/tools/ls-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ls-lint/default.nix b/pkgs/development/tools/ls-lint/default.nix index e42f7f50122..550931d9d1e 100644 --- a/pkgs/development/tools/ls-lint/default.nix +++ b/pkgs/development/tools/ls-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ls-lint"; - version = "1.11.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "loeffel-io"; repo = "ls-lint"; rev = "v${version}"; - sha256 = "sha256-mt1SvRHtAA0lChZ//8XIQGDPg1l1EOMkPIAe8YKhMSs="; + sha256 = "sha256-eEP/l3vdObdxUYIp8eSSCn3W0ypcmykbwQTDP083MVE="; }; - vendorSha256 = "sha256-OEwN9kj1npI+H7DY+e3tl5TIY/qr4y2CgAV5fwNA9l4="; + vendorHash = "sha256-nSHhU6z3ItCKBZy8ENBcAkXqSVo3DU6hAyezQczKShM="; meta = with lib; { description = "An extremely fast file and directory name linter"; From 736cd76b3e65a03a7bc516ae4bb75c6c73a05612 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 10:16:08 +0000 Subject: [PATCH 093/159] ginkgo: 2.9.4 -> 2.9.5 --- pkgs/development/tools/ginkgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index bd0e3e651cc..cad04204916 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-groih0LxtmB8k4/vfw2Ivtzm+SOyQqK1o7XASNplFvQ="; + sha256 = "sha256-1Hb8pCvPs/L5UU280XwwEOnQ1CjJjgw0+GdCbtLkIpg="; }; - vendorHash = "sha256-Rm5fpiTZMo/B9+yIpmEniJVRfKgHjpFIagELEjgFYwc="; + vendorHash = "sha256-IxyPRUS7aqkfZ+hjtuopCd95dgiTgVdg1thSiTBZArg="; # integration tests expect more file changes # types tests are missing CodeLocation From 015722217e0cdf61410170c116554fabdbfc9215 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 27 May 2023 12:41:44 +0200 Subject: [PATCH 094/159] libb64: Fix i686-linux build failure https://hydra.nixos.org/build/221506062 --- pkgs/development/libraries/libb64/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 88bc059892c..38f16fa5bb1 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -19,6 +19,17 @@ stdenv.mkDerivation rec { url = "https://github.com/libb64/libb64/commit/4fe47c052e9123da8f751545deb48be08c3411f6.patch"; sha256 = "18b3np3gpyzimqmk6001riqv5n70wfbclky6zzsrvj5zl1dj4ljf"; }) + # Fix i686-linux build failure. + (fetchpatch { + name = "elif.patch"; + url = "https://github.com/libb64/libb64/commit/819e43c8b34261ea3ee694bdc27865a033966083.patch"; + hash = "sha256-r2jI6Q3rWDtArLlkAuyy7vcjsuRvX+2fBd5yk8XOMcc"; + }) + (fetchpatch { + name = "size_t.patch"; + url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch"; + hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo"; + }) ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch { name = "0001-example-Do-not-run-the-tests.patch"; url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf"; From ae9ce7f2e301ba8647c897c2e8914b789081b445 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 27 May 2023 12:45:04 +0200 Subject: [PATCH 095/159] orchis-theme: 2023-04-08 -> 2023-05-27 https://github.com/vinceliuice/Orchis-theme/releases/tag/2023-05-27 --- pkgs/data/themes/orchis-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index de628bbe74a..2d07ac3ae38 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-04-08"; + version = "2023-05-27"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-/X4Hr2M/7pf6JxTUvPoG5VkQd+rweEPeTNe9glSLh78="; + hash = "sha256-I1a8y9dAJqFgnhyMqfupSdGvbbScf6tSYKlAhAzY4Dk="; }; nativeBuildInputs = [ gtk3 sassc ]; From 33481c38345520b7bb812feee976817886e73ec8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 11:43:35 +0000 Subject: [PATCH 096/159] signal-cli: 0.11.10 -> 0.11.11 --- .../networking/instant-messengers/signal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index eeac2cfc5bb..7137b62502b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.11.10"; + version = "0.11.11"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - hash = "sha256-8iWUhneAialoEn3igxxTGJBmopbZHHqkvtJPZEESWM0="; + hash = "sha256-IKKWJBe6A3TVWIRTDyWbfRYMwgRNhSqSJK0ZRZNCVkA="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; From 8f9039a8d6f207033da885fbfab6b0989718b1d7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 14:46:31 +0300 Subject: [PATCH 097/159] rbspy: fix build on aarch64-linux --- pkgs/development/tools/rbspy/default.nix | 21 ++++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index d54d52e139e..2a7ced543ba 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -4,8 +4,6 @@ , fetchFromGitHub , ruby , which -, runCommand -, darwin }: rustPlatform.buildRustPackage rec { @@ -20,6 +18,12 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-JzspNL4T28awa/1Uajw0gLM3bYyUBYTjnfCXn9qG7SY="; + + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config + ''; + doCheck = true; # The current implementation of rbspy fails to detect the version of ruby @@ -39,19 +43,10 @@ rustPlatform.buildRustPackage rec { "--skip=test_sample_subprocesses" ]; - nativeBuildInputs = [ ruby which ]; - - buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - # Pull a header that contains a definition of proc_pid_rusage(). - (runCommand "${pname}_headers" { } '' - install -Dm444 ${lib.getDev darwin.apple_sdk.sdk}/include/libproc.h $out/include/libproc.h - '') - ]; - - LIBCLANG_PATH = lib.optionalString stdenv.isDarwin "${stdenv.cc.cc.lib}/lib"; + nativeBuildInputs = [ ruby which ] + ++ lib.optional stdenv.isDarwin rustPlatform.bindgenHook; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://rbspy.github.io/"; description = '' A Sampling CPU Profiler for Ruby. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21098685454..71efd3a9220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39560,7 +39560,7 @@ with pkgs; rauc = callPackage ../tools/misc/rauc { }; - rbspy = callPackage ../development/tools/rbspy { }; + rbspy = darwin.apple_sdk_11_0.callPackage ../development/tools/rbspy { }; redprl = callPackage ../applications/science/logic/redprl { }; From 527049b1c101816f71e27889666336843e70ffd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 11:52:59 +0000 Subject: [PATCH 098/159] unciv: 4.6.13 -> 4.6.14-patch1 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index ee13a1a1e35..1042060c171 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.6.13"; + version = "4.6.14-patch1"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-CNtaaMvBXJ6Fl5FJIWva5nAs/zniPA2rcfcf+RegymY="; + hash = "sha256-CVwME8lvRjJ0ugps0lcO8FRk8AsFYs8w0oGNAB9TCnM="; }; dontUnpack = true; From 9751fb4c9a974203a9ecc9ea35c22d188c298f42 Mon Sep 17 00:00:00 2001 From: Timon Stampfli Date: Sat, 27 May 2023 14:21:21 +0200 Subject: [PATCH 099/159] dtools: 2.095.1 -> 2.103.1 This also fixes the broken Hydra build. For ZHF #230712 at the #ZurichZHF hackathon! --- pkgs/development/tools/dtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index f1d841828b3..d605e4d4ef4 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dtools"; - version = "2.095.1"; + version = "2.103.1"; src = fetchFromGitHub { owner = "dlang"; repo = "tools"; rev = "v${version}"; - sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b"; + sha256 = "sha256-XM4gUxcarQCOBR8W/o0iWAI54PyLDkH6CsDce22Cnu4="; name = "dtools"; }; From c17fdfca6fa7af55e61a2890a5a7efb9b56570e8 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 27 May 2023 02:40:58 +0000 Subject: [PATCH 100/159] agola: 0.7.0 -> 0.8.0 --- .../tools/continuous-integration/agola/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/agola/default.nix b/pkgs/development/tools/continuous-integration/agola/default.nix index effe905d762..02cd0f25acd 100644 --- a/pkgs/development/tools/continuous-integration/agola/default.nix +++ b/pkgs/development/tools/continuous-integration/agola/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.7.0"; + version = "0.8.0"; in buildGoModule { @@ -15,12 +15,13 @@ buildGoModule { owner = "agola-io"; repo = "agola"; rev = "v${version}"; - sha256 = "sha256-AiD7mVogWk/TOYy7Ed1aT31h1kbrRwseue5qc3wLOCI="; + hash = "sha256-nU04MVkUC+m6Ga4qDUH9KrA0zbYmttAicpvdxbaBG0Y="; }; - vendorSha256 = "sha256-Y3ck7Qdo9uq3YuLzZUe+RZkKQqWpSko3q+f4bfkSz6g="; + vendorHash = "sha256-k3Sip9CqTGRTWxr3RzZf0jCrm4AfUrpY/wSTmHy+yik="; ldflags = [ + "-s" "-w" "-X agola.io/agola/cmd.Version=${version}" ]; From d289ed9ef77bb9ee3fffbee090d476b15fdbceb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 08:50:18 +0000 Subject: [PATCH 101/159] rebar3: 3.21.0 -> 3.22.0 --- pkgs/development/tools/build-managers/rebar3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 6104b7779e8..f3ea408cf8b 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,7 +3,7 @@ writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: let - version = "3.21.0"; + version = "3.22.0"; owner = "erlang"; deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; }; rebar3 = stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ let inherit owner; repo = pname; rev = version; - sha256 = "QRQlqzYxRD4W63CawXBQ9ysPHzHQ5JrfjPqAivFyJAM="; + sha256 = "OCd9wGwnwOuv/Ojf1S4ALLn73AGKuXlRtukIiTSE2rs="; }; buildInputs = [ erlang ]; From 845576aac4c067b816886d5ef55aaec82ea37c17 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 27 May 2023 12:56:04 +0000 Subject: [PATCH 102/159] nixos/test-driver: undeprecate create_machine This warning was added a year and a half ago, but still no test in NixOS directly instantiates the machine class, presumably because it's not actually possible for a test to do so without losing functionality. For example, there's no way for a NixOS test to access the output directory that create_machine passes to the Machine constructor. This warning is therefore just contributing to alert fatigue for users, who are unable to follow its advice. Once it's actually possible to do what it suggests, the warning can be reintroduced. --- nixos/lib/test-driver/test_driver/driver.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index ea6ba4b65b5..835d60ec3b4 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -163,11 +163,6 @@ class Driver: machine.wait_for_shutdown() def create_machine(self, args: Dict[str, Any]) -> Machine: - rootlog.warning( - "Using legacy create_machine(), please instantiate the" - "Machine class directly, instead" - ) - tmp_dir = get_tmp_dir() if args.get("startCommand"): From 479712af11f99487320358a76482de5cc33024d7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 26 Apr 2022 15:49:52 -0400 Subject: [PATCH 103/159] networkd: support specifying the ClientIdentifier for DHCPv4 options --- nixos/modules/system/boot/networkd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 07f51f43184..463e2b8d90b 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -25,9 +25,11 @@ let sectionDHCPv4 = checkUnitConfig "DHCPv4" [ (assertOnlyFields [ + "ClientIdentifier" "DUIDType" "DUIDRawData" ]) + (assertValueOneOf "ClientIdentifier" ["mac" "duid" "duid-only"]) ]; sectionDHCPv6 = checkUnitConfig "DHCPv6" [ From 1a67b29431d5e263ddba278e3265d5fd0c39457a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 15:44:55 +0300 Subject: [PATCH 104/159] tremor-language-server: build on more platforms --- pkgs/tools/misc/tremor-rs/ls.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tremor-rs/ls.nix b/pkgs/tools/misc/tremor-rs/ls.nix index 90fe5686f81..ea1b30b07e8 100644 --- a/pkgs/tools/misc/tremor-rs/ls.nix +++ b/pkgs/tools/misc/tremor-rs/ls.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, llvmPackages }: rustPlatform.buildRustPackage rec { @@ -15,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-odYhpb3FkbIF1dc2DSpz3Lg+r39lhDKml9KGmbqJAtA="; }; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; cargoSha256 = "sha256-/RKwmslhMm30QxviVV7HthDHSmTmaGZn1hdt6bNF3d4="; @@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec { description = "Tremor Language Server (Trill)"; homepage = "https://www.tremor.rs/docs/next/getting-started/tooling"; license = licenses.asl20; - platforms = platforms.x86_64; maintainers = with maintainers; [ happysalada ]; }; } From e1884a1644877ee34185c7506b886422e5a787d5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 16:13:42 +0300 Subject: [PATCH 105/159] tremor-rs: build on more platforms --- pkgs/tools/misc/tremor-rs/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index 91944817f3d..71899299e2d 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -2,7 +2,6 @@ , rustPlatform , pkg-config , cmake -, llvmPackages , openssl , fetchFromGitHub , installShellFiles @@ -33,7 +32,7 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = [ cmake pkg-config installShellFiles ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles rustPlatform.bindgenHook ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ]; @@ -57,8 +56,6 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/tremor completions zsh) ''; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - # OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; @@ -80,14 +77,13 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p tremor-cli" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.isDarwin && stdenv.isx86_64; description = '' Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation ''; homepage = "https://www.tremor.rs/"; license = licenses.asl20; - platforms = platforms.x86_64; maintainers = with maintainers; [ humancalico happysalada ]; }; } From f333927497274800b76f5c016a89bc51b33893f5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 25 May 2023 10:56:43 +0000 Subject: [PATCH 106/159] weston: remove unused dependencies colord support is deprecated and disabled by default. libGL is redundant with Mesa. libXcursor is only required when Xwayland is enabled. libunwind and mtdev is unused since Weston 4. libxcb and udev are propagated. pam is unused since Weston 11. There's no "vaapi" package at all, and there never has been. This presumably meant to refer to libva. This is a very good demonstration of the problem with the "? null" pattern for optional dependencies! As a result, VA-API support had been unintentionally disabled by default this whole time. --- .../window-managers/weston/default.nix | 16 +++++++--------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 13dd27e9386..84ef3b8d338 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,10 +1,9 @@ { lib, stdenv, fetchurl , meson, ninja, pkg-config, python3, wayland-scanner -, cairo, colord, dbus, lcms2, libGL, libXcursor, libdrm, libevdev, libinput -, libjpeg, seatd, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland -, wayland-protocols -, pipewire ? null, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null -, libva ? null, libwebp ? null, xwayland ? null +, cairo, dbus, lcms2, libdrm, libevdev, libinput, libjpeg, seatd, libxkbcommon +, mesa, wayland, wayland-protocols +, pipewire ? null, pango ? null, freerdp ? null +, libXcursor ? null, libva ? null, libwebp ? null, xwayland ? null # beware of null defaults, as the parameters *are* supplied by callPackage by default , buildDemo ? true , buildRemoting ? true, gst_all_1 @@ -22,16 +21,15 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ - cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput - libjpeg seatd libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam - pango pipewire udev vaapi wayland wayland-protocols + cairo dbus freerdp lcms2 libXcursor libdrm libevdev libinput libjpeg seatd + libva libwebp libxkbcommon mesa pango pipewire wayland wayland-protocols ] ++ lib.optionals buildRemoting [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; mesonFlags= [ - "-Dbackend-drm-screencast-vaapi=${lib.boolToString (vaapi != null)}" + "-Dbackend-drm-screencast-vaapi=${lib.boolToString (libva != null)}" "-Dbackend-rdp=${lib.boolToString (freerdp != null)}" "-Dxwayland=${lib.boolToString (xwayland != null)}" # Default is true! (lib.mesonBool "remoting" buildRemoting) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7518848ccc..d694d05d42b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35212,8 +35212,7 @@ with pkgs; westonLite = weston.override { pango = null; freerdp = null; - libunwind = null; - vaapi = null; + libXcursor = null; libva = null; libwebp = null; xwayland = null; From dcc7704356d5622b0de8a1e41a537849cee6baf1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 25 May 2023 11:11:36 +0000 Subject: [PATCH 107/159] weston: use proper option parameters This will prevent mistakes like trying to enable features based on a non-existent package, like the one I just fixed. --- .../window-managers/weston/default.nix | 55 +++++++++++-------- pkgs/top-level/all-packages.nix | 17 +++--- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 84ef3b8d338..118fe626eee 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,12 +1,16 @@ { lib, stdenv, fetchurl , meson, ninja, pkg-config, python3, wayland-scanner -, cairo, dbus, lcms2, libdrm, libevdev, libinput, libjpeg, seatd, libxkbcommon -, mesa, wayland, wayland-protocols -, pipewire ? null, pango ? null, freerdp ? null -, libXcursor ? null, libva ? null, libwebp ? null, xwayland ? null -# beware of null defaults, as the parameters *are* supplied by callPackage by default -, buildDemo ? true -, buildRemoting ? true, gst_all_1 +, cairo, dbus, lcms2, libdrm, libevdev, libinput, libjpeg, libxkbcommon, mesa +, seatd, wayland, wayland-protocols + +, demoSupport ? true +, pangoSupport ? true, pango +, pipewireSupport ? true, pipewire +, rdpSupport ? true, freerdp +, remotingSupport ? true, gst_all_1 +, vaapiSupport ? true, libva +, webpSupport ? true, libwebp +, xwaylandSupport ? true, libXcursor, xwayland }: stdenv.mkDerivation rec { @@ -21,25 +25,28 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ - cairo dbus freerdp lcms2 libXcursor libdrm libevdev libinput libjpeg seatd - libva libwebp libxkbcommon mesa pango pipewire wayland wayland-protocols - ] ++ lib.optionals buildRemoting [ - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ]; + cairo dbus lcms2 libdrm libevdev libinput libjpeg libxkbcommon mesa seatd + wayland wayland-protocols + ] ++ lib.optional pangoSupport pango + ++ lib.optional pipewireSupport pipewire + ++ lib.optional rdpSupport freerdp + ++ lib.optionals remotingSupport [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ] + ++ lib.optional vaapiSupport libva + ++ lib.optional webpSupport libwebp + ++ lib.optionals xwaylandSupport [ libXcursor xwayland ]; mesonFlags= [ - "-Dbackend-drm-screencast-vaapi=${lib.boolToString (libva != null)}" - "-Dbackend-rdp=${lib.boolToString (freerdp != null)}" - "-Dxwayland=${lib.boolToString (xwayland != null)}" # Default is true! - (lib.mesonBool "remoting" buildRemoting) - "-Dpipewire=${lib.boolToString (pipewire != null)}" - "-Dimage-webp=${lib.boolToString (libwebp != null)}" - (lib.mesonBool "demo-clients" buildDemo) - "-Dsimple-clients=" - "-Dtest-junit-xml=false" - ] ++ lib.optionals (xwayland != null) [ - "-Dxwayland-path=${xwayland.out}/bin/Xwayland" + (lib.mesonBool "backend-drm-screencast-vaapi" vaapiSupport) + (lib.mesonBool "backend-rdp" rdpSupport) + (lib.mesonBool "demo-clients" demoSupport) + (lib.mesonBool "image-webp" webpSupport) + (lib.mesonBool "pipewire" pipewireSupport) + (lib.mesonBool "remoting" remotingSupport) + (lib.mesonOption "simple-clients" "") + (lib.mesonBool "test-junit-xml" false) + (lib.mesonBool "xwayland" xwaylandSupport) + ] ++ lib.optionals xwaylandSupport [ + (lib.mesonOption "xwayland-path" "${xwayland.out}/bin/Xwayland") ]; passthru.providedSessions = [ "weston" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d694d05d42b..ac46b64496c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35210,15 +35210,14 @@ with pkgs; weechatScripts = recurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); westonLite = weston.override { - pango = null; - freerdp = null; - libXcursor = null; - libva = null; - libwebp = null; - xwayland = null; - pipewire = null; - buildDemo = false; - buildRemoting = false; + demoSupport = false; + pangoSupport = false; + pipewireSupport = false; + rdpSupport = false; + remotingSupport = false; + vaapiSupport = false; + webpSupport = false; + xwaylandSupport = false; }; chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 { From 11723f1a0182df5ae509bd082db6cf3816b3dfa1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 25 May 2023 11:12:10 +0000 Subject: [PATCH 108/159] weston: adopt --- pkgs/applications/window-managers/weston/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 118fe626eee..358c0128edc 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/wayland/weston"; license = licenses.mit; # Expat version platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos qyliss ]; }; } From 88555d518d4fa3d3891d750e2b77b78cba1364f9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 25 May 2023 11:24:18 +0000 Subject: [PATCH 109/159] weston: 11.0.2 -> 12.0.1 --- .../window-managers/weston/default.nix | 18 ++++++++++++------ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 358c0128edc..e410453055c 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,43 +1,49 @@ { lib, stdenv, fetchurl , meson, ninja, pkg-config, python3, wayland-scanner , cairo, dbus, lcms2, libdrm, libevdev, libinput, libjpeg, libxkbcommon, mesa -, seatd, wayland, wayland-protocols +, seatd, wayland, wayland-protocols, xcbutilcursor , demoSupport ? true +, hdrSupport ? true, libdisplay-info , pangoSupport ? true, pango , pipewireSupport ? true, pipewire , rdpSupport ? true, freerdp , remotingSupport ? true, gst_all_1 , vaapiSupport ? true, libva +, vncSupport ? true, aml, neatvnc, pam , webpSupport ? true, libwebp , xwaylandSupport ? true, libXcursor, xwayland }: stdenv.mkDerivation rec { pname = "weston"; - version = "11.0.2"; + version = "12.0.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-ckB1LO8LfeYiuvi9U0jmP8axnwLvgklhsq3Rd9llKVI="; + hash = "sha256-sYWR6rJ4vBkXIPbAkVgEC3lecRivHV3cpqzZqOIDlTU="; }; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ - cairo dbus lcms2 libdrm libevdev libinput libjpeg libxkbcommon mesa seatd + cairo lcms2 libdrm libevdev libinput libjpeg libxkbcommon mesa seatd wayland wayland-protocols - ] ++ lib.optional pangoSupport pango + ] ++ lib.optional hdrSupport libdisplay-info + ++ lib.optional pangoSupport pango ++ lib.optional pipewireSupport pipewire ++ lib.optional rdpSupport freerdp ++ lib.optionals remotingSupport [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ] ++ lib.optional vaapiSupport libva + ++ lib.optionals vncSupport [ aml neatvnc pam ] ++ lib.optional webpSupport libwebp - ++ lib.optionals xwaylandSupport [ libXcursor xwayland ]; + ++ lib.optionals xwaylandSupport [ libXcursor xcbutilcursor xwayland ]; mesonFlags= [ (lib.mesonBool "backend-drm-screencast-vaapi" vaapiSupport) + (lib.mesonBool "backend-pipewire" pipewireSupport) (lib.mesonBool "backend-rdp" rdpSupport) + (lib.mesonBool "backend-vnc" vncSupport) (lib.mesonBool "demo-clients" demoSupport) (lib.mesonBool "image-webp" webpSupport) (lib.mesonBool "pipewire" pipewireSupport) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac46b64496c..fab30f3590d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35211,11 +35211,13 @@ with pkgs; westonLite = weston.override { demoSupport = false; + hdrSupport = false; pangoSupport = false; pipewireSupport = false; rdpSupport = false; remotingSupport = false; vaapiSupport = false; + vncSupport = false; webpSupport = false; xwaylandSupport = false; }; From 25e796bd9ed75adb83bc39a83afbe771261a298b Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 09:22:02 -0400 Subject: [PATCH 110/159] cargo-zigbuild: 0.16.9 -> 0.16.10 Diff: https://github.com/messense/cargo-zigbuild/compare/v0.16.9...v0.16.10 Changelog: https://github.com/messense/cargo-zigbuild/releases/tag/v0.16.10 --- pkgs/development/tools/rust/cargo-zigbuild/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 9dfcfc36353..f424a713723 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.16.9"; + version = "0.16.10"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AimdMEdqNbcNE47mHb4KOYQBtZqtpxFDHCnMbheynFU="; + sha256 = "sha256-d7RA6sOM5zHAhM51pBc0ahblVaT/+fzLUPtbGcxIqfA="; }; - cargoSha256 = "sha256-k403T+31dwjEkdXEvAiwrguSUBksXGZz+pCu2BiJbsQ="; + cargoSha256 = "sha256-Frs4BvD562RUSwyjlmJIihqFTtPjYTdpUlDGXKkg/9U="; nativeBuildInputs = [ makeWrapper ]; From 5c06cf351b6871a8b5a7d9452d7dcb332518865b Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 09:28:12 -0400 Subject: [PATCH 111/159] pipe-rename: 1.6.3 -> 1.6.4 Diff: https://diff.rs/pipe-rename/1.6.3/1.6.4 --- pkgs/tools/misc/pipe-rename/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pipe-rename/default.nix b/pkgs/tools/misc/pipe-rename/default.nix index a0a734cd1e9..a0d62b847ec 100644 --- a/pkgs/tools/misc/pipe-rename/default.nix +++ b/pkgs/tools/misc/pipe-rename/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "pipe-rename"; - version = "1.6.3"; + version = "1.6.4"; src = fetchCrate { inherit pname version; - hash = "sha256-vpSzyDswIIKVFEHwTvFvPq3SRoBePHSv4A31rlj4ymU="; + hash = "sha256-LSkUZ90lS2QGF6f8sFvunuYpw8Cmx8s6JCCOJYo2j7g="; }; - cargoHash = "sha256-tlG2Vk1YJBZs2mX1/QqIyFqOsnaK9oa+PsYcmKISC4E="; + cargoHash = "sha256-wvs1uYqm9kb4hp4tgOR3UZzW1rButEWQYpv0Ca9CXe0="; nativeCheckInputs = [ python3 ]; From 90bca32e902e96e786e4524b1f233783bbd8a0a2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 09:44:59 -0400 Subject: [PATCH 112/159] scli: fix version --- pkgs/applications/misc/scli/default.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index d300691934b..4da57993fb8 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -4,6 +4,8 @@ , dbus , signal-cli , xclip +, testers +, scli }: python3.pkgs.buildPythonApplication rec { @@ -26,24 +28,27 @@ python3.pkgs.buildPythonApplication rec { dontBuild = true; - checkPhase = '' - # scli attempts to write to these directories, make sure they're writeable - export XDG_DATA_HOME=$(mktemp -d) - export XDG_CONFIG_HOME=$(mktemp -d) - ./scli --help > /dev/null # don't spam nix-build log - test $? == 0 - ''; - installPhase = '' - mkdir -p $out/bin + runHook preInstall + patchShebangs scli - install -m755 -D scli $out/bin/scli + install -Dm555 scli -t $out/bin + echo "v$version" > $out/bin/VERSION + + runHook postInstall ''; makeWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ dbus signal-cli xclip ]) ]; + passthru.tests = { + version = testers.testVersion { + package = scli; + command = "HOME=$(mktemp -d) scli --version"; + }; + }; + meta = with lib; { description = "Simple terminal user interface for Signal"; homepage = "https://github.com/isamert/scli"; From e1a0a7aa7610f0a4f11d1444cf77d06d7bf24cd9 Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Sat, 27 May 2023 11:53:28 +0200 Subject: [PATCH 113/159] prometheus: skip tests on 32-bit platforms --- pkgs/servers/monitoring/prometheus/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 1724c0f53fa..0abdb97a542 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -120,7 +120,9 @@ buildGoModule rec { moveToOutput bin/promtool $cli ''; - doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1 + # https://hydra.nixos.org/build/130673870/nixlog/1 + # Test mock data uses 64 bit data without an explicit (u)int64 + doCheck = !(stdenv.isDarwin || stdenv.hostPlatform.parsed.cpu.bits < 64); passthru.tests = { inherit (nixosTests) prometheus; }; From 5dd0190da9b5aecb5238c1bea1ebaa77f15c6a45 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 17:11:11 +0300 Subject: [PATCH 114/159] python310Packages.johnnycanencrypt: migrate to bindgenHook --- pkgs/development/python-modules/johnnycanencrypt/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 2f4e2613d6a..dca215358e0 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , buildPythonPackage , rustPlatform -, llvmPackages , pkg-config , pcsclite , nettle @@ -35,16 +34,14 @@ buildPythonPackage rec { format = "pyproject"; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - propagatedBuildInputs = [ httpx ]; nativeBuildInputs = [ - llvmPackages.clang pkg-config ] ++ (with rustPlatform; [ + bindgenHook cargoSetupHook maturinBuildHook ]); From e33c2a5e4cbd1de00f4e4530e43f8be29200369f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 27 May 2023 13:03:56 +0000 Subject: [PATCH 115/159] nixos/test-driver: add missing spaces to warning --- nixos/lib/test-driver/test_driver/machine.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index a362e99f98e..1a97cedb2e8 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -369,8 +369,8 @@ class Machine: @staticmethod def create_startcommand(args: Dict[str, str]) -> StartCommand: rootlog.warning( - "Using legacy create_startcommand()," - "please use proper nix test vm instrumentation, instead" + "Using legacy create_startcommand(), " + "please use proper nix test vm instrumentation, instead " "to generate the appropriate nixos test vm qemu startup script" ) hda = None From 6abae5cbb5950b973b115b99bcb7f8ac2b47a482 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 27 May 2023 13:26:40 +0000 Subject: [PATCH 116/159] xwayland: set meta.mainProgram --- pkgs/applications/window-managers/weston/default.nix | 2 +- pkgs/desktops/gnome/core/mutter/43/default.nix | 2 +- pkgs/desktops/gnome/core/mutter/default.nix | 2 +- pkgs/desktops/plasma-5/kwin/default.nix | 2 +- pkgs/servers/mir/default.nix | 2 +- pkgs/servers/x11/xorg/xwayland.nix | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index e410453055c..86b9a84267c 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { (lib.mesonBool "test-junit-xml" false) (lib.mesonBool "xwayland" xwaylandSupport) ] ++ lib.optionals xwaylandSupport [ - (lib.mesonOption "xwayland-path" "${xwayland.out}/bin/Xwayland") + (lib.mesonOption "xwayland-path" (lib.getExe xwayland)) ]; passthru.providedSessions = [ "weston" ]; diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix index 56bd69e499c..6c91193851a 100644 --- a/pkgs/desktops/gnome/core/mutter/43/default.nix +++ b/pkgs/desktops/gnome/core/mutter/43/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dinstalled_tests=false" # TODO: enable these "-Dwayland_eglstream=true" "-Dprofiler=true" - "-Dxwayland_path=${xwayland}/bin/Xwayland" + "-Dxwayland_path=${lib.getExe xwayland}" # This should be auto detected, but it looks like it manages a false # positive. "-Dxwayland_initfd=disabled" diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index ec3d6945904..3a2d8981b0b 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dtests=false" "-Dwayland_eglstream=true" "-Dprofiler=true" - "-Dxwayland_path=${xwayland}/bin/Xwayland" + "-Dxwayland_path=${lib.getExe xwayland}" # This should be auto detected, but it looks like it manages a false # positive. "-Dxwayland_initfd=disabled" diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 47ddcc95451..2334604903f 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -144,7 +144,7 @@ mkDerivation { ]; CXXFLAGS = [ - ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' + ''-DNIXPKGS_XWAYLAND=\"${lib.getExe xwayland}\"'' ]; postInstall = '' diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index ea6976cdd6c..98b5fd39e5f 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { # Fix Xwayland default substituteInPlace src/miral/x11_support.cpp \ - --replace '/usr/bin/Xwayland' '${xwayland}/bin/Xwayland' + --replace '/usr/bin/Xwayland' '${lib.getExe xwayland}' # Fix paths for generating drm-formats substituteInPlace src/platform/graphics/CMakeLists.txt \ diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index a6c270182f7..f8d85231ca4 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -108,6 +108,7 @@ stdenv.mkDerivation rec { description = "An X server for interfacing X11 apps with the Wayland protocol"; homepage = "https://wayland.freedesktop.org/xserver.html"; license = licenses.mit; + mainProgram = "Xwayland"; maintainers = with maintainers; [ emantor ]; platforms = platforms.linux; }; From 09d102278285e4a8917cb94de4d578243b57f2d3 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 27 May 2023 17:20:08 +0200 Subject: [PATCH 117/159] nixos/qemu-vm: fix 32-bits assert for memorySize It should be an implication, rather than &&. --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index da1fea80823..388ba816845 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -894,7 +894,7 @@ in ''; } ])) ++ [ - { assertion = pkgs.stdenv.hostPlatform.is32bit && cfg.memorySize < 2047; + { assertion = pkgs.stdenv.hostPlatform.is32bit -> cfg.memorySize < 2047; message = '' virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max. ''; From ee58ad840b53e536dd893d809b23b51dadccf002 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 18:43:20 +0300 Subject: [PATCH 118/159] gnome-decoder: migrate to bindgenHook --- pkgs/applications/graphics/gnome-decoder/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index 473d66d9c8b..a7e895fb4b6 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -1,7 +1,6 @@ { lib , clangStdenv , fetchFromGitLab -, libclang , rustPlatform , cargo , meson @@ -50,6 +49,7 @@ clangStdenv.mkDerivation rec { desktop-file-utils cargo rustc + rustPlatform.bindgenHook rustPlatform.cargoSetupHook ]; @@ -66,8 +66,6 @@ clangStdenv.mkDerivation rec { gst-plugins-bad ]; - LIBCLANG_PATH = "${libclang.lib}/lib"; - meta = with lib; { description = "Scan and Generate QR Codes"; homepage = "https://gitlab.gnome.org/World/decoder"; From 3e5995d7eadf679331e46c5902d2f57249ee6780 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 24 May 2023 09:47:12 -0300 Subject: [PATCH 119/159] legit: init at 0.2.1 --- .../version-management/legit-web/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/version-management/legit-web/default.nix diff --git a/pkgs/applications/version-management/legit-web/default.nix b/pkgs/applications/version-management/legit-web/default.nix new file mode 100644 index 00000000000..72de9d90c3e --- /dev/null +++ b/pkgs/applications/version-management/legit-web/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "legit"; + version = "0.2.1"; + + src = fetchFromGitHub { + repo = "legit"; + owner = "icyphox"; + rev = "v${version}"; + hash = "sha256-Y0lfbe4xBCj80z07mLFIiX+shvntYAHiW2Uw7h94jrE="; + }; + + vendorHash = "sha256-RAUSYCtP4rcJ2zIBXfPAEZWD1VSfr3d4MrmUMiPpjK8="; + + postInstall = '' + mkdir -p $out/lib/legit/templates + mkdir -p $out/lib/legit/static + + cp -r $src/templates/* $out/lib/legit/templates + cp -r $src/static/* $out/lib/legit/static + ''; + + meta = { + description = "Web frontend for git"; + homepage = "https://github.com/icyphox/legit"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e68d069104a..51898095899 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2152,6 +2152,8 @@ with pkgs; legit = callPackage ../applications/version-management/legit { }; + legit-web = callPackage ../applications/version-management/legit-web { }; + lucky-commit = callPackage ../applications/version-management/lucky-commit { inherit (darwin.apple_sdk.frameworks) OpenCL; }; From 77520d39ce72daed1f7bdf0d337c3c2a3249fece Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 24 May 2023 09:47:50 -0300 Subject: [PATCH 120/159] nixos/legit: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/legit.nix | 182 ++++++++++++++++++++ 2 files changed, 183 insertions(+) create mode 100644 nixos/modules/services/networking/legit.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a25e28775e4..0efc948f402 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -911,6 +911,7 @@ ./services/networking/knot.nix ./services/networking/kresd.nix ./services/networking/lambdabot.nix + ./services/networking/legit.nix ./services/networking/libreswan.nix ./services/networking/lldpd.nix ./services/networking/logmein-hamachi.nix diff --git a/nixos/modules/services/networking/legit.nix b/nixos/modules/services/networking/legit.nix new file mode 100644 index 00000000000..90234f3955e --- /dev/null +++ b/nixos/modules/services/networking/legit.nix @@ -0,0 +1,182 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) + literalExpression + mkEnableOption + mdDoc + mkIf + mkOption + mkPackageOptionMD + optionalAttrs + optional + types; + + cfg = config.services.legit; + + yaml = pkgs.formats.yaml { }; + configFile = yaml.generate "legit.yaml" cfg.settings; + + defaultStateDir = "/var/lib/legit"; + defaultStaticDir = "${cfg.settings.repo.scanPath}/static"; + defaultTemplatesDir = "${cfg.settings.repo.scanPath}/templates"; +in +{ + options.services.legit = { + enable = mkEnableOption (mdDoc "legit git web frontend"); + + package = mkPackageOptionMD pkgs "legit-web" { }; + + user = mkOption { + type = types.str; + default = "legit"; + description = mdDoc "User account under which legit runs."; + }; + + group = mkOption { + type = types.str; + default = "legit"; + description = mdDoc "Group account under which legit runs."; + }; + + settings = mkOption { + default = { }; + description = mdDoc '' + The primary legit configuration. See the + [sample configuration](https://github.com/icyphox/legit/blob/master/config.yaml) + for possible values. + ''; + type = types.submodule { + options.repo = { + scanPath = mkOption { + type = types.path; + default = defaultStateDir; + description = mdDoc "Directory where legit will scan for repositories."; + }; + readme = mkOption { + type = types.listOf types.str; + default = [ ]; + description = mdDoc "Readme files to look for."; + }; + mainBranch = mkOption { + type = types.listOf types.str; + default = [ "main" "master" ]; + description = mdDoc "Main branch to look for."; + }; + ignore = mkOption { + type = types.listOf types.str; + default = [ ]; + description = mdDoc "Repositories to ignore."; + }; + }; + options.dirs = { + templates = mkOption { + type = types.path; + default = "${pkgs.legit-web}/lib/legit/templates"; + defaultText = literalExpression ''"''${pkgs.legit-web}/lib/legit/templates"''; + description = mdDoc "Directories where template files are located."; + }; + static = mkOption { + type = types.path; + default = "${pkgs.legit-web}/lib/legit/static"; + defaultText = literalExpression ''"''${pkgs.legit-web}/lib/legit/static"''; + description = mdDoc "Directories where static files are located."; + }; + }; + options.meta = { + title = mkOption { + type = types.str; + default = "legit"; + description = mdDoc "Website title."; + }; + description = mkOption { + type = types.str; + default = "git frontend"; + description = mdDoc "Website description."; + }; + }; + options.server = { + name = mkOption { + type = types.str; + default = "localhost"; + description = mdDoc "Server name."; + }; + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = mdDoc "Host address."; + }; + port = mkOption { + type = types.port; + default = 5555; + description = mdDoc "Legit port."; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + users.groups = optionalAttrs (cfg.group == "legit") { + "${cfg.group}" = { }; + }; + + users.users = optionalAttrs (cfg.user == "legit") { + "${cfg.user}" = { + group = cfg.group; + isSystemUser = true; + }; + }; + + systemd.services.legit = { + description = "legit git frontend"; + + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ configFile ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/legit -config ${configFile}"; + Restart = "always"; + + WorkingDirectory = cfg.settings.repo.scanPath; + StateDirectory = [ ] ++ + optional (cfg.settings.repo.scanPath == defaultStateDir) "legit" ++ + optional (cfg.settings.dirs.static == defaultStaticDir) "legit/static" ++ + optional (cfg.settings.dirs.templates == defaultTemplatesDir) "legit/templates"; + + # Hardening + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadWritePaths = cfg.settings.repo.scanPath; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + UMask = "0077"; + }; + }; + }; +} From fca068a55862456224bedee8ff2f780b0028c6f8 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 24 May 2023 09:48:02 -0300 Subject: [PATCH 121/159] nixos/tests/legit: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/legit.nix | 54 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 nixos/tests/legit.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 49a7db012a1..abe281a204b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -278,6 +278,7 @@ in { fsck = handleTest ./fsck.nix {}; fsck-systemd-stage-1 = handleTest ./fsck.nix { systemdStage1 = true; }; ft2-clone = handleTest ./ft2-clone.nix {}; + legit = handleTest ./legit.nix {}; mimir = handleTest ./mimir.nix {}; garage = handleTest ./garage {}; gemstash = handleTest ./gemstash.nix {}; diff --git a/nixos/tests/legit.nix b/nixos/tests/legit.nix new file mode 100644 index 00000000000..3eb3f503569 --- /dev/null +++ b/nixos/tests/legit.nix @@ -0,0 +1,54 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: +let + port = 5000; + scanPath = "/var/lib/legit"; +in +{ + name = "legit-web"; + meta.maintainers = [ lib.maintainers.ratsclub ]; + + nodes = { + server = { config, pkgs }: { + services.legit = { + enable = true; + settings = { + server.port = 5000; + repo = { inherit scanPath; }; + }; + }; + + environment.systemPackages = [ pkgs.git ]; + }; + }; + + testScript = { nodes, ... }: + let + strPort = builtins.toString port; + in + '' + start_all() + + server.wait_for_unit("network.target") + server.wait_for_unit("legit.service") + + server.wait_until_succeeds( + "curl -f http://localhost:${strPort}" + ) + + server.succeed("${pkgs.writeShellScript "setup-legit-test-repo" '' + set -e + git init --bare -b master ${scanPath}/some-repo + git init -b master reference + cd reference + git remote add origin ${scanPath}/some-repo + date > date.txt + git add date.txt + git -c user.name=test -c user.email=test@localhost commit -m 'add date' + git push -u origin master + ''}") + + server.wait_until_succeeds( + "curl -f http://localhost:${strPort}/some-repo" + ) + ''; +}) From 55a963275353f246551cbe3cb622ec30b0030833 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 27 May 2023 11:55:19 +0200 Subject: [PATCH 122/159] metabase: 0.46.2 -> 0.46.4 Fixes CVE-2023-32680. Changelogs: https://github.com/metabase/metabase/releases/tag/v0.46.4 https://github.com/metabase/metabase/releases/tag/v0.46.3 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 2685444361e..f6866a805d4 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.46.2"; + version = "0.46.4"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-FHI8QUZIPMhBNOd0RfdSKGkILaRlS4he8EVSrQxjD0s="; + hash = "sha256-sWmX1k581t7Owjt2ksE0xno0q8sDW9WgSLmjjadf5QY="; }; nativeBuildInputs = [ makeWrapper ]; From 26d5c72cac6bba4985e324fd527b9a29d5aa9e3d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 20:05:28 +0300 Subject: [PATCH 123/159] influxdb: migrate to bindgenHook --- pkgs/servers/nosql/influxdb/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index a80975926e8..85cc8b97608 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, stdenv, pkg-config, rustPlatform, llvmPackages, libiconv, fetchpatch, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, stdenv, pkg-config, rustPlatform, libiconv, fetchpatch, nixosTests }: let libflux_version = "0.170.1"; @@ -25,9 +25,8 @@ let ]; sourceRoot = "source/libflux"; cargoSha256 = "sha256-kYiZ5ZRiFHRf1RQeeUGjIhnEkTvhNSZ0t4tidpRIDyk="; - nativeBuildInputs = [ llvmPackages.libclang ]; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; pkgcfg = '' Name: flux Version: ${libflux_version} From 2e290f56769b404784e4019776e167becbebbc6e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 20:05:57 +0300 Subject: [PATCH 124/159] influxdb2: migrate to bindgenHook --- pkgs/servers/nosql/influxdb2/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 4f86cc4da53..b5352909cab 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -1,10 +1,8 @@ { buildGoModule , fetchFromGitHub , fetchurl -, fetchpatch , go-bindata , lib -, llvmPackages , perl , pkg-config , rustPlatform @@ -43,9 +41,8 @@ let }; sourceRoot = "source/libflux"; cargoSha256 = "sha256-9rPW0lgi3lXJARa1KXgSY8LVJsoFjppok5ODGlqYeYw="; - nativeBuildInputs = [ llvmPackages.libclang ]; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; pkgcfg = '' Name: flux Version: ${libflux_version} From 9190b1088daa2b69c3d89aafd6b4cb25ffb191d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 17:08:16 +0000 Subject: [PATCH 125/159] zsh-autocomplete: 23.05.02 -> 23.05.24 --- pkgs/shells/zsh/zsh-autocomplete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/shells/zsh/zsh-autocomplete/default.nix index 4eec02e86c0..05721221f2a 100644 --- a/pkgs/shells/zsh/zsh-autocomplete/default.nix +++ b/pkgs/shells/zsh/zsh-autocomplete/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "zsh-autocomplete"; - version = "23.05.02"; + version = "23.05.24"; src = fetchFromGitHub { owner = "marlonrichert"; repo = "zsh-autocomplete"; rev = version; - sha256 = "sha256-HVt7JGkNxg9Kb29x95mxq/vtQ1dBbNeQlb9lK2qTBSI="; + sha256 = "sha256-/6V6IHwB5p0GT1u5SAiUa20LjFDSrMo731jFBq/bnpw="; }; strictDeps = true; From e21b39b6a7a729c50ae7e298ca9f8a10749f6bca Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 20:45:25 +0300 Subject: [PATCH 126/159] cargo-spellcheck: migrate to bindgenHook --- pkgs/development/tools/rust/cargo-spellcheck/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 7fb07e4b448..5a9baa33403 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, libclang , stdenv , Security }: @@ -19,9 +18,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-hYCDpSKi7HlqwdnMnfnKw46VpO+bhsV11kIu/4yMaBw="; - buildInputs = lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; - LIBCLANG_PATH = "${libclang.lib}/lib"; + buildInputs = lib.optional stdenv.isDarwin Security; preCheck = "HOME=$(mktemp -d)"; From 2f384f9c6679060438f806439ed078df15727fc2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 18:11:45 +0000 Subject: [PATCH 127/159] mdbook-katex: 0.4.2 -> 0.5.0 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 65babe0af10..c5cf1db068f 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.4.2"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-aEtmHihncs+Z+VRtUVsiRLK72bDWJQNjy/Q5xBvM1d0="; + hash = "sha256-6gZTJrjr3cO7f6XBrQrBKe62UsnPxGo1eXX/+ICdJfk="; }; - cargoHash = "sha256-L5bdR1khL3AHRNtFhy1GWRqMxdpNxrYGX3TELCUB4mQ="; + cargoHash = "sha256-KHC37LNnc789anxJBADgj97tw5TwR/5ksxP3X/9pHlo="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; From 3aa92e371dfd106e94cf6f3e6069a0dd01b8ef7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 18:24:51 +0000 Subject: [PATCH 128/159] grpc_cli: 1.54.1 -> 1.55.0 --- pkgs/tools/networking/grpc_cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index cb20dfd8d1d..76db0f21282 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.54.1"; + version = "1.55.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-svQxWHCoDHYZSvSrzUuwO0+6WMtgKsu+uVDV1mP/nL4="; + hash = "sha256-xEfYNqtMKeJpztUm39PaUrE8OKa8TQhtLBny2/D99VM="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; From ac7c0ee7e1ad86e8dc85c8c83be069c9443edcd2 Mon Sep 17 00:00:00 2001 From: name_snrl Date: Sat, 27 May 2023 19:30:47 +0500 Subject: [PATCH 129/159] languagetool-rust: init at 2.1.1 --- pkgs/tools/text/languagetool-rust/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/tools/text/languagetool-rust/default.nix diff --git a/pkgs/tools/text/languagetool-rust/default.nix b/pkgs/tools/text/languagetool-rust/default.nix new file mode 100644 index 00000000000..159b696c657 --- /dev/null +++ b/pkgs/tools/text/languagetool-rust/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, installShellFiles +, pkg-config +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "languagetool-rust"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "jeertmans"; + repo = pname; + rev = "v${version}"; + hash = "sha256-tgx1LcVAlBcgYAdtn4n5TiLzinmOImLoatGowUFHpUM="; + }; + + cargoHash = "sha256-8Q+Li4wLkS9/HlSdtfOFnojtUBojO3oUpNHkyOu5clA="; + + buildFeatures = [ "full" ]; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + + checkFlags = [ + # requires network access + "--skip=server::tests::test_server_check_data" + "--skip=server::tests::test_server_check_text" + "--skip=server::tests::test_server_languages" + "--skip=server::tests::test_server_ping" + "--skip=test_match_positions_1" + "--skip=test_match_positions_2" + "--skip=test_match_positions_3" + "--skip=test_match_positions_4" + "--skip=src/lib/lib.rs" + ]; + + postInstall = '' + installShellCompletion --cmd ltrs \ + --bash <($out/bin/ltrs completions bash) \ + --fish <($out/bin/ltrs completions fish) \ + --zsh <($out/bin/ltrs completions zsh) + ''; + + meta = with lib; { + description = "LanguageTool API in Rust"; + homepage = "https://github.com/jeertmans/languagetool-rust"; + license = licenses.mit; + maintainers = with maintainers; [ name-snrl ]; + mainProgram = "ltrs"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fab30f3590d..8b6b6d08209 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5311,6 +5311,10 @@ with pkgs; languagetool = callPackage ../tools/text/languagetool { }; + languagetool-rust = callPackage ../tools/text/languagetool-rust { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ldtk = callPackage ../applications/editors/ldtk { }; lepton = callPackage ../tools/graphics/lepton { }; From 22731f497dffb5df9d11d133abfb749b7950a3f1 Mon Sep 17 00:00:00 2001 From: name_snrl Date: Sat, 27 May 2023 19:30:59 +0500 Subject: [PATCH 130/159] maintainers: add name-snrl --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 30ebe4a7ce5..d16cbe2864c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11050,6 +11050,11 @@ githubId = 1009523; name = "Ashijit Pramanik"; }; + name-snrl = { + github = "name-snrl"; + githubId = 72071763; + name = "Yusup Urazaev"; + }; namore = { email = "namor@hemio.de"; github = "namore"; From 7db6adad1f66df38464092dd5b03f9a1a1b40ea7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 18:47:48 +0000 Subject: [PATCH 131/159] go-musicfox: 4.0.6 -> 4.1.1 --- pkgs/applications/audio/go-musicfox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index f67a6d8052c..6442489aca6 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "go-musicfox"; - version = "4.0.6"; + version = "4.1.1"; src = fetchFromGitHub { owner = "go-musicfox"; repo = pname; rev = "v${version}"; - hash = "sha256-ZqB3NL/pLIY1lHl3qMIOciqsOW9jNwjVQAq1j/ydDWs="; + hash = "sha256-A1+JDMT4mHUi10GE4/qV5IMuwNsm4EdBt9VC2ZvJzuU="; }; deleteVendor = true; - vendorHash = "sha256-rJlyrPQS9UKinxIwGGo3EHlmWrzTKIm1jM1UDqnmVyg="; + vendorHash = "sha256-xzLUWqzDVT+Htw/BHygOJM16uQvWXopyxxHBZQKcOQ8="; subPackages = [ "cmd/musicfox.go" ]; From 874d79d4757d399f8e5dc0c5b98720f9e8ac13d1 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 27 May 2023 14:57:27 -0400 Subject: [PATCH 132/159] lxd: 5.13 -> 5.14 --- pkgs/tools/admin/lxd/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index d32d35dd88a..3048eaac33c 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -28,18 +28,19 @@ , bash , installShellFiles , nixosTests +, gitUpdater }: buildGoModule rec { pname = "lxd"; - version = "5.13"; + version = "5.14"; src = fetchurl { urls = [ "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" ]; - hash = "sha256-kys8zfqhkpJqq4ICg6dOsoJEoxJ209GwdjGRrfrZ7j0="; + hash = "sha256-EtVZ0g9LD6dWA70/E1Ad/RWJjbvrAzU2hF3n6CdTMBE="; }; vendorHash = null; @@ -98,6 +99,10 @@ buildGoModule rec { passthru.tests.lxd = nixosTests.lxd; passthru.tests.lxd-nftables = nixosTests.lxd-nftables; + passthru.updateScript = gitUpdater { + url = "https://github.com/lxc/lxd.git"; + rev-prefix = "lxd-"; + }; meta = with lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; From 6d6a709a50dbf40654a6aa53b5fa679e167e27b4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 15:13:55 -0400 Subject: [PATCH 133/159] mdbook-katex: remove unused dependencies --- pkgs/tools/text/mdbook-katex/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index c5cf1db068f..b465dd5560b 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchCrate, rustPlatform, openssl, CoreServices }: +{ lib, rustPlatform, fetchCrate, stdenv, CoreServices }: rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; @@ -11,9 +11,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-KHC37LNnc789anxJBADgj97tw5TwR/5ksxP3X/9pHlo="; - OPENSSL_DIR = "${lib.getDev openssl}"; - OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { From 7997e72cd9e80ba973cb8350451e0cfd0fe20d8f Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 15:16:25 -0400 Subject: [PATCH 134/159] mdbook-katex: 0.5.0 -> 0.5.1 Diff: https://diff.rs/mdbook-katex/0.5.0/0.5.1 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index b465dd5560b..a1314d2ccd1 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.5.0"; + version = "0.5.1"; src = fetchCrate { inherit pname version; - hash = "sha256-6gZTJrjr3cO7f6XBrQrBKe62UsnPxGo1eXX/+ICdJfk="; + hash = "sha256-RDNZ6+d+UbiQ/Eb2+YbhPyGVcM8079UFsnNvch/1oAs="; }; - cargoHash = "sha256-KHC37LNnc789anxJBADgj97tw5TwR/5ksxP3X/9pHlo="; + cargoHash = "sha256-An2mQ4kWGF3qk2v9VeQh700n7n/+3ShPqMfCnZmiIuc="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 7a3065da25eac14f216a411d1c5cdf0890aefc8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 19:24:36 +0000 Subject: [PATCH 135/159] python311Packages.dominate: 2.7.0 -> 2.8.0 --- pkgs/development/python-modules/dominate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 142f1e32eda..38aaccf4b15 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "dominate"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UgEBNgiS6/nQVT9n0341n/kkA9ih4zgUAwUDCIoF2kk="; + hash = "sha256-TJDDvvr4jmErcfSzmve8vviXes+oVc7JVyJaj79QQAc="; }; nativeCheckInputs = [ From e074386f98446165cbc0cc0565bfc1745d558a31 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 28 May 2023 03:25:37 +0800 Subject: [PATCH 136/159] fdroidcl: init at 0.7.0 --- pkgs/development/mobile/fdroidcl/default.nix | 36 ++++++++++++++ .../fdroidcl/go_mod_version_update.patch | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 85 insertions(+) create mode 100644 pkgs/development/mobile/fdroidcl/default.nix create mode 100644 pkgs/development/mobile/fdroidcl/go_mod_version_update.patch diff --git a/pkgs/development/mobile/fdroidcl/default.nix b/pkgs/development/mobile/fdroidcl/default.nix new file mode 100644 index 00000000000..6b6f676a8d4 --- /dev/null +++ b/pkgs/development/mobile/fdroidcl/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, android-tools +}: + +buildGoModule rec { + pname = "fdroidcl"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "mvdan"; + repo = "fdroidcl"; + rev = "v${version}"; + hash = "sha256-tqhs3b/DHfnGOm9qcM56NSzt1GJflJfbemkp7+nXbug="; + }; + + patches = [ ./go_mod_version_update.patch ]; + + vendorHash = "sha256-BWbwhHjfmMjiRurrZfW/YgIzJUH/hn+7qonD0BcTLxs="; + + postPatch = '' + substituteInPlace adb/{server,device}.go \ + --replace 'exec.Command("adb"' 'exec.Command("${android-tools}/bin/adb"' + ''; + + # TestScript/search attempts to connect to fdroid + doCheck = false; + + meta = with lib; { + description = "F-Droid command line interface written in Go"; + homepage = "https://github.com/mvdan/fdroidcl"; + license = licenses.bsd3; + maintainers = with maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/development/mobile/fdroidcl/go_mod_version_update.patch b/pkgs/development/mobile/fdroidcl/go_mod_version_update.patch new file mode 100644 index 00000000000..079ea02c0a1 --- /dev/null +++ b/pkgs/development/mobile/fdroidcl/go_mod_version_update.patch @@ -0,0 +1,47 @@ +diff --git a/go.mod b/go.mod +index a482585..5c836dd 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,10 +1,19 @@ + module mvdan.cc/fdroidcl + +-go 1.16 ++go 1.18 + + require ( + github.com/kr/pretty v0.3.0 + github.com/rogpeppe/go-internal v1.9.0 + github.com/schollz/progressbar/v3 v3.13.0 +- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ++) ++ ++require ( ++ github.com/kr/text v0.2.0 // indirect ++ github.com/mattn/go-runewidth v0.0.14 // indirect ++ github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect ++ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect ++ github.com/rivo/uniseg v0.4.3 // indirect ++ golang.org/x/sys v0.4.0 // indirect ++ golang.org/x/term v0.4.0 // indirect + ) +diff --git a/go.sum b/go.sum +index 7befc16..d8523cb 100644 +--- a/go.sum ++++ b/go.sum +@@ -23,8 +23,6 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ + github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= + github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= + github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +-github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= +-github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= + github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= + github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= + github.com/schollz/progressbar/v3 v3.13.0 h1:9TeeWRcjW2qd05I8Kf9knPkW4vLM/hYoa6z9ABvxje8= +@@ -38,7 +36,4 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg= + golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +-gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= + gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b40f367bea9..c659f8e199d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4859,6 +4859,8 @@ with pkgs; fd = callPackage ../tools/misc/fd { }; + fdroidcl = pkgs.callPackage ../development/mobile/fdroidcl { }; + fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; fetch-scm = callPackage ../tools/misc/fetch-scm { }; From cbf3c2f6f57122f2dfbdad65d611faaedf15e97a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 19:45:43 +0000 Subject: [PATCH 137/159] nats-server: 2.9.16 -> 2.9.17 --- pkgs/servers/nats-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 39dff3395be..4b59a16fd2e 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.16"; + version = "2.9.17"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-tkOhPa163hiuk2sbfhHL6JTD7do3rrDZTkLYvwuue+o="; + hash = "sha256-tWCZq6OwcjVaeaL4CrxSPwGaCKNZ2eN5s3vOoU9oT1I="; }; - vendorHash = "sha256-OixJhKaPZ58L+eN/cZnsXUPuGhYhFxfMKtqiV/mWLak="; + vendorHash = "sha256-Qn1FkZLo3EC7KX7ZsQLDu26fbMFiwvy7cjlsFlgMtmo="; doCheck = false; From 2c9bea0eaadaf8e3c17afac89ae53154e37016da Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 27 May 2023 16:52:52 +0100 Subject: [PATCH 138/159] sharpsat-td: patch with updated version of mpreal/mpfrc++ this version is needed for mpfr 4.2.0+ support lesson - don't merge old PRs without re-testing them yourself --- .../science/logic/sharpsat-td/default.nix | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/sharpsat-td/default.nix b/pkgs/applications/science/logic/sharpsat-td/default.nix index de9e212d8cc..2f2128d542f 100644 --- a/pkgs/applications/science/logic/sharpsat-td/default.nix +++ b/pkgs/applications/science/logic/sharpsat-td/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, gmp, mpfr }: +{ lib +, stdenv +, fetchFromGitHub +, fetchzip +, cmake +, gmp +, mpfr +}: let satlib-bmc = fetchzip { @@ -7,6 +14,14 @@ let sha256 = "sha256-F1Jfrj4iMMf/3LFCShIDMs4JfLkJ51Z4wkL1FDT9b/A="; }; + # needed for mpfr 4.2.0+ support + mpreal = fetchFromGitHub { + owner = "advanpix"; + repo = "mpreal"; + rev = "mpfrc++-3.6.9"; + sha256 = "sha256-l61SKEx4pBocADrEGPVacQ6F2ep9IuvNZ8W08dKeZKg="; + }; + in stdenv.mkDerivation rec { pname = "sharpsat-td"; version = "unstable-2021-09-05"; @@ -27,6 +42,10 @@ in stdenv.mkDerivation rec { --replace '"../../../flow-cutter-pace17/flow_cutter_pace17"' '"'"$out"'/bin/flow_cutter_pace17"' substituteInPlace src/preprocessor/treewidth.cpp \ --replace '"./flow_cutter_pace17"' '"'"$out"'/bin/flow_cutter_pace17"' + + # replace bundled version of mpreal/mpfrc++ + rm -r src/mpfr + cp -r ${mpreal} src/mpfr ''; nativeBuildInputs = [ cmake ]; From 263dafd91f33e6b6115f1ea619a87162de3317a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 19:58:13 +0000 Subject: [PATCH 139/159] system76-keyboard-configurator: 1.3.2 -> 1.3.3 --- .../misc/system76-keyboard-configurator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 1cec644ba92..3844fb72db3 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-21cn43qyKg8jL6FF8D9H7dgcgSKggqaxb4cJVc0ljl0="; + sha256 = "sha256-8Mb07OlmYl/dNxCdBrAq7mgXZvi0oqtt76UX8TMWUPY="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-9VjrDE/1VAgNrRmSYxCYKPrnilPQF+OXAYpFkF2lpAE="; + cargoHash = "sha256-3IAljoL4cabZ9rpgqPrgG7ofwETHS/9OlBKjxTwCDTU="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; From dfa694f915aa63c00d02bb5f8425726853ad9751 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 20:18:38 +0000 Subject: [PATCH 140/159] rpm-ostree: 2023.3 -> 2023.4 --- pkgs/tools/misc/rpm-ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 0dffe4a63b9..8ed7f61f430 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2023.3"; + version = "2023.4"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-qIkGQqU+6EbSKmHwjZe+A1XsIZVnBQyM28DN9GFP/qE="; + hash = "sha256-xk06T4A451o5C5rquCvQEpGKCw8AcBVf49Lg8VD0GdE="; }; nativeBuildInputs = [ From 3df669965184571f861e5e1e8a7c315198b83e31 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 23:25:16 +0300 Subject: [PATCH 141/159] procs: migrate to bindgenHook --- pkgs/tools/admin/procs/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 1effea02d99..4da957880b1 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -13,9 +13,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-B+LpUErsvtLYn+Xvq4KNBpLR9WYe38yMWHUNsd9jIs8="; - nativeBuildInputs = [ installShellFiles ]; - - LIBCLANG_PATH = lib.optionals stdenv.isDarwin "${stdenv.cc.cc.lib}/lib/"; + nativeBuildInputs = [ installShellFiles ] + ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; postInstall = '' for shell in bash fish zsh; do From 79de71304886a5c8fb028eef7336c8f4c985e3d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 20:39:59 +0000 Subject: [PATCH 142/159] plantuml-server: 1.2023.7 -> 1.2023.8 --- pkgs/tools/misc/plantuml-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 94916f227b3..d15aff792f1 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: let - version = "1.2023.7"; + version = "1.2023.8"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-JsMO2aef9DTo94uQNJN4jdiT5vnBTE8XDc4TtTTixVk="; + sha256 = "sha256-2rvYoDna9zV+KAsSNYsThWLyu0BTtFm5GMBTXB7DRkA="; }; dontUnpack = true; From 8f73830dbe9e1a0f42a9a00437b3f2bc06864008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Sat, 27 May 2023 22:45:30 +0200 Subject: [PATCH 143/159] wasmtime: 9.0.1 -> 9.0.2 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 0396486fbd0..58cde0e1013 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "9.0.1"; + version = "9.0.2"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-6pZZawygFxE5rWkdJUaJLxTd5pZiC0o1Rvc5Zl6YJpw="; + hash = "sha256-Fnc3iepxHr7WjorFoabHE6ZM/zK1T5W/gkxL+AEcVgU="; fetchSubmodules = true; }; - cargoHash = "sha256-GUYd5/1pekOHG1e0WBxjOe3/foZ5YdU2ovF0btZ6+ec="; + cargoHash = "sha256-7Q5aJU0sYzRLgjiSNLIrydYRJ3ozABjDo4VtmexS3po="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; From ea332796f2bd6c571cd5c2aae044c298e0fea24f Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 16:50:22 -0400 Subject: [PATCH 144/159] frogmouth: 0.5.0 -> 0.6.0 Diff: https://github.com/Textualize/frogmouth/compare/v0.5.0...v0.6.0 Changelog: https://github.com/Textualize/frogmouth/blob/v0.6.0/ChangeLog.md --- pkgs/tools/text/frogmouth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/frogmouth/default.nix b/pkgs/tools/text/frogmouth/default.nix index 3ce784b5aa2..658d0656496 100644 --- a/pkgs/tools/text/frogmouth/default.nix +++ b/pkgs/tools/text/frogmouth/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "frogmouth"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Textualize"; repo = "frogmouth"; rev = "v${version}"; - hash = "sha256-5MNQ78zwjtenHDjy2g1rjiq4HvFie7uUSlMwZu6RmXg="; + hash = "sha256-BgJdcdIgYNZUJLWDgUWIDyiSSAkLdePYus3IYQo/QpY="; }; nativeBuildInputs = [ From 03b352a9317c6904da36b97bb9ab598470b8439a Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 16:59:21 -0400 Subject: [PATCH 145/159] cargo-show-asm: 0.2.0 -> 0.2.18 Diff: https://github.com/pacak/cargo-show-asm/compare/0.2.0...0.2.18 --- pkgs/development/tools/rust/cargo-show-asm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index ae03097c8f8..2220c6419b1 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-asm"; - version = "0.2.0"; + version = "0.2.18"; src = fetchFromGitHub { owner = "pacak"; repo = "cargo-show-asm"; rev = version; - hash = "sha256-qsr28zuvu+i7P/MpwhDKQFFXTyFFo+vWrjBrpD1V8PY="; + hash = "sha256-K7hWXRS6bb9XZxIgZQeu22Gtt3WmXI63Xd97Unm6mHs="; }; - cargoHash = "sha256-IL+BB08uZr5fm05ITxpm66jTb+pYYlLKOwQ8uf5rKSs="; + cargoHash = "sha256-PJ5v8uuRZZV2jcVS+a8/CAABekdsB+nvSJWI4cUHq0A="; nativeBuildInputs = [ installShellFiles From 9f7a5205a9bc1b3b47d749bf78d8d4984e762250 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 17:01:05 -0400 Subject: [PATCH 146/159] cargo-show-asm: set meta.mainProgram --- pkgs/development/tools/rust/cargo-show-asm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 2220c6419b1..5a4204549fa 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pacak/cargo-show-asm"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ figsoda oxalica ]; + mainProgram = "cargo-asm"; }; } From 76a9874ec19dfabc5bf27d07ec897f53f0a1a0e0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 17:11:47 -0400 Subject: [PATCH 147/159] proximity-sort: 1.2.0 -> 1.3.0 Diff: https://github.com/jonhoo/proximity-sort/compare/v1.2.0...v1.3.0 --- pkgs/tools/misc/proximity-sort/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/proximity-sort/default.nix b/pkgs/tools/misc/proximity-sort/default.nix index 43a8580ab35..8ad6e5c1c17 100644 --- a/pkgs/tools/misc/proximity-sort/default.nix +++ b/pkgs/tools/misc/proximity-sort/default.nix @@ -1,15 +1,17 @@ -{ lib, rustPlatform, fetchCrate }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "proximity-sort"; - version = "1.2.0"; + version = "1.3.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-So3cvL2F7wfcPVPEBspMLH4f5KSbVQeUKLJve/BXLA4="; + src = fetchFromGitHub { + owner = "jonhoo"; + repo = "proximity-sort"; + rev = "v${version}"; + hash = "sha256-MRLQvspv6kjirljhAkk1KT+hPA4hdjA1b7RL9eEyglQ="; }; - cargoSha256 = "sha256-VGxU3CD5pj0Hrt6nUbNU7eNEpNrzHp/WaFHAKPUz8DA="; + cargoHash = "sha256-0hP6qa8d5CaqtBHCWBJ8UjtVJc6Z0GmL8DvdTWDMM8g="; meta = with lib; { description = "Simple command-line utility for sorting inputs by proximity to a path argument"; From b6f5b5de65eaa3afb9fe8625d3f736843ee8e600 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 17:18:23 -0400 Subject: [PATCH 148/159] grass-sass: 0.12.3 -> 0.12.4 Diff: https://diff.rs/grass/0.12.3/0.12.4 Changelog: https://github.com/connorskees/grass/blob/master/CHANGELOG.md#0124 --- pkgs/tools/misc/grass-sass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grass-sass/default.nix b/pkgs/tools/misc/grass-sass/default.nix index c01d0270ca0..0ca638e0768 100644 --- a/pkgs/tools/misc/grass-sass/default.nix +++ b/pkgs/tools/misc/grass-sass/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "grass"; - version = "0.12.3"; + version = "0.12.4"; src = fetchCrate { inherit pname version; - hash = "sha256-qx63icK4g/5LqKUsJpXs2Jpv30RuvIeLF6JNrTTkcLs="; + hash = "sha256-tp3L8TDIG/92RupRAyRWSiALqE1XBK8jespKcSdSzsM="; }; - cargoHash = "sha256-v2ikP+zujj6GWN1ZwPIKK0jtF8Na5PaR1ZNelGdLzMM="; + cargoHash = "sha256-hxVcHD5k1YwXCOq1UdiivPLwtY2egGvf/T3NrZTAB/k="; # tests require rust nightly doCheck = false; From 6656d69d7db55c282f1690d69271df1eec1fe744 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 17:32:57 -0400 Subject: [PATCH 149/159] rust-code-analysis: 0.0.23 -> 0.0.25 Diff: https://diff.rs/rust-code-analysis-cli/0.0.23/0.0.25 --- .../tools/rust-code-analysis/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/rust-code-analysis/default.nix b/pkgs/development/tools/rust-code-analysis/default.nix index d0c9d56a25e..7427a8bd76d 100644 --- a/pkgs/development/tools/rust-code-analysis/default.nix +++ b/pkgs/development/tools/rust-code-analysis/default.nix @@ -1,19 +1,16 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "rust-code-analysis"; - version = "0.0.23"; + version = "0.0.25"; - src = fetchFromGitHub { - owner = "mozilla"; - repo = pname; - rev = "v${version}"; - sha256 = "1l9qr5rvbj542fx6g6h9p38z31kvwli39vipbmd3pvic2mpi6mzx"; + src = fetchCrate { + pname = "rust-code-analysis-cli"; + inherit version; + hash = "sha256-/Irmtsy1PdRWQ7dTAHLZJ9M0J7oi2IiJyW6HeTIDOCs="; }; - cargoSha256 = "sha256-++d/czDJVGzY8GvBpBKpP0Rum4J4RpT95S81IRUWY2M="; - - cargoBuildFlags = [ "--workspace" ]; + cargoHash = "sha256-axrtFZQOm1/UUBq1CDFkaZCks1mWoLWmfajDfsqSBmY="; meta = with lib; { description = "Analyze and collect metrics on source code"; From fe1bb502a32f194a969bd33d6e75008567f2db9a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 22:59:01 +0300 Subject: [PATCH 150/159] vector: migrate to bindgenHook --- pkgs/tools/misc/vector/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 87a1710882f..ce4f1a8e419 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -1,10 +1,8 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , rustPlatform , pkg-config -, llvmPackages , openssl , protobuf , rdkafka @@ -58,7 +56,7 @@ rustPlatform.buildRustPackage { "tracing-0.2.0" = "sha256-YAxeEofFA43PX2hafh3RY+C81a2v6n1fGzYz2FycC3M="; }; }; - nativeBuildInputs = [ pkg-config cmake perl git ]; + nativeBuildInputs = [ pkg-config cmake perl git rustPlatform.bindgenHook ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; @@ -66,7 +64,6 @@ rustPlatform.buildRustPackage { PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; RUSTONIG_SYSTEM_LIBONIG = true; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; TZDIR = "${tzdata}/share/zoneinfo"; From 02914c3d0b95c70e977e07d8231d98fc2aa5ed32 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 27 May 2023 17:46:16 -0400 Subject: [PATCH 151/159] uniffi-bindgen: remove --- .../tools/uniffi-bindgen/default.nix | 43 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/tools/uniffi-bindgen/default.nix diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix deleted file mode 100644 index 194cb4ac173..00000000000 --- a/pkgs/development/tools/uniffi-bindgen/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, makeWrapper -, ktlint -, yapf -, rubocop -, rustfmt -, nix-update-script -}: - -rustPlatform.buildRustPackage rec { - pname = "uniffi-bindgen"; - version = "0.22.0"; - - src = fetchCrate { - inherit pname version; - sha256 = "sha256-cUJsfAlzdoGMeFcdXwdPU0JcruneY60pssJPkJtb5gs="; - }; - - cargoSha256 = "sha256-k5uIR5rO4T1Xsu50vdLxCgSsVkNcxXHT4MitnMZkY6g="; - - nativeBuildInputs = [ makeWrapper ]; - - checkFlags = [ - # this test assumes it is run from the repository - "--skip=test::test_guessing_of_crate_root_directory_from_udl_file" - ]; - - postFixup = '' - wrapProgram "$out/bin/uniffi-bindgen" \ - --suffix PATH : ${lib.strings.makeBinPath [ ktlint yapf rubocop rustfmt ] } - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Toolkit for building cross-platform software components in Rust"; - homepage = "https://mozilla.github.io/uniffi-rs/"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda vtuan10 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6905dc50940..67538ab89e2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1690,6 +1690,7 @@ mapAliases ({ ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now"; # Added 2020-01-11 ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22 unicorn-emu = unicorn; # Added 2020-10-29 + uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; unifi-poller = unpoller; # Added 2022-11-24 unifiStable = unifi6; # Added 2020-12-28 unity3d = throw "'unity3d' is unmaintained, has seen no updates in years and depends on deprecated GTK2"; # Added 2022-06-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a83fb9b495..af3e56f9832 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6339,8 +6339,6 @@ with pkgs; unifdef = callPackage ../development/tools/misc/unifdef { }; - uniffi-bindgen = callPackage ../development/tools/uniffi-bindgen { }; - unify = with python3Packages; toPythonApplication unify; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; From 48c59620485b184b132f911823ece6fa0108eb97 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 25 May 2023 22:49:03 +0800 Subject: [PATCH 152/159] doc/language-frameworks/go.section.md: fix spelling Change "platform dependant" to "platform-dependent" The word "dependant" (with suffix -ant) is used as a noun in British English, while the adjetive is "dependent" (-ent). Both are "dependent" in American English. Reference: https://www.merriam-webster.com/words-at-play/spelling-variants-dependent-vs-dependant https://dictionary.cambridge.org/dictionary/english/dependant --- doc/languages-frameworks/go.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index c697a690875..cf180841423 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -19,7 +19,7 @@ In the following is an example expression using `buildGoModule`, the following a To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;` To obtain the actual hash, set `vendorHash = lib.fakeSha256;` and run the build ([more details here](#sec-source-hashes)). -- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorHash` checksums. +- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums. - `modPostBuild`: Shell commands to run after the build of the go-modules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash` (or `vendorSha256`). Note that if you change this attribute, you need to update `vendorHash` (or `vendorSha256`) attribute. ```nix From 1a89cfae1f0fa83238ffdabf4f06dd435bd45108 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 25 May 2023 22:49:02 +0800 Subject: [PATCH 153/159] buildGoModule: simplify go-module attribute structure without rebuild --- pkgs/build-support/go/module.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 9bfb5858ad4..2b63d9e9f53 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -54,7 +54,8 @@ assert (args' ? vendorHash && args' ? vendorSha256) -> throw "both `vendorHash` let args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "vendorHash" ]; - go-modules = if (vendorHash != null) then stdenv.mkDerivation (let modArgs = { + go-modules = if (vendorHash == null) then "" else + (stdenv.mkDerivation { name = "${name}-go-modules"; @@ -138,13 +139,11 @@ let ''; dontFixup = true; - }; in modArgs // ( - { - outputHashMode = "recursive"; - outputHash = vendorHash; - outputHashAlgo = if args' ? vendorSha256 || vendorHash == "" then "sha256" else null; - } - ) // overrideModAttrs modArgs) else ""; + + outputHashMode = "recursive"; + outputHash = vendorHash; + outputHashAlgo = if args' ? vendorSha256 || vendorHash == "" then "sha256" else null; + }).overrideAttrs overrideModAttrs; package = stdenv.mkDerivation (args // { nativeBuildInputs = [ go ] ++ nativeBuildInputs; From e66453b831fc760361e694468f267bb408a142af Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 28 May 2023 01:03:22 +0300 Subject: [PATCH 154/159] rustdesk: migrate to bindgenHook --- pkgs/applications/networking/remote/rustdesk/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/rustdesk/default.nix b/pkgs/applications/networking/remote/rustdesk/default.nix index bb3b8ffed61..76f34cd68f2 100644 --- a/pkgs/applications/networking/remote/rustdesk/default.nix +++ b/pkgs/applications/networking/remote/rustdesk/default.nix @@ -20,7 +20,6 @@ , libyuv , libopus , libsciter -, llvmPackages , wrapGAppsHook , writeText }: @@ -41,8 +40,6 @@ rustPlatform.buildRustPackage rec { ./fix-for-rust-1.65.diff ]; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -98,7 +95,7 @@ rustPlatform.buildRustPackage rec { ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ ''; - nativeBuildInputs = [ pkg-config cmake makeWrapper copyDesktopItems yasm nasm clang wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config cmake makeWrapper copyDesktopItems yasm nasm clang wrapGAppsHook rustPlatform.bindgenHook ]; buildInputs = [ alsa-lib pulseaudio libXfixes libxcb xdotool gtk3 libvpx libopus libXtst libyuv ]; # Checks require an active X display. From a24848c470968a9ae449afd26acfd4e7d1435ef9 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 23 May 2023 22:00:17 +0200 Subject: [PATCH 155/159] nixos/etcd: allow to choose the package --- nixos/modules/services/misc/etcd.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 17a7cca917f..7bc7a949911 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -15,6 +15,8 @@ in { type = types.bool; }; + package = mkPackageOptionMD pkgs "etcd" { }; + name = mkOption { description = lib.mdDoc "Etcd unique node name."; default = config.networking.hostName; @@ -187,13 +189,13 @@ in { serviceConfig = { Type = "notify"; - ExecStart = "${pkgs.etcd}/bin/etcd"; + ExecStart = "${cfg.package}/bin/etcd"; User = "etcd"; LimitNOFILE = 40000; }; }; - environment.systemPackages = [ pkgs.etcd ]; + environment.systemPackages = [ cfg.package ]; users.users.etcd = { isSystemUser = true; From 85f15277d05368bc35bf47779866d8c16e0cee94 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 23 May 2023 22:54:43 +0200 Subject: [PATCH 156/159] etcd: switch to etcd_3_5 --- .../manual/release-notes/rl-2311.section.md | 2 ++ nixos/tests/etcd-cluster.nix | 25 +++++++++++-------- nixos/tests/etcd.nix | 2 +- pkgs/servers/etcd/3.3.nix | 4 +-- pkgs/servers/etcd/3.5.nix | 7 ++++-- pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 2c50780b656..2c5f47c6796 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -16,6 +16,8 @@ - The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`. +- `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides + ## Other Notable Changes {#sec-release-23.11-notable-changes} - A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant. diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix index 97b6e63b273..c77c0dd73c2 100644 --- a/nixos/tests/etcd-cluster.nix +++ b/nixos/tests/etcd-cluster.nix @@ -53,7 +53,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let [ v3_req ] basicConstraints = CA:FALSE keyUsage = digitalSignature, keyEncipherment - extendedKeyUsage = serverAuth + extendedKeyUsage = serverAuth, clientAuth subjectAltName = @alt_names [alt_names] DNS.1 = node1 @@ -86,10 +86,13 @@ import ./make-test-python.nix ({ pkgs, ... } : let }; environment.variables = { - ETCDCTL_CERT_FILE = "${etcd_client_cert}"; - ETCDCTL_KEY_FILE = "${etcd_client_key}"; - ETCDCTL_CA_FILE = "${ca_pem}"; - ETCDCTL_PEERS = "https://127.0.0.1:2379"; + ETCD_CERT_FILE = "${etcd_client_cert}"; + ETCD_KEY_FILE = "${etcd_client_key}"; + ETCD_CA_FILE = "${ca_pem}"; + ETCDCTL_ENDPOINTS = "https://127.0.0.1:2379"; + ETCDCTL_CACERT = "${ca_pem}"; + ETCDCTL_CERT = "${etcd_cert}"; + ETCDCTL_KEY = "${etcd_key}"; }; networking.firewall.allowedTCPPorts = [ 2380 ]; @@ -134,21 +137,21 @@ in { node2.start() node1.wait_for_unit("etcd.service") node2.wait_for_unit("etcd.service") - node2.wait_until_succeeds("etcdctl cluster-health") - node1.succeed("etcdctl set /foo/bar 'Hello world'") + node2.wait_until_succeeds("etcdctl endpoint status") + node1.succeed("etcdctl put /foo/bar 'Hello world'") node2.succeed("etcdctl get /foo/bar | grep 'Hello world'") with subtest("should add another member"): - node1.wait_until_succeeds("etcdctl member add node3 https://node3:2380") + node1.wait_until_succeeds("etcdctl member add node3 --peer-urls=https://node3:2380") node3.start() node3.wait_for_unit("etcd.service") node3.wait_until_succeeds("etcdctl member list | grep 'node3'") - node3.succeed("etcdctl cluster-health") + node3.succeed("etcdctl endpoint status") with subtest("should survive member crash"): node3.crash() - node1.succeed("etcdctl cluster-health") - node1.succeed("etcdctl set /foo/bar 'Hello degraded world'") + node1.succeed("etcdctl endpoint status") + node1.succeed("etcdctl put /foo/bar 'Hello degraded world'") node1.succeed("etcdctl get /foo/bar | grep 'Hello degraded world'") ''; }) diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix index 702bbb668f5..79857778ae1 100644 --- a/nixos/tests/etcd.nix +++ b/nixos/tests/etcd.nix @@ -19,7 +19,7 @@ import ./make-test-python.nix ({ pkgs, ... } : { node.wait_for_unit("etcd.service") with subtest("should write and read some values to etcd"): - node.succeed("etcdctl set /foo/bar 'Hello world'") + node.succeed("etcdctl put /foo/bar 'Hello world'") node.succeed("etcdctl get /foo/bar | grep 'Hello world'") ''; }) diff --git a/pkgs/servers/etcd/3.3.nix b/pkgs/servers/etcd/3.3.nix index 44edfd76a29..228337a5d94 100644 --- a/pkgs/servers/etcd/3.3.nix +++ b/pkgs/servers/etcd/3.3.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests, stdenv }: +{ lib, buildGoPackage, fetchFromGitHub, stdenv }: buildGoPackage rec { pname = "etcd"; @@ -24,8 +24,6 @@ buildGoPackage rec { install -Dm755 bin/* bin/functional/cmd/* -t $out/bin ''; - passthru.tests = { inherit (nixosTests) etcd etcd-cluster; }; - meta = with lib; { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; diff --git a/pkgs/servers/etcd/3.5.nix b/pkgs/servers/etcd/3.5.nix index 17a49b62faf..2bee123b9a8 100644 --- a/pkgs/servers/etcd/3.5.nix +++ b/pkgs/servers/etcd/3.5.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, symlinkJoin }: +{ lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests }: let version = "3.5.9"; @@ -65,7 +65,10 @@ symlinkJoin { inherit meta version; - passthru = { inherit etcdserver etcdutl etcdctl; }; + passthru = { + inherit etcdserver etcdutl etcdctl; + tests = { inherit (nixosTests) etcd etcd-cluster; }; + }; paths = [ etcdserver diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a83fb9b495..94bf86c47a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25320,7 +25320,7 @@ with pkgs; ergochat = callPackage ../servers/irc/ergochat { }; - etcd = etcd_3_3; + etcd = etcd_3_5; etcd_3_3 = callPackage ../servers/etcd/3.3.nix { }; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; etcd_3_5 = callPackage ../servers/etcd/3.5.nix { }; From ed33222971ee19b52fd515265b14c158ada87d18 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 23 May 2023 22:56:52 +0200 Subject: [PATCH 157/159] etcd_3_3: mark vulnerable to CVE-2023-32082 --- pkgs/servers/etcd/3.3.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/etcd/3.3.nix b/pkgs/servers/etcd/3.3.nix index 228337a5d94..a892a38c3b4 100644 --- a/pkgs/servers/etcd/3.3.nix +++ b/pkgs/servers/etcd/3.3.nix @@ -30,5 +30,6 @@ buildGoPackage rec { homepage = "https://etcd.io/"; maintainers = with maintainers; [ offline zowoq ]; broken = stdenv.isDarwin; # outdated golang.org/x/sys + knownVulnerabilities = [ "CVE-2023-32082" ]; }; } From 570d4efc7cddbfb01d5f08c71695b2485c13c67f Mon Sep 17 00:00:00 2001 From: Jakob Leifhelm Date: Fri, 19 May 2023 15:51:18 +0200 Subject: [PATCH 158/159] libwacom: disable tests on risc-v --- pkgs/development/libraries/libwacom/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index f14bbb3b314..f1f6762bab8 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libgudev ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform valgrind; mesonFlags = [ "-Dtests=${if doCheck then "enabled" else "disabled"}" From 1ea2260060de2f9139f5e32f38f5134beabcb0ce Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 24 May 2023 22:48:23 -0300 Subject: [PATCH 159/159] fleng: init at 14 FLENG is a low level concurrent logic programming language descended from Prolog. --- pkgs/development/compilers/fleng/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/compilers/fleng/default.nix diff --git a/pkgs/development/compilers/fleng/default.nix b/pkgs/development/compilers/fleng/default.nix new file mode 100644 index 00000000000..d1ab9595980 --- /dev/null +++ b/pkgs/development/compilers/fleng/default.nix @@ -0,0 +1,25 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fleng"; + version = "14"; + + src = fetchurl { + url = "http://www.call-with-current-continuation.org/fleng/fleng-${finalAttrs.version}.tgz"; + hash = "sha256-Js9bllX/399t9oeiRrqJNUFyYJwJVb/xSzwrcMrdi08="; + }; + + doCheck = true; + + meta = { + homepage = "http://www.call-with-current-continuation.org/fleng/fleng.html"; + description = "A low level concurrent logic programming language descended from Prolog"; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) +# TODO: bootstrap diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94bf86c47a1..3a9909f4dc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2290,6 +2290,8 @@ with pkgs; flix = callPackage ../development/compilers/flix { }; + fleng = callPackage ../development/compilers/fleng { }; + fsrx = callPackage ../tools/misc/fsrx { }; fsuae = callPackage ../applications/emulators/fs-uae { };