From bac0d3b001a693fabaf89e24761ae47ada371c52 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 15 May 2022 15:12:02 +0200 Subject: [PATCH 001/100] dotnetPackages.SharpZipLib: 0.86.0 -> 1.3.3 Fixes CVE-2021-32840 --- pkgs/top-level/dotnet-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 10188cee9148..732fb66731ef 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -53,8 +53,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { SharpZipLib = fetchNuGet { pname = "SharpZipLib"; - version = "0.86.0"; - sha256 = "01w2038gckfnq31pncrlgm7d0c939pwr1x4jj5450vcqpd4c41jr"; + version = "1.3.3"; + sha256 = "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4="; outputFiles = [ "lib/*" ]; }; From 24bb1b1c9acf0de5bf2e72910b18669ea0e6c12b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 11:00:14 +0000 Subject: [PATCH 002/100] chafa: 1.8.0 -> 1.10.3 --- pkgs/tools/misc/chafa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 7a0178eea735..85b52dd398c2 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.8.0"; + version = "1.10.3"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-8ENPmcl0KVxoBu8FGOGk+y8XsONWW0YW32MHAKBUiPE="; + sha256 = "sha256-GRPn0xPWtCayOdmA6M+KQrObAHtZIJLEydXaKhhO5IU="; }; nativeBuildInputs = [ autoconf From 9f598bb87ddbf33e8cd995c2d66a270e72573697 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 00:14:59 +0000 Subject: [PATCH 003/100] amtk: 5.4.0 -> 5.4.1 --- pkgs/development/libraries/amtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 961c63a3037f..30a16cb48df0 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "g10IUHo96sie91NRzOu0szWv/qNhuIvQ+mZ/QM53enA="; + sha256 = "frq8QpsO67KzI2DJv9vjaOSJs1w83AhqhWz8mzpGanI="; }; nativeBuildInputs = [ From 6ad120be1f7d61113607fd3dfd509f65bd5dde11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 03:02:35 +0000 Subject: [PATCH 004/100] geonkick: 2.9.0 -> 2.9.1 --- pkgs/applications/audio/geonkick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 9739a88586ae..0a99edd7b069 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/BDK1PyRw4xOt+rzC9yX29aRQb1aDnDBIenSz+859OY="; + sha256 = "sha256-XSqcj8+X6QMBnIusPB9VNrgcbdiWhNMOYeFyKklGmO8="; }; nativeBuildInputs = [ cmake pkg-config ]; From c41b541b22fb02bfae325446f58da81b76be148d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 04:54:44 +0000 Subject: [PATCH 005/100] frostwire-bin: 6.9.7 -> 6.9.8 --- pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index cfee9d91c930..2d9a319b22c0 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "6.9.7"; + version = "6.9.8"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc="; + sha256 = "sha256-gslNdvxA4rGKg0bjf2KWw7w9NMp3zqrii144AfKsV4s="; }; nativeBuildInputs = [ makeWrapper ]; From 88e182b3bf46aaa820d2f56a3c02323ff66285e8 Mon Sep 17 00:00:00 2001 From: Jeroen Simonetti Date: Fri, 27 May 2022 09:03:09 +0200 Subject: [PATCH 006/100] maintainers: add jsimonetti Signed-off-by: Jeroen Simonetti --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b1bed259a050..82e2a04a59c3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6342,6 +6342,13 @@ github = "jsierles"; githubId = 82; }; + jsimonetti = { + email = "jeroen+nixpkgs@simonetti.nl"; + matrix = "@jeroen:simonetti.nl"; + name = "Jeroen Simonetti"; + github = "jsimonetti"; + githubId = 5478838; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; From 7a687b7dbe4c09fc72e6f6e4beab2d0596e8bde7 Mon Sep 17 00:00:00 2001 From: Reed Date: Wed, 1 Jun 2022 18:15:40 -0400 Subject: [PATCH 007/100] shairport-sync: add dbus, mpris, and metadata flags --- pkgs/servers/shairport-sync/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index ed3c0dcc7f9d..dbe478568ac6 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,6 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsa-lib -, libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }: +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, openssl, avahi, alsa-lib, glib, libdaemon, popt, libconfig, libpulseaudio, soxr +, enableDbus ? stdenv.isLinux +, enableMetadata ? false +, enableMpris ? stdenv.isLinux +}: +with lib; stdenv.mkDerivation rec { version = "3.3.9"; pname = "shairport-sync"; @@ -23,7 +29,12 @@ stdenv.mkDerivation rec { libconfig libpulseaudio soxr - ]; + ] ++ optional stdenv.isLinux glib; + + prePatch = '' + sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' dbus-service.c + sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' mpris-service.c + ''; enableParallelBuilding = true; @@ -32,7 +43,10 @@ stdenv.mkDerivation rec { "--with-avahi" "--with-ssl=openssl" "--with-soxr" "--without-configfiles" "--sysconfdir=/etc" - ]; + ] + ++ optional enableDbus "--with-dbus-interface" + ++ optional enableMetadata "--with-metadata" + ++ optional enableMpris "--with-mpris-interface"; meta = with lib; { inherit (src.meta) homepage; From 70b31373b4b4c5673e36f1bb6fe88045304d705f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 7 Jun 2022 13:37:11 +0200 Subject: [PATCH 008/100] tt-rss: downgrade to php 8.0 --- nixos/modules/services/web-apps/tt-rss.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 9aa38ab25c9a..c441a2a7764e 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -534,6 +534,7 @@ let services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { ${poolName} = { inherit (cfg) user; + phpPackage = pkgs.php80; settings = mapAttrs (name: mkDefault) { "listen.owner" = "nginx"; "listen.group" = "nginx"; From e8ce74879d88a35caa83a1a76b3f232bf777c60d Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 5 Jun 2022 01:04:18 -0400 Subject: [PATCH 009/100] packwiz: unstable-2022-05-25 -> unstable-2022-06-08 --- pkgs/tools/games/minecraft/packwiz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/games/minecraft/packwiz/default.nix b/pkgs/tools/games/minecraft/packwiz/default.nix index 3be2798312e7..80feced2b701 100644 --- a/pkgs/tools/games/minecraft/packwiz/default.nix +++ b/pkgs/tools/games/minecraft/packwiz/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "packwiz"; - version = "unstable-2022-5-25"; + version = "unstable-2022-06-08"; src = fetchFromGitHub { owner = "packwiz"; repo = "packwiz"; - rev = "e71b63ea98283c8c1f0e03ee51ae40f452f22a61"; - sha256 = "sha256-XwGacEVfQAduDCSMQFRw7Xnx4bND2zaV7l27B+2u5xg="; + rev = "d051932bbbeb7b16cd21a1897019428e71f63bfd"; + sha256 = "sha256-H1v5pY9hJYGP0ZiE/GrsATf1ljw69085t6PQhPOfYCs="; }; vendorSha256 = "sha256-M9u7N4IrL0B4pPRQwQG5TlMaGT++w3ZKHZ0RdxEHPKk="; From 6be823dd77ecd67bc335c272b6892bb5d7e24d7b Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sat, 11 Jun 2022 17:41:36 +0200 Subject: [PATCH 010/100] youtube-dl: fallback to throttled downloads instead of aborting --- pkgs/tools/misc/youtube-dl/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index faf4b558ad64..4d907094653b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -25,8 +25,8 @@ buildPythonPackage rec { }; patches = [ - # Fixes throttling on youtube.com. Without the patch downloads are capped at - # about 80KiB/s. See, e.g., + # Fixes throttling on youtube.com by decoding a "n-parameter". Without the patch + # downloads are capped at about 80KiB/s. See, e.g., # # https://github.com/ytdl-org/youtube-dl/issues/29326 # @@ -37,6 +37,20 @@ buildPythonPackage rec { url = "https://github.com/ytdl-org/youtube-dl/compare/57044eacebc6f2f3cd83c345e1b6e659a22e4773...1e677567cd083d43f55daef0cc74e5fa24575ae3.diff"; sha256 = "11s0j3w60r75xx20p0x2j3yc4d3yvz99r0572si8b5qd93lqs4pr"; }) + # The above patch may fail to decode the n-parameter (if, say, YouTube is updated). Failure to decode + # it blocks the download instead of falling back to the throttled version. The patch below implements + # better fallback behaviour. + (fetchpatch { + name = "avoid-crashing-if-nsig-decode-fails.patch"; + url = "https://github.com/ytdl-org/youtube-dl/commit/41f0043983c831b7c0c3614340d2f66ec153087b.diff"; + sha256 = "sha256-a72gWhBXCLjuBBD36PpZ5F/AHBdiBv4W8Wf9g4P/aBY="; + }) + # YouTube changed the n-parameter format in April 2022, so decoder updates are required. + (fetchpatch { + name = "fix-n-descrambling.patch"; + url = "https://github.com/ytdl-org/youtube-dl/commit/a0068bd6bec16008bda7a39caecccbf84881c603.diff"; + sha256 = "sha256-tSuEns4jputa2nOOo6JsFXpK3hvJ/+z1/ymcLsd3A6w="; + }) ]; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 5e52fdf6f6751c0fc3a2bebe2adb0296f18fbcfd Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 14 Jun 2022 22:23:50 +0200 Subject: [PATCH 011/100] vengi-tools: 0.0.18 -> 0.0.20 --- nixos/tests/vengi-tools.nix | 2 +- pkgs/applications/graphics/vengi-tools/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/vengi-tools.nix b/nixos/tests/vengi-tools.nix index 8b80a13384e5..5bc8d72c7723 100644 --- a/nixos/tests/vengi-tools.nix +++ b/nixos/tests/vengi-tools.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { # OCR on voxedit's window is very expensive, so we avoid wasting a try # by letting the window load fully first machine.sleep(15) - machine.wait_for_text("Palette") + machine.wait_for_text("Solid") machine.screenshot("screen") ''; }) diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index eb5033a4a97c..fb44d36f62a6 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.18"; + version = "0.0.20"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-Ur1X5FhOa87jbjWBXievBfCHW+qP/8bqLiyKAC8+KU4="; + sha256 = "sha256-WsG6mjO90QQNsAarxdupZvXubdy06JjQmVYUzygl8l4="; }; nativeBuildInputs = [ From 766a7195574d9b33086be362432d9afbc9f47d78 Mon Sep 17 00:00:00 2001 From: Jeroen Simonetti Date: Wed, 15 Jun 2022 08:32:56 +0200 Subject: [PATCH 012/100] routedns: init at 0.1.5 Signed-off-by: Jeroen Simonetti --- pkgs/tools/networking/routedns/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/routedns/default.nix diff --git a/pkgs/tools/networking/routedns/default.nix b/pkgs/tools/networking/routedns/default.nix new file mode 100644 index 000000000000..4cf2c9eeeed8 --- /dev/null +++ b/pkgs/tools/networking/routedns/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "routedns"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "folbricht"; + repo = "routedns"; + # https://github.com/folbricht/routedns/issues/237 + rev = "02f14a567fee2a289810979446f5260b8a31bf73"; + sha256 = "sha256-oImimNBz1qizUPD6qHi73fGKNCu5cii99GIUo21e+bs="; + }; + + vendorSha256 = "sha256-T6adpxJgOPGy+UOOlGAAf1gjk1wJxwOc9enfv9X3LBE="; + + subPackages = [ "./cmd/routedns" ]; + + meta = with lib; { + homepage = "https://github.com/folbricht/routedns"; + description = "DNS stub resolver, proxy and router"; + license = licenses.bsd3; + maintainers = with maintainers; [ jsimonetti ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60e4de34f5d8..1349575250ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29621,6 +29621,10 @@ with pkgs; robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; + routedns = callPackage ../tools/networking/routedns { + buildGoModule = buildGo118Module; + }; + skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; smartgithg = callPackage ../applications/version-management/smartgithg { From 829167bd27d6de5ecbbd1fc43452fb9d3e5ece98 Mon Sep 17 00:00:00 2001 From: Jeroen Simonetti Date: Wed, 15 Jun 2022 08:33:46 +0200 Subject: [PATCH 013/100] nixos/routedns: init Signed-off-by: Jeroen Simonetti --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/routedns.nix | 84 +++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 nixos/modules/services/networking/routedns.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2607e99d8459..744459bb1315 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -884,6 +884,7 @@ ./services/networking/redsocks.nix ./services/networking/resilio.nix ./services/networking/robustirc-bridge.nix + ./services/networking/routedns.nix ./services/networking/rpcbind.nix ./services/networking/rxe.nix ./services/networking/sabnzbd.nix diff --git a/nixos/modules/services/networking/routedns.nix b/nixos/modules/services/networking/routedns.nix new file mode 100644 index 000000000000..e0f5eedd2c8e --- /dev/null +++ b/nixos/modules/services/networking/routedns.nix @@ -0,0 +1,84 @@ +{ config +, lib +, pkgs +, ... +}: + +with lib; + +let + cfg = config.services.routedns; + settingsFormat = pkgs.formats.toml { }; +in +{ + options.services.routedns = { + enable = mkEnableOption "RouteDNS - DNS stub resolver, proxy and router"; + + settings = mkOption { + type = settingsFormat.type; + example = literalExpression '' + { + resolvers.cloudflare-dot = { + address = "1.1.1.1:853"; + protocol = "dot"; + }; + groups.cloudflare-cached = { + type = "cache"; + resolvers = ["cloudflare-dot"]; + }; + listeners.local-udp = { + address = "127.0.0.1:53"; + protocol = "udp"; + resolver = "cloudflare-cached"; + }; + listeners.local-tcp = { + address = "127.0.0.1:53"; + protocol = "tcp"; + resolver = "cloudflare-cached"; + }; + } + ''; + description = '' + Configuration for RouteDNS, see + for more information. + ''; + }; + + configFile = mkOption { + default = settingsFormat.generate "routedns.toml" cfg.settings; + defaultText = "A RouteDNS configuration file automatically generated by values from services.routedns.*"; + type = types.path; + example = literalExpression ''"''${pkgs.routedns}/cmd/routedns/example-config/use-case-1.toml"''; + description = "Path to RouteDNS TOML configuration file."; + }; + + package = mkOption { + default = pkgs.routedns; + defaultText = literalExpression "pkgs.routedns"; + type = types.package; + description = "RouteDNS package to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.routedns = { + description = "RouteDNS - DNS stub resolver, proxy and router"; + after = [ "network.target" ]; # in case a bootstrap resolver is used, this might fail a few times until the respective server is actually reachable + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + startLimitIntervalSec = 30; + startLimitBurst = 5; + serviceConfig = { + Restart = "on-failure"; + RestartSec = "5s"; + LimitNPROC = 512; + LimitNOFILE = 1048576; + DynamicUser = true; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + NoNewPrivileges = true; + ExecStart = "${getBin cfg.package}/bin/routedns -l 4 ${cfg.configFile}"; + }; + }; + }; + meta.maintainers = with maintainers; [ jsimonetti ]; +} From 37e98f1eef97553c9e04e9f69bc8c9c500fc63d1 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Sun, 19 Jun 2022 22:02:59 -0300 Subject: [PATCH 014/100] egl-wayland: 1.1.9 -> 1.1.10 --- pkgs/development/libraries/egl-wayland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 3881f8f7ee38..83cde54f348e 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -42,7 +42,7 @@ let in stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.9"; + version = "1.1.10"; outputs = [ "out" "dev" ]; @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - sha256 = "sha256-rcmGVEcOtKTR8sVkHV7Xb+8NuKWUapYn+/Fswi4z6Mc="; + sha256 = "sha256-dbcEMtPnzF2t7O8YtKVUGSvJqb5WPMmmW+SyqOFnDY4="; }; depsBuildBuild = [ From 8d8c50ba2f86751e3c96cec356a3428563c27237 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 20 Jun 2022 14:44:38 -0300 Subject: [PATCH 015/100] coredns: 1.9.2 -> 1.9.3 --- pkgs/servers/dns/coredns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index c93d1235ea82..54965fd998aa 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-6ABcXRuPEkzhjVZcltPoWGAc+fs6FwmgQCMRuLmhXxo="; + sha256 = "sha256-9lRZjY85SD1HXAWVCp8fpzV0d1Y+LbodT3Sp21CNp+k="; }; - vendorSha256 = "sha256-0S77748voNlIuY6yUAa669pB09h35THojCyQKUm5VFc="; + vendorSha256 = "sha256-gNa+dm7n71IiSCztTO5VZ5FnGTGYfNXo/HMichNzek0="; postPatch = '' substituteInPlace test/file_cname_proxy_test.go \ From d194ad962764cf69dd1b138adfb410bb2b2061fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Mon, 20 Jun 2022 21:57:25 +0200 Subject: [PATCH 016/100] poedit: 3.0.1 -> 3.1 --- pkgs/tools/text/poedit/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index fcb2a7019aca..c64828579c94 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK31-gtk3, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "poedit"; - version = "3.0.1"; + version = "3.1"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; rev = "v${version}-oss"; - sha256 = "sha256-PBAOCAO3OrBE7lOho7nJNEpqwds7XiblN/f+GonrXHA="; + sha256 = "sha256-Wxj1xPbtupEnzuvf7JdUgdTxX2oAZDEYk6W4CjrmRRE="; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkg-config ]; - buildInputs = [ lucenepp nlohmann_json wxGTK31-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; + buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2284cbdef4d..c1261c0beff7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9548,7 +9548,7 @@ with pkgs; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; poedit = callPackage ../tools/text/poedit { - wxGTK31-gtk3 = wxGTK31-gtk3.override { withWebKit = true; }; + wxGTK30-gtk3 = wxGTK30-gtk3.override { withWebKit = true; }; }; polipo = callPackage ../servers/polipo { }; From 0b7337095ae8979741ccf8df448165b70b7c19c1 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 20 Jun 2022 22:17:55 +0200 Subject: [PATCH 017/100] gnonograms: 2.0.0 -> 2.1.2 --- pkgs/games/gnonograms/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/games/gnonograms/default.nix index 21f522d3418f..2446384ff719 100644 --- a/pkgs/games/gnonograms/default.nix +++ b/pkgs/games/gnonograms/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , vala , meson , ninja @@ -19,24 +18,15 @@ stdenv.mkDerivation rec { pname = "gnonograms"; - version = "2.0.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "jeremypw"; repo = "gnonograms"; rev = "v${version}"; - sha256 = "sha256-2uXaybpCAm9cr0o7bqfhgD7mMNPwtv1X/PgnFnSDOl0="; + sha256 = "sha256-TkEVjrwlr4Q5FsfcdY+9fxwaMq+DFs0RwGI2E+GT5Mk="; }; - patches = [ - # Fix build with meson 0.61, can be removed on next release - # https://github.com/jeremypw/gnonograms/pull/45 - (fetchpatch { - url = "https://github.com/jeremypw/gnonograms/commit/0e90d8ff42d64a94002ec8500889bc4d7e06c1b6.patch"; - sha256 = "sha256-G/yqsZFmOA69A3E2CROMYAS5vmok/K5l1S/M2m8DMh4="; - }) - ]; - postPatch = '' patchShebangs meson/post_install.py ''; From 55364f67067085e31703f8d2e6ec4cfeb9354c84 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 20 Jun 2022 21:24:13 +0100 Subject: [PATCH 018/100] rtmpdump: unstable-2019-03-30 -> unstable-2021-02-19 Contains single but important change: orbea (1): Fix race condition in the librtmp install target. --- pkgs/tools/video/rtmpdump/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 5f301ae88915..6e05f81fcd8c 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -15,13 +15,13 @@ assert (gnutlsSupport || opensslSupport); with lib; stdenv.mkDerivation { pname = "rtmpdump"; - version = "unstable-2019-03-30"; + version = "unstable-2021-02-19"; src = fetchgit { url = "git://git.ffmpeg.org/rtmpdump"; # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4') - rev = "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3"; - sha256 = "07ias612jgmxpam9h418kvlag32da914jsnjsfyafklpnh8gdzjb"; + rev = "f1b83c10d8beb43fcc70a6e88cf4325499f25857"; + sha256 = "0vchr0f0d5fi0zaa16jywva5db3x9dyws7clqaq32gwh5drbkvs0"; }; patches = [ From ec8f7e4008ca8ab0c3468f83b84f57d3352d2ef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 20 Jun 2022 22:47:13 +0000 Subject: [PATCH 019/100] chatty: 0.6.4 -> 0.6.6 https://source.puri.sm/Librem5/chatty/-/blob/v0.6.6/NEWS --- .../networking/instant-messengers/chatty/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 35266eff9009..a6e31573ae81 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.6.4"; + version = "0.6.6"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-uDuSx+tWv6DV93/99QUcUKZaWA9kNW8phHZhetYlG/M="; + hash = "sha256-vwgXfoyZOCSMnRAB6bFSrtYlSrpMa9OOcmxYTqhU+lA="; }; postPatch = '' @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "XMPP and SMS messaging via libpurple and ModemManager"; homepage = "https://source.puri.sm/Librem5/chatty"; + changelog = "https://source.puri.sm/Librem5/chatty/-/blob/${src.rev}/NEWS"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda tomfitzhenry ]; platforms = platforms.linux; From d35fc529cf09512aa28f0d78489e122350f20c53 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 21 Jun 2022 11:17:29 +0300 Subject: [PATCH 020/100] Group geospatial servers --- pkgs/top-level/all-packages.nix | 46 +++++++++++++++++---------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80ee01e38895..1ea813eb9599 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7748,14 +7748,6 @@ with pkgs; mani = callPackage ../development/tools/mani { }; - mapcache = callPackage ../servers/geospatial/mapcache { }; - - mapserver = callPackage ../servers/geospatial/mapserver { }; - - martin = callPackage ../servers/geospatial/martin { - inherit (darwin.apple_sdk.frameworks) Security; - }; - mask = callPackage ../development/tools/mask { }; mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { }; @@ -10964,8 +10956,6 @@ with pkgs; tidy-viewer = callPackage ../tools/text/tidy-viewer { }; - tile38 = callPackage ../servers/geospatial/tile38 { }; - tiled = libsForQt5.callPackage ../applications/editors/tiled { }; tiledb = callPackage ../development/libraries/tiledb { }; @@ -11580,8 +11570,6 @@ with pkgs; td = callPackage ../tools/misc/td { }; - tegola = callPackage ../servers/geospatial/tegola {}; - tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; tigervnc = callPackage ../tools/admin/tigervnc {}; @@ -13199,10 +13187,6 @@ with pkgs; remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { }; - t-rex = callPackage ../servers/geospatial/t-rex { - inherit (darwin.apple_sdk.frameworks) Security; - }; - tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = @@ -22090,8 +22074,6 @@ with pkgs; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; - mbtileserver = callPackage ../servers/geospatial/mbtileserver { }; - memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; @@ -22334,10 +22316,6 @@ with pkgs; tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; - pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { }; - - pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; - pies = callPackage ../servers/pies { }; rpcbind = callPackage ../servers/rpcbind { }; @@ -22930,6 +22908,30 @@ with pkgs; zipkin = callPackage ../servers/monitoring/zipkin { }; + ### SERVERS / GEOSPATIAL + + mapcache = callPackage ../servers/geospatial/mapcache { }; + + mapserver = callPackage ../servers/geospatial/mapserver { }; + + martin = callPackage ../servers/geospatial/martin { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + mbtileserver = callPackage ../servers/geospatial/mbtileserver { }; + + pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { }; + + pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; + + t-rex = callPackage ../servers/geospatial/t-rex { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + tegola = callPackage ../servers/geospatial/tegola { }; + + tile38 = callPackage ../servers/geospatial/tile38 { }; + ### OS-SPECIFIC afuse = callPackage ../os-specific/linux/afuse { }; From c976deee0a00b34db696a605015613d8b585fd40 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 21 Jun 2022 01:28:25 +0300 Subject: [PATCH 021/100] geoserver: init at 2.21.0 --- pkgs/servers/geospatial/geoserver/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/servers/geospatial/geoserver/default.nix diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/servers/geospatial/geoserver/default.nix new file mode 100644 index 000000000000..0fc184e063e5 --- /dev/null +++ b/pkgs/servers/geospatial/geoserver/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchurl, unzip, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "geoserver"; + version = "2.21.0"; + + src = fetchurl { + url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; + sha256 = "sha256-UCr22Ffhnux6eA0w5qoaf5Hvuypsl/FGpK+emi8G0Mc="; + }; + + sourceRoot = "."; + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/geoserver + cp -r . $out/share/geoserver + rm -fr $out/share/geoserver/bin/*.bat + + makeWrapper $out/share/geoserver/bin/startup.sh $out/bin/geoserver-startup \ + --set JAVA_HOME "${jre}" \ + --set GEOSERVER_HOME "$out/share/geoserver" + makeWrapper $out/share/geoserver/bin/shutdown.sh $out/bin/geoserver-shutdown \ + --set JAVA_HOME "${jre}" \ + --set GEOSERVER_HOME "$out/share/geoserver" + runHook postInstall + ''; + + meta = with lib; { + description = "Open source server for sharing geospatial data"; + homepage = "https://geoserver.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ea813eb9599..0bf52bb708f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22910,6 +22910,8 @@ with pkgs; ### SERVERS / GEOSPATIAL + geoserver = callPackage ../servers/geospatial/geoserver { }; + mapcache = callPackage ../servers/geospatial/mapcache { }; mapserver = callPackage ../servers/geospatial/mapserver { }; From 464a8c94b18149c7a69b56fad1c63c2d19f3db9a Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 21 Jun 2022 17:48:41 +0200 Subject: [PATCH 022/100] threema-desktop: 1.2.0 -> 1.2.13 --- .../instant-messengers/threema-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 0951f1d3d8e7..e9bc45b3a3f9 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "threema-desktop"; - version = "1.2.0"; + version = "1.2.13"; src = fetchurl { # As Threema only offers a Latest Release url, the plan is to upload each # new release url to web.archive.org until their Github releases page gets populated. - url = "https://web.archive.org/web/20220408213031if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; - sha256 = "7c8e1e76ad82a0cf776eb8b0a683a41a00dc8752bb79a24b0ae9d795fdedcde6"; + url = "https://web.archive.org/web/20220621152620id_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; + sha256 = "sha256-X16GMxUIKUloj0FxhzWQKUBf4zwfSBVg0cwLgGxHPHE="; }; nativeBuildInputs = [ From e2eb2550b7f885453d0d7a2814945fd73585a05e Mon Sep 17 00:00:00 2001 From: lunik1 Date: Tue, 21 Jun 2022 22:47:01 +0100 Subject: [PATCH 023/100] =?UTF-8?q?megacmd:=201.5.0c=20=E2=86=92=201.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/megacmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index afdfc6c905e0..2d5b6ee8f2ae 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.5.0c"; + version = "1.5.1"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-JHuGkf6TBOZMvoP7Izm5/T9AWxyjaqrxR99x4bm7tVE="; + sha256 = "sha256-qOXw/KGt3DyWQGBe/pbMujQITCMItHobxuK+1r00ZIs="; fetchSubmodules = true; }; From ddeb50d445e65fc7d6bedd2dd347439e62fc4450 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jun 2022 02:36:18 +0000 Subject: [PATCH 024/100] flameshot: 11.0.0 -> 12.0.0 --- pkgs/tools/misc/flameshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 82cf7a3b78fd..4bbe0508c12c 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "flameshot"; - version = "11.0.0"; + version = "12.0.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "sha256-SlnEXW3Uhdgl0icwYyYsKQOcYkAtHpAvL6LMXBF2gWM="; + sha256 = "sha256-ByW+XYTaeBTTbOaxNeF367nqgnBM+EC8jm+PmwHcVGQ="; }; passthru = { From 990bd301c178d864288e9655a31572837982e3cf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 22 Jun 2022 14:50:17 +1000 Subject: [PATCH 025/100] talosctl: 1.0.6 -> 1.1.0 https://github.com/siderolabs/talos/releases/tag/v1.1.0 > https://github.com/siderolabs/talos/commit/b315ed95327a9b7cfb1f83a9da02e96bafecbb1d > Generate separate file for each variable and assign them during go build using go:embed instead of using ldflags -X. --- .../networking/cluster/talosctl/default.nix | 42 ++++++------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 15 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index da240b337bfc..42d451bd44db 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,42 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -let - # look for GO_LDFLAGS getting set in the Makefile - version = "1.0.6"; - sha256 = "sha256-4cUaQWqVndp06eFgqInOMMGITbTdZO5BOqXW2XEpuWU="; - vendorSha256 = "sha256-7q35d+jbIDe7fAy6nL5FWdSovBb/f64HYLHGL+zE6bI="; - pkgsVersion = "v1.0.0-25-gcf9709e"; - extrasVersion = "v1.0.0-4-g05b0920"; -in +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: + buildGoModule rec { pname = "talosctl"; - inherit version vendorSha256; - # nixpkgs-update: no auto update + version = "1.1.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - inherit sha256; + sha256 = "sha256-52WzQ5LWgIX/XBJPNvWV0tAPnw1AiINDL/7D3UYvvn4="; }; - ldflags = - let - versionPkg = "github.com/talos-systems/talos/pkg/version"; # VERSION_PKG - imagesPkgs = "github.com/talos-systems/talos/pkg/images"; # IMAGES_PKGS - mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG - in - [ - "-X ${versionPkg}.Name=Client" - "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do - "-X ${versionPkg}.Tag=${src.rev}" - "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS - "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS - "-X ${imagesPkgs}.Username=siderolabs" # USERNAME - "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY - "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS - "-s" - "-w" - ]; + vendorSha256 = "sha256-iluI4UGw5cZ70wmC9jDiGttvxZ7xFyqcL9IZX4ubJqs="; + + ldflags = [ "-s" "-w" ]; + + GOWORK = "off"; subPackages = [ "cmd/talosctl" ]; @@ -56,5 +35,8 @@ buildGoModule rec { homepage = "https://www.talos.dev/"; license = licenses.mpl20; maintainers = with maintainers; [ flokli ]; + # requires >= 10.14 SDK https://github.com/NixOS/nixpkgs/issues/101229 + # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 238e2537d2bf..55ba07c1b7c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30046,7 +30046,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - talosctl = callPackage ../applications/networking/cluster/talosctl { }; + talosctl = callPackage ../applications/networking/cluster/talosctl { + buildGoModule = buildGo118Module; + }; talentedhack = callPackage ../applications/audio/talentedhack { }; From e9b39ae01c1af6f4be2359a19c0817656412d82c Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Thu, 2 Jun 2022 21:26:59 +0200 Subject: [PATCH 026/100] butler: init at 15.21.0 --- pkgs/games/itch/butler.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/games/itch/butler.nix diff --git a/pkgs/games/itch/butler.nix b/pkgs/games/itch/butler.nix new file mode 100644 index 000000000000..68f1bac49e90 --- /dev/null +++ b/pkgs/games/itch/butler.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "butler"; + version = "15.21.0"; + + src = fetchFromGitHub { + owner = "itchio"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vciSmXR3wI3KcnC+Uz36AgI/WUfztA05MJv1InuOjJM="; + }; + + proxyVendor = true; + + vendorSha256 = "sha256-EIl0ZFDKbZopUR22hp5a2vRUu0O1h1O953NrtoNa2x8="; + + doCheck = false; + + meta = with lib; { + description = "Command-line itch.io helper"; + homepage = "https://github.com/itchio/butler"; + license = licenses.mit; + maintainers = with maintainers; [ martfont ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a664688a7e2..a80bc9b84c6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1139,6 +1139,8 @@ with pkgs; asleap = callPackage ../tools/networking/asleap { }; + butler = callPackage ../games/itch/butler.nix { }; + cf-vault = callPackage ../tools/admin/cf-vault { }; bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; From deabb657a28f8c84226ac6a630bb0ce20c38e5b4 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Thu, 2 Jun 2022 21:29:40 +0200 Subject: [PATCH 027/100] itch: install binary in system --- pkgs/games/itch/default.nix | 87 ++++++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 25 deletions(-) diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix index 34a2775c3c80..991623b6c9f7 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/games/itch/default.nix @@ -1,30 +1,56 @@ { lib , stdenvNoCC -, fetchurl -, libnotify -, nss -, gtk3 +, fetchpatch +, fetchzip , fetchFromGitHub +, butler +, electron_11 +, steam-run +, makeWrapper +, copyDesktopItems , makeDesktopItem -, itch-setup -, runtimeShell }: -stdenvNoCC.mkDerivation rec{ +stdenvNoCC.mkDerivation rec { pname = "itch"; version = "25.5.1"; - src = fetchFromGitHub { - owner = "itchio"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Pi3l3uK4kr+N3p7fGQuqckYIzycRqJHDVX00reoSbp4="; + src = fetchzip { + url = "https://broth.itch.ovh/${pname}/linux-amd64/${version}/itch.zip"; + stripRoot = false; + sha256 = "sha256-ejfS+sqhacW2h8u96W4fout3V8xrBs0SrW5w/7X83m4="; }; + patches = [ + # Fixes crash while browsing the store. + (fetchpatch { + name = "itch.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/itch.patch?h=itch-bin&id=0b181454567029141749f870880b10093216e133"; + sha256 = "sha256-gmLL/BMondSflERm0z+DuGDP56JhDXiyxEwLUavTD8Q="; + }) + ]; + + itch-setup = fetchzip { + url = "https://broth.itch.ovh/itch-setup/linux-amd64/1.26.0/itch-setup.zip"; + stripRoot = false; + sha256 = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA="; + }; + + icons = let sparseCheckout = "/release/images/itch-icons"; in + fetchFromGitHub { + owner = "itchio"; + repo = pname; + rev = "v${version}"; + hash = "sha256-1L6STTBHA9xL9IaERaH2OTvurTSng1D+P3KoW0ucEJc="; + inherit sparseCheckout; + } + sparseCheckout; + + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + desktopItems = [ (makeDesktopItem { name = pname; - exec = pname; - tryExec = "itch %U"; + exec = "itch %U"; + tryExec = pname; icon = pname; desktopName = pname; mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; @@ -33,23 +59,33 @@ stdenvNoCC.mkDerivation rec{ }) ]; - itchBin = '' - #!${runtimeShell} - exec ${itch-setup}/bin/itch-setup --prefer-launch -- "$@" - ''; - - passAsFile = [ "itchBin" ]; - - # as taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=itch + # As taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=itch-bin installPhase = '' - install -Dm0777 $itchBinPath $out/bin/itch - for icon in release/images/itch-icons/icon*.png + runHook preInstall + + mkdir -p $out/bin $out/share/${pname}/resources/app + cp -r resources/app "$out/share/${pname}/resources/" + + install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/" + install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/" + + for icon in $icons/icon*.png do - iconsize="''${icon#release/images/itch-icons/icon}" + iconsize="''${icon#$icons/icon}" iconsize="''${iconsize%.png}" icondir="$out/share/icons/hicolor/''${iconsize}x''${iconsize}/apps/" install -Dm644 "$icon" "$icondir/itch.png" done + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${steam-run}/bin/steam-run $out/bin/${pname} \ + --add-flags ${electron_11}/bin/electron \ + --add-flags $out/share/${pname}/resources/app \ + --set BROTH_USE_LOCAL butler,itch-setup \ + --prefix PATH : ${butler}/bin/:${itch-setup} ''; meta = with lib; { @@ -57,6 +93,7 @@ stdenvNoCC.mkDerivation rec{ homepage = "https://github.com/itchio/itch"; license = licenses.mit; platforms = platforms.linux; + sourceProvenance = lib.sourceTypes.binaryBytecode; maintainers = with maintainers; [ pasqui23 ]; }; } From b3080101af5fd937ee3ba6a6bfc60c4f3c5881d4 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Thu, 2 Jun 2022 21:29:57 +0200 Subject: [PATCH 028/100] itch-setup: remove --- pkgs/games/itch-setup/default.nix | 24 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/games/itch-setup/default.nix diff --git a/pkgs/games/itch-setup/default.nix b/pkgs/games/itch-setup/default.nix deleted file mode 100644 index 55d488bcaac0..000000000000 --- a/pkgs/games/itch-setup/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, writeShellScriptBin, steam-run, fetchurl }: -let - - pname = "itch-setup"; - version = "1.26.0"; - - src = fetchurl { - url = "https://broth.itch.ovh/itch-setup/linux-amd64/${version}/unpacked/default"; - hash = "sha256-bcJKqhgZK42Irx12BIvbTDMb/DHEOEXljetlDokF7x8="; - executable = true; - }; - -in -(writeShellScriptBin pname ''exec ${steam-run}/bin/steam-run ${src} "$@"'') // { - - passthru = { inherit pname version src; }; - meta = with lib; { - description = "An installer for the itch.io desktop app"; - homepage = "https://github.com/itchio/itch-setup"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ pasqui23 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3b2a08673c7f..fdf0e40de72c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -619,6 +619,7 @@ mapAliases ({ iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 iproute = iproute2; # moved from top-level 2021-03-14 ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15 + itch-setup = throw "itch-setup has benn removed, use itch instead"; # Added 2022-06-02 ### J ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a80bc9b84c6f..38b94345ec5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2429,8 +2429,6 @@ with pkgs; itch = callPackage ../games/itch {}; - itch-setup = callPackage ../games/itch-setup {}; - lastpass-cli = callPackage ../tools/security/lastpass-cli { }; leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; From ee18cc78cc8d5f7fd06c68ac6834fc81453a04e0 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Wed, 22 Jun 2022 09:51:10 -0400 Subject: [PATCH 029/100] clickgen: allow building on Python 3.10+ --- pkgs/development/python-modules/clickgen/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index b74827d1971d..d0f81a20c6d3 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , pythonOlder -, pythonAtLeast , fetchFromGitHub , pillow , libX11 @@ -17,7 +16,7 @@ buildPythonPackage rec { version = "1.2.0"; format = "setuptools"; - disabled = pythonOlder "3.8" || pythonAtLeast "3.10"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ful1e5"; From bad7610c88e33724d3514f49fccec9264324c958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Jun 2022 19:58:16 +0200 Subject: [PATCH 030/100] maintainers/teams: add c3d2 --- maintainers/team-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 5e852275b4a1..413a6f9b1d7a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -94,6 +94,16 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + c3d2 = { + members = [ + astro + SuperSandro2000 + ]; + scope = "Maintain packages used in the C3D2 hackspace"; + shortName = "c3d2"; + enableFeatureFreezePing = true; + }; + cinnamon = { members = [ mkg20001 From bdf068714516c5c5716b8a6b144bd48a0ccfc891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Jun 2022 19:58:36 +0200 Subject: [PATCH 031/100] ncpamixer: move to c3d2 team --- pkgs/applications/audio/ncpamixer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index aca96ef5da35..7663d1745d2f 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fulhax/ncpamixer"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ StijnDW SuperSandro2000 ]; + maintainers = with maintainers; [ StijnDW ] ++ teams.c3d2.members; }; } From 8df67a3a89fe29bb22725e71f7191f79647a57ca Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 22 Jun 2022 19:45:29 +0100 Subject: [PATCH 032/100] nkf: pull upstream fix for parallel build failure Without the change parallel build fails as: cp -f nkf ...-nkf-2.1.5/bin/ mkdir ...-nkf-2.1.5/man/ja mkdir: cannot create directory '...-nkf-2.1.5/man/ja': No such file or directory --- pkgs/tools/text/nkf/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix index a2b5f66a6e91..9a70ea9461af 100644 --- a/pkgs/tools/text/nkf/default.nix +++ b/pkgs/tools/text/nkf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "nkf"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0i5dbcb9aipwr8ym4mhvgf1in3frl6y8h8x96cprz9s7b11xz9yi"; }; + patches = [ + # Pull upstream fix for parllel build failures + (fetchpatch { + name = "parallel-install.patch"; + url = "http://git.osdn.net/view?p=nkf/nkf.git;a=patch;h=9ccff5975bec7963e591e042e1ab1139252a4dc9"; + sha256 = "00f0x414gfch650b20w0yj5x2bd67hchmadl7v54lk3vdgkc6jwj"; + }) + ]; + makeFlags = [ "prefix=$(out)" ]; meta = { From 9d9f63e9b93a5d7bf894a474a05bb431faf28fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Jun 2022 19:58:57 +0200 Subject: [PATCH 033/100] openipmi: move to c3d2 team --- pkgs/tools/system/openipmi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/tools/system/openipmi/default.nix index 8a8ac04f3acc..228c305de0c6 100644 --- a/pkgs/tools/system/openipmi/default.nix +++ b/pkgs/tools/system/openipmi/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "A user-level library that provides a higher-level abstraction of IPMI and generic services"; license = with licenses; [ gpl2Only lgpl2Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ arezvov SuperSandro2000 ]; + maintainers = with maintainers; [ arezvov ] ++ teams.c3d2.members; }; } From 57e9b1af3fed31b623157e309a7536f206970785 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 22 Jun 2022 12:16:24 -0700 Subject: [PATCH 034/100] nodePackages.aws-cdk: add meta.mainProgram --- pkgs/development/node-packages/main-programs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index b5c710bd8c84..8004f2025a91 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -32,6 +32,7 @@ "@webassemblyjs/wasm-strip" = "wasm-strip"; "@webassemblyjs/wasm-text-gen" = "wasmgen"; "@webassemblyjs/wast-refmt" = "wast-refmt"; + aws-cdk = "cdk"; balanceofsatoshis = "bos"; carbon-now-cli = "carbon-now"; cdk8s-cli = "cdk8s"; From 2d9ea7483517a50c669f37d72dc1e0d47db04362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Jun 2022 23:11:05 +0200 Subject: [PATCH 035/100] python310Packages.email-validator: normalize attr, update meta --- pkgs/development/python-modules/email-validator/default.nix | 3 +-- pkgs/development/python-modules/fastapi-mail/default.nix | 4 ++-- pkgs/development/python-modules/flask-admin/default.nix | 4 ++-- pkgs/development/python-modules/flask-appbuilder/default.nix | 4 ++-- pkgs/development/python-modules/flask-mongoengine/default.nix | 4 ++-- .../development/python-modules/flask-security-too/default.nix | 4 ++-- pkgs/development/python-modules/flask-wtf/default.nix | 4 ++-- pkgs/development/python-modules/ihatemoney/default.nix | 4 ++-- pkgs/development/python-modules/pydantic/default.nix | 4 ++-- pkgs/development/python-modules/vaa/default.nix | 4 ++-- pkgs/development/python-modules/wtforms/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index b6112bb87dcc..bdd830810fb3 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -44,10 +44,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A robust email syntax and deliverability validation library for Python 2.x/3.x."; + description = "A robust email syntax and deliverability validation library"; homepage = "https://github.com/JoshData/python-email-validator"; license = licenses.cc0; maintainers = with maintainers; [ siddharthist ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index 8b3c6d0ed056..973c810b6347 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -3,7 +3,7 @@ , aiosmtplib , blinker , buildPythonPackage -, email_validator +, email-validator , fakeredis , fastapi , fetchFromGitHub @@ -45,7 +45,7 @@ buildPythonPackage rec { aioredis aiosmtplib blinker - email_validator + email-validator fakeredis fastapi httpx diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 6a1ea3991cfa..75573c7a69d6 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -2,7 +2,7 @@ , arrow , buildPythonPackage , colour -, email_validator +, email-validator , enum34 , fetchPypi , flask @@ -45,7 +45,7 @@ buildPythonPackage rec { checkInputs = [ arrow colour - email_validator + email-validator flask_sqlalchemy flask-babelex flask-mongoengine diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 5276fceb3f51..9b0e993b1eb3 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -5,7 +5,7 @@ , apispec , colorama , click -, email_validator +, email-validator , flask , flask-babel , flask_login @@ -56,7 +56,7 @@ buildPythonPackage rec { apispec colorama click - email_validator + email-validator flask flask-babel flask_login diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index ee05ff420333..e411d1f55a78 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -8,7 +8,7 @@ , nose , rednose , coverage -, email_validator +, email-validator }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - email_validator + email-validator flask flask-wtf mongoengine diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index ec088d5332c1..e1a598d3a0ba 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -23,7 +23,7 @@ # propagates , blinker -, email_validator +, email-validator , flask , flask_login , flask_principal @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ blinker - email_validator + email-validator flask flask_login flask_principal diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index fcfa4835be7c..014f250128c3 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -4,7 +4,7 @@ , flask , itsdangerous , wtforms -, email_validator +, email-validator , pytestCheckHook }: @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - email = [ email_validator ]; + email = [ email-validator ]; }; checkInputs = [ diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index dafea4e2cb20..bacaea2f2cb1 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -10,7 +10,7 @@ , cachetools , click , dnspython -, email_validator +, email-validator , flask , flask-babel , flask-cors @@ -60,7 +60,7 @@ buildPythonPackage rec { click debts dnspython - email_validator + email-validator flask flask_mail flask_migrate diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index a886b5ba78ce..25a5d54d529e 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , cython , devtools -, email_validator +, email-validator , fetchFromGitHub , pytest-mock , pytestCheckHook @@ -57,7 +57,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ devtools - email_validator + email-validator python-dotenv typing-extensions ]; diff --git a/pkgs/development/python-modules/vaa/default.nix b/pkgs/development/python-modules/vaa/default.nix index 783cc7bd6811..d43f007c35cd 100644 --- a/pkgs/development/python-modules/vaa/default.nix +++ b/pkgs/development/python-modules/vaa/default.nix @@ -9,7 +9,7 @@ , marshmallow , pyschemes , wtforms -, email_validator +, email-validator }: buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { marshmallow pyschemes wtforms - email_validator + email-validator ]; pythonImportsCheck = [ "vaa" ]; diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index c6a3ecf2088a..ef2e06cc3e71 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -4,7 +4,7 @@ , markupsafe , babel , pytestCheckHook -, email_validator +, email-validator }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - email_validator + email-validator ]; pythonImportsCheck = [ "wtforms" ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 04f93fd015e9..326e0a74913d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -69,6 +69,7 @@ mapAliases ({ dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 + email_validator = email-validator; # added 2022-06-22 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 flask_testing = flask-testing; # added 2022-04-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ffa21b26996..0b12f32360a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2739,7 +2739,7 @@ in { emailthreads = callPackage ../development/python-modules/emailthreads { }; - email_validator = callPackage ../development/python-modules/email-validator { }; + email-validator = callPackage ../development/python-modules/email-validator { }; embrace = callPackage ../development/python-modules/embrace { }; From e9819519588a777e8b009aa8e885183eb91464d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Jun 2022 23:41:13 +0200 Subject: [PATCH 036/100] ArchiSteamFarm.web-ui: drop compile time node_modules --- pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index bbe37b5ed743..fdd2970fdac7 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -27,7 +27,8 @@ in postInstall = '' patchShebangs node_modules/ npm run build - ln -s $out/lib/node_modules/asf-ui/dist $out/lib/dist + cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist + rm -rf $out/lib/node_modules/ ''; meta = with lib; { From 5147a3e4c262bde42c7ded1aeb21fc2cd095e629 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Mon, 20 Jun 2022 22:46:10 +0100 Subject: [PATCH 037/100] js8call: init at 2.2.0 --- pkgs/applications/radio/js8call/cmake.patch | 69 +++++++++++++++++++++ pkgs/applications/radio/js8call/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 136 insertions(+) create mode 100644 pkgs/applications/radio/js8call/cmake.patch create mode 100644 pkgs/applications/radio/js8call/default.nix diff --git a/pkgs/applications/radio/js8call/cmake.patch b/pkgs/applications/radio/js8call/cmake.patch new file mode 100644 index 000000000000..04552eac40ec --- /dev/null +++ b/pkgs/applications/radio/js8call/cmake.patch @@ -0,0 +1,69 @@ +diff --git a/CMake/Modules/Findhamlib.cmake b/CMake/Modules/Findhamlib.cmake +index 1590f05..e797851 100644 +--- a/CMake/Modules/Findhamlib.cmake ++++ b/CMake/Modules/Findhamlib.cmake +@@ -47,7 +47,7 @@ if (NOT PC_HAMLIB_FOUND) + + # libusb-1.0 has no pkg-config file on Windows so we have to find it + # ourselves +- find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/dll) ++ find_library (LIBUSB NAMES libusb-1.0 usb-1.0 PATH_SUFFIXES MinGW32/dll) + if (LIBUSB) + set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES}) + get_filename_component (hamlib_libusb_path ${LIBUSB} PATH) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 75b80b3..7c04265 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -558,7 +558,6 @@ find_package (FFTW3 COMPONENTS double single threads REQUIRED) + # + # libhamlib setup + # +-set (hamlib_STATIC 1) + find_package (hamlib 3 REQUIRED) + find_program (RIGCTL_EXE rigctl) + find_program (RIGCTLD_EXE rigctld) +@@ -576,6 +576,7 @@ message (STATUS "hamlib_LIBRARY_DIRS: ${hamlib_LIBRARY_DIRS}") + find_package (Qt5Widgets 5 REQUIRED) + find_package (Qt5Multimedia 5 REQUIRED) + find_package (Qt5PrintSupport 5 REQUIRED) ++find_package (Qt5SerialPort 5 REQUIRED) + + if (WIN32) + add_definitions (-DQT_NEEDS_QTMAIN) +@@ -849,7 +850,7 @@ target_link_libraries (qcp Qt5::Widgets Qt5::PrintSupport) + add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS} ${GENAXSRCS}) + # set wsjtx_udp exports to static variants + target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE) +-target_link_libraries (wsjt_qt qcp Qt5::Widgets Qt5::Network) ++target_link_libraries (wsjt_qt qcp Qt5::Widgets Qt5::Network Qt5::SerialPort) + target_include_directories (wsjt_qt BEFORE PRIVATE ${hamlib_INCLUDE_DIRS}) + if (WIN32) + target_link_libraries (wsjt_qt Qt5::AxContainer Qt5::AxBase) +@@ -959,7 +960,6 @@ else () + ) + endif () + endif () +-qt5_use_modules (js8call SerialPort) # not sure why the interface link library syntax above doesn't work + + # if (UNIX) + # if (NOT WSJT_SKIP_MANPAGES) +@@ -1292,3 +1292,5 @@ configure_file ("${PROJECT_SOURCE_DIR}/CMakeCPackOptions.cmake.in" + set (CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIR}/CMakeCPackOptions.cmake") + + include (CPack) ++ ++add_definitions (-DJS8_USE_HAMLIB_THREE) +diff --git a/Configuration.cpp b/Configuration.cpp +index 8258f97..63a29bb 100644 +--- a/Configuration.cpp ++++ b/Configuration.cpp +@@ -160,7 +160,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/pkgs/applications/radio/js8call/default.nix b/pkgs/applications/radio/js8call/default.nix new file mode 100644 index 000000000000..e89d3445697f --- /dev/null +++ b/pkgs/applications/radio/js8call/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromBitbucket +, wrapQtAppsHook +, pkg-config +, hamlib +, libusb1 +, cmake +, gfortran +, fftw +, fftwFloat +, qtbase +, qtmultimedia +, qtserialport +}: + +stdenv.mkDerivation rec { + pname = "js8call"; + version = "2.2.0"; + + src = fetchFromBitbucket { + owner = "widefido"; + repo = pname; + rev = "v${version}-ga"; + sha256 = "sha256-mFPhiAAibCiAkLrysAmIQalVCGd9ips2lqbAsowYprY="; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + gfortran + pkg-config + cmake + ]; + + buildInputs = [ + hamlib + libusb1 + fftw + fftwFloat + qtbase + qtmultimedia + qtserialport + ]; + + prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/share/applications" "$out/share/applications" \ + --replace "/usr/share/pixmaps" "$out/share/pixmaps" \ + --replace "/usr/bin/" "$out/bin" + ''; + + patches = [ ./cmake.patch ]; + + meta = with lib; { + description = "Weak-signal keyboard messaging for amateur radio"; + longDescription = '' + JS8Call is software using the JS8 Digital Mode providing weak signal + keyboard to keyboard messaging to Amateur Radio Operators. + ''; + homepage = "http://js8call.com/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0a8e10d1fd1..af8c014ef7fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27640,6 +27640,8 @@ with pkgs; josm = callPackage ../applications/misc/josm { }; + js8call = qt5.callPackage ../applications/radio/js8call { }; + jwm = callPackage ../applications/window-managers/jwm { }; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; From 202aeba57c93cbd04c33cd135177ea3745ef810e Mon Sep 17 00:00:00 2001 From: "M. A" Date: Wed, 22 Jun 2022 23:50:53 +0000 Subject: [PATCH 038/100] snipe-it: 6.0.4 -> 6.0.5 https://github.com/snipe/snipe-it/releases/tag/v6.0.5 --- pkgs/servers/web-apps/snipe-it/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix index 3e3ac6fde11b..02a1ff30d8f9 100644 --- a/pkgs/servers/web-apps/snipe-it/default.nix +++ b/pkgs/servers/web-apps/snipe-it/default.nix @@ -18,13 +18,13 @@ let in package.override rec { pname = "snipe-it"; - version = "6.0.4"; + version = "6.0.5"; src = fetchFromGitHub { owner = "snipe"; repo = pname; rev = "v${version}"; - sha256 = "06h8rnk8q85f0z0a1q0j010kzs4z2k5sxvi06avk7ndpkrisv4wz"; + sha256 = "15dp8y0kdjg9x4iwa5ha5w4qbwwsdg5z8337rmkkla2yjmf4lrxb"; }; meta = with lib; { From badcbf43f5428a99880e6589983dc2e8fe038037 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 23 Jun 2022 00:41:54 -0300 Subject: [PATCH 039/100] dterm: move to applications/terminal-emulators Also, use SRI hash and add a `longDescription`. --- .../terminal-emulators}/dterm/default.nix | 19 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 19 insertions(+), 4 deletions(-) rename pkgs/{tools/misc => applications/terminal-emulators}/dterm/default.nix (53%) diff --git a/pkgs/tools/misc/dterm/default.nix b/pkgs/applications/terminal-emulators/dterm/default.nix similarity index 53% rename from pkgs/tools/misc/dterm/default.nix rename to pkgs/applications/terminal-emulators/dterm/default.nix index 48665751aeb3..69b1f67d629a 100644 --- a/pkgs/tools/misc/dterm/default.nix +++ b/pkgs/applications/terminal-emulators/dterm/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, readline }: +{ lib +, stdenv +, fetchurl +, readline +}: stdenv.mkDerivation rec { pname = "dterm"; @@ -6,20 +10,31 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.knossos.net.nz/downloads/dterm-${version}.tgz"; - sha256 = "94533be79f1eec965e59886d5f00a35cb675c5db1d89419f253bb72f140abddb"; + hash = "sha256-lFM7558e7JZeWYhtXwCjXLZ1xdsdiUGfJTu3LxQKvds="; }; buildInputs = [ readline ]; + postPatch = '' substituteInPlace Makefile \ --replace 'gcc' '${stdenv.cc.targetPrefix}cc' ''; + preInstall = "mkdir -p $out/bin"; + installFlags = [ "BIN=$(out)/bin/" ]; meta = with lib; { homepage = "http://www.knossos.net.nz/resources/free-software/dterm/"; description = "A simple terminal program"; + longDescription = '' + dterm is a simple terminal emulator, which doesn’t actually emulate any + particular terminal. Mainly, it is designed for use with xterm and + friends, which already do a perfectly good emulation, and therefore don’t + need any special help; dterm simply provides a means by which keystrokes + are forwarded to the serial line, and data forwarded from the serial line + appears on the terminal. + ''; license = licenses.gpl2Only; maintainers = with maintainers; [ auchter ]; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40ba78f49082..c2e33fd6e145 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1147,8 +1147,6 @@ with pkgs; cope = callPackage ../tools/misc/cope { }; - dterm = callPackage ../tools/misc/dterm { }; - ejson2env = callPackage ../tools/admin/ejson2env { }; davinci-resolve = callPackage ../applications/video/davinci-resolve { }; @@ -1583,6 +1581,8 @@ with pkgs; darktile = callPackage ../applications/terminal-emulators/darktile { }; + dterm = callPackage ../applications/terminal-emulators/dterm { }; + eterm = callPackage ../applications/terminal-emulators/eterm { }; foot = callPackage ../applications/terminal-emulators/foot { }; From 369740a2815ab9675b6394069300f697c4cd8af8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jun 2022 05:00:14 +0000 Subject: [PATCH 040/100] jenkins: 2.332.3 -> 2.346.1 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index abf7f840a454..00395854cfd8 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.332.3"; + version = "2.346.1"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "sha256-0ZPxearfOnzrYa3rw6tRIYrEp4UriJMv8ztE/XvmAQ8="; + sha256 = "09rvwpywf8wc3605kc0x171kmxfigqg4dq7gkd1hng1xqbjjqvhp"; }; nativeBuildInputs = [ makeWrapper ]; From e9392c24b6966e9fe8aee9d2dd87433f3aee93a8 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Thu, 23 Jun 2022 09:43:27 +0300 Subject: [PATCH 041/100] xmcp: init at unstable-2020-10-10 --- pkgs/tools/x11/xmcp/default.nix | 33 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/x11/xmcp/default.nix diff --git a/pkgs/tools/x11/xmcp/default.nix b/pkgs/tools/x11/xmcp/default.nix new file mode 100644 index 000000000000..178861d63724 --- /dev/null +++ b/pkgs/tools/x11/xmcp/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, libX11 +}: + +stdenv.mkDerivation rec { + pname = "xmcp"; + version = "unstable-2020-10-10"; + + src = fetchFromGitHub { + owner = "blblapco"; + repo = "xmcp"; + rev = "ee56225f1665f9edc04fe5c165809f2fe160a420"; + sha256 = "sha256-B3YkYrVEg6UJ2ApaVook4N2XvrCboxDMUG5CN9I79Sg="; + }; + + buildInputs = [ libX11 ]; + + installPhase = '' + runHook preInstall + install -Dm0755 xmcp $out/bin/xmcp + runHook postInstall + ''; + + meta = with lib; { + description = "Tiny color picker for X11"; + homepage = "https://github.com/blblapco/xmcp"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 238e2537d2bf..bb9ed095d88c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35602,6 +35602,7 @@ with pkgs; xsos = callPackage ../os-specific/linux/xsos { }; + xmcp = callPackage ../tools/x11/xmcp { }; zk = callPackage ../applications/office/zk {}; From 253ccf71235cd35581706190366a64e3a2398c5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jun 2022 08:14:08 +0000 Subject: [PATCH 042/100] python310Packages.imap-tools: 0.55.0 -> 0.56.0 --- pkgs/development/python-modules/imap-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 404731e22a9a..95f988a34951 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.55.0"; + version = "0.56.0"; disabled = isPy27; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; - rev = "v${version}"; - hash = "sha256-Jtuw0pYkgR1wrqPlEBOpia1rFU/+MLadOFEm2xLIFMw="; + rev = "refs/tags/v${version}"; + hash = "sha256-g1m44hUtD/x7zEe/ELY6zj2hJikSmZB6S8ZHEHPrvz0="; }; checkInputs = [ From 4f79aa9e140a03058d2b1e60c696738c4f7cc35b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jun 2022 09:02:50 +0000 Subject: [PATCH 043/100] python310Packages.mysqlclient: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/mysqlclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index ad1e321e9f84..c12b16611e92 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "2.1.0"; + version = "2.1.1"; nativeBuildInputs = [ libmysqlclient @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "973235686f1b720536d417bf0a0d39b4ab3d5086b2b6ad5e6752393428c02b12"; + sha256 = "sha256-godX5Bn7Ed1sXtJXbsksPvqpOg98OeJjWG0e53nD14I="; }; meta = with lib; { From 6f714b9553b9317eb987aa6ac790f1fa07705ac4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:11:20 +0200 Subject: [PATCH 044/100] python310Packages.types-pytz: 2021.3.8 -> 2022.1.0 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index bbbd79130181..d63968603a03 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.3.8"; + version = "2022.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QSU6OivwKLaj8XtYdJppLZVa8PdOl13pT29NLTzQHb0="; + sha256 = "sha256-u+fq+TtPvsR4AyOvklKG0mWmaB9Q26V9FtvYaVw+1j0="; }; # Modules doesn't have tests From 6a56e73a29049eba4fc2f1ea2de940b418af8502 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 13:44:48 +0200 Subject: [PATCH 045/100] python310Packages.sentry-sdk: 1.5.12 -> 1.6.0 --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 542178a3cae3..e434310f56f0 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.12"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-8M0FWfvaGp74Fb+qJlhyiJPUVHN2ZdEleZf27d+bftE="; + hash = "sha256-X831uMlxvcgxQz8xWQZkJOp/fTmF62J95esJY23DZQw="; }; propagatedBuildInputs = [ From f7471ac652d5d145aaf1856c6d16f72b59f668a3 Mon Sep 17 00:00:00 2001 From: Michael Auchter Date: Tue, 21 Jun 2022 15:33:43 +0000 Subject: [PATCH 046/100] harec: 0.pre+date=2022-04-26 -> unstable-2022-06-20 --- pkgs/development/compilers/hare/harec.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/hare/harec.nix b/pkgs/development/compilers/hare/harec.nix index a3ad53350b09..4c77a77bd0d1 100644 --- a/pkgs/development/compilers/hare/harec.nix +++ b/pkgs/development/compilers/hare/harec.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "harec"; - version = "0.pre+date=2022-04-26"; + version = "unstable-2022-06-20"; src = fetchFromSourcehut { name = pname + "-src"; owner = "~sircmpwn"; repo = pname; - rev = "e5fb5176ba629e98ace5fcb3aa427b2c25d8fdf0"; - hash = "sha256-sqt3q6sarzrpyJ/1QYM1WTukrZpflAmAYq6pQwAwe18="; + rev = "2eccbc4b959a590dda91143c8487edda841106d9"; + hash = "sha256-pwy7cNxAqIbhx9kpcjfgk7sCEns9oA6zhKSQJdHLZCM="; }; nativeBuildInputs = [ From 0c5d1a7d93d07c54db8c9cdb082cb3a8716d3800 Mon Sep 17 00:00:00 2001 From: Michael Auchter Date: Tue, 21 Jun 2022 15:34:18 +0000 Subject: [PATCH 047/100] hare: 0.pre+date=2022-04-27 -> unstable-2022-06-18 --- pkgs/development/compilers/hare/hare.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/hare/hare.nix b/pkgs/development/compilers/hare/hare.nix index f5c0cd8e405f..9d309e5c5d2c 100644 --- a/pkgs/development/compilers/hare/hare.nix +++ b/pkgs/development/compilers/hare/hare.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "hare"; - version = "0.pre+date=2022-04-27"; + version = "unstable-2022-06-18"; src = fetchFromSourcehut { name = pname + "-src"; owner = "~sircmpwn"; repo = pname; - rev = "1bfb2e6dee850c675a8831b41420800d3c62c2a0"; - hash = "sha256-1b7U5u3PM3jmnH/OnY9O++GTPyVOdFkJ0fwJBoDZgSU="; + rev = "ac9b2c35c09d555e09dbd81c5ed95bdfa14313ba"; + hash = "sha256-eeS14LGkbi9IamvKzK+HF0Rvk9NFp4QVYcrHwNSNBx4="; }; nativeBuildInputs = [ @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { runHook preConfigure export HARECACHE="$NIX_BUILD_TOP/.harecache" + export BINOUT="$NIX_BUILD_TOP/.bin" cat ${config-file} > config.mk runHook postConfigure From f514ac5a4aa708a986ba13e32111002eec89f1c3 Mon Sep 17 00:00:00 2001 From: Michael Auchter Date: Tue, 21 Jun 2022 15:34:47 +0000 Subject: [PATCH 048/100] hare: disable failing test cases A few complex math tests have been failing since they were added, so disable the failing cases for now. > 3 tests failed: > math::complex::cos: Assertion failed: ./math/complex/+test.ha:1088:2 > math::complex::cosh: Assertion failed: ./math/complex/+test.ha:1114:2 > math::complex::exp: Assertion failed: ./math/complex/+test.ha:1140:2 > > 372 passed; 3 failed; 375 tests completed in 1.19521s --- .../hare/disable-failing-test-cases.patch | 37 +++++++++++++++++++ pkgs/development/compilers/hare/hare.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/compilers/hare/disable-failing-test-cases.patch diff --git a/pkgs/development/compilers/hare/disable-failing-test-cases.patch b/pkgs/development/compilers/hare/disable-failing-test-cases.patch new file mode 100644 index 000000000000..4f8ba6056046 --- /dev/null +++ b/pkgs/development/compilers/hare/disable-failing-test-cases.patch @@ -0,0 +1,37 @@ +diff --git a/math/complex/+test.ha b/math/complex/+test.ha +index a1cc0916..705a0a41 100644 +--- a/math/complex/+test.ha ++++ b/math/complex/+test.ha +@@ -567,8 +567,8 @@ const TEST_COSSC: [](c128, c128) = [ + (math::INF, math::NAN)), // real sign unspecified + ((math::INF, math::NAN), + (math::NAN, math::NAN)), +- ((math::NAN, 0f64), +- (math::NAN, -0f64)), // imaginary sign unspecified ++// ((math::NAN, 0f64), ++// (math::NAN, -0f64)), // imaginary sign unspecified + ((math::NAN, 1f64), + (math::NAN, math::NAN)), + ((math::NAN, math::INF), +@@ -583,8 +583,8 @@ const TEST_COSHSC: [](c128, c128) = [ + (1f64, 0f64)), + ((0f64, math::INF), + (math::NAN, 0f64)), // imaginary sign unspecified +- ((0f64, math::NAN), +- (math::NAN, 0f64)), // imaginary sign unspecified ++// ((0f64, math::NAN), ++// (math::NAN, 0f64)), // imaginary sign unspecified + ((1f64, math::INF), + (math::NAN, math::NAN)), + ((1f64, math::NAN), +@@ -627,8 +627,8 @@ const TEST_EXPSC: [](c128, c128) = [ + (0f64, 0f64)), // real and imaginary sign unspecified + ((math::INF, math::INF), + (math::INF, math::NAN)), // real sign unspecified +- ((-math::INF, math::NAN), +- (0f64, 0f64)), // real and imaginary sign unspecified ++// ((-math::INF, math::NAN), ++// (0f64, 0f64)), // real and imaginary sign unspecified + ((math::INF, math::NAN), + (math::INF, math::NAN)), // real sign unspecified + ((math::NAN, 0f64), diff --git a/pkgs/development/compilers/hare/hare.nix b/pkgs/development/compilers/hare/hare.nix index 9d309e5c5d2c..fe0cc2872a11 100644 --- a/pkgs/development/compilers/hare/hare.nix +++ b/pkgs/development/compilers/hare/hare.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { hash = "sha256-eeS14LGkbi9IamvKzK+HF0Rvk9NFp4QVYcrHwNSNBx4="; }; + patches = [ ./disable-failing-test-cases.patch ]; + nativeBuildInputs = [ binutils-unwrapped harec From 8ecf252eda03be8480a90d42829b352b3062da4e Mon Sep 17 00:00:00 2001 From: Michael Auchter Date: Wed, 22 Jun 2022 15:08:55 +0000 Subject: [PATCH 049/100] hare: add setupHook to configure HAREPATH Add a setupHook so the HAREPATH environment variable is correctly set to point to the hare stdlib and any third-party libraries. --- pkgs/development/compilers/hare/hare.nix | 1 + pkgs/development/compilers/hare/setup-hook.sh | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 pkgs/development/compilers/hare/setup-hook.sh diff --git a/pkgs/development/compilers/hare/hare.nix b/pkgs/development/compilers/hare/hare.nix index fe0cc2872a11..e24fc68ab422 100644 --- a/pkgs/development/compilers/hare/hare.nix +++ b/pkgs/development/compilers/hare/hare.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { qbe ]; + setupHook = ./setup-hook.sh; strictDeps = true; configurePhase = diff --git a/pkgs/development/compilers/hare/setup-hook.sh b/pkgs/development/compilers/hare/setup-hook.sh new file mode 100644 index 000000000000..d2d2c34354d6 --- /dev/null +++ b/pkgs/development/compilers/hare/setup-hook.sh @@ -0,0 +1,9 @@ +addHarepath () { + for haredir in third-party stdlib; do + if [[ -d "$1/src/hare/$haredir" ]]; then + addToSearchPath HAREPATH "$1/src/hare/$haredir" + fi + done +} + +addEnvHooks "$hostOffset" addHarepath From 5453969a2a1aa738c2a2a6089b3aa8a83193d44c Mon Sep 17 00:00:00 2001 From: Michael Auchter Date: Wed, 22 Jun 2022 15:24:16 +0000 Subject: [PATCH 050/100] hare: set HARECACHE in setupHook If HARECACHE is unset, it hare will default to attempting to cache files relative to $HOME, which isn't writable during a build. Set HARECACHE to a suitable location so packages that are built with hare don't have to manually handle this. --- pkgs/development/compilers/hare/setup-hook.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/hare/setup-hook.sh b/pkgs/development/compilers/hare/setup-hook.sh index d2d2c34354d6..999b91df122f 100644 --- a/pkgs/development/compilers/hare/setup-hook.sh +++ b/pkgs/development/compilers/hare/setup-hook.sh @@ -1,3 +1,5 @@ +export HARECACHE="$NIX_BUILD_TOP/.harecache" + addHarepath () { for haredir in third-party stdlib; do if [[ -d "$1/src/hare/$haredir" ]]; then From 6a823d8f66d83cfbeaf17ba98c9abe82956e3d43 Mon Sep 17 00:00:00 2001 From: Michael Auchter Date: Tue, 21 Jun 2022 15:43:44 +0000 Subject: [PATCH 051/100] himitsu: init at 0.1 --- pkgs/tools/security/himitsu/default.nix | 34 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/security/himitsu/default.nix diff --git a/pkgs/tools/security/himitsu/default.nix b/pkgs/tools/security/himitsu/default.nix new file mode 100644 index 000000000000..e48de780d72d --- /dev/null +++ b/pkgs/tools/security/himitsu/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromSourcehut +, hare +, scdoc +}: + +stdenv.mkDerivation rec { + pname = "himitsu"; + version = "0.1"; + + src = fetchFromSourcehut { + name = pname + "-src"; + owner = "~sircmpwn"; + repo = pname; + rev = "003c14747fcddceb5359c9503f20c44b15fea5fa"; + hash = "sha256-tzBTDJKMuFh9anURy1aKQTmt77tI7wZDZQiOUowuomk="; + }; + + nativeBuildInputs = [ + hare + scdoc + ]; + + installFlags = [ "PREFIX=" "DESTDIR=$(out)" ]; + + meta = with lib; { + homepage = "https://himitsustore.org/"; + description = "A secret storage manager"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ auchter ]; + inherit (hare.meta) platforms badPlatforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index daa41e5e4db1..f9afa12cd47d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2401,6 +2401,8 @@ with pkgs; hime = callPackage ../tools/inputmethods/hime {}; + himitsu = callPackage ../tools/security/himitsu { }; + hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; hostctl = callPackage ../tools/system/hostctl { }; From eb04690de39d557e0050aa3927fb43713619a789 Mon Sep 17 00:00:00 2001 From: Michael Auchter Date: Wed, 22 Jun 2022 15:17:00 +0000 Subject: [PATCH 052/100] himitsu-firefox: init at 0.3 --- .../security/himitsu-firefox/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/security/himitsu-firefox/default.nix diff --git a/pkgs/tools/security/himitsu-firefox/default.nix b/pkgs/tools/security/himitsu-firefox/default.nix new file mode 100644 index 000000000000..b46286301187 --- /dev/null +++ b/pkgs/tools/security/himitsu-firefox/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromSourcehut +, hare +, himitsu +, zip +}: + +stdenv.mkDerivation rec { + pname = "himitsu-firefox"; + version = "0.3"; + + src = fetchFromSourcehut { + name = pname + "-src"; + owner = "~sircmpwn"; + repo = pname; + rev = "d6d0fdb30aefc93f6ff7d48e5737557051f1ffea"; + hash = "sha256-5RbNdEGPnfDt1KDeU2LnuRsqqqMRyV/Dh2cgEWkz4vQ="; + }; + + nativeBuildInputs = [ + hare + zip + ]; + + buildInputs = [ + himitsu + ]; + + buildFlags = [ "LIBEXECDIR=$(out)/libexec" ]; + + # Only install the native component; per the docs: + # > To install the add-on for Firefox ESR, run make install-xpi. Be advised + # > that this will probably not work. The recommended installation procedure + # > for the native extension is to install it from addons.mozilla.org instead. + installTargets = [ "install-native" ]; + installFlags = [ "PREFIX=" "DESTDIR=$(out)" ]; + + meta = with lib; { + homepage = "https://git.sr.ht/~sircmpwn/himitsu-firefox"; + description = "Himitsu integration for Firefox"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ auchter ]; + inherit (hare.meta) platforms badPlatforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9afa12cd47d..ebb92bec0b7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2403,6 +2403,8 @@ with pkgs; himitsu = callPackage ../tools/security/himitsu { }; + himitsu-firefox = callPackage ../tools/security/himitsu-firefox { }; + hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; hostctl = callPackage ../tools/system/hostctl { }; From 19aa5e2d9cdf6460d9fccd7d7cf48c305de2bd10 Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 23 Jun 2022 16:41:11 +0200 Subject: [PATCH 053/100] oh: 0.8.0 -> 0.8.1 https://github.com/michaelmacinnis/oh/releases/tag/v0.8.1 --- pkgs/shells/oh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index 68f34fe8eb17..e9a09c8c2888 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oh"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "michaelmacinnis"; repo = pname; rev = "v${version}"; - sha256 = "0sdpk77i5mfamkdqldybl9znzz92hqgi4xvby5j28m0a5gw46kj0"; + sha256 = "sha256-DMxC5fv5ZLDv7gMajC/eyJd2YpO+OXFdvwAPYotnczw="; }; - vendorSha256 = "12vlvh37hvi8c1i9arppm5wj4v9c98s7myxra10q6qpdqssgc8a0"; + vendorSha256 = "sha256-f4rqXOu6yXUzNsseSaV9pb8c2KXItYOalB5pfH3Acnc="; meta = with lib; { homepage = "https://github.com/michaelmacinnis/oh"; From 614ad1c1c0459b9fe26f085ee45d31f32adad183 Mon Sep 17 00:00:00 2001 From: Greizgh Date: Thu, 23 Jun 2022 18:35:25 +0200 Subject: [PATCH 054/100] freeciv: 3.0.1 -> 3.0.2 --- pkgs/games/freeciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index b1d215912a0a..e3057d59cd43 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-Nzc6Tirj6TKLgTYN5XjZZut9HVYLKGOp1GZeaoqEtW8="; + sha256 = "sha256-1QGARXIfb97aLxQ5TZ6Fjznlniznnyuc2ugiW/Drf9g="; }; postPatch = '' From 10d97b774cbfa7fca616ed3c7ea0c2a0bf33cc60 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 23 Jun 2022 13:34:18 -0400 Subject: [PATCH 055/100] anytype: 0.25.4 -> 0.26.1 --- pkgs/applications/misc/anytype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 07cbee42694d..6e28c58798e7 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.25.4"; + version = "0.26.1"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-v6Zecv/m1GvPJk/SmLlxHFyeYbNbIB+x17+AKCI45AM="; + sha256 = "sha256-lPzeYZzerFa0T77uaavvBQkMn4PUEfVj4SPlErqM9DI="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in From 8840b83dbfbe7595b48131616607be3ed9030d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:08:21 +0200 Subject: [PATCH 056/100] python310Packages.proto-plus: 1.20.5 -> 1.20.6 --- pkgs/development/python-modules/proto-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index ace9537c1d04..3db023447f61 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.20.5"; + version = "1.20.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-gXlOsb4zPGeYYzOUjfcOu4zfU44Dn4z6kv0qnXF21AU="; + sha256 = "sha256-RJtFN+g/R3a9aQUcTXdtuP/j+dBkHx6HsGwRbrlMkOk="; }; propagatedBuildInputs = [ protobuf ]; From 396fc796441d01f7832bbcaa16664a1eb5e01261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:26:26 +0200 Subject: [PATCH 057/100] hound: 0.5.0 -> 0.5.1 --- pkgs/development/tools/misc/hound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 4a2b4ac60360..7e46fadf362e 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "hound"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "hound-search"; repo = "hound"; rev = "v${version}"; - sha256 = "sha256-FNK6SgISGqx+O7Vgp+KOqQyPhqzERDjeo6mQIX1SXnA="; + sha256 = "sha256-1URhb+ZrtP5eGS2o7lBxvAxQJR/J6oE+pCbJ7sQb0X4="; }; vendorSha256 = "sha256-ZgF/PB3VTPx367JUkhOkSEK1uvqENNG0xuNXvCGENnQ="; From 269f5c7ea05083735d1236cc394bdf4b27f57e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ho=C5=82ubowicz?= Date: Thu, 23 Jun 2022 18:10:22 +0200 Subject: [PATCH 058/100] tidal-hifi: init at 4.0.0 Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> --- .../applications/audio/tidal-hifi/default.nix | 119 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 121 insertions(+) create mode 100644 pkgs/applications/audio/tidal-hifi/default.nix diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix new file mode 100644 index 000000000000..1befa966d351 --- /dev/null +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -0,0 +1,119 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, makeWrapper +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, expat +, ffmpeg +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, libappindicator-gtk3 +, libdbusmenu +, libdrm +, libnotify +, libpulseaudio +, libsecret +, libuuid +, libxkbcommon +, mesa +, nss +, pango +, systemd +, xdg-utils +, xorg +}: + +stdenv.mkDerivation rec { + pname = "tidal-hifi"; + version = "4.0.0"; + + src = fetchurl { + url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; + sha256 = "19gx9x3v5ywlvg5vyqgj6pghzwinby0i8isavfrix798pfr98j5z"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + ffmpeg + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + pango + systemd + mesa # for libgbm + nss + libuuid + libdrm + libnotify + libsecret + libpulseaudio + libxkbcommon + libappindicator-gtk3 + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libxshmfence + xorg.libXtst + ]; + + runtimeDependencies = + [ (lib.getLib systemd) libnotify libdbusmenu xdg-utils ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" + + runHook postInstall + ''; + + postFixup = '' + makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ + "''${gappsWrapperArgs[@]}" + ''; + + meta = with lib; { + description = "The web version of Tidal running in electron with hifi support thanks to widevine"; + homepage = "https://github.com/Mastermindzh/tidal-hifi"; + changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ alternateved ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a81af518232..4668cc3a693a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21030,6 +21030,8 @@ with pkgs; tidyp = callPackage ../development/libraries/tidyp { }; + tidal-hifi = callPackage ../applications/audio/tidal-hifi { }; + tinycdb = callPackage ../development/libraries/tinycdb { }; tinyxml = tinyxml2; From 736c9800c91372632999f8f5e3de4c76ab0534f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:44:59 +0200 Subject: [PATCH 059/100] docker-compose: 2.6.0 -> 2.6.1 --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 98af8ebf7fb5..583a3e50a1f5 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-Fg99ugaqH/jL3KUZ5Vh/SJnqzEyOaR/KuPFwt2oqXxM="; + sha256 = "sha256-D3+qDWxg3e5/3UIMz8FZDuxmQHmTv0NJVT/otGYedtw="; }; - vendorSha256 = "sha256-7uNQNO+EI90J2Btz2tnumKqd+AtVWON+Csh6tkTNKNA="; + vendorSha256 = "sha256-WxLQfu65Gr+ao/pM8B2uiS88sNT72Klhz7ZIrEadW5g="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From f19d13394d8e87c0350efba1511d7d8872f110fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:54:28 +0200 Subject: [PATCH 060/100] debian-goodies: 0.87 -> 0.88 --- pkgs/applications/misc/debian-goodies/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/applications/misc/debian-goodies/default.nix index 20d47e204f7c..560afe32b8a1 100644 --- a/pkgs/applications/misc/debian-goodies/default.nix +++ b/pkgs/applications/misc/debian-goodies/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "debian-goodies"; - version = "0.87"; + version = "0.88"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; rev = "debian/${version}"; - sha256 = "sha256-7O2AY7tWYiOIy4ImFBxWu6S+ljc3VmqS/j4KyEzVVIA="; + sha256 = "sha256-SDGWRGwRuryCJSWjuYB+Cg/Pl8q4VP4zcisUOn/GhJY="; }; postPatch = '' From 4ecf88be2dbb46c039f433043317de53a1cf13e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 23 Jun 2022 16:34:12 -0300 Subject: [PATCH 061/100] discord: add openasar option --- .../instant-messengers/discord/darwin.nix | 10 ++++- .../instant-messengers/discord/default.nix | 7 +++- .../instant-messengers/discord/linux.nix | 10 ++++- .../instant-messengers/discord/openasar.nix | 42 +++++++++++++++++++ 4 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/discord/openasar.nix diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index 4bc9ac98df1f..494a7e6a4428 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, stdenv, binaryName, desktopName, undmg }: +{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg }: stdenv.mkDerivation { inherit pname version src meta; @@ -8,7 +8,15 @@ stdenv.mkDerivation { sourceRoot = "."; installPhase = '' + runHook preInstall + mkdir -p $out/Applications cp -r "${desktopName}.app" $out/Applications + + runHook postInstall + ''; + + postInstall = lib.strings.optionalString (openasar != null) '' + cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar ''; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ab471ef47fb7..957efb7a1a48 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,4 +1,4 @@ -{ branch ? "stable", pkgs, lib, stdenv }: +{ branch ? "stable", pkgs, lib, stdenv, withOpenASAR ? false }: let inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { @@ -61,8 +61,11 @@ let ++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ]; }; package = if stdenv.isLinux then ./linux.nix else ./darwin.nix; + + openasar = if withOpenASAR then callPackage ./openasar.nix { } else null; + packages = (builtins.mapAttrs - (_: value: callPackage package (value // { inherit src version; meta = meta // { mainProgram = value.binaryName; }; })) + (_: value: callPackage package (value // { inherit src version openasar; meta = meta // { mainProgram = value.binaryName; }; })) { stable = rec { pname = "discord"; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 74e424aaf1df..28c1d353ff61 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook +{ pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook , makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,opt/${binaryName},share/pixmaps,share/icons/hicolor/256x256/apps} mv * $out/opt/${binaryName} @@ -95,6 +97,12 @@ stdenv.mkDerivation rec { ln -s $out/opt/${binaryName}/discord.png $out/share/icons/hicolor/256x256/apps/${pname}.png ln -s "${desktopItem}/share/applications" $out/share/ + + runHook postInstall + ''; + + postInstall = lib.strings.optionalString (openasar != null) '' + cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar ''; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix new file mode 100644 index 000000000000..e378f490c0f4 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages }: + +stdenv.mkDerivation rec { + version = "unstable-2022-06-10"; + pname = "openasar"; + + src = fetchFromGitHub { + owner = "GooseMod"; + repo = "OpenAsar"; + rev = "c6f2f5eb7827fea14cb4c54345af8ff6858c633a"; + sha256 = "m6e/WKGgkR8vjKcHSNdWE25MmDQM1Z3kgB24OJgbw/w="; + }; + + buildPhase = '' + runHook preBuild + + bash scripts/injectPolyfills.sh + substituteInPlace src/index.js --replace 'nightly' '${version}' + ${nodejs}/bin/node scripts/strip.js + ${nodePackages.asar}/bin/asar pack src app.asar + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install app.asar $out + + runHook postInstall + ''; + + doCheck = false; + + meta = with lib; { + description = "Open-source alternative of Discord desktop's \"app.asar\"."; + homepage = "https://openasar.dev"; + license = licenses.mit; + maintainers = with maintainers; [ pedrohlc ]; + platforms = nodejs.meta.platforms; + }; +} From 64938ed3918114605ca20028b93b10555e9c4e11 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 23 Jun 2022 16:42:57 -0300 Subject: [PATCH 062/100] discord: no pkgs in inputs --- .../networking/instant-messengers/discord/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 957efb7a1a48..54bd7acf6833 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,6 +1,5 @@ -{ branch ? "stable", pkgs, lib, stdenv, withOpenASAR ? false }: +{ branch ? "stable", callPackage, fetchurl, lib, stdenv, withOpenASAR ? false }: let - inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { stable = "0.0.18"; ptb = "0.0.29"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d525f2e5da02..b3a11961d6c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35212,19 +35212,16 @@ with pkgs; mpvc = callPackage ../applications/misc/mpvc { }; - discord = import ../applications/networking/instant-messengers/discord { + discord = callPackage ../applications/networking/instant-messengers/discord { branch = "stable"; - inherit pkgs lib stdenv; }; - discord-ptb = import ../applications/networking/instant-messengers/discord { + discord-ptb = callPackage ../applications/networking/instant-messengers/discord { branch = "ptb"; - inherit pkgs lib stdenv; }; - discord-canary = import ../applications/networking/instant-messengers/discord { + discord-canary = callPackage ../applications/networking/instant-messengers/discord { branch = "canary"; - inherit pkgs lib stdenv; }; golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; From 8cfcee74b1678205aa82af92f2daeec293d50ced Mon Sep 17 00:00:00 2001 From: Madoura Date: Wed, 22 Jun 2022 15:30:16 -0500 Subject: [PATCH 063/100] zfs: 2.1.4 -> 2.1.5 --- .../from_md/release-notes/rl-2211.section.xml | 6 ++++++ .../manual/release-notes/rl-2211.section.md | 2 ++ pkgs/os-specific/linux/zfs/default.nix | 18 +++++++++--------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index c62efadbbf1a..8b1e402fc6f4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -262,6 +262,12 @@ and require manual remediation. + + + zfs was updated from 2.1.4 to 2.1.5, + enabling it to be used with Linux kernel 5.18. + + memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index f6366c14cf48..c2626998843b 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -102,6 +102,8 @@ Use `configure.packages` instead. - Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation. +- `zfs` was updated from 2.1.4 to 2.1.5, enabling it to be used with Linux kernel 5.18. + - memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available. diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 96c6f57b019a..eec2d1ad04ab 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 +, linuxPackages_5_18 ? pkgs.linuxKernel.packages.linux_5_18 }: let @@ -216,28 +216,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelOlder "5.19"; + latestCompatibleLinuxPackages = linuxPackages_5_18; # this package should point to the latest release. - version = "2.1.4"; + version = "2.1.5"; - sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; + sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelOlder "5.19"; + latestCompatibleLinuxPackages = linuxPackages_5_18; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.4"; + version = "2.1.5"; # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; + sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE="; isUnstable = true; }; From 567738b1d410ead51c38eb64b940e4d57a869278 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 22:09:23 +0200 Subject: [PATCH 064/100] sslscan: 2.0.13 -> 2.0.14 --- pkgs/tools/security/sslscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index ae94b6e25470..6c112d6488da 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = version; - sha256 = "sha256-boXp26f8jiw73lMLwUMuAuDBRIw8JzokYadbKx/VeSg="; + sha256 = "sha256-CqfxiTRIgrr4J6qThDFqohkxJj5Byf0vQzG+voAEzag="; }; buildInputs = [ openssl ]; From eb72486d13038d992f58fcce94207279fe6f681a Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 23 Jun 2022 23:10:17 +0200 Subject: [PATCH 065/100] ocamlPackages.ffmpeg*: 1.1.3 -> 1.1.4 --- pkgs/development/ocaml-modules/ffmpeg/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index 5dc5f612fd32..212ad686e356 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: rec { - version = "1.1.3"; + version = "1.1.4"; useDune2 = true; @@ -9,7 +9,7 @@ rec { owner = "savonet"; repo = "ocaml-ffmpeg"; rev = "v${version}"; - sha256 = "1l40dfc0v3wn2drfq0mclrc1lrlpycdjrkrw4knkwpsg0za68v4c"; + sha256 = "sha256-IM7bzOZAZQjLz4YjRTMU5fZgrA2QTZcSDMgclDo4sn0="; }; meta = with lib; { From 8a40b9f1e618879c02902a25f4b795e714f481b4 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 24 Jun 2022 00:13:04 +0300 Subject: [PATCH 066/100] zfsbackup: unstable-2020-09-30 -> unstable-2021-05-26 --- pkgs/tools/backup/zfsbackup/default.nix | 26 +- pkgs/tools/backup/zfsbackup/deps.nix | 1326 ----------------------- 2 files changed, 17 insertions(+), 1335 deletions(-) delete mode 100644 pkgs/tools/backup/zfsbackup/deps.nix diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/pkgs/tools/backup/zfsbackup/default.nix index ff47ce47edef..332ad619a431 100644 --- a/pkgs/tools/backup/zfsbackup/default.nix +++ b/pkgs/tools/backup/zfsbackup/default.nix @@ -1,26 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, zfs +}: -buildGoPackage rec { +buildGoModule rec { pname = "zfsbackup"; - version = "unstable-2020-09-30"; - rev = "092f80846b23e02f99d2aa72d9d889eabfdcb053"; - - goPackagePath = "github.com/someone1/zfsbackup-go"; + version = "unstable-2021-05-26"; + rev = "2d4534b920d3c57552667e1c6da9978b3a9278f0"; src = fetchFromGitHub { owner = "someone1"; repo = "zfsbackup-go"; inherit rev; - sha256 = "1xiacaf4r9jkx0m8wjfis14cq622yhljldwkflh9ni3khax7dlgi"; + sha256 = "sha256-slVwXXGLvq+eAlqzD8p1fnc17CGUBY0Z68SURBBuf2k="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-jpxp8RKDBrkBBaY89QnKYGWFI/DUURUVX8cPJ/qoLrg="; + + ldflags = [ "-w" "-s" ]; + + # Tests require loading the zfs kernel module. + doCheck = false; meta = with lib; { description = "Backup ZFS snapshots to cloud storage such as Google, Amazon, Azure, etc"; homepage = "https://github.com/someone1/zfsbackup-go"; license = licenses.mit; - maintainers = [ maintainers.xfix ]; + maintainers = with maintainers; [ xfix ]; + platforms = platforms.linux; mainProgram = "zfsbackup-go"; }; } diff --git a/pkgs/tools/backup/zfsbackup/deps.nix b/pkgs/tools/backup/zfsbackup/deps.nix deleted file mode 100644 index 28be9fa141cf..000000000000 --- a/pkgs/tools/backup/zfsbackup/deps.nix +++ /dev/null @@ -1,1326 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "v0.57.0"; - sha256 = "0lcq68h0x56qb14yx2df584ad0g9s1s19py813dy9nzqp0bmjig8"; - }; - } - { - goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; - fetch = { - type = "git"; - url = "https://dmitri.shuralyov.com/gpu/mtl"; - rev = "666a987793e9"; - sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; - }; - } - { - goPackagePath = "github.com/Azure/azure-pipeline-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-pipeline-go"; - rev = "v0.2.2"; - sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6"; - }; - } - { - goPackagePath = "github.com/Azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-sdk-for-go"; - rev = "v42.3.0"; - sha256 = "1nqxpifrr8n17irkfzhx253b17cwd15x4vfqxx80l5y7dn0jqavq"; - }; - } - { - goPackagePath = "github.com/Azure/azure-storage-blob-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-storage-blob-go"; - rev = "v0.8.0"; - sha256 = "00gsnk9s1rlrakqvcm917hn4r47jannxwp7rkhrb71pamzm46752"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/BurntSushi/xgb"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/xgb"; - rev = "27f122750802"; - sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; - }; - } - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.2"; - sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "eb2c6b5be1b6"; - sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "v1.31.4"; - sha256 = "07ia78j6j2y139iq9x5gin0fwc77wv8x0zhg47kibykxn4iyx85y"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.2.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "v0.2.1"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v1.1.0"; - sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; - }; - } - { - goPackagePath = "github.com/chzyer/logex"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/logex"; - rev = "v1.1.10"; - sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/chzyer/test"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/test"; - rev = "a1ea475d72b1"; - sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - { - goPackagePath = "github.com/cncf/udpa"; - fetch = { - type = "git"; - url = "https://github.com/cncf/udpa"; - rev = "269d4d468f6f"; - sha256 = "0i1jiaw2k3hlwwmg4hap81vb4s1p25xp9kdfww37v0fbgjariccs"; - }; - } - { - goPackagePath = "github.com/coreos/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/coreos/bbolt"; - rev = "v1.3.2"; - sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "v3.3.10"; - sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "95778dfbb74e"; - sha256 = "1s3bg9p78wkixn2bqb2p23wbsqfg949ml6crw2b498s71mwh8rcf"; - }; - } - { - goPackagePath = "github.com/coreos/pkg"; - fetch = { - type = "git"; - url = "https://github.com/coreos/pkg"; - rev = "399ea9e2e55f"; - sha256 = "0nxbn0m7lr4dg0yrwnvlkfiyg3ndv8vdpssjx7b714nivpc6ar0y"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v2.0.0"; - sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "v3.2.0"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/dgryski/go-sip13"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-sip13"; - rev = "e10d5fee7954"; - sha256 = "15fyibfas209ljz3f7g07kdmfbl3hhyd9n5n7aq5n5p9m5mn41d6"; - }; - } - { - goPackagePath = "github.com/dnaeon/go-vcr"; - fetch = { - type = "git"; - url = "https://github.com/dnaeon/go-vcr"; - rev = "v1.0.1"; - sha256 = "1d0kpqr12qrqlamz5a47bp05mx49za2v6l1k7c6z71xahfmb7v2d"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/envoyproxy/go-control-plane"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/go-control-plane"; - rev = "v0.9.4"; - sha256 = "0m0crzx70lp7vz13v20wxb1fcfdnzp7h3mkh3bn6a8mbfz6w5asj"; - }; - } - { - goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/protoc-gen-validate"; - rev = "v0.1.0"; - sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "v1.0.0"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/go-gl/glfw"; - fetch = { - type = "git"; - url = "https://github.com/go-gl/glfw"; - rev = "6f7a984d4dc4"; - sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.5.0"; - sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.2.1"; - sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "8c9f03a8e57e"; - sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.4.3"; - sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.4.1"; - sha256 = "0w7ks4vffnnkp0miwgc3chrsnmya45lzvpahb2wmw0jwhdp5kdx7"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "v1.0.0"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "fc25d7d30c6d"; - sha256 = "0ba28qx2i1bi6n6x5g670v8hmqavwj8lwl8psnc6vzagmdhjw0vg"; - }; - } - { - goPackagePath = "github.com/google/renameio"; - fetch = { - type = "git"; - url = "https://github.com/google/renameio"; - rev = "v0.1.0"; - sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.5"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-middleware"; - rev = "v1.0.0"; - sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; - rev = "v1.2.0"; - sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/grpc-gateway"; - rev = "v1.9.0"; - sha256 = "1r4y48c76yxc2hpqszfjirvh7zxjb6z72qmk95li12ar79dhv3dy"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/ianlancetaylor/demangle"; - fetch = { - type = "git"; - url = "https://github.com/ianlancetaylor/demangle"; - rev = "5e5cf60278f6"; - sha256 = "1fhjk11cip9c3jyj1byz9z77n6n2rlxmyz0xjx1zpn1da3cvri75"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "v0.3.0"; - sha256 = "12qgp7yb7yfjxhd311kb820fcjmg7gd4hp2fc4v6x8s7121pwnjp"; - }; - } - { - goPackagePath = "github.com/jonboulle/clockwork"; - fetch = { - type = "git"; - url = "https://github.com/jonboulle/clockwork"; - rev = "v0.1.0"; - sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "v0.9.1"; - sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; - }; - } - { - goPackagePath = "github.com/juju/ratelimit"; - fetch = { - type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "v1.0.1"; - sha256 = "0ppwvwbh9jdpdk4f9924vw373cpfz5g5ad10c707p22a984vanrz"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/kisielk/errcheck"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/errcheck"; - rev = "v1.1.0"; - sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "v1.10.6"; - sha256 = "0jnm5mjazxkjwzb7z6sjlqm2l68z4h4xjhir2lgfkf04rj4l290s"; - }; - } - { - goPackagePath = "github.com/klauspost/pgzip"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/pgzip"; - rev = "v1.2.4"; - sha256 = "0mnhfdn0isbkra455jynqjbmrwymx09shlbzbyvgfycih3nbrif0"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/kurin/blazer"; - fetch = { - type = "git"; - url = "https://github.com/kurin/blazer"; - rev = "v0.5.3"; - sha256 = "18jsq7n31ycvaivpvyksbddj82spw4g29w6dx92x2wab2hzbc7ik"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mattn/go-ieproxy"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-ieproxy"; - rev = "v0.0.1"; - sha256 = "0x1ijwwp22s20vjbca5ac7y7bx2jp6jizzqa38ks4943q7vi4w09"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/miolini/datacounter"; - fetch = { - type = "git"; - url = "https://github.com/miolini/datacounter"; - rev = "v1.0.2"; - sha256 = "0lqhdb9glx65ycjjrqqqpd28zi95qnr2sdz93y6fma0khss46c5f"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/nightlyone/lockfile"; - fetch = { - type = "git"; - url = "https://github.com/nightlyone/lockfile"; - rev = "v1.0.0"; - sha256 = "0jzlngank7yaq5pl5mipsfglmalv9x2b9yhqr78w5dmx4hikh7kr"; - }; - } - { - goPackagePath = "github.com/oklog/ulid"; - fetch = { - type = "git"; - url = "https://github.com/oklog/ulid"; - rev = "v1.3.1"; - sha256 = "0hybwyid820n80axrk863k2py93hbqlq6hxhf84ppmz0qd0ys0gq"; - }; - } - { - goPackagePath = "github.com/op/go-logging"; - fetch = { - type = "git"; - url = "https://github.com/op/go-logging"; - rev = "970db520ece7"; - sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.1"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.3"; - sha256 = "1608rm1y2p3iv8k2x7wyc6hshvpbfkv2k77hy0x870syms1g3g1p"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.0"; - sha256 = "00008pczafy982m59n1j31pnp41f4grbc2c40jccp52xg3m5klmr"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "5867b95ac084"; - sha256 = "1rahdk62ajj4zpfb3mgzjqip773la9fb0m87m7s9a0b39l3fmzvr"; - }; - } - { - goPackagePath = "github.com/prometheus/tsdb"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/tsdb"; - rev = "v0.7.1"; - sha256 = "1c1da8i5byvhh4fp3vqjfb65aaksjskn3ggb8wg9hcfzjrhgpz04"; - }; - } - { - goPackagePath = "github.com/rogpeppe/fastuuid"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/fastuuid"; - rev = "6724a57986af"; - sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "v1.3.0"; - sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v2.0.1"; - sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "v1.2.0"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/soheilhy/cmux"; - fetch = { - type = "git"; - url = "https://github.com/soheilhy/cmux"; - rev = "v0.1.4"; - sha256 = "1f736g68d9vwlyfb6g0fxkr0r875369xafk30cz8kaq5niaqwv0h"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc72"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.3.0"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v1.0.0"; - sha256 = "0vbppqqhby302a5ayn0296jqr71qkcd4c9am7wzsk6z71fwdsa7h"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.5"; - sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.4.0"; - sha256 = "1zpzxvn13wpvbblbbn73svaq39zgxfjqhci9d68g3qf309pcfy19"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/tmc/grpc-websocket-proxy"; - fetch = { - type = "git"; - url = "https://github.com/tmc/grpc-websocket-proxy"; - rev = "0ad062ec5ee5"; - sha256 = "1anw4v9wspnw9xf2z5r9w0sszwjklyanl0l85wgg6nxak9gnrqp4"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "v1.1.4"; - sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; - }; - } - { - goPackagePath = "github.com/xiang90/probing"; - fetch = { - type = "git"; - url = "https://github.com/xiang90/probing"; - rev = "43a291ad63a2"; - sha256 = "1z22ms16j5j42775mf31isanwx2pwr1d8wqw8006dczjv36qnz5i"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "github.com/yuin/goldmark"; - fetch = { - type = "git"; - url = "https://github.com/yuin/goldmark"; - rev = "v1.1.27"; - sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; - }; - } - { - goPackagePath = "go.etcd.io/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/etcd-io/bbolt"; - rev = "v1.3.2"; - sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.22.3"; - sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.4.0"; - sha256 = "0c6yzx15c20719xii3dm0vyjd8i9jx45m0wh5yp1zf29b0gbljcy"; - }; - } - { - goPackagePath = "go.uber.org/multierr"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/multierr"; - rev = "v1.1.0"; - sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; - }; - } - { - goPackagePath = "go.uber.org/zap"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/zap"; - rev = "v1.10.0"; - sha256 = "10hdzr1rghwbsl6bbd30779dx44fh9mg9pq8d2cgqlknqxxpvpvr"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "06a226fb4e37"; - sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "6cc2880d07d6"; - sha256 = "1iia6hiif6hcp0cg1i6nq63qg0pmvm2kq24pf2r2il3597rfmlgy"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "cff245a6509b"; - sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "738671d3881b"; - sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "d2bd2a29d028"; - sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "v0.2.0"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "7e3656a0809f"; - sha256 = "1rmj59bd0hvf8cbp42c0y8y38prs5ill1zszhqp9i8m86cvkfqk9"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "43a5402ce75a"; - sha256 = "0j6zrrb81qjr1926kkwmn0di9a0jn8qyjd9dw614rfkihxgq1vsm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7e40ca221e25"; - sha256 = "1fkhs1sn6prfsqaj70kya2gn1sqqa85lmgff6j6s7027zc1yjvqa"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "555d28b269f0"; - sha256 = "1rhl4lyz030kwfsg63yk83yd3ivryv1afmzdz9sxbhcj84ym6h4r"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "2bc93b1c0c88"; - sha256 = "10sg7nvw40f2d6hxmsy4nvhmawbidk022v3arbh8acsjxglw84zs"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-api-go-client"; - rev = "v0.25.0"; - sha256 = "0bfpii160ns1pl3iqc38h5db258mv58igf2ifglds3dajgsj2qrr"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.6.6"; - sha256 = "15c38h6fbv06cnkr6yknygfrpibyms2mya4w0l29kaxf42jn1qi5"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "f5ebc3bea380"; - sha256 = "1v5dyp6g35rwjwx1ixjy7yh1hay4n7ya5aq5h4ckvd9h0j7rw5sz"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.29.1"; - sha256 = "1465947r6536si36cl2ppx7929la9zba1y6xfczfyp4kgf8988hf"; - }; - } - { - goPackagePath = "google.golang.org/protobuf"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/protobuf"; - rev = "v1.22.0"; - sha256 = "0n7lc4m7kfvj01glc0gnjy0zsnsic7cxnbvlajy0h14cxbab87pj"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/errgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/errgo.v2"; - rev = "v2.1.0"; - sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; - }; - } - { - goPackagePath = "gopkg.in/resty.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/resty.v1"; - rev = "v1.12.0"; - sha256 = "062mn735rqzhha5ag07z4gz08hxzrfm2yx067jfmaaxmb6797lmp"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "v0.0.1-2020.1.3"; - sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; - }; - } - { - goPackagePath = "rsc.io/binaryregexp"; - fetch = { - type = "git"; - url = "https://github.com/rsc/binaryregexp"; - rev = "v0.2.0"; - sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; - }; - } - { - goPackagePath = "rsc.io/quote"; - fetch = { - type = "git"; - url = "https://github.com/rsc/quote"; - rev = "v3.1.0"; - sha256 = "0nvv97hwwrl1mx5gzsbdm1ndnwpg3m7i2jb10ig9wily7zmvki0i"; - }; - } - { - goPackagePath = "rsc.io/sampler"; - fetch = { - type = "git"; - url = "https://github.com/rsc/sampler"; - rev = "v1.3.0"; - sha256 = "0byxk2ynba50py805kcvbvjzh59l1r308i1xgyzpw6lff4xx9xjh"; - }; - } -] From 251ca357bb1f5f9710a1c05784711622ffc824d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Thu, 23 Jun 2022 23:25:15 +0200 Subject: [PATCH 067/100] micromamba: build on all platforms --- pkgs/tools/package-management/micromamba/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index c1f8fc9c990b..6083a83872b3 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { description = "Reimplementation of the conda package manager"; homepage = "https://github.com/mamba-org/mamba"; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ mausch ]; }; } From 710f6606659d803b9cd486f75ff70a00d58ad9dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 23:40:21 +0200 Subject: [PATCH 068/100] checkov: 2.1.4 -> 2.1.5 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 06ba4fe762ef..6cb98bf10d4d 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.1.4"; + version = "2.1.5"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-J8CpNeON2qOaU/U7LbIOaQ/DJ/7Q+kLzzw+jD1QLkik="; + hash = "sha256-bH7W+GZ4O32ty5YD4hfKz2R10v7zEJLU1kLzKvdx3E4="; }; nativeBuildInputs = with py.pkgs; [ From ccbf6438f1f0d8be4a92fc56ab5f432b13c822ea Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 23 Jun 2022 19:49:53 -0400 Subject: [PATCH 069/100] geos: backport patch to fix config paths Backport an upstream patch to fix the paths in geos-config and geos.pc when built with absolute CMAKE_INSTALL_*DIR. --- pkgs/development/libraries/geos/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index c067a705d0bf..32b3155b8c56 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , cmake }: stdenv.mkDerivation rec { @@ -12,13 +13,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-ULvFmaw4a0wrOWLcxBHwBAph8gSq7066ciXs3Qz0VxU="; }; - nativeBuildInputs = [ cmake ]; + patches = [ + # Fix paths with absolute CMAKE_INSTALL_*DIR + (fetchpatch { + url = "https://github.com/libgeos/geos/commit/11faa4db672ed61d64fd8a6f1a59114f5b5f2406.patch"; + hash = "sha256-oAArwGq91Z93C6hBPQD0AlY8Q4Nnn6tA40HUPoZ5ftc="; + }) + ]; - postPatch = '' - substituteInPlace tools/geos-config.in \ - --replace "@libdir@" "@prefix@/lib" \ - --replace "@includedir@" "@prefix@/include" - ''; + nativeBuildInputs = [ cmake ]; meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; From f6770a9d96f0efeb95fc30b60182af679c5e22cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 01:55:30 +0000 Subject: [PATCH 070/100] python310Packages.django-debug-toolbar: 3.4 -> 3.5 --- .../python-modules/django-debug-toolbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index 871b8bb852e6..b4409dc04d4c 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "3.4"; + version = "3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tXQZcQvdGEtcIAtER1s2HSVkGHW0sdrnC+i01+RuSXg="; + hash = "sha256-OZWO3tXZ+p+zKtQHCkj0kGSXpDFHFV+HqSgiJvLmMTg="; }; propagatedBuildInputs = [ From 0d655f39d82dc237f9e8b812904c649482d26d8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 03:18:47 +0000 Subject: [PATCH 071/100] deno: 1.23.0 -> 1.23.1 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 3a62b1802b74..c433e2dfa671 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nPVghkLtXhd2/TeBeNDtA1ucgiqzZWmtxXf9bCrFh44="; + sha256 = "sha256-Z9dZrhH+zlYNuhFs+aicuepnUTSOfIHdLaz9sJp0LCA="; }; - cargoSha256 = "sha256-bCk6zgsfyI5Nk0AHPyr29KzgltobxfD6b72N0ZaQyOU="; + cargoSha256 = "sha256-VIpy5vRZinFvFhyyKQwi5ThrBNwqGy1TVg5tAoxxJyQ="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 581c2e88d9ca..793bc9cb1949 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.44.1"; + version = "0.44.2"; shas = { - x86_64-linux = "sha256-8aBjN9ukbH+lr3YPdngXxSjPjutBgWv4hEdhYmcvtO4="; - aarch64-linux = "sha256-h0mxzeA/wB+/zNz0ZKjSBH7lpYrCLRdTgeDGwZypuXE="; - x86_64-darwin = "sha256-4YXYHhYwCBnb1clxW1ziccHMWsUcGz8Rr8/anCvI1lY="; - aarch64-darwin = "sha256-3sBeL+YJB1HaEhM76GfABvN/6iWeST7Z6lVu3X8sRjk="; + x86_64-linux = "sha256-I1ad9a9FtJGGGW7Odc8HfysQyCEAb8xoEYmYti0pEkE="; + aarch64-linux = "sha256-KHjVMI9qiJ6q3D6t6iUKxbp1qthHSSl+2AfvL3Hvk6I="; + x86_64-darwin = "sha256-UO1NRpbCA5MtqeRLTGM3FIWdX/ECDW/JG52U756FIv8="; + aarch64-darwin = "sha256-FqakcG050m52/F6nWlS7VeW0r+77CCIzG1qvBP3Naik="; }; } From a6ed92b0440128220e6c50ac65a0299996b7cdfb Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Wed, 22 Jun 2022 22:08:08 +0200 Subject: [PATCH 072/100] onedrive: 2.4.17 -> 2.14.19 --- pkgs/applications/networking/sync/onedrive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index a76be3d318c3..7b6316631e89 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.17"; + version = "2.4.19"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA="; + hash = "sha256-7kX7gC/1jSZGgV3ZhfebMIn/Y5gXkz22GDP2zpiwUZ4="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; From 6fae48936bf1691c87893f89140c9e453127607b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 03:46:47 +0000 Subject: [PATCH 073/100] dsq: 0.20.1 -> 0.20.2 --- pkgs/tools/misc/dsq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 1d6dde3c3cff..62a17142bde6 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "dsq"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; rev = version; - hash = "sha256-zTrIs6Q/+PW6CKCx1L8VaXhc1ZAqbb+Od+LJNjPCOTs="; + hash = "sha256-dgx1rFdhEtvyH/N3AtQE89ASBoE3CLl+ZFWwWWYe0II="; }; vendorSha256 = "sha256-bLaBBWChK2RKXd/rX9m9UfHu8zt0j8TOm5S2M02U91A="; From b9a9608e6b829e5953fc3a1f91130eca838c20dd Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Fri, 24 Jun 2022 09:53:45 +0530 Subject: [PATCH 074/100] terraform-ls: 0.26.0 -> 0.28.1 --- pkgs/development/tools/misc/terraform-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index e85e014368af..3e218523ed34 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.26.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xq9HojFjUrdThXvQ4M8o4LLmxopVErnN3WGUgI79BCw="; + sha256 = "sha256-6K4aOp5mjX+qhG/OS/Gs1kAOpDGUPdgRNx4zp3i/c2A="; }; - vendorSha256 = "sha256-iSgK+FOD9olVN4bR2jmtWndaRHrh9pfo/42COTiIh9c="; + vendorSha256 = "sha256-YouAdTo7huco35er84MRfI1gmq11VbFwRGSovs1XDYo="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; From 955567fba80fa11e06aab378087b911eae212443 Mon Sep 17 00:00:00 2001 From: Varun Madiath Date: Thu, 23 Jun 2022 17:29:52 -0400 Subject: [PATCH 075/100] {jesec,rakshasa}-rtorrent: allow passthrough of dependency. Previously it was not possible to access the libtorrent dependency --- pkgs/applications/networking/p2p/jesec-rtorrent/default.nix | 4 ++++ .../applications/networking/p2p/rakshasa-rtorrent/default.nix | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index a760a0f96c35..df314b6591c2 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k="; }; + passthru = { + inherit libtorrent; + }; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index f166f6d0e29f..fa459137f199 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0="; }; + passthru = { + inherit libtorrent; + }; + nativeBuildInputs = [ autoconf-archive autoreconfHook From 0de6e1dfb07cf43b31ce72bd48ae54bc0254d0f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 05:56:20 +0000 Subject: [PATCH 076/100] python310Packages.youtube-search-python: 1.6.5 -> 1.6.6 --- .../python-modules/youtube-search-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 9383d4cb0598..11da850c992d 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.5"; + version = "1.6.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1B7rppa+s/oE8w91Ca7ogjkNHu5pFSnNmDyUopCWEY8="; + hash = "sha256-RWjR12ns1+tLuDZfBO7G42TF9w7sezdl9UPa67E1/PU="; }; propagatedBuildInputs = [ From c889a0dd6a818f7ef5714ae4269d7daaea831b16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 06:14:53 +0000 Subject: [PATCH 077/100] python310Packages.mockito: 1.3.1 -> 1.3.3 --- pkgs/development/python-modules/mockito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 1d2509c4a75e..e9af134ba111 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.3.3"; pname = "mockito"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o8Hg3UnxWbJITBu/IjsbWRHDiJ5smffKUNHAqG21170="; + sha256 = "sha256-mCRTdihXcyMHNPJkmGWLHcBFrTvhNCH1CMcaXHaVe8E="; }; propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; From c299e5c7da69f290cef6153122bcdd6e8e5704a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 10:25:03 +0200 Subject: [PATCH 078/100] skytemple: add missing runtime dependencies --- pkgs/applications/misc/skytemple/default.nix | 22 +++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 0f331ef6e2ce..2ec034e882e1 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -1,4 +1,12 @@ -{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, webkitgtk, wrapGAppsHook, python3Packages }: +{ lib +, fetchFromGitHub +, gobject-introspection +, gtk3 +, gtksourceview3 +, webkitgtk +, wrapGAppsHook +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "skytemple"; @@ -8,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; + hash = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; }; buildInputs = [ @@ -20,9 +28,16 @@ python3Packages.buildPythonApplication rec { # any Pokemon, and clicking Stats and Moves tab. webkitgtk ]; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + propagatedBuildInputs = with python3Packages; [ + cairosvg natsort + ndspy packaging pycairo pygal @@ -36,6 +51,7 @@ python3Packages.buildPythonApplication rec { skytemple-files skytemple-icons skytemple-ssb-debugger + tilequant ]; doCheck = false; # there are no tests From de43d937f503940541275c4c4c7f1ce4fb5a1dfb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 24 Jun 2022 16:29:01 +0800 Subject: [PATCH 079/100] v2ray-geoip: 202205260055 -> 202206230045 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index a6954100d547..e4ab5df75842 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202205260055"; + version = "202206230045"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "96f4639373709f7560ccaf374d1ff008781aa324"; - sha256 = "sha256-aFTLeYr+JishhJ2AhGMrD02fKxci2rREkh8HN9HtXLs="; + rev = "2e2aba7f3dfb4139e8a882f85350045f2ef522d1"; + sha256 = "sha256-WFvS51RmkAWivYj0HFAT6S3euJk+GSYLDTN3cmkcCNs="; }; installPhase = '' From 106bc570be5c088274117046eca53c3766aeb8c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 08:33:13 +0000 Subject: [PATCH 080/100] python310Packages.railroad-diagrams: 1.1.1 -> 2.0.3 --- pkgs/development/python-modules/railroad-diagrams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix index 57c07e0dc48b..6d1a9eea6140 100644 --- a/pkgs/development/python-modules/railroad-diagrams/default.nix +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "railroad-diagrams"; - version = "1.1.1"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "8a1ec227666be2000e76794aa740f77987f1586077aae4d090d2633b3064c976"; + sha256 = "sha256-wRClrA4I/DWNw/hL5rowQMn0R61c6qiNg9Ho6nXqi+4="; }; # this is a dependency of pyparsing, which is a dependency of pytest From 5525e6a2026acc23036d85354b31d5339898404c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 24 Jun 2022 16:34:52 +0800 Subject: [PATCH 081/100] v2ray-domain-list-community: 20220528180904 -> 20220624025859 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 5e84f479d21b..a5bbb2b5c013 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220528180904"; + version = "20220624025859"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-j1Q7B/U0OADOcgJRJ269Jx9Z5dmmT4T2eaOHeGmUjmc="; + sha256 = "sha256-/4wfTtRsBzOCbx3I3H28tB935xDZPPwHOFFmjiV7kEI="; }; vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; meta = with lib; { From 6eb44e6fce70ad67d6fb2534e7bd7cd78c90037b Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 24 Jun 2022 10:50:56 +0200 Subject: [PATCH 082/100] nar-serve: 0.4.0 -> 0.6.1 --- pkgs/tools/nix/nar-serve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix index 1d7fd6beb4a7..10ac797578f9 100644 --- a/pkgs/tools/nix/nar-serve/default.nix +++ b/pkgs/tools/nix/nar-serve/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "nar-serve"; - version = "0.4.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "numtide"; repo = "nar-serve"; rev = "v${version}"; - hash = "sha256-h/pzKRXgcGTpr1YUKppDa+iTLKak/PGhbYa8ZczWj1U="; + hash = "sha256-cSOYHYJJEGzFtkD4mjTmYBiM9CaWKt64xgV/JeNHpfM="; }; - vendorSha256 = "sha256-eW+cul/5qJocpKV/6azxj7HTmkezDw6dNubPtAOP5HU="; + vendorSha256 = "sha256-RpjLs4+9abbbysYAlPDUXBLe1cz4Lp+QmR1yv+LpYwQ="; doCheck = false; From 78ede9c299d9d8f3e437419bbdfb1bab452013ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 11:05:02 +0200 Subject: [PATCH 083/100] python310Packages.railroad-diagrams: disable on older Python releases --- .../python-modules/railroad-diagrams/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix index 6d1a9eea6140..1af5a196250f 100644 --- a/pkgs/development/python-modules/railroad-diagrams/default.nix +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -1,24 +1,30 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "railroad-diagrams"; version = "2.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wRClrA4I/DWNw/hL5rowQMn0R61c6qiNg9Ho6nXqi+4="; + hash = "sha256-wRClrA4I/DWNw/hL5rowQMn0R61c6qiNg9Ho6nXqi+4="; }; - # this is a dependency of pyparsing, which is a dependency of pytest + # This is a dependency of pyparsing, which is a dependency of pytest doCheck = false; - pythonImportsCheck = [ "railroad" ]; + pythonImportsCheck = [ + "railroad" + ]; meta = with lib; { - description = "Generate SVG railroad syntax diagrams, like on JSON.org"; + description = "Module to generate SVG railroad syntax diagrams"; homepage = "https://github.com/tabatkins/railroad-diagrams"; license = licenses.cc0; maintainers = with maintainers; [ jonringer ]; From a331014990a5bd08aae31caeab94dbafd13a5498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 09:45:52 +0000 Subject: [PATCH 084/100] python310Packages.django-oauth-toolkit: 1.7.0 -> 2.1.0 --- .../python-modules/django-oauth-toolkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index eca67211671c..65bf5045a035 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "django-oauth-toolkit"; - version = "1.7.0"; + version = "2.1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "jazzband"; repo = pname; - rev = version; - sha256 = "0rp7pjif54yvdxfxn0pnf8ha3fjxspnx1ijyr1f8npwk2x5vnvhb"; + rev = "refs/tags/${version}"; + sha256 = "sha256-c78QYlU/gB4Lt04TlQFjtsS6pyjDm/fURBMa9hXLpLI="; }; postPatch = '' From fcda800ae2a95fb10c432ce715030d6a6e8fd402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Fri, 24 Jun 2022 14:01:02 +0200 Subject: [PATCH 085/100] add `platforms.all` --- pkgs/tools/package-management/micromamba/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 6083a83872b3..1f95e41e6103 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { description = "Reimplementation of the conda package manager"; homepage = "https://github.com/mamba-org/mamba"; license = licenses.bsd3; + platforms = platforms.all; maintainers = with maintainers; [ mausch ]; }; } From 47db3772a731d48f30d6dc97120ef77f5240096c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 21 Jun 2022 18:38:36 +1000 Subject: [PATCH 086/100] kubernetes: switch to buildGoModule --- .../networking/cluster/kubernetes/default.nix | 31 +++++++++---------- .../networking/cluster/kubernetes/kubectl.nix | 13 ++++---- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 8ed8cd568913..5cbd307a3d73 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,11 +1,11 @@ -{ stdenv -, lib +{ lib +, buildGoModule , fetchFromGitHub , which -, go , makeWrapper , rsync , installShellFiles +, runtimeShell , kubectl , nixosTests @@ -19,7 +19,7 @@ ] }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubernetes"; version = "1.23.8"; @@ -30,23 +30,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-mu+jBSypoMNxOugLbS3foH4C4AqSZnlic4Bf1v9dYc8="; }; - nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; + vendorSha256 = null; + + doCheck = false; + + nativeBuildInputs = [ makeWrapper which rsync installShellFiles ]; outputs = [ "out" "man" "pause" ]; patches = [ ./fixup-addonmanager-lib-path.patch ]; - postPatch = '' - substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - patchShebangs ./hack - ''; - WHAT = lib.concatStringsSep " " ([ "cmd/kubeadm" ] ++ components); - postBuild = '' + buildPhase = '' + runHook preBuild + substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${runtimeShell}" + patchShebangs ./hack ./cluster/addons/addon-manager + make "SHELL=${runtimeShell}" "WHAT=$WHAT" ./hack/update-generated-docs.sh + runHook postBuild ''; installPhase = '' @@ -69,7 +73,6 @@ stdenv.mkDerivation rec { --subst-var out chmod +x $out/bin/kube-addons - patchShebangs $out/bin/kube-addons wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons-lib.sh @@ -80,10 +83,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - disallowedReferences = [ go ]; - - GOFLAGS = [ "-trimpath" ]; - meta = with lib; { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index 6a6f9042124b..754bca32511c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, kubernetes }: +{ lib, buildGoModule, kubernetes }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubectl"; inherit (kubernetes) - disallowedReferences - GOFLAGS + buildPhase + doCheck nativeBuildInputs - postBuild - postPatch src + vendorSha256 version ; @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { WHAT = lib.concatStringsSep " " [ "cmd/kubectl" "cmd/kubectl-convert" - ]; + ]; installPhase = '' runHook preInstall From 67cd38b51954536f4c02e7f51503750795be33cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 24 Jun 2022 15:28:34 +0200 Subject: [PATCH 087/100] python3Packages.django-prometheus: fix 2.2.0 update --- .../python-modules/django-prometheus/default.nix | 4 ++-- .../drop-untestable-database-backends.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix index 733a177d6a5e..209395ef6430 100644 --- a/pkgs/development/python-modules/django-prometheus/default.nix +++ b/pkgs/development/python-modules/django-prometheus/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "korfuri"; repo = pname; - rev = version; - sha256 = "1y1cmycc545xrys41jk8kia36hwnkwhkw26mlpfdjgb63vq30x1d"; + rev = "v${version}"; + hash = "sha256-NE0zHnGGSrtkBLrSyBcQuyGrSfSQbdpevokg3YZhwDw="; }; patches = [ diff --git a/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch b/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch index 1e9e65060849..41f1229c5e59 100644 --- a/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch +++ b/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch @@ -1,5 +1,5 @@ diff --git a/django_prometheus/tests/end2end/testapp/settings.py b/django_prometheus/tests/end2end/testapp/settings.py -index 0630721..bd2190a 100644 +index cdd167f..5c6073b 100644 --- a/django_prometheus/tests/end2end/testapp/settings.py +++ b/django_prometheus/tests/end2end/testapp/settings.py @@ -53,33 +53,6 @@ DATABASES = { @@ -28,9 +28,9 @@ index 0630721..bd2190a 100644 - "mysql": { - "ENGINE": "django_prometheus.db.backends.mysql", - "NAME": "django_prometheus_1", -- "USER": "travis", +- "USER": "root", - "PASSWORD": "", -- "HOST": "localhost", +- "HOST": "127.0.0.1", - "PORT": "3306", - }, # The following databases are used by test_db.py only From 203b454fc19b83e5e7ebe35185d2d23430341c8a Mon Sep 17 00:00:00 2001 From: wyndon Date: Fri, 24 Jun 2022 16:21:54 +0200 Subject: [PATCH 088/100] httm: 0.11.6 -> 0.12.1 --- pkgs/tools/filesystems/httm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index f4cfdc46e9b4..c68e692ed2d1 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.11.6"; + version = "0.12.1"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "5jeCENAas7i/eBySSBjwmdc3MEHVhWWH7/RZGS8g1Y4="; + sha256 = "2pShuWJns8VnxiRgj5GLv5Y7H5Qw/SfQ6lVo6VqyU/A="; }; - cargoSha256 = "x4qfi3Wm5r0HNqDgmJBXNvS1xQDU7MQ/H2+zNpHon+s="; + cargoSha256 = "x5JUwQxrZ5TBG8FAMlomTkZOCxV0c/7i5sx33BCUkKo="; nativeBuildInputs = [ installShellFiles ]; From 32aa830e1089bb676469bdc6a7100314e8e515bd Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 24 Jun 2022 16:32:29 +0200 Subject: [PATCH 089/100] woodpecker-{agent,cli,server}: init at 0.15.3 (#178441) * woodpecker-{agent,cli,server}: init at 0.15.3 * woodpecker-*: tweak packaging * Use 'callPackage' to import 'common.nix'. * Prefix the binaries with 'woodpecker-', removing the need for 'meta.mainProgram'. * Remove IFD in 'mkYarnPackage' by committing 'package.json'. * Simplify the server derivation, by not building it statically. * Expose 'woodpecker-frontend' as a package for overriding purposes. * Reduce package size for 'woodpecker-frontend' by just keeping the 'dist' folder. * Have common `ldflags` and `postBuild` values. * woodpecker-server: expose front-end with 'passthru' * woodpecker-server: add update script Co-authored-by: 06kellyjac --- .../woodpecker/agent.nix | 17 +++++ .../continuous-integration/woodpecker/cli.nix | 17 +++++ .../woodpecker/common.nix | 36 +++++++++++ .../woodpecker/frontend.nix | 40 ++++++++++++ .../woodpecker/server.nix | 27 ++++++++ .../woodpecker/update.sh | 50 +++++++++++++++ .../woodpecker/woodpecker-package.json | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++ 8 files changed, 258 insertions(+) create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/agent.nix create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/cli.nix create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/common.nix create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/frontend.nix create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/server.nix create mode 100755 pkgs/development/tools/continuous-integration/woodpecker/update.sh create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json diff --git a/pkgs/development/tools/continuous-integration/woodpecker/agent.nix b/pkgs/development/tools/continuous-integration/woodpecker/agent.nix new file mode 100644 index 000000000000..2865711d507c --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/agent.nix @@ -0,0 +1,17 @@ +{ lib, buildGoModule, callPackage, fetchFromGitHub }: +let + common = callPackage ./common.nix { }; +in +buildGoModule { + pname = "woodpecker-agent"; + inherit (common) version src ldflags postBuild; + vendorSha256 = null; + + subPackages = "cmd/agent"; + + CGO_ENABLED = 0; + + meta = common.meta // { + description = "Woodpecker Continuous Integration agent"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix new file mode 100644 index 000000000000..b5eda9efb917 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -0,0 +1,17 @@ +{ lib, buildGoModule, callPackage, fetchFromGitHub }: +let + common = callPackage ./common.nix { }; +in +buildGoModule { + pname = "woodpecker-cli"; + inherit (common) version src ldflags postBuild; + vendorSha256 = null; + + subPackages = "cmd/cli"; + + CGO_ENABLED = 0; + + meta = common.meta // { + description = "Command line client for the Woodpecker Continuous Integration server"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix new file mode 100644 index 000000000000..932fa934b1bc --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub }: +let + version = "0.15.3"; + srcSha256 = "sha256-HOOH3H2SXLcT2oW/xL80TO+ZSI+Haulnznpb4hlCQow="; + yarnSha256 = "sha256-x9g0vSoexfknqLejgcNIigmkFnqYsmhcQNTOStcj68o="; +in +{ + inherit version yarnSha256; + + src = fetchFromGitHub { + owner = "woodpecker-ci"; + repo = "woodpecker"; + rev = "v${version}"; + sha256 = srcSha256; + }; + + postBuild = '' + cd $GOPATH/bin + for f in *; do + mv -- "$f" "woodpecker-$f" + done + cd - + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/woodpecker-ci/woodpecker/version.Version=${version}" + ]; + + meta = with lib; { + homepage = "https://woodpecker-ci.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix b/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix new file mode 100644 index 000000000000..267fdc13985a --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix @@ -0,0 +1,40 @@ +{ lib, callPackage, fetchFromGitHub, fetchYarnDeps, mkYarnPackage }: +let + common = callPackage ./common.nix { }; +in +mkYarnPackage { + pname = "woodpecker-frontend"; + inherit (common) version; + + src = "${common.src}/web"; + + packageJSON = ./woodpecker-package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${common.src}/web/yarn.lock"; + sha256 = common.yarnSha256; + }; + + buildPhase = '' + runHook preBuild + + yarn build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -R deps/woodpecker-ci/dist $out + echo "${common.version}" > "$out/version" + + runHook postInstall + ''; + + # Do not attempt generating a tarball for woodpecker-frontend again. + doDist = false; + + meta = common.meta // { + description = "Woodpecker Continuous Integration server frontend"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/server.nix b/pkgs/development/tools/continuous-integration/woodpecker/server.nix new file mode 100644 index 000000000000..d97412649b5d --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/server.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, callPackage, fetchFromGitHub, woodpecker-frontend }: +let + common = callPackage ./common.nix { }; +in +buildGoModule { + pname = "woodpecker-server"; + inherit (common) version src ldflags postBuild; + vendorSha256 = null; + + postPatch = '' + cp -r ${woodpecker-frontend} web/dist + ''; + + subPackages = "cmd/server"; + + CGO_ENABLED = 1; + + passthru = { + inherit woodpecker-frontend; + + updateScript = ./update.sh; + }; + + meta = common.meta // { + description = "Woodpecker Continuous Integration server"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/update.sh b/pkgs/development/tools/continuous-integration/woodpecker/update.sh new file mode 100755 index 000000000000..3530ea6c46c6 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/update.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq + +# shellcheck shell=bash + +if [ -n "$GITHUB_TOKEN" ]; then + TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN") +fi + +if [[ $# -gt 1 || $1 == -* ]]; then + echo "Regenerates packaging data for the woodpecker packages." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +set -x + +cd "$(dirname "$0")" +version="$1" + +set -euo pipefail + +if [ -z "$version" ]; then + version="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/woodpecker-ci/woodpecker/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +# strip leading "v" +version="${version#v}" + +# Woodpecker repository +src_hash=$(nix-prefetch-github woodpecker-ci woodpecker --rev "v${version}" | jq -r .sha256) + +# Front-end dependencies +woodpecker_src="https://raw.githubusercontent.com/woodpecker-ci/woodpecker/v$version" +wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/package.json" -O woodpecker-package.json + +web_tmpdir=$(mktemp -d) +trap 'rm -rf "$web_tmpdir"' EXIT +pushd "$web_tmpdir" +wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/yarn.lock" +yarn_hash=$(prefetch-yarn-deps yarn.lock) +popd + +# Use friendlier hashes +src_hash=$(nix hash to-sri --type sha256 "$src_hash") +yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") + +sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix +sed -i -E -e "s#srcSha256 = \".*\"#srcSha256 = \"$src_hash\"#" common.nix +sed -i -E -e "s#yarnSha256 = \".*\"#yarnSha256 = \"$yarn_hash\"#" common.nix diff --git a/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json b/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json new file mode 100644 index 000000000000..eb29431a0566 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json @@ -0,0 +1,63 @@ +{ + "name": "woodpecker-ci", + "author": "Woodpecker CI", + "version": "0.0.0", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "scripts": { + "start": "vite", + "build": "vite build", + "serve": "vite preview", + "lint": "eslint --max-warnings 0 --ext .js,.ts,.vue,.json .", + "formatcheck": "prettier -c .", + "format:fix": "prettier --write .", + "typecheck": "vue-tsc --noEmit", + "test": "echo 'No tests configured' && exit 0" + }, + "dependencies": { + "@kyvg/vue3-notification": "2.3.4", + "@meforma/vue-toaster": "1.2.2", + "ansi-to-html": "0.7.2", + "dayjs": "1.10.7", + "floating-vue": "2.0.0-beta.5", + "fuse.js": "6.4.6", + "humanize-duration": "3.27.0", + "javascript-time-ago": "2.3.10", + "node-emoji": "1.11.0", + "pinia": "2.0.0", + "vue": "v3.2.20", + "vue-router": "4.0.10" + }, + "devDependencies": { + "@iconify/json": "1.1.421", + "@types/humanize-duration": "3.27.0", + "@types/javascript-time-ago": "2.0.3", + "@types/node": "16.11.6", + "@types/node-emoji": "1.8.1", + "@typescript-eslint/eslint-plugin": "5.6.0", + "@typescript-eslint/parser": "5.6.0", + "@vitejs/plugin-vue": "1.9.4", + "@vue/compiler-sfc": "3.2.20", + "eslint": "7.32.0", + "eslint-config-airbnb-base": "15.0.0", + "eslint-config-airbnb-typescript": "16.1.0", + "eslint-config-prettier": "8.3.0", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-prettier": "4.0.0", + "eslint-plugin-promise": "5.1.1", + "eslint-plugin-simple-import-sort": "7.0.0", + "eslint-plugin-vue": "7.18.0", + "eslint-plugin-vue-scoped-css": "1.3.0", + "prettier": "2.4.1", + "typescript": "4.4.4", + "unplugin-icons": "0.12.17", + "unplugin-vue-components": "0.17.0", + "vite": "2.6.13", + "vite-plugin-windicss": "1.4.12", + "vite-svg-loader": "3.0.0", + "vue-tsc": "0.28.10", + "windicss": "3.2.0" + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04377cb57dc5..dcf088595606 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11546,6 +11546,14 @@ with pkgs; woff2 = callPackage ../development/web/woff2 { }; + woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { }; + + woodpecker-cli = callPackage ../development/tools/continuous-integration/woodpecker/cli.nix { }; + + woodpecker-server = callPackage ../development/tools/continuous-integration/woodpecker/server.nix { + woodpecker-frontend = callPackage ../development/tools/continuous-integration/woodpecker/frontend.nix { }; + }; + woof = callPackage ../tools/misc/woof { }; wootility = callPackage ../tools/misc/wootility { From dc0380bb215ce001fcfccf4609d902115f87ddf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 24 Jun 2022 15:04:02 +0000 Subject: [PATCH 090/100] taskflow: 3.3.0 -> 3.4.0 (#178384) https://taskflow.github.io/taskflow/release-3-4-0.html --- pkgs/development/libraries/taskflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix index 29760cdb94bd..dd2f8fb39144 100644 --- a/pkgs/development/libraries/taskflow/default.nix +++ b/pkgs/development/libraries/taskflow/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; - hash = "sha256-UfXGupxgtowIt3BnIVWwim3rTE57TT1C9TCx9LVyN34="; + hash = "sha256-5bTTV/WAxslHQ+hvATtUUA1h3MuNzwVTlYMbD/sINRM="; }; patches = [ From c110d8148b20691792e97621cfffb5fc12422b5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jun 2022 13:25:26 +0000 Subject: [PATCH 091/100] python310Packages.django-webpack-loader: 1.4.1 -> 1.6.0 --- .../python-modules/django-webpack-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 2656dd593c1c..ee51b0e7c8ec 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "1.4.1"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "7e34085b7fc4d352e482ff9cf7d09ae4524e730675e25432ab1d25a2dd94e583"; + sha256 = "sha256-opQY/0FpADW+ENLJSgZV2rCZAJxouJiDmBPWoQmxTXE="; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) From 5771e8fcddc1c71703a62abbdbb6536488d6aa32 Mon Sep 17 00:00:00 2001 From: midchildan Date: Fri, 24 Jun 2022 10:10:36 +0900 Subject: [PATCH 092/100] tmux: fix static build --- pkgs/tools/misc/tmux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index fd4361d27678..44cbe713f096 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -6,7 +6,7 @@ , libevent , ncurses , pkg-config -, systemd +, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd , utf8proc }: @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libevent - ] ++ lib.optionals stdenv.isLinux [ systemd ] + ] ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals stdenv.isDarwin [ utf8proc ]; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - ] ++ lib.optionals stdenv.isLinux [ "--enable-systemd" ] + ] ++ lib.optionals withSystemd [ "--enable-systemd" ] ++ lib.optionals stdenv.isDarwin [ "--enable-utf8proc" ]; enableParallelBuilding = true; From 2c135ab9c995df38c3a8e692c167469a1b705286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 24 Jun 2022 19:32:01 +0200 Subject: [PATCH 093/100] python310Packages.junos-eznc: update homepage --- pkgs/development/python-modules/junos-eznc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index d693c73130be..9830d29789b5 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jnpr.junos" ]; meta = with lib; { - homepage = "http://www.github.com/Juniper/py-junos-eznc"; + homepage = "https://github.com/Juniper/py-junos-eznc"; description = "Junos 'EZ' automation for non-programmers"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; From 8d17794ac9d81282c5aa3d97416efe438b9b5473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 24 Jun 2022 19:32:29 +0200 Subject: [PATCH 094/100] python310Packages.napalm: fix dependencies --- pkgs/development/python-modules/napalm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index 09d38875db8e..d7120085d632 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, fetchpatch, setuptools, cffi , paramiko, requests, future, textfsm, jinja2, netaddr, pyyaml, pyeapi, netmiko , junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock -, pythonOlder }: +, pythonOlder, invoke }: buildPythonPackage rec { pname = "napalm"; @@ -35,14 +35,13 @@ buildPythonPackage rec { --replace "netmiko>=3.3.0,<4.0.0" "netmiko" ''; - buildInputs = [ setuptools ]; - propagatedBuildInputs = [ cffi paramiko requests future textfsm + invoke jinja2 netaddr pyyaml @@ -51,6 +50,7 @@ buildPythonPackage rec { junos-eznc ciscoconfparse scp + setuptools lxml ncclient ]; From 7d2f0049576f4b75274b74ca01c6176d836f198f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 24 Jun 2022 19:32:36 +0200 Subject: [PATCH 095/100] python310Packages.napalm: move to c3d2 team --- pkgs/development/python-modules/napalm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index d7120085d632..9625c8b55649 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { "Network Automation and Programmability Abstraction Layer with Multivendor support"; homepage = "https://github.com/napalm-automation/napalm"; license = licenses.asl20; - maintainers = [ maintainers.astro ]; + maintainers = with maintainers; [ ] ++ teams.c3d2.members; }; } From cf4ba94f427e8806d9b9ef8d95d48a7341874c2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 27 Jan 2022 01:51:56 +0100 Subject: [PATCH 096/100] schleuder: init at 0.4.2 --- pkgs/tools/security/schleuder/Gemfile | 3 + pkgs/tools/security/schleuder/Gemfile.lock | 85 ++++++ pkgs/tools/security/schleuder/default.nix | 33 +++ pkgs/tools/security/schleuder/gemset.nix | 316 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 439 insertions(+) create mode 100644 pkgs/tools/security/schleuder/Gemfile create mode 100644 pkgs/tools/security/schleuder/Gemfile.lock create mode 100644 pkgs/tools/security/schleuder/default.nix create mode 100644 pkgs/tools/security/schleuder/gemset.nix diff --git a/pkgs/tools/security/schleuder/Gemfile b/pkgs/tools/security/schleuder/Gemfile new file mode 100644 index 000000000000..687c293bac91 --- /dev/null +++ b/pkgs/tools/security/schleuder/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' do + gem 'schleuder' +end diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/tools/security/schleuder/Gemfile.lock new file mode 100644 index 000000000000..a5b7312901c2 --- /dev/null +++ b/pkgs/tools/security/schleuder/Gemfile.lock @@ -0,0 +1,85 @@ +GEM + specs: + +GEM + remote: https://rubygems.org/ + specs: + activemodel (6.1.4.4) + activesupport (= 6.1.4.4) + activerecord (6.1.4.4) + activemodel (= 6.1.4.4) + activesupport (= 6.1.4.4) + activesupport (6.1.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + bcrypt (3.1.16) + charlock_holmes (0.7.7) + concurrent-ruby (1.1.9) + daemons (1.4.1) + eventmachine (1.2.7) + gpgme (2.0.20) + mini_portile2 (~> 2.3) + i18n (1.8.11) + concurrent-ruby (~> 1.0) + mail (2.7.1) + mini_mime (>= 0.1.1) + mail-gpg (0.4.4) + gpgme (~> 2.0, >= 2.0.2) + mail (~> 2.5, >= 2.5.3) + mini_mime (1.1.2) + mini_portile2 (2.7.1) + minitest (5.15.0) + multi_json (1.15.0) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + rack (2.2.3) + rack-protection (2.1.0) + rack + rake (13.0.6) + ruby2_keywords (0.0.5) + schleuder (4.0.2) + activerecord (~> 6.1.3) + bcrypt (~> 3.1.2) + charlock_holmes (~> 0.7.6) + gpgme (~> 2.0, >= 2.0.19) + mail (~> 2.7.1) + mail-gpg (~> 0.3) + rake (>= 10.5.0) + sinatra (~> 2) + sinatra-contrib (~> 2) + sqlite3 (~> 1.4.2) + thin (~> 1) + thor (~> 0) + sinatra (2.1.0) + mustermann (~> 1.0) + rack (~> 2.2) + rack-protection (= 2.1.0) + tilt (~> 2.0) + sinatra-contrib (2.1.0) + multi_json + mustermann (~> 1.0) + rack-protection (= 2.1.0) + sinatra (= 2.1.0) + tilt (~> 2.0) + sqlite3 (1.4.2) + thin (1.8.1) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (0.20.3) + tilt (2.0.10) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + zeitwerk (2.5.3) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + schleuder! + +BUNDLED WITH + 2.2.24 diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/tools/security/schleuder/default.nix new file mode 100644 index 000000000000..7fc320a7043c --- /dev/null +++ b/pkgs/tools/security/schleuder/default.nix @@ -0,0 +1,33 @@ +{ lib +, bundlerApp +, ruby +, bundlerUpdateScript +}: + +bundlerApp { + inherit ruby; + + pname = "schleuder"; + + gemdir = ./.; + + exes = [ + "schleuder" + "schleuder-api-daemon" + ]; + + passthru.updateScript = bundlerUpdateScript "schleuder"; + + meta = with lib; { + description = "Schleuder is an encrypting mailing list manager with remailing-capabilities"; + longDescription = '' + Schleuder is a group's email-gateway: subscribers can exchange + encrypted emails among themselves, receive emails from + non-subscribers and send emails to non-subscribers via the list. + ''; + homepage = "https://schleuder.org"; + changelog = "https://0xacab.org/schleuder/schleuder/blob/main/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa lheckemann ]; + }; +} diff --git a/pkgs/tools/security/schleuder/gemset.nix b/pkgs/tools/security/schleuder/gemset.nix new file mode 100644 index 000000000000..9bd9cadbb883 --- /dev/null +++ b/pkgs/tools/security/schleuder/gemset.nix @@ -0,0 +1,316 @@ +{ + activemodel = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm"; + type = "gem"; + }; + version = "6.1.4.4"; + }; + activerecord = { + dependencies = ["activemodel" "activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik"; + type = "gem"; + }; + version = "6.1.4.4"; + }; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; + type = "gem"; + }; + version = "6.1.4.4"; + }; + bcrypt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb"; + type = "gem"; + }; + version = "3.1.16"; + }; + charlock_holmes = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; + type = "gem"; + }; + version = "0.7.7"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + version = "1.1.9"; + }; + daemons = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07cszb0zl8mqmwhc8a2yfg36vi6lbgrp4pa5bvmryrpcz9v6viwg"; + type = "gem"; + }; + version = "1.4.1"; + }; + eventmachine = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + gpgme = { + dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xbgh9d8nbvsvyzqnd0mzhz0nr9hx4qn025kmz6d837lry4lc6gw"; + type = "gem"; + }; + version = "2.0.20"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + type = "gem"; + }; + version = "1.8.11"; + }; + mail = { + dependencies = ["mini_mime"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + type = "gem"; + }; + version = "2.7.1"; + }; + mail-gpg = { + dependencies = ["gpgme" "mail"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rz936m8nacy7agksvpvkf6b37d1h5qvh5xkrjqvv5wbdqs3cyfj"; + type = "gem"; + }; + version = "0.4.4"; + }; + mini_mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + type = "gem"; + }; + version = "1.1.2"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z"; + type = "gem"; + }; + version = "2.7.1"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + type = "gem"; + }; + version = "5.15.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + mustermann = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + type = "gem"; + }; + version = "1.1.1"; + }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + version = "2.2.3"; + }; + rack-protection = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; + type = "gem"; + }; + version = "2.1.0"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + schleuder = { + dependencies = ["activerecord" "bcrypt" "charlock_holmes" "gpgme" "mail" "mail-gpg" "rake" "sinatra" "sinatra-contrib" "sqlite3" "thin" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15j1rfkfvni82msamikynsg48s50hbsx1pxm3y967caq9s80ll6c"; + type = "gem"; + }; + version = "4.0.2"; + }; + sinatra = { + dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; + type = "gem"; + }; + version = "2.1.0"; + }; + sinatra-contrib = { + dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl1iiafz51yzjd0vchl2lni7lmwppjql6cn1fnfxbma707qlcja"; + type = "gem"; + }; + version = "2.1.0"; + }; + sqlite3 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + type = "gem"; + }; + version = "1.4.2"; + }; + thin = { + dependencies = ["daemons" "eventmachine" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "123bh7qlv6shk8bg8cjc84ix8bhlfcilwnn3iy6zq3l57yaplm9l"; + type = "gem"; + }; + version = "1.8.1"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + type = "gem"; + }; + version = "2.0.10"; + }; + tzinfo = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + type = "gem"; + }; + version = "2.0.4"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + type = "gem"; + }; + version = "2.5.3"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed9894e4516b..8e48417a5df7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5490,6 +5490,8 @@ with pkgs; conf = config.schildichat-web.conf or {}; }; + schleuder = callPackage ../tools/security/schleuder { }; + tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; }; From 41d5a21d6a2b8dae1ea855cfab00da2f498c2064 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 27 Jan 2022 01:52:47 +0100 Subject: [PATCH 097/100] schleuder-cli: init 0.1.0 --- pkgs/tools/security/schleuder/cli/Gemfile | 4 +++ .../tools/security/schleuder/cli/Gemfile.lock | 21 ++++++++++++ pkgs/tools/security/schleuder/cli/default.nix | 34 +++++++++++++++++++ pkgs/tools/security/schleuder/cli/gemset.nix | 25 ++++++++++++++ pkgs/tools/security/schleuder/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 87 insertions(+) create mode 100644 pkgs/tools/security/schleuder/cli/Gemfile create mode 100644 pkgs/tools/security/schleuder/cli/Gemfile.lock create mode 100644 pkgs/tools/security/schleuder/cli/default.nix create mode 100644 pkgs/tools/security/schleuder/cli/gemset.nix diff --git a/pkgs/tools/security/schleuder/cli/Gemfile b/pkgs/tools/security/schleuder/cli/Gemfile new file mode 100644 index 000000000000..428e856aecc6 --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem "schleuder-cli", git: "https://0xacab.org/schleuder/schleuder-cli", tag: "schleuder-cli-0.1.0" + diff --git a/pkgs/tools/security/schleuder/cli/Gemfile.lock b/pkgs/tools/security/schleuder/cli/Gemfile.lock new file mode 100644 index 000000000000..bd47b9df7f9a --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/Gemfile.lock @@ -0,0 +1,21 @@ +GIT + remote: https://0xacab.org/schleuder/schleuder-cli + revision: 1de2548695d9a74f47b7868954561b48cbc966f9 + tag: schleuder-cli-0.1.0 + specs: + schleuder-cli (0.1.0) + thor (~> 0) + +GEM + remote: https://rubygems.org/ + specs: + thor (0.20.3) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + schleuder-cli! + +BUNDLED WITH + 2.3.6 diff --git a/pkgs/tools/security/schleuder/cli/default.nix b/pkgs/tools/security/schleuder/cli/default.nix new file mode 100644 index 000000000000..e34afa699f04 --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/default.nix @@ -0,0 +1,34 @@ +{ lib +, bundlerApp +, ruby +, bundlerUpdateScript +}: + +bundlerApp { + inherit ruby; + + pname = "schleuder-cli"; + + gemdir = ./.; + + installManpages = false; + + exes = [ + "schleuder-cli" + ]; + + passthru.updateScript = bundlerUpdateScript "schleuder-cli"; + + meta = with lib; { + description = "A command line tool to create and manage schleuder-lists"; + longDescription = '' + Schleuder-cli enables creating, configuring, and deleting lists, + subscriptions, keys, etc. It uses the Schleuder API, provided by + schleuder-api-daemon (part of Schleuder). + ''; + homepage = "https://schleuder.org"; + changelog = "https://0xacab.org/schleuder/schleuder-cli/-/blob/main/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/tools/security/schleuder/cli/gemset.nix b/pkgs/tools/security/schleuder/cli/gemset.nix new file mode 100644 index 000000000000..45ff62f89137 --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/gemset.nix @@ -0,0 +1,25 @@ +{ + schleuder-cli = { + dependencies = ["thor"]; + groups = ["default"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "1de2548695d9a74f47b7868954561b48cbc966f9"; + sha256 = "0k4i33w9a0bscw4wbs301vxca367g7pa89y6cr24i0014pbmhs9z"; + type = "git"; + url = "https://0xacab.org/schleuder/schleuder-cli"; + }; + version = "0.1.0"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; +} diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/tools/security/schleuder/default.nix index 7fc320a7043c..8966dbd55b22 100644 --- a/pkgs/tools/security/schleuder/default.nix +++ b/pkgs/tools/security/schleuder/default.nix @@ -2,6 +2,7 @@ , bundlerApp , ruby , bundlerUpdateScript +, defaultGemConfig }: bundlerApp { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e48417a5df7..2bc4abf5c408 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5492,6 +5492,8 @@ with pkgs; schleuder = callPackage ../tools/security/schleuder { }; + schleuder-cli = callPackage ../tools/security/schleuder/cli { }; + tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; }; From 1dabedae3e41d2c64a754487e351fa3c19bdb0d5 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 31 May 2022 17:27:54 +0200 Subject: [PATCH 098/100] nixos/schleuder: init module and accompanying test Co-Authored-By: Martin Weinelt Co-Authored-By: Cole Helbling --- nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/schleuder.nix | 162 ++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/schleuder.nix | 128 +++++++++++++++++ pkgs/tools/security/schleuder/default.nix | 4 + 5 files changed, 296 insertions(+) create mode 100644 nixos/modules/services/mail/schleuder.nix create mode 100644 nixos/tests/schleuder.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 43ae28ac02c5..3aae26f38543 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -516,6 +516,7 @@ ./services/mail/rspamd.nix ./services/mail/rss2email.nix ./services/mail/roundcube.nix + ./services/mail/schleuder.nix ./services/mail/sympa.nix ./services/mail/nullmailer.nix ./services/matrix/appservice-discord.nix diff --git a/nixos/modules/services/mail/schleuder.nix b/nixos/modules/services/mail/schleuder.nix new file mode 100644 index 000000000000..7ba15f1070bd --- /dev/null +++ b/nixos/modules/services/mail/schleuder.nix @@ -0,0 +1,162 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.services.schleuder; + settingsFormat = pkgs.formats.yaml { }; + postfixMap = entries: lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${value}") entries); + writePostfixMap = name: entries: pkgs.writeText name (postfixMap entries); + configScript = pkgs.writeScript "schleuder-cfg" '' + #!${pkgs.runtimeShell} + set -exuo pipefail + umask 0077 + ${pkgs.yq}/bin/yq \ + --slurpfile overrides <(${pkgs.yq}/bin/yq . <${lib.escapeShellArg cfg.extraSettingsFile}) \ + < ${settingsFormat.generate "schleuder.yml" cfg.settings} \ + '. * $overrides[0]' \ + > /etc/schleuder/schleuder.yml + chown schleuder: /etc/schleuder/schleuder.yml + ''; +in +{ + options.services.schleuder = { + enable = lib.mkEnableOption "Schleuder secure remailer"; + enablePostfix = lib.mkEnableOption "automatic postfix integration" // { default = true; }; + lists = lib.mkOption { + description = '' + List of list addresses that should be handled by Schleuder. + + Note that this is only handled by the postfix integration, and + the setup of the lists, their members and their keys has to be + performed separately via schleuder's API, using a tool such as + schleuder-cli. + ''; + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ "widget-team@example.com" "security@example.com" ]; + }; + /* maybe one day.... + domains = lib.mkOption { + description = "Domains for which all mail should be handled by Schleuder."; + type = lib.types.listOf lib.types.str; + default = []; + example = ["securelists.example.com"]; + }; + */ + settings = lib.mkOption { + description = '' + Settings for schleuder.yml. + + Check the example configuration for possible values. + ''; + type = lib.types.submodule { + freeformType = settingsFormat.type; + options.keyserver = lib.mkOption { + type = lib.types.str; + description = '' + Key server from which to fetch and update keys. + + Note that NixOS uses a different default from upstream, since the upstream default sks-keyservers.net is deprecated. + ''; + default = "keys.openpgp.org"; + }; + }; + default = { }; + }; + extraSettingsFile = lib.mkOption { + description = "YAML file to merge into the schleuder config at runtime. This can be used for secrets such as API keys."; + type = lib.types.nullOr lib.types.path; + default = null; + }; + listDefaults = lib.mkOption { + description = '' + Default settings for lists (list-defaults.yml). + + Check the example configuration for possible values. + ''; + type = settingsFormat.type; + default = { }; + }; + }; + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = !(cfg.settings.api ? valid_api_keys); + message = '' + services.schleuder.settings.api.valid_api_keys is set. Defining API keys via NixOS config results in them being copied to the world-readable Nix store. Please use the extraSettingsFile option to store API keys in a non-public location. + ''; + } + { + assertion = !(lib.any (db: db ? password) (lib.attrValues cfg.settings.database or {})); + message = '' + A password is defined for at least one database in services.schleuder.settings.database. Defining passwords via NixOS config results in them being copied to the world-readable Nix store. Please use the extraSettingsFile option to store database passwords in a non-public location. + ''; + } + ]; + users.users.schleuder.isSystemUser = true; + users.users.schleuder.group = "schleuder"; + users.groups.schleuder = {}; + environment.systemPackages = [ + pkgs.schleuder-cli + ]; + services.postfix = lib.mkIf cfg.enablePostfix { + extraMasterConf = '' + schleuder unix - n n - - pipe + flags=DRhu user=schleuder argv=/${pkgs.schleuder}/bin/schleuder work ''${recipient} + ''; + transport = lib.mkIf (cfg.lists != [ ]) (postfixMap (lib.genAttrs cfg.lists (_: "schleuder:"))); + extraConfig = '' + schleuder_destination_recipient_limit = 1 + ''; + # review: does this make sense? + localRecipients = lib.mkIf (cfg.lists != [ ]) cfg.lists; + }; + systemd.services = let commonServiceConfig = { + # We would have liked to use DynamicUser, but since the default + # database is SQLite and lives in StateDirectory, and that same + # database needs to be readable from the postfix service, this + # isn't trivial to do. + User = "schleuder"; + StateDirectory = "schleuder"; + StateDirectoryMode = "0700"; + }; in + { + schleuder-init = { + serviceConfig = commonServiceConfig // { + ExecStartPre = lib.mkIf (cfg.extraSettingsFile != null) [ + "+${configScript}" + ]; + ExecStart = [ "${pkgs.schleuder}/bin/schleuder install" ]; + Type = "oneshot"; + }; + }; + schleuder-api-daemon = { + after = [ "local-fs.target" "network.target" "schleuder-init.service" ]; + wantedBy = [ "multi-user.target" ]; + requires = [ "schleuder-init.service" ]; + serviceConfig = commonServiceConfig // { + ExecStart = [ "${pkgs.schleuder}/bin/schleuder-api-daemon" ]; + }; + }; + schleuder-weekly-key-maintenance = { + after = [ "local-fs.target" "network.target" ]; + startAt = "weekly"; + serviceConfig = commonServiceConfig // { + ExecStart = [ + "${pkgs.schleuder}/bin/schleuder refresh_keys" + "${pkgs.schleuder}/bin/schleuder check_keys" + ]; + }; + }; + }; + + environment.etc."schleuder/schleuder.yml" = lib.mkIf (cfg.extraSettingsFile == null) { + source = settingsFormat.generate "schleuder.yml" cfg.settings; + }; + environment.etc."schleuder/list-defaults.yml".source = settingsFormat.generate "list-defaults.yml" cfg.listDefaults; + + services.schleuder = { + #lists_dir = "/var/lib/schleuder.lists"; + settings.filters_dir = lib.mkDefault "/var/lib/schleuder/filters"; + settings.keyword_handlers_dir = lib.mkDefault "/var/lib/schleuder/keyword_handlers"; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 38c320886d1a..658c62b2a4e2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -485,6 +485,7 @@ in { samba = handleTest ./samba.nix {}; samba-wsdd = handleTest ./samba-wsdd.nix {}; sanoid = handleTest ./sanoid.nix {}; + schleuder = handleTest ./schleuder.nix {}; sddm = handleTest ./sddm.nix {}; seafile = handleTest ./seafile.nix {}; searx = handleTest ./searx.nix {}; diff --git a/nixos/tests/schleuder.nix b/nixos/tests/schleuder.nix new file mode 100644 index 000000000000..a9e4cc325bc7 --- /dev/null +++ b/nixos/tests/schleuder.nix @@ -0,0 +1,128 @@ +let + certs = import ./common/acme/server/snakeoil-certs.nix; + domain = certs.domain; +in +import ./make-test-python.nix { + name = "schleuder"; + nodes.machine = { pkgs, ... }: { + imports = [ ./common/user-account.nix ]; + services.postfix = { + enable = true; + enableSubmission = true; + tlsTrustedAuthorities = "${certs.ca.cert}"; + sslCert = "${certs.${domain}.cert}"; + sslKey = "${certs.${domain}.key}"; + inherit domain; + destination = [ domain ]; + localRecipients = [ "root" "alice" "bob" ]; + }; + services.schleuder = { + enable = true; + # Don't do it like this in production! The point of this setting + # is to allow loading secrets from _outside_ the world-readable + # Nix store. + extraSettingsFile = pkgs.writeText "schleuder-api-keys.yml" '' + api: + valid_api_keys: + - fnord + ''; + lists = [ "security@${domain}" ]; + settings.api = { + tls_cert_file = "${certs.${domain}.cert}"; + tls_key_file = "${certs.${domain}.key}"; + }; + }; + + environment.systemPackages = [ + pkgs.gnupg + pkgs.msmtp + (pkgs.writeScriptBin "do-test" '' + #!${pkgs.runtimeShell} + set -exuo pipefail + + # Generate a GPG key with no passphrase and export it + sudo -u alice gpg --passphrase-fd 0 --batch --yes --quick-generate-key 'alice@${domain}' rsa4096 sign,encr < <(echo) + sudo -u alice gpg --armor --export alice@${domain} > alice.asc + # Create a new mailing list with alice as the owner, and alice's key + schleuder-cli list new security@${domain} alice@${domain} alice.asc + + # Send an email from a non-member of the list. Use --auto-from so we don't have to specify who it's from twice. + msmtp --auto-from security@${domain} --host=${domain} --port=25 --tls --tls-starttls < list.asc + + # Import the key into alice's keyring, so we can verify it as well as decrypting + sudo -u alice gpg --import decrypted + # And check that the text matches. + grep "big security problem" decrypted + '') + + # For debugging: + # pkgs.vim pkgs.openssl pkgs.sqliteinteractive + ]; + + security.pki.certificateFiles = [ certs.ca.cert ]; + + # Since we don't have internet here, use dnsmasq to provide MX records from /etc/hosts + services.dnsmasq = { + enable = true; + extraConfig = '' + selfmx + ''; + }; + + networking.extraHosts = '' + 127.0.0.1 ${domain} + ''; + + # schleuder-cli's config is not quite optimal in several ways: + # - A fingerprint _must_ be pinned, it doesn't even have an option + # to trust the PKI + # - It compares certificate fingerprints rather than key + # fingerprints, so renewals break the pin (though that's not + # relevant for this test) + # - It compares them as strings, which means we need to match the + # expected format exactly. This means removing the :s and + # lowercasing it. + # Refs: + # https://0xacab.org/schleuder/schleuder-cli/-/issues/16 + # https://0xacab.org/schleuder/schleuder-cli/-/blob/f8895b9f47083d8c7b99a2797c93f170f3c6a3c0/lib/schleuder-cli/helper.rb#L230-238 + systemd.tmpfiles.rules = let cliconfig = pkgs.runCommand "schleuder-cli.yml" + { + nativeBuildInputs = [ pkgs.jq pkgs.openssl ]; + } '' + fp=$(openssl x509 -in ${certs.${domain}.cert} -noout -fingerprint -sha256 | cut -d = -f 2 | tr -d : | tr 'A-Z' 'a-z') + cat > $out < Date: Wed, 8 Jun 2022 16:16:28 +0200 Subject: [PATCH 099/100] bundler bin stubs: Squelch sudo warning @ruby maintainers: please feel free to revert this and let me know, should it cause any problems. Stuff that's in the store shouldn't be writable! So let's disable Bundler's requires_sudo? method, which checks if some files are writable and suggests using sudo if not, entirely. Previously, schleuder-cli would print to stderr when run: Following files may not be writable, so sudo is needed: /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0 /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/bin /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/bin /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/build_info /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/bundler /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/cache /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/doc /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/extensions /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/gems /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/plugins /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/specifications --- .../ruby-modules/bundled-common/gen-bin-stubs.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index 3106e9c24ca7..822996b7cbf6 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -41,6 +41,20 @@ Gem.paths = { 'GEM_HOME' => #{bundle_path.dump} } $LOAD_PATH.unshift #{File.join(bundler_path, "/lib").dump} require 'bundler' +# Monkey-patch out the check that Bundler performs to determine +# whether the bundler env is writable. It's not writable, even for +# root! And for this use of Bundler, it shouldn't be necessary since +# we're not trying to perform any package management operations, only +# produce a Gem path. Thus, we replace it with a method that will +# always return false, to squelch a warning from Bundler saying that +# sudo may be required. +module Bundler + class < Date: Fri, 24 Jun 2022 15:19:58 -0400 Subject: [PATCH 100/100] rl-2211: document schleuder addition --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ 2 files changed, 9 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 958000687810..b78cfad63b94 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -71,6 +71,13 @@ services.persistent-evdev. + + + schleuder, a + mailing list manager with PGP support. Enable using + services.schleuder. + + expressvpn, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 1a14885ed8c3..436d590fb9a6 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -31,6 +31,8 @@ In addition to numerous new and upgraded packages, this release has the followin Available as [services.infnoise](options.html#opt-services.infnoise.enable). - [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable). +- [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable). + - [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable).