From 57a136f61db6cb15e1ce39fe77b599df26453ab7 Mon Sep 17 00:00:00 2001 From: Ivan Jager Date: Wed, 9 Feb 2022 06:41:24 -0600 Subject: [PATCH 01/58] sasutils: init at 0.3.12 --- pkgs/os-specific/linux/sasutils/default.nix | 22 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/linux/sasutils/default.nix diff --git a/pkgs/os-specific/linux/sasutils/default.nix b/pkgs/os-specific/linux/sasutils/default.nix new file mode 100644 index 000000000000..4298e003a00f --- /dev/null +++ b/pkgs/os-specific/linux/sasutils/default.nix @@ -0,0 +1,22 @@ +{ lib, python3Packages, fetchFromGitHub, sg3_utils }: + +python3Packages.buildPythonApplication rec { + pname = "sasutils"; + version = "0.3.12"; + + src = fetchFromGitHub { + owner = "stanford-rc"; + repo = pname; + rev = "v${version}"; + sha256 = "0kh5pcc2shdmrvqqi2y1zamzsfvk56pqgwqgqhjfz4r6yfpm04wl"; + }; + + propagatedBuildInputs = [ sg3_utils ]; + + meta = with lib; { + homepage = "https://github.com/stanford-rc/sasutils"; + description = "A set of command-line tools to ease the administration of Serial Attached SCSI (SAS) fabrics"; + license = licenses.asl20; + maintainers = with maintainers; [ aij ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 497dfe97365b..aaf7df725b6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22968,6 +22968,8 @@ with pkgs; s3ql = callPackage ../tools/backup/s3ql { }; + sasutils = callPackage ../os-specific/linux/sasutils { }; + sass = callPackage ../development/tools/sass { }; sassc = callPackage ../development/tools/sassc { }; From 14f36b6f87d5f4c2f00d846d82743b4f68323d11 Mon Sep 17 00:00:00 2001 From: GRBurst Date: Wed, 1 Dec 2021 10:04:21 +0100 Subject: [PATCH 02/58] Update hash + add myself as maintainer Signed-off-by: GRBurst --- pkgs/games/runescape-launcher/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 8b678d792fcb..78ebe606865a 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -12,7 +12,7 @@ let src = fetchurl { url = "https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb"; - sha256 = "0r5v1pwh0aas31b1d3pkrc8lqmqz9b4fml2b4kxmg5xzp677h271"; + sha256 = "10ly44lbgbbqc65lx7mhfzfjaiz1xj0mfjqlwlxz0sdjyw4a6ij6"; }; nativeBuildInputs = [ @@ -76,7 +76,7 @@ let description = "Launcher for RuneScape 3, the current main RuneScape"; homepage = "https://www.runescape.com/"; license = licenses.unfree; - maintainers = with lib.maintainers; [ grburst ]; + maintainers = with maintainers; [ grburst ]; platforms = [ "x86_64-linux" ]; }; }; @@ -100,4 +100,12 @@ in ]; multiPkgs = pkgs: [ libGL ]; runScript = "runescape-launcher"; + + meta = with lib; { + description = "Launcher for RuneScape 3"; + homepage = "https://www.runescape.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ grburst ]; + platforms = [ "x86_64-linux" ]; + }; } From 2f444f12c8c6dceba20db54b4afe33192a929a7d Mon Sep 17 00:00:00 2001 From: GRBurst Date: Wed, 1 Dec 2021 10:59:45 +0100 Subject: [PATCH 03/58] runescape-launcher: use package from archive.org Signed-off-by: GRBurst --- pkgs/games/runescape-launcher/default.nix | 41 ++++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 78ebe606865a..3385f57839f4 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -10,8 +10,9 @@ let pname = "runescape-launcher"; version = "2.2.9"; + # upstream is https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb src = fetchurl { - url = "https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb"; + url = "https://archive.org/download/${pname}_${version}_amd64/${pname}_${version}_amd64.deb"; sha256 = "10ly44lbgbbqc65lx7mhfzfjaiz1xj0mfjqlwlxz0sdjyw4a6ij6"; }; @@ -89,23 +90,23 @@ in * FHS simulates a classic linux shell */ buildFHSUserEnv { - name = "RuneScape"; - targetPkgs = pkgs: [ - runescape - dpkg glibc gcc-unwrapped - libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl - libpulseaudio - xorg.libX11 - SDL2 xorg_sys_opengl libGL - ]; - multiPkgs = pkgs: [ libGL ]; - runScript = "runescape-launcher"; + name = "RuneScape"; + targetPkgs = pkgs: [ + runescape + dpkg glibc gcc-unwrapped + libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl + libpulseaudio + xorg.libX11 + SDL2 xorg_sys_opengl libGL + ]; + multiPkgs = pkgs: [ libGL ]; + runScript = "runescape-launcher"; - meta = with lib; { - description = "Launcher for RuneScape 3"; - homepage = "https://www.runescape.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ grburst ]; - platforms = [ "x86_64-linux" ]; - }; -} + meta = with lib; { + description = "RuneScape Game Client (NXT) - Launcher for RuneScape 3"; + homepage = "https://www.runescape.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ grburst ]; + platforms = [ "x86_64-linux" ]; + }; + } From abe8ff56e274d80a82b51d022875123ffaa3ebc8 Mon Sep 17 00:00:00 2001 From: GRBurst Date: Fri, 28 Jan 2022 17:00:27 +0100 Subject: [PATCH 04/58] update remote package hash Signed-off-by: GRBurst --- pkgs/games/runescape-launcher/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 3385f57839f4..3208aa3b4612 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -10,10 +10,11 @@ let pname = "runescape-launcher"; version = "2.2.9"; + # Packages: https://content.runescape.com/downloads/ubuntu/dists/trusty/non-free/binary-amd64/Packages # upstream is https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb src = fetchurl { url = "https://archive.org/download/${pname}_${version}_amd64/${pname}_${version}_amd64.deb"; - sha256 = "10ly44lbgbbqc65lx7mhfzfjaiz1xj0mfjqlwlxz0sdjyw4a6ij6"; + sha256 = "1zilpxh8k8baylbl9nqq9kgjiv2xzw4lizbgcmzky5rhmych8n4g"; }; nativeBuildInputs = [ From 86ee754c4f5cc76ac6bea9066f00d48edc247a5b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 6 Apr 2022 21:40:55 +0800 Subject: [PATCH 05/58] wlr-randr: add wayland-scanner to nativeBuildInputs --- pkgs/tools/wayland/wlr-randr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/wayland/wlr-randr/default.nix b/pkgs/tools/wayland/wlr-randr/default.nix index e2c941998a99..fe140720973e 100644 --- a/pkgs/tools/wayland/wlr-randr/default.nix +++ b/pkgs/tools/wayland/wlr-randr/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , wayland +, wayland-scanner }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; }; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; buildInputs = [ wayland ]; meta = with lib; { From 0d0feaa4fc281c6d79b7a8afb97237676a623d44 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 13 Apr 2022 14:45:39 -0700 Subject: [PATCH 06/58] gcc{4..10}: add aarch64-darwin to badPlatforms --- pkgs/development/compilers/gcc/10/default.nix | 1 + pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 1 + pkgs/development/compilers/gcc/7/default.nix | 1 + pkgs/development/compilers/gcc/8/default.nix | 1 + pkgs/development/compilers/gcc/9/default.nix | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 1e8917ef6cf1..88d4831812fd 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -288,6 +288,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; platforms = lib.platforms.unix; + badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ef1a04635f9a..8cd0d3c9ce80 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -312,7 +312,7 @@ stdenv.mkDerivation ({ maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; - badPlatforms = [ "x86_64-darwin" ]; + badPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 289df07d0312..b3d0f8d5d502 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -328,7 +328,7 @@ stdenv.mkDerivation ({ maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; - badPlatforms = [ "x86_64-darwin" ]; + badPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index a577c61bdf58..62b46df1ab00 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -341,6 +341,7 @@ stdenv.mkDerivation ({ ''; platforms = lib.platforms.unix; + badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 937ccbb35103..1abf14c8a8c7 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -297,6 +297,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; platforms = lib.platforms.unix; + badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index e98197836955..2dd265b648ce 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -276,6 +276,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; platforms = lib.platforms.unix; + badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index dd1a53e172a4..2ecfa1bb1cf0 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -307,6 +307,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; platforms = lib.platforms.unix; + badPlatforms = [ "aarch64-darwin" ]; }; } From 9d295d7ca4cdb04092e371fe81c02796f7e2e806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 16 Apr 2022 12:06:24 -0300 Subject: [PATCH 07/58] xfce.xfce4-panel: 4.16.3 -> 4.16.4 --- pkgs/desktops/xfce/core/xfce4-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index 4fa26b3da024..5ac7fa9e79b9 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -17,9 +17,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.16.3"; + version = "4.16.4"; - sha256 = "sha256-PdE64WKdluKfof/l1wTPi7JdpJMYWIvi0yIdpyntsCA="; + sha256 = "sha256-DlGcec5oUPDMzVztADw9fROmBIIO7isZ8gZEMGeDVcA="; nativeBuildInputs = [ gobject-introspection From c29cca1eef4e16dab6354a96076396362a9a016f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 16 Apr 2022 12:52:14 -0300 Subject: [PATCH 08/58] xfce.xfce4-eyes-plugin: 4.5.1 -> 4.6.0 --- .../desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix index 08434ad25227..e4a252c7ed06 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix @@ -15,11 +15,11 @@ let category = "panel-plugins"; in stdenv.mkDerivation rec { pname = "xfce4-eyes-plugin"; - version = "4.5.1"; + version = "4.6.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-TbeAF45Sk5HVPaGA5JOGkE5ppaM7O9UYWDXQp+b/WsU="; + sha256 = "sha256-rQ/wXYi6OTt8iSL4Iz7dM/wKTosAC2HeH486EMWuUyQ="; }; nativeBuildInputs = [ From 77f15bc69feebcea77d4d075b8302d99871b12ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 16 Apr 2022 13:06:55 -0300 Subject: [PATCH 09/58] xfce.xfce4-terminal: 0.8.10 -> 1.0.1 --- pkgs/desktops/xfce/applications/xfce4-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 65611f73a1d2..c83dd372e4ab 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "0.8.10"; + version = "1.0.1"; - sha256 = "sha256-FINoED7C2PXeDJf9sKD7bk+b5FGZMMqXFe3i2zLDqGw="; + sha256 = "sha256-+tuJGA/g0ddDop5mTbRZGVGUKKZ87fmdVMOaaBhMpFQ="; nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ]; From 9919952421f39d20eb28e0bbeaf7206d6950bf6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Apr 2022 00:53:01 +0000 Subject: [PATCH 10/58] bada-bib: 0.6.1 -> 0.6.2 --- pkgs/applications/science/misc/bada-bib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 6dfc6f7ea55a..8f840b2998db 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -17,15 +17,15 @@ python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.6.1"; + version = "0.6.2"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitHub { owner = "RogerCrocker"; repo = "BadaBib"; - rev = "v${version}"; - sha256 = "sha256-fuGGKBScdo9rI3tLSBWIcWEME8nSuct0IUyfmI7PzCc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-3dXtBwqEqiXLjntmqLYeuwLv0RDb774+yOXc7vdf8+Y="; }; nativeBuildInputs = [ From f202a18f608c4ee1c2a257f6703a8351f1e2dc91 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 20 Apr 2022 23:18:40 -0400 Subject: [PATCH 11/58] atlassian-confluence: 7.14.1 -> 7.17.1 --- pkgs/servers/atlassian/confluence.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index f580abc18781..6dfe291746b0 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.14.1"; + version = "7.17.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "1lcwdjby18xr54i408kncfhlizf18xcrnhfgsvhx5m02arid7mk7"; + sha256 = "sha256-TFtWuJR/t3MMbs8Gd818ByOnMtiT4QxbcpgBxYXzFYY="; }; buildPhase = '' @@ -44,6 +44,6 @@ stdenvNoCC.mkDerivation rec { description = "Team collaboration software written in Java and mainly used in corporate environments"; homepage = "https://www.atlassian.com/software/confluence"; license = licenses.unfree; - maintainers = with maintainers; [ fpletz globin willibutz ciil ]; + maintainers = with maintainers; [ fpletz globin willibutz ciil techknowlogick ]; }; } From 07e68f3fc4fa685f4ffda02cb60c4011c84fbbf8 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 19 Apr 2022 21:08:35 +0200 Subject: [PATCH 12/58] chia-plotter: 1.1.7 -> 1.1.8 --- .../blockchains/chia-plotter/default.nix | 19 ++++++---- .../dont_fetch_dependencies.patch | 35 +++++++++++++------ 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/applications/blockchains/chia-plotter/default.nix index 51ca4469bc48..25d4d8653466 100644 --- a/pkgs/applications/blockchains/chia-plotter/default.nix +++ b/pkgs/applications/blockchains/chia-plotter/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "chia-plotter"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "madMAx43v3r"; repo = "chia-plotter"; - rev = "18cad340858f0dbcc8dafd0bda1ce1af0fe58c65"; - sha256 = "sha256-lXjeqcjn3+LtnVYngdM1T3on7V7wez4oOAZ0RpKJXMM="; + rev = "9d7fd929919d1adde6404cb4718a665a81bcef6d"; + sha256 = "sha256-TMAly+Qof2DHPRHqE1nZuHQaCeMo0jEd8MWy4OlXrcs="; fetchSubmodules = true; }; @@ -25,10 +25,17 @@ stdenv.mkDerivation { src = ./dont_fetch_dependencies.patch; pybind11_src = python3Packages.pybind11.src; relic_src = fetchFromGitHub { - owner = "relic-toolkit"; + owner = "Chia-Network"; repo = "relic"; - rev = "1885ae3b681c423c72b65ce1fe70910142cf941c"; - hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0="; + rev = "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7"; + hash = "sha256-IfTD8DvTEXeLUoKe4Ejafb+PEJW5DV/VXRYuutwGQHU="; + }; + sodium_src = fetchFromGitHub { + owner = "AmineKhaldi"; + repo = "libsodium-cmake"; + rev = "f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65"; # pinned by upstream + sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA="; + fetchSubmodules = true; }; }) ]; diff --git a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch index 05486473eef5..b7474af4c963 100644 --- a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch +++ b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch @@ -11,30 +11,43 @@ index 255e3bb..5f99c3a 100644 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11 relic) - -diff --git a/lib/bls-signatures/src/CMakeLists.txt b/lib/bls-signatures/src/CMakeLists.txt -index b762b5d..e06073b 100644 ---- a/lib/bls-signatures/src/CMakeLists.txt -+++ b/lib/bls-signatures/src/CMakeLists.txt -@@ -4,18 +4,11 @@ set (CMAKE_CXX_STANDARD 17) - # CMake 3.14+ + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6922167..23d8da6 100644 +--- a/lib/bls-signatures/CMakeLists.txt ++++ b/lib/bls-signatures/CMakeLists.txt +@@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH include(FetchContent) + FetchContent_Declare(Sodium +- GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git +- # Latest commit at the moment this was added here +- # Anchored to libsodium v1.0.18 +- GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65 ++ URL @sodium_src@ + ) + set(SODIUM_PCH "on" CACHE STRING "") + set(SODIUM_DISABLE_TESTS "on" CACHE STRING "") + set(SODIUM_CHIA_MINIMAL "on" CACHE STRING "") + FetchContent_MakeAvailable(Sodium) + -if (DEFINED ENV{RELIC_MAIN}) - set(RELIC_GIT_TAG "origin/main") -else () -- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c") +- # This is currently anchored to upstream aecdcae7956f542fbee2392c1f0feb0a8ac41dc5 +- set(RELIC_GIT_TAG "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7") -endif () - message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") FetchContent_Declare( relic -- GIT_REPOSITORY https://github.com/relic-toolkit/relic.git -- GIT_TAG ${RELIC_GIT_TAG} +- GIT_REPOSITORY https://github.com/Chia-Network/relic.git +- GIT_TAG ${RELIC_GIT_TAG} + SOURCE_DIR @relic_src@ ) - FetchContent_MakeAvailable(relic) + + # Relic related options diff --git a/CMakeLists.txt b/CMakeLists.txt index 970ec74..948441a 100644 From f17ccd671f9c8d32bfe34d9bed9c5c366a9f939a Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Thu, 21 Apr 2022 14:47:06 -0500 Subject: [PATCH 13/58] libsystemtap: 3.2 -> 4.6 --- .../libraries/libsystemtap/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix index 17ac533732f9..3525d057b97a 100644 --- a/pkgs/development/libraries/libsystemtap/default.nix +++ b/pkgs/development/libraries/libsystemtap/default.nix @@ -1,19 +1,22 @@ -{lib, stdenv, fetchgit, gettext, python2, elfutils}: +{ lib, stdenv, fetchgit +, gettext +, python3 +, elfutils +}: stdenv.mkDerivation { pname = "libsystemtap"; - version = "3.2"; + version = "4.6"; src = fetchgit { url = "git://sourceware.org/git/systemtap.git"; - rev = "4051c70c9318c837981384cbb23f3e9eb1bd0892"; - sha256 = "0sd8n3j3rishks3gyqj2jyqhps7hmlfjyz8i0w8v98cczhhh04rq"; - fetchSubmodules = false; + rev = "release-4.6"; + hash = "sha256-z7OUy0VGxK39aYCWFfvJnWk34Je0R+51kK5pGh7TzXM="; }; dontBuild = true; - nativeBuildInputs = [ gettext python2 elfutils ]; + nativeBuildInputs = [ gettext python3 elfutils ]; installPhase = '' mkdir -p $out/include From f3d70ac6634350b5bef3952b4f4d35e4420621e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Fri, 22 Apr 2022 01:27:36 +0200 Subject: [PATCH 14/58] sampler: build on Darwin --- pkgs/applications/misc/sampler/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index 2e1b94b6b6c7..a020b15eea3e 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, alsa-lib }: +{ lib, buildGoModule, fetchFromGitHub, darwin, libiconv, alsa-lib, stdenv }: buildGoModule rec { pname = "sampler"; @@ -17,7 +17,10 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = [ alsa-lib ]; + buildInputs = lib.optional stdenv.isLinux alsa-lib + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.OpenAL + ]; meta = with lib; { description = "Tool for shell commands execution, visualization and alerting"; From f83b8f10b81dfbace259d16861a754285493c076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 22 Apr 2022 01:37:13 +0200 Subject: [PATCH 15/58] git-crypt: adopt --- .../git-and-tools/git-crypt/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index f0184c663777..3326e3a59c90 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -1,5 +1,12 @@ -{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, lib, stdenv -, libxslt, docbook_xsl +{ fetchFromGitHub +, git +, gnupg +, makeWrapper +, openssl +, lib +, stdenv +, libxslt +, docbook_xsl }: stdenv.mkDerivation rec { @@ -13,11 +20,13 @@ stdenv.mkDerivation rec { sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602"; }; + strictDeps = true; + nativeBuildInputs = [ libxslt makeWrapper ]; buildInputs = [ openssl ]; - patchPhase = '' + postPatch = '' substituteInPlace commands.cpp \ --replace '(escape_shell_arg(our_exe_path()))' '= "git-crypt"' ''; @@ -29,7 +38,8 @@ stdenv.mkDerivation rec { ]; postFixup = '' - wrapProgram $out/bin/git-crypt --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin + wrapProgram $out/bin/git-crypt \ + --suffix PATH : ${lib.makeBinPath [ git gnupg ]} ''; meta = with lib; { @@ -48,7 +58,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/AGWA/git-crypt/releases"; license = licenses.gpl3; - maintainers = [ maintainers.dochang ]; + maintainers = with maintainers; [ dochang SuperSandro2000 ]; platforms = platforms.unix; }; From 319d22ab467cf7548a19ac86db561959135d1a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 22 Apr 2022 01:38:19 +0200 Subject: [PATCH 16/58] git-crypt: 0.6.0 -> 0.7.0 --- .../version-management/git-and-tools/git-crypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 3326e3a59c90..1cf29fbd6c2d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-crypt"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "AGWA"; repo = pname; rev = version; - sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602"; + sha256 = "sha256-GcGCX6hoKL+sNLAeGEzZpaM+cdFjcNlwYExfOFEPi0I="; }; strictDeps = true; From c6a937fcfc6cd70342359b24d4316eb2e83a003f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 07:13:13 +0000 Subject: [PATCH 17/58] armadillo: 11.0.0 -> 11.0.1 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 8d57ce5b1568..ce41240ecf72 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-f91PBBpiTNm/I8nYSYLZGI7HA1L6jqA0YanU2hFl8NM="; + sha256 = "sha256-5D1ESTdsH8i1YglUMbuCz5xP+Yp5GiKiXQ+W5eeTfCI="; }; nativeBuildInputs = [ cmake ]; From 7a33f3d009d8e2817958ad1c434f59435fed3d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Fri, 22 Apr 2022 23:13:05 +0200 Subject: [PATCH 18/58] kjv: get patches from archive.org Ensure the package can still be built if the repository is deleted. --- pkgs/applications/misc/kjv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index 08a1b5a71af6..b618cc9efb50 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, readline }: let - patchPrefix = "https://github.com/samuelgrf/kjv/commit/"; + patchPrefix = "https://web.archive.org/web/20220422205751/https://github.com/samuelgrf/kjv/commit/"; add-apocrypha = fetchpatch { url = patchPrefix + "0856fa0d37b45de0d6b47d163b5ea9a0b7f2c061.patch"; From 0c890f586676a9c48a2c893c89334915d1fb1e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Fri, 22 Apr 2022 23:21:58 +0200 Subject: [PATCH 19/58] treewide: remove samuelgrf from maintainers --- maintainers/maintainer-list.nix | 16 ---------------- .../graphics/gimp/plugins/default.nix | 2 +- pkgs/applications/graphics/skanpage/default.nix | 2 +- pkgs/applications/misc/kjv/default.nix | 2 +- pkgs/data/fonts/times-newer-roman/default.nix | 2 +- .../3rdparty/kwin/scripts/dynamic-workspaces.nix | 2 +- pkgs/tools/archivers/quickbms/default.nix | 2 +- pkgs/tools/wayland/wl-clipboard-x11/default.nix | 2 +- 8 files changed, 7 insertions(+), 23 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b20b473dc679..715244aab685 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11074,22 +11074,6 @@ githubId = 132835; name = "Samuel Dionne-Riel"; }; - samuelgrf = { - email = "s@muel.gr"; - github = "samuelgrf"; - githubId = 67663538; - name = "Samuel Gräfenstein"; - keys = [ - { - longkeyid = "rsa4096/0xDE75F92E318123F0"; - fingerprint = "6F2E 2A90 423C 8111 BFF2 895E DE75 F92E 3181 23F0"; - } - { - longkeyid = "rsa4096/0xEF76A063F15C63C8"; - fingerprint = "FF24 5832 8FAF 4660 18C6 186E EF76 A063 F15C 63C8"; - } - ]; - }; samuelrivas = { email = "samuelrivas@gmail.com"; github = "samuelrivas"; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 6f4fdd689098..79760bb31a65 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -101,7 +101,7 @@ in description = "Batch Image Manipulation Plugin for GIMP"; homepage = "https://github.com/alessandrofrancesconi/gimp-plugin-bimp"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ samuelgrf ]; + maintainers = with maintainers; [ ]; }; }; diff --git a/pkgs/applications/graphics/skanpage/default.nix b/pkgs/applications/graphics/skanpage/default.nix index 17a228808972..bee04cbad52c 100644 --- a/pkgs/applications/graphics/skanpage/default.nix +++ b/pkgs/applications/graphics/skanpage/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { description = "KDE utility to scan images and multi-page documents"; homepage = "https://apps.kde.org/skanpage"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ samuelgrf ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index b618cc9efb50..ee599fd3b6cc 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { description = "The Bible, King James Version"; homepage = "https://github.com/bontibon/kjv"; license = licenses.unlicense; - maintainers = with maintainers; [ jtobin samuelgrf ]; + maintainers = with maintainers; [ jtobin ]; mainProgram = "kjv"; }; } diff --git a/pkgs/data/fonts/times-newer-roman/default.nix b/pkgs/data/fonts/times-newer-roman/default.nix index 6122883c6156..4bfe358d13ed 100644 --- a/pkgs/data/fonts/times-newer-roman/default.nix +++ b/pkgs/data/fonts/times-newer-roman/default.nix @@ -19,7 +19,7 @@ fetchzip { description = "A font that looks just like Times New Roman, except each character is 5-10% wider"; homepage = "https://timesnewerroman.com/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ samuelgrf ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix index cea788f26403..043f52c37efc 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix @@ -32,7 +32,7 @@ mkDerivation rec { meta = with lib; { description = "KWin script that automatically adds/removes virtual desktops"; license = licenses.bsd3; - maintainers = with maintainers; [ samuelgrf ]; + maintainers = with maintainers; [ ]; inherit (src.meta) homepage; inherit (kwindowsystem.meta) platforms; }; diff --git a/pkgs/tools/archivers/quickbms/default.nix b/pkgs/tools/archivers/quickbms/default.nix index 7846f18a1740..d2f39ac2cf18 100644 --- a/pkgs/tools/archivers/quickbms/default.nix +++ b/pkgs/tools/archivers/quickbms/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Universal script based file extractor and reimporter"; homepage = "https://aluigi.altervista.org/quickbms.htm"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ samuelgrf ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wl-clipboard-x11/default.nix b/pkgs/tools/wayland/wl-clipboard-x11/default.nix index 5e87342dff89..25a303a301d7 100644 --- a/pkgs/tools/wayland/wl-clipboard-x11/default.nix +++ b/pkgs/tools/wayland/wl-clipboard-x11/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A wrapper to use wl-clipboard as a drop-in replacement for X11 clipboard tools"; homepage = "https://github.com/brunelli/wl-clipboard-x11"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ samuelgrf ]; + maintainers = with maintainers; [ ]; mainProgram = "xclip"; }; } From e593b9b41f1f4c10acbf35d2a47ab2babe80d8b2 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 22 Apr 2022 17:52:46 -0500 Subject: [PATCH 20/58] pydb: remove --- pkgs/development/tools/pydb/default.nix | 25 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/tools/pydb/default.nix diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix deleted file mode 100644 index 5380bb686085..000000000000 --- a/pkgs/development/tools/pydb/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, python2, emacs }: - -stdenv.mkDerivation rec { - pname = "pydb"; - version = "1.26"; - - src = fetchurl { - url = "mirror://sourceforge/sourceforge/bashdb/${pname}-${version}.tar.bz2"; - sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1"; - }; - - buildInputs = [ python2 emacs /* emacs is optional */ ]; - - preConfigure = '' - p="$(toPythonPath $out)" - configureFlags="$configureFlags --with-python=${python2.interpreter} --with-site-packages=$p" - ''; - - meta = { - description = "Python debugger with GDB-like commands and Emacs bindings"; - homepage = "http://bashdb.sourceforge.net/pydb/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index db330743e50d..c0750fa02640 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1042,6 +1042,7 @@ mapAliases ({ pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22 pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13 pulseeffects-pw = easyeffects; # Added 2021-07-07 + pydb = throw "pydb has been removed: abandoned by upstream"; # Added 2022-04-22 pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # Added 2021-05-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434d94509ab4..3314d0fdf4ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9480,8 +9480,6 @@ with pkgs; pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot; - pydb = callPackage ../development/tools/pydb { }; - pydf = callPackage ../applications/misc/pydf { }; pyinfra = with python3Packages; toPythonApplication pyinfra; From 7f51b529169c277cd17b99a440cc31561c422973 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Apr 2022 04:20:00 +0000 Subject: [PATCH 21/58] scheme-manpages: 2021-03-11 -> 2022-04-21 --- pkgs/data/documentation/scheme-manpages/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 900f28edc8d2..aaa7007d0262 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scheme-manpages-unstable"; - version = "2021-03-11"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "d0163a4e29d29b2f0beb762be4095775134f5ef9"; - sha256 = "0a8f7rq458c7985chwn1qb9yxcwyr0hl39r9vlvm5j687hy3igs2"; + rev = "e3faaa1b80b3493ee644958a105f84f2995a0436"; + sha256 = "sha256-28e6tFRTqX/PWMhdoUZ4nQU1e/JL2uR+NjVXGBwogMM="; }; dontBuild = true; From 3c729e242bec0c4e28da74e4b2400a25e73b9bd3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Apr 2022 04:20:00 +0000 Subject: [PATCH 22/58] sumneko-lua-language-server: fix build on darwin --- .../tools/sumneko-lua-language-server/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index f9f3e9eaab67..f49ee01deafa 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.Foundation ]; + # Disable cwd support on darwin, because it requires macOS>=10.15 + preConfigure = lib.optionalString stdenv.isDarwin '' + for file in 3rd/bee.lua/bee/subprocess/subprocess_posix.cpp 3rd/luamake/3rd/bee.lua/bee/subprocess/subprocess_posix.cpp; do + substituteInPlace $file --replace '#define SUPPORT_CWD 1' "" + done + ''; + preBuild = '' cd 3rd/luamake '' From 9e26e53a66fab70e94e0b3bb8b2353569dd13dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Sat, 23 Apr 2022 07:49:10 +0200 Subject: [PATCH 23/58] wl-clipboard-x11: add artturin to maintainers --- pkgs/tools/wayland/wl-clipboard-x11/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/wayland/wl-clipboard-x11/default.nix b/pkgs/tools/wayland/wl-clipboard-x11/default.nix index 25a303a301d7..b5d15b4a978e 100644 --- a/pkgs/tools/wayland/wl-clipboard-x11/default.nix +++ b/pkgs/tools/wayland/wl-clipboard-x11/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A wrapper to use wl-clipboard as a drop-in replacement for X11 clipboard tools"; homepage = "https://github.com/brunelli/wl-clipboard-x11"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ artturin ]; mainProgram = "xclip"; }; } From 9931c4a4072215569a80a8e31316ab35bc65c8a5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 23 Apr 2022 13:17:51 +0200 Subject: [PATCH 24/58] nixos/nextcloud: make `profile.enabled` configurable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I recently learned that Nextcloud 23's new profile feature — basically a way for users to share personal contact details — has a problematic default setting, profile data is shared with **everyone** by default. This means that an unauthenticated user can access personal information by accessing `nextcloud.tld/u/user.name`. The announcement of v23 states[1]: > We go a step further and introduce a profile page. Here you can put a > description of yourself, show links to, for example, social media, what > department you are in and information on how to contact you. All these > are of course entirely optional and you can choose what is visible to who! > The profile and user status are accessible also from our mobile and desktop clients. It's not mentioned that by default you share personal information[3] with everyone and personally I think that's somewhat problematic. To work around that, I decided to add an option for the recently added[2] and even set it to `false` by default to make an explicit opt-in for that feature. [1] https://nextcloud.com/blog/nextcloud-hub-2-brings-major-overhaul-introducing-nextcloud-office-p2p-backup-and-more/ [2] https://github.com/nextcloud/server/pull/31624/files [3] By default, this affects the following properties: * About * Full name * Headline * Organisation * Profile picture * Role * Twitter * Website Phone, Address and Email are not affected and only shown to authenticated users by default. --- nixos/modules/services/web-apps/nextcloud.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index f74b6bda0caf..a4b886821ebf 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -522,6 +522,29 @@ in { The nextcloud-occ program preconfigured to target this Nextcloud instance. ''; }; + globalProfiles = mkEnableOption "global profiles" // { + description = '' + Makes user-profiles globally available under nextcloud.tld/u/user.name. + Even though it's enabled by default in Nextcloud, it must be explicitly enabled + here because it has the side-effect that personal information is even accessible to + unauthenticated users by default. + + By default, the following properties are set to Show to everyone + if this flag is enabled: + + About + Full name + Headline + Organisation + Profile picture + Role + Twitter + Website + + + Only has an effect in Nextcloud 23 and later. + ''; + }; nginx.recommendedHttpHeaders = mkOption { type = types.bool; @@ -650,6 +673,8 @@ in { if x == null then "false" else boolToString x; + nextcloudGreaterOrEqualThan = req: versionAtLeast cfg.package.version req; + overrideConfig = pkgs.writeText "nextcloud-config.php" '' ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)}, 'trusted_proxies' => ${writePhpArrary (c.trustedProxies)}, ${optionalString (c.defaultPhoneRegion != null) "'default_phone_region' => '${c.defaultPhoneRegion}',"} + ${optionalString (nextcloudGreaterOrEqualThan "23") "'profile.enabled' => ${boolToString cfg.globalProfiles}"} ${objectstoreConfig} ]; ''; From 77b10ee973d54f50acefdd971b55dacd7c3135ce Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 23 Apr 2022 17:46:56 +0000 Subject: [PATCH 25/58] =?UTF-8?q?krane:=202.4.0=20=E2=86=92=202.4.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/krane/Gemfile.lock | 24 +++++------ .../networking/cluster/krane/gemset.nix | 40 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 1c1b8dc7b715..ba7e5bb0a633 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.1) + activesupport (7.0.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -9,11 +9,11 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) colorize (0.8.1) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) ejson (1.3.1) - faraday (1.9.3) + faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -58,12 +58,12 @@ GEM http-form_data (2.3.0) http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) - i18n (1.8.11) + i18n (1.10.0) concurrent-ruby (~> 1.0) - jsonpath (1.1.0) + jsonpath (1.1.1) multi_json jwt (2.3.0) - krane (2.4.0) + krane (2.4.6) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -74,7 +74,7 @@ GEM oj (~> 3.0) statsd-instrument (>= 2.8, < 4) thor (>= 1.0, < 2.0) - kubeclient (4.9.2) + kubeclient (4.9.3) http (>= 3.0, < 5.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -89,7 +89,7 @@ GEM netrc (0.11.0) oj (3.13.11) os (1.1.4) - public_suffix (4.0.6) + public_suffix (4.0.7) rake (13.0.6) recursive-open-struct (1.1.3) rest-client (2.1.0) @@ -98,9 +98,9 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) ruby2_keywords (0.0.5) - signet (0.16.0) + signet (0.16.1) addressable (~> 2.8) - faraday (>= 0.17.3, < 2.0) + faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) statsd-instrument (3.1.2) @@ -109,7 +109,7 @@ GEM concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.1) PLATFORMS ruby @@ -118,4 +118,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.2.24 + 2.3.9 diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index e14b6902fe26..058910072a78 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6"; + sha256 = "1jpydd414j0fig3r0f6ci67mchclg6cq2qgqbq9zplrbg40pzfi8"; type = "gem"; }; - version = "7.0.1"; + version = "7.0.2.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; domain_name = { dependencies = ["unf"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; + sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.0"; }; faraday-em_http = { groups = ["default"]; @@ -265,10 +265,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.8.11"; + version = "1.10.0"; }; jsonpath = { dependencies = ["multi_json"]; @@ -276,10 +276,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hjsr0plnx6v0bh1rhhimfi7z3rqm19xb47ybdkc1h9yhynnmdq"; + sha256 = "0slr38w21gwizkq4nk6c7l7lcqc2c733zfn5fq1pmbwy5bwiggad"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; jwt = { groups = ["default"]; @@ -297,10 +297,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xnf0cw5i1i8l5nm1c9z02h184ad6hvy7fydr4bdzckjkyinamv9"; + sha256 = "16rf7qzwshlbhrc9fdgq44fcf2qbgjwik1kwkv1gncy12lvwfdmz"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.6"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -308,10 +308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kld1w4706dfd6jx3snsi4h2pvqfazz1fni5al2ln60s3b8sybq4"; + sha256 = "0ih04d0vgj91rl66iaqh8jmpskwz3g6mgajid0wlzi5skxqqxlym"; type = "gem"; }; - version = "4.9.2"; + version = "4.9.3"; }; memoist = { groups = ["default"]; @@ -409,10 +409,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; rake = { groups = ["default"]; @@ -461,10 +461,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cgmadrpgkpcklvvm2cga9mnrfqwqlydwpask1wx617h5ha6954k"; + sha256 = "1jwyggz80xb3yi2hycmmw214c4072g8i56y0b0gsmpkiyk5d0vh1"; type = "gem"; }; - version = "0.16.0"; + version = "0.16.1"; }; statsd-instrument = { groups = ["default"]; @@ -513,9 +513,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd"; + sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; type = "gem"; }; - version = "0.0.8"; + version = "0.0.8.1"; }; } From 13977be6e9b157935c092bdbdbf41cf882c23afc Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 23 Apr 2022 19:47:57 +0000 Subject: [PATCH 26/58] =?UTF-8?q?git-review:=202.3.0=20=E2=86=92=202.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/version-management/git-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 37053b7f7a0c..1eaedf218cda 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "git-review"; - version = "2.3.0"; + version = "2.3.1"; # Manually set version because prb wants to get it from the git # upstream repository (and we are installing from tarball instead) @@ -20,7 +20,7 @@ buildPythonApplication rec { owner = "opendev"; repo = pname; rev = version; - sha256 = "sha256-ENrv2jx59iNA/hALFg6+gOz8zxJaoiCwYcAh1xeEOR0="; + sha256 = "sha256-C8M4b/paHJB9geizc1eIhXsTuLeeS4dDisCfCQF1RuU="; }; outputs = [ "out" "man" ]; From 4320942d19118d38caf33a56a4eaa318de3ed104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 24 Apr 2022 03:31:45 +0200 Subject: [PATCH 27/58] python310Packages.google-cloud-bigquery-storage: init at 2.13.1 --- .../google-cloud-bigquery-storage/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix new file mode 100644 index 000000000000..1b59bc8ddbf8 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, google-cloud-bigquery +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "google-cloud-bigquery-storage"; + version = "2.13.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "7a25148f635a04ca9ff568d47e64be275d3a4a3c90772524879e8f88f270d92d"; + }; + + propagatedBuildInputs = [ + google-api-core + ]; + + checkInputs = [ + google-auth + google-cloud-bigquery + pytestCheckHook + ]; + + # dependency loop with google-cloud-bigquery + doCheck = false; + + preCheck = '' + rm -r google + ''; + + pythonImportsCheck = [ + "google.cloud.bigquery_storage" + "google.cloud.bigquery_storage_v1" + "google.cloud.bigquery_storage_v1beta2" + ]; + + meta = with lib; { + description = "BigQuery Storage API API client library"; + homepage = "https://github.com/googleapis/python-bigquery-storage"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2a37a9419cf..4296ec59bb6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3443,6 +3443,8 @@ in { google-cloud-bigquery-logging = callPackage ../development/python-modules/google-cloud-bigquery-logging { }; + google-cloud-bigquery-storage = callPackage ../development/python-modules/google-cloud-bigquery-storage { }; + google-cloud-bigtable = callPackage ../development/python-modules/google-cloud-bigtable { }; google-cloud-container = callPackage ../development/python-modules/google-cloud-container { }; From c5aa93e1a9c74c7df80b506c89fe2f3ce336e2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 24 Apr 2022 04:04:46 +0200 Subject: [PATCH 28/58] python310Packages.db-dtypes: init at 1.0.0 --- .../python-modules/db-dtypes/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/db-dtypes/default.nix diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix new file mode 100644 index 000000000000..883439aba462 --- /dev/null +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, packaging +, pandas +, pyarrow +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "db-dtypes"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "3070d1a8d86ff0b5d9b16f15c5fab9c18893c6b3d5723cd95ee397b169049454"; + }; + + propagatedBuildInputs = [ + numpy + packaging + pandas + pyarrow + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "db_dtypes" ]; + + meta = with lib; { + description = "Pandas Data Types for SQL systems (BigQuery, Spanner)"; + homepage = "https://github.com/googleapis/python-db-dtypes-pandas"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4296ec59bb6c..68365eb10d96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2099,6 +2099,8 @@ in { dbutils = callPackage ../development/python-modules/dbutils { }; + db-dtypes = callPackage ../development/python-modules/db-dtypes { }; + dcmstack = callPackage ../development/python-modules/dcmstack { }; ddt = callPackage ../development/python-modules/ddt { }; From b5058d029c70e92930c9c4c13bfe3ade59283ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 24 Apr 2022 03:56:22 +0200 Subject: [PATCH 29/58] python310Packages.google-cloud-bigquery: fix build --- .../google-cloud-bigquery/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index e6b2ba11f676..3a5142a9ceff 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -2,7 +2,9 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, db-dtypes , freezegun +, google-cloud-bigquery-storage , google-cloud-core , google-cloud-datacatalog , google-cloud-storage @@ -27,13 +29,15 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - google-resumable-media google-cloud-core + google-cloud-bigquery-storage + google-resumable-media proto-plus pyarrow ]; checkInputs = [ + db-dtypes freezegun google-cloud-testutils ipython @@ -54,8 +58,8 @@ buildPythonPackage rec { # requires credentials "test_bigquery_magic" "TestBigQuery" + "test_context_with_no_query_cache_from_context" "test_arrow_extension_types_same_for_storage_and_REST_APIs_894" - "test_query_retry_539" "test_list_rows_empty_table" "test_list_rows_page_size" "test_list_rows_scalars" @@ -75,6 +79,13 @@ buildPythonPackage rec { "test__initiate_resumable_upload_with_retry" ]; + disabledTestPaths = [ + # requires credentials + "tests/system/test_query.py" + "tests/system/test_job_retry.py" + "tests/system/test_pandas.py" + ]; + pythonImportsCheck = [ "google.cloud.bigquery" "google.cloud.bigquery_v2" From ad97a4885528522216877350e33f3586b838ad8e Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sun, 24 Apr 2022 11:34:51 +0200 Subject: [PATCH 30/58] rr: disable LTO and build with current stdenv --- pkgs/development/tools/analysis/rr/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index bda6f7e4e3c5..a667de3d5cb7 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,6 +1,6 @@ -{ lib, gcc9Stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: +{ lib, stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: -gcc9Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "5.5.0"; pname = "rr"; @@ -17,9 +17,15 @@ gcc9Stdenv.mkDerivation rec { patchShebangs . ''; - # TODO: remove this preConfigure hook after 5.2.0 since it is fixed upstream - # see https://github.com/mozilla/rr/issues/2269 - preConfigure = ''substituteInPlace CMakeLists.txt --replace "std=c++11" "std=c++14"''; + # With LTO enabled, linking fails with the following message: + # + # src/AddressSpace.cc:1666: undefined reference to `rr_syscall_addr' + # ld.bfd: bin/rr: hidden symbol `rr_syscall_addr' isn't defined + # ld.bfd: final link failed: bad value + # collect2: error: ld returned 1 exit status + # + # See also https://github.com/NixOS/nixpkgs/pull/110846 + preConfigure = ''substituteInPlace CMakeLists.txt --replace "-flto" ""''; nativeBuildInputs = [ cmake pkg-config which ]; buildInputs = [ From 31ed8a5745a6de1fe684f730bd9056f122d04318 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Sun, 24 Apr 2022 19:38:18 +1000 Subject: [PATCH 31/58] python3Packages.dm-sonnet, python3Packages.graph_nets: remove --- .../python-modules/dm-sonnet/default.nix | 91 ------------------- .../python-modules/graph_nets/default.nix | 45 --------- .../bazel/bazel_0_29/default.nix | 7 +- .../build-managers/bazel/bazel_1/default.nix | 7 +- .../build-managers/bazel/bazel_3/default.nix | 7 +- .../build-managers/bazel/bazel_4/default.nix | 7 +- .../build-managers/bazel/bazel_5/default.nix | 7 +- pkgs/top-level/python-packages.nix | 4 - 8 files changed, 5 insertions(+), 170 deletions(-) delete mode 100644 pkgs/development/python-modules/dm-sonnet/default.nix delete mode 100644 pkgs/development/python-modules/graph_nets/default.nix diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix deleted file mode 100644 index 3820fdd1e36c..000000000000 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, fetchFromGitHub -, bazel_0_26 -, buildBazelPackage -, buildPythonPackage -, git -, python -, six -, absl-py -, semantic-version -, contextlib2 -, wrapt -, tensorflow -, tensorflow-probability -, tensorflow-estimator -}: - -let - version = "1.33"; - - # first build all binaries and generate setup.py using bazel - bazel-build = buildBazelPackage { - bazel = bazel_0_26; - - name = "dm-sonnet-bazel-${version}"; - - src = fetchFromGitHub { - owner = "deepmind"; - repo = "sonnet"; - rev = "v${version}"; - sha256 = "1nqsja1s8jrkq6v1whgh7smk17313mjr9vs3k5c1m8px4yblzhqc"; - }; - - nativeBuildInputs = [ - git # needed to fetch the bazel deps (protobuf in particular) - ]; - - # see https://github.com/deepmind/sonnet/blob/master/docs/INSTALL.md - bazelTarget = ":install"; - - fetchAttrs = { - sha256 = "09dzxs2v5wpiaxrz7qj257q1fbx0gxwbk0jyx58n81m5kys7yj9k"; - }; - - buildAttrs = { - preBuild = '' - patchShebangs . - ''; - - installPhase = '' - # do not generate a wheel, instead just copy the generated files to $out to be installed by buildPythonPackage - sed -i 's,.*bdist_wheel.*,cp -rL . "$out"; exit 0,' bazel-bin/install - - # the target directory "dist" does not actually matter since we're not generating a wheel - bazel-bin/install dist - ''; - }; - }; - -# now use pip to install the package prepared by bazel -in buildPythonPackage { - pname = "dm-sonnet"; - inherit version; - - src = bazel-build; - - propagatedBuildInputs = [ - six - absl-py - semantic-version - contextlib2 - wrapt - tensorflow - tensorflow-probability - tensorflow-estimator - ]; - - # not sure how to properly run the real test suite -- through bazel? - checkPhase = '' - ${python.interpreter} -c "import sonnet" - ''; - - meta = with lib; { - description = "TensorFlow-based neural network library"; - homepage = "https://sonnet.dev"; - license = licenses.asl20; - maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; - broken = true; # depends on older TensorFlow version than is currently packaged - }; -} diff --git a/pkgs/development/python-modules/graph_nets/default.nix b/pkgs/development/python-modules/graph_nets/default.nix deleted file mode 100644 index 4f7b8c52e9ee..000000000000 --- a/pkgs/development/python-modules/graph_nets/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, tensorflow -, absl-py -, dm-sonnet -, networkx -, numpy -, setuptools -, six -, future -}: - -buildPythonPackage rec { - pname = "graph_nets"; - version = "1.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "278a040674bef295aaf8bb5b0d1b3f207144dc68f0bcfe3f14912b9b85eb0927"; - }; - - postPatch = '' - # https://github.com/deepmind/graph_nets/issues/63 - sed -i 's/dm-sonnet==1.23/dm-sonnet/' setup.py - ''; - - propagatedBuildInputs = [ - tensorflow - absl-py - dm-sonnet - networkx - numpy - setuptools - six - future - ]; - - meta = with lib; { - description = "Build Graph Nets in Tensorflow"; - homepage = "https://github.com/deepmind/graph_nets"; - license = licenses.asl20; - maintainers = with maintainers; [ timokau ]; - }; -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix index 9f2fb8b40f41..91131bc02c63 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix @@ -279,12 +279,7 @@ stdenv'.mkDerivation rec { # fixed-output hashes of the fetch phase need to be spot-checked manually downstream = recurseIntoAttrs ({ inherit bazel-watcher; - } - # dm-sonnet is only packaged for linux - // (lib.optionalAttrs stdenv.isLinux { - # TODO(timokau) dm-sonnet is broken currently - # dm-sonnet-linux = python3.pkgs.dm-sonnet; - })); + }); }; # update the list of workspace dependencies diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index 0402fb85f26d..f9bcab19fe02 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -280,12 +280,7 @@ stdenv'.mkDerivation rec { # fixed-output hashes of the fetch phase need to be spot-checked manually downstream = recurseIntoAttrs ({ inherit bazel-watcher; - } - # dm-sonnet is only packaged for linux - // (lib.optionalAttrs stdenv.isLinux { - # TODO(timokau) dm-sonnet is broken currently - # dm-sonnet-linux = python3.pkgs.dm-sonnet; - })); + }); }; # update the list of workspace dependencies diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index c5f61e7d25c3..69a61a718860 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -303,12 +303,7 @@ stdenv.mkDerivation rec { # fixed-output hashes of the fetch phase need to be spot-checked manually downstream = recurseIntoAttrs ({ inherit bazel-watcher; - } - # dm-sonnet is only packaged for linux - // (lib.optionalAttrs stdenv.isLinux { - # TODO(timokau) dm-sonnet is broken currently - # dm-sonnet-linux = python3.pkgs.dm-sonnet; - })); + }); }; # update the list of workspace dependencies diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 79bb378534bd..03006fe6fbee 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -338,12 +338,7 @@ stdenv.mkDerivation rec { # fixed-output hashes of the fetch phase need to be spot-checked manually downstream = recurseIntoAttrs ({ inherit bazel-watcher; - } - # dm-sonnet is only packaged for linux - // (lib.optionalAttrs stdenv.isLinux { - # TODO(timokau) dm-sonnet is broken currently - # dm-sonnet-linux = python3.pkgs.dm-sonnet; - })); + }); }; src_for_updater = stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 60e708bb47c8..253fe8a67dd1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -300,12 +300,7 @@ stdenv.mkDerivation rec { # fixed-output hashes of the fetch phase need to be spot-checked manually downstream = recurseIntoAttrs ({ inherit bazel-watcher; - } - # dm-sonnet is only packaged for linux - // (lib.optionalAttrs stdenv.isLinux { - # TODO(timokau) dm-sonnet is broken currently - # dm-sonnet-linux = python3.pkgs.dm-sonnet; - })); + }); }; src_for_updater = stdenv.mkDerivation rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2a37a9419cf..76e8c2656e2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2408,8 +2408,6 @@ in { dm-haiku = callPackage ../development/python-modules/dm-haiku { }; - dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; - dm-tree = callPackage ../development/python-modules/dm-tree { abseil-cpp = pkgs.abseil-cpp.override { cxxStandard = "14"; @@ -3584,8 +3582,6 @@ in { graphite-web = callPackage ../development/python-modules/graphite-web { }; - graph_nets = callPackage ../development/python-modules/graph_nets { }; - graphene = callPackage ../development/python-modules/graphene { }; graphene-django = callPackage ../development/python-modules/graphene-django { }; From 12dbdfb6198b0f68732caedecacbf9a607de447e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Apr 2022 15:24:20 +0200 Subject: [PATCH 32/58] checkov: 2.0.1076 -> 2.0.1077 --- 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 a6d0f5d22612..fca7695757cb 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1076"; + version = "2.0.1077"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-LDO4f8SHyTtJp9zOF+exCrNAMhNoIERqHRk11BJgrFs="; + hash = "sha256-Jrwgm5diBSJGY0DFG6r6iv1VQwwawKy04K8/y8yokYI="; }; nativeBuildInputs = with py.pkgs; [ From 9a4208b06fb4a45fa714dac5f9894e8aff2233b6 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 24 Apr 2022 17:42:26 +0200 Subject: [PATCH 33/58] flexget: unbreak by adding some more explicit dependencies --- pkgs/applications/networking/flexget/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index ad18f4e1e611..8421a077d005 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { ln -sf requirements.in requirements.txt # remove dependency constraints - sed 's/[>=]=.*//' -i requirements.txt + sed 's/[~<>=].*//' -i requirements.txt # "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in # nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110 @@ -35,6 +35,8 @@ python3Packages.buildPythonApplication rec { # See https://github.com/Flexget/Flexget/blob/master/requirements.in APScheduler beautifulsoup4 + click + colorama feedparser guessit html5lib @@ -62,6 +64,7 @@ python3Packages.buildPythonApplication rec { flask-restx flask pyparsing + werkzeug zxcvbn # Plugins requirements From ded34c9cb0002f25a0bfe3afe1342384f16fad17 Mon Sep 17 00:00:00 2001 From: Ashley Chiara Date: Sat, 23 Apr 2022 23:31:45 +0200 Subject: [PATCH 34/58] prboom-plus: init at 2.6.2 --- pkgs/games/prboom-plus/default.nix | 62 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/games/prboom-plus/default.nix diff --git a/pkgs/games/prboom-plus/default.nix b/pkgs/games/prboom-plus/default.nix new file mode 100644 index 000000000000..a249a4585bd8 --- /dev/null +++ b/pkgs/games/prboom-plus/default.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, SDL2 +, SDL2_mixer +, SDL2_image +, SDL2_net +, fluidsynth +, soundfont-fluid +, portmidi +, dumb +, libvorbis +, libmad +, pcre +}: + +stdenv.mkDerivation rec { + pname = "prboom-plus"; + version = "2.6.2"; + + src = fetchFromGitHub { + owner = "coelckers"; + repo = "prboom-plus"; + rev = "v${version}"; + sha256 = "iK70PMRLJiZHcK1jCQ2s88LgEMbcfG2pXjwCDVG7zUM="; + }; + + sourceRoot = "source/prboom2"; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + SDL2 + SDL2_mixer + SDL2_image + SDL2_net + fluidsynth + portmidi + dumb + libvorbis + libmad + pcre + ]; + + # Fixes impure path to soundfont + prePatch = '' + substituteInPlace src/m_misc.c --replace \ + "/usr/share/sounds/sf3/default-GM.sf3" \ + "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2" + ''; + + meta = with lib; { + homepage = "https://github.com/coelckers/prboom-plus"; + description = "An advanced, Vanilla-compatible Doom engine based on PrBoom"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.ashley ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d72316c089c9..91a4d70ef11f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31861,6 +31861,8 @@ with pkgs; prboom = callPackage ../games/prboom { }; + prboom-plus = callPackage ../games/prboom-plus { }; + pysolfc = python3Packages.callPackage ../games/pysolfc { }; qqwing = callPackage ../games/qqwing { }; From c7d26e160f7cb27a5c449a23a9bda7cf78a7f016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 24 Apr 2022 18:14:26 +0200 Subject: [PATCH 35/58] libraw: switch the default back to 0.20 Many packages still won't work with the newer unreleased version. --- pkgs/development/libraries/libraw/0_20.nix | 12 ------------ pkgs/development/libraries/libraw/default.nix | 8 ++++---- pkgs/development/libraries/libraw/unstable.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++--- 4 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 pkgs/development/libraries/libraw/0_20.nix create mode 100644 pkgs/development/libraries/libraw/unstable.nix diff --git a/pkgs/development/libraries/libraw/0_20.nix b/pkgs/development/libraries/libraw/0_20.nix deleted file mode 100644 index 9fa85e3ace27..000000000000 --- a/pkgs/development/libraries/libraw/0_20.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ libraw, fetchFromGitHub }: - -libraw.overrideAttrs (_: rec { - version = "0.20.2"; - - src = fetchFromGitHub { - owner = "LibRaw"; - repo = "LibRaw"; - rev = version; - sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc"; - }; -}) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 2dfadcdd4886..3ff7e725f3d8 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libraw"; - version = "unstable-2021-12-03"; + version = "0.20.2"; src = fetchFromGitHub { owner = "LibRaw"; repo = "LibRaw"; - rev = "52b2fc52e93a566e7e05eaa44cada58e3360b6ad"; - sha256 = "kW0R4iPuqnFuWYDrl46ok3kaPcGgY2MqZT7mqVX+BDQ="; + rev = version; + sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc"; }; outputs = [ "out" "lib" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libraw/unstable.nix b/pkgs/development/libraries/libraw/unstable.nix new file mode 100644 index 000000000000..3f19bb53c4e6 --- /dev/null +++ b/pkgs/development/libraries/libraw/unstable.nix @@ -0,0 +1,12 @@ +{ libraw, fetchFromGitHub }: + +libraw.overrideAttrs (_: rec { + version = "unstable-2021-12-03"; + + src = fetchFromGitHub { + owner = "LibRaw"; + repo = "LibRaw"; + rev = "52b2fc52e93a566e7e05eaa44cada58e3360b6ad"; + sha256 = "kW0R4iPuqnFuWYDrl46ok3kaPcGgY2MqZT7mqVX+BDQ="; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 792b61ab0df2..4862e7fa5082 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17087,7 +17087,9 @@ with pkgs; fplll = callPackage ../development/libraries/fplll {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; - freeimage = callPackage ../development/libraries/freeimage { }; + freeimage = callPackage ../development/libraries/freeimage { + libraw = libraw_unstable; + }; freetts = callPackage ../development/libraries/freetts { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -17170,7 +17172,6 @@ with pkgs; gegl = callPackage ../development/libraries/gegl { inherit (darwin.apple_sdk.frameworks) OpenCL; - libraw = libraw_0_20; }; gensio = callPackage ../development/libraries/gensio {}; @@ -23158,7 +23159,7 @@ with pkgs; }; libraw = callPackage ../development/libraries/libraw { }; - libraw_0_20 = callPackage ../development/libraries/libraw/0_20.nix { }; + libraw_unstable = callPackage ../development/libraries/libraw/unstable.nix { }; libraw1394 = callPackage ../development/libraries/libraw1394 { }; From b2db21e6506e6d8a334be3105cfcbc642c7e8b79 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 7 Jan 2022 13:23:24 +0100 Subject: [PATCH 36/58] buho: init at 2.1.1 --- pkgs/applications/office/buho/default.nix | 58 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/office/buho/default.nix diff --git a/pkgs/applications/office/buho/default.nix b/pkgs/applications/office/buho/default.nix new file mode 100644 index 000000000000..997b1c9d502d --- /dev/null +++ b/pkgs/applications/office/buho/default.nix @@ -0,0 +1,58 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-filebrowsing +, mauikit-accounts +, mauikit-texteditor +, qtmultimedia +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "buho"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "buho"; + rev = "v${version}"; + sha256 = "sha256-rHjjvjRY2WsyZfj3fzp46copZ1g2ae6PVv9lBNZDzcI="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-filebrowsing + mauikit-accounts + mauikit-texteditor + qtmultimedia + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Task and Note Keeper"; + homepage = "https://invent.kde.org/maui/buho"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c93ca619777d..ac57f47c1962 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25287,6 +25287,8 @@ with pkgs; btops = callPackage ../applications/window-managers/btops { }; + buho = libsForQt5.callPackage ../applications/office/buho { }; + bvi = callPackage ../applications/editors/bvi { }; bviplus = callPackage ../applications/editors/bviplus { }; From dbf443827d27d3343023ad057bea2bc1e3103681 Mon Sep 17 00:00:00 2001 From: Ashley Chiara Date: Sun, 24 Apr 2022 19:00:03 +0200 Subject: [PATCH 37/58] prboom: remove PrBoom has not seen a release since 2008 and is essentially superseded by PrBoom+ --- pkgs/games/prboom/default.nix | 35 --------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/games/prboom/default.nix diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix deleted file mode 100644 index 8adc9645b7ae..000000000000 --- a/pkgs/games/prboom/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_net -, libGLU ? null -, libGL ? null -, useOpenGL ? stdenv.hostPlatform == stdenv.buildPlatform -}: - -assert useOpenGL -> libGL != null && libGLU != null; - -stdenv.mkDerivation rec { - pname = "prboom"; - version = "2.5.0"; - src = fetchurl { - url = "mirror://sourceforge/prboom/prboom-${version}.tar.gz"; - sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12"; - }; - - buildInputs = [ SDL SDL_mixer SDL_net ] - ++ lib.optionals useOpenGL [ libGL libGLU ]; - - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - - configureFlags = [ - (lib.enableFeature useOpenGL "gl") - (lib.enableFeature doCheck "sdltest") - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--disable-cpu-opt" - "--without-x" - "ac_cv_type_uid_t=yes" - "ac_cv_type_gid_t=yes" - ]; - - postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - mv $out/games/ $out/bin - ''; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e960196bb6d7..1e08e6b44dfe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1030,6 +1030,7 @@ mapAliases ({ pinentry_gtk2 = pinentry-gtk2; # Added 2019-10-14 pinentry_qt = pinentry-qt; # Added 2019-10-14 pinentry_qt5 = pinentry-qt; # Added 2020-02-11 + prboom = throw "prboom was removed because it was abandoned by upstream, use prboom-plus instead"; # Added 2022-04-24 privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18 processing3 = processing; # Added 2019-08-16 procps-ng = throw "'procps-ng' has been renamed to/replaced by 'procps'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91a4d70ef11f..06524bc93cd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31859,8 +31859,6 @@ with pkgs; powermanga = callPackage ../games/powermanga { }; - prboom = callPackage ../games/prboom { }; - prboom-plus = callPackage ../games/prboom-plus { }; pysolfc = python3Packages.callPackage ../games/pysolfc { }; From 0cf5df6fa5412318817274d55528c7eafff8d17d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 23 Apr 2022 18:58:22 +0200 Subject: [PATCH 38/58] i3status-rust: 0.21.9 -> 0.21.10 ChangeLog: https://github.com/greshake/i3status-rust/blob/v0.21.10/NEWS.md#i3status-rust-02110-not-released --- pkgs/applications/window-managers/i3/status-rust.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 83406d33961c..c3d8d96bba4e 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.9"; + version = "0.21.10"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UbQEPY/Qzu3akWqCTdbhO8V46KyNh/4XCA+PySQyNaw="; + sha256 = "sha256-HtPgl52ysE/CVX706YeKBFc6CgGpHzvHwZoS+DzHADY="; }; - cargoSha256 = "sha256-Bb4kkS0eSg0ue24UIy8f0kwD9w4kSCVTd1OqwEggyVs="; + cargoSha256 = "sha256-ini0AIYwvTskNFMSC+Gy23ohL75PTET95e1mjpjCsWE="; nativeBuildInputs = [ pkg-config makeWrapper ]; From c924a4f5803c7f45997c791124f187cc334f9e95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 14:04:33 +0000 Subject: [PATCH 39/58] dprint: 0.24.4 -> 0.26.0 --- pkgs/development/tools/dprint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index b81c3b3dd5bc..20646fa696d5 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.24.4"; + version = "0.26.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-cOjtwdkkENy9HmJ9KRiZJ+JibTmNdkr/17EDgvyNmPw="; + sha256 = "sha256-s8M7xQTADPVRGM3Cu2jmNrdMWBRKNLWsRlXnnB+FHH4="; }; - cargoSha256 = "sha256-cyd9h2Yz8XU/X1w0P9qMv1GDuOL5X24CCstAv7BS7nw="; + cargoSha256 = "sha256-UaD85fCWWYyDNF/HiWDRVpQD0snhiQtEWfIq7GSoZts="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From e66cf9c6c81a99864b15c7c75bc7f0f192ba30e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 13:28:29 +0000 Subject: [PATCH 40/58] elan: 1.4.0 -> 1.4.1 --- pkgs/applications/science/logic/elan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 7e4cc08d358a..1c16de8ad951 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-86O2P48wcib22IRB8niqVLIukGECbBV9ZufEUZEkvnQ="; + sha256 = "sha256-jHECNSXSATLuNHNSVwi7mBTI8l6+cLPDISc5T/4yHDg="; }; - cargoSha256 = "sha256-2kTAFyFDeFQn7x2oVHZvFzJVs4jLBgl0pSOCcj6Vzdk="; + cargoSha256 = "sha256-/XwlTmUboDbB6RTanhKyO6o2GBUhxpH/NQjeNsKpse0="; nativeBuildInputs = [ pkg-config makeWrapper ]; From e325f7aeaafa51db41bd7e8d86d04b934dbab949 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 24 Apr 2022 14:12:28 -0400 Subject: [PATCH 41/58] igrep: 0.2.0 -> 0.5.0 --- pkgs/tools/text/igrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index 87f9de373e23..bb93574f1ffb 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "igrep"; - version = "0.2.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "konradsz"; repo = "igrep"; rev = "v${version}"; - sha256 = "sha256-CH0wf9EhNnfi93W/4IJf6bPqU4pgw6Q9965Wjln9pso="; + sha256 = "sha256-mJtxqwbqofiDuiGokn24qdnck27w7w/3A5mdqZIU88U="; }; - cargoSha256 = "sha256-VnZuRLBt/Q+D89+jKm0rak+ID5oNbvN1k8or3pYzfIM="; + cargoSha256 = "sha256-ikU4SRLu7PQGbidPmf2W39e3sE8QY8YMU6Q0eWhgvLM="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 43049e863cce1d1bca7d017afa60186be0c047e6 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Thu, 21 Apr 2022 17:18:42 -0500 Subject: [PATCH 42/58] lasso: switch to python3 --- pkgs/development/libraries/lasso/default.nix | 42 ++++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index 81cd3799a363..06825c5379d9 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -1,22 +1,49 @@ -{ lib, stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }: +{ lib, stdenv +, autoreconfHook +, fetchurl +, glib +, gobject-introspection +, gtk-doc +, libtool +, libxml2 +, libxslt +, openssl +, pkg-config +, python3 +, xmlsec +, zlib +}: stdenv.mkDerivation rec { - pname = "lasso"; version = "2.8.0"; src = fetchurl { url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz"; - sha256 = "sha256-/8vVhR2YWGx+HK9DutZhZCEaO2HRK/hgoFmESP+fKzg="; - + hash = "sha256-/8vVhR2YWGx+HK9DutZhZCEaO2HRK/hgoFmESP+fKzg="; }; - nativeBuildInputs = [ autoreconfHook pkg-config autoconf automake ]; - buildInputs = [ glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3 + ]; + + buildInputs = [ + glib + gobject-introspection + gtk-doc + libtool + libxml2 + libxslt + openssl + python3.pkgs.six + xmlsec + zlib + ]; configurePhase = '' ./configure --with-pkg-config=$PKG_CONFIG_PATH \ - --disable-python \ --disable-perl \ --prefix=$out ''; @@ -28,5 +55,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ womfoo ]; }; - } From da80a59e8f646ca284d2c7ffe070ad8e010c614f Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 11 Apr 2022 20:39:53 +0200 Subject: [PATCH 43/58] libwebsockets: 4.3.0 -> 4.3.1 Changelog (there's no official one): - https://github.com/warmcat/libwebsockets/compare/v4.3.0...v4.3.1 Also apply a patch required to make ttyd build again. This is probably due to a bug in the lws cmake module, which may only be exercised in this package. See also https://github.com/tsl0922/ttyd/issues/918. --- .../libraries/libwebsockets/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index faf6acd40b92..e0ee94faf0d4 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -5,12 +5,13 @@ , openssl , zlib , libuv +, fetchpatch # External poll is required for e.g. mosquitto, but discouraged by the maintainer. , withExternalPoll ? false }: let - generic = { version, sha256 }: stdenv.mkDerivation rec { + generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec { pname = "libwebsockets"; inherit version; @@ -21,6 +22,8 @@ let inherit sha256; }; + inherit patches; + buildInputs = [ openssl zlib libuv ]; nativeBuildInputs = [ cmake ]; @@ -76,7 +79,15 @@ in { }; libwebsockets_4_3 = generic { - version = "4.3.0"; - sha256 = "13lxb487mqlzbsbv6fbj50r1717mfwdy87ps592lgfy3307yqpr4"; + version = "4.3.1"; + sha256 = "sha256-lB3JHh058cQc5rycLnHk3JAOgtku0nRCixN5U6lPKq8="; + patches = [ + # fixes the propagated cmake files, fixing the build of ttyd + # see also https://github.com/tsl0922/ttyd/issues/918 + (fetchpatch { + url = "https://github.com/warmcat/libwebsockets/commit/99a8b9c4422bed45c8b7412a1e121056f2a6132a.patch"; + hash = "sha256-zHBo2ZEayvibM+jzeVaZqySxghaOLUglpSFwuGhl6HM="; + }) + ]; }; } From 255fe81ed63af9003795ba660904cfecbdd3210d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 24 Apr 2022 18:24:07 +0200 Subject: [PATCH 44/58] libraw: update two commits ahead The fixes are potentially relevant from security point of view. --- pkgs/development/libraries/libraw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 3ff7e725f3d8..758b00febf5f 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libraw"; - version = "0.20.2"; + version = "0.20.2.p2"; src = fetchFromGitHub { owner = "LibRaw"; repo = "LibRaw"; - rev = version; - sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc"; + rev = "fedad11e87daad7b7d389a3ef84ccf10b5e84710"; # current 0.20-stable branch + sha256 = "1mklf8lzybzyg75ja34822xlv6h9nw93griyrjjna7darl1dyvja"; }; outputs = [ "out" "lib" "dev" "doc" ]; From c60d862933db1847e09f3e57b4bd69dfb3bea7e3 Mon Sep 17 00:00:00 2001 From: AtilaSaraiva Date: Sun, 24 Apr 2022 12:31:20 -0300 Subject: [PATCH 45/58] subnetcalc: init at 2.4.19 --- pkgs/tools/networking/subnetcalc/default.nix | 31 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/subnetcalc/default.nix diff --git a/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/tools/networking/subnetcalc/default.nix new file mode 100644 index 000000000000..db8c983be096 --- /dev/null +++ b/pkgs/tools/networking/subnetcalc/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, cmake, ninja }: + +stdenv.mkDerivation rec { + pname = "subnetcalc"; + version = "2.4.19"; + + src = fetchFromGitHub { + owner = "dreibh"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-70OHHcdCsZBa95KQEEYhs6LfpjPg+ULOB+A+VrQVltU="; + }; + + nativeBuildInputs = [ cmake ninja ]; + + meta = with lib; { + description = "SubNetCalc is an IPv4/IPv6 subnet address calculator"; + longDescription = '' + SubNetCalc is an IPv4/IPv6 subnet address calculator. For given IPv4 or + IPv6 address and netmask or prefix length, it calculates network address, + broadcast address, maximum number of hosts and host address range. Also, + it prints the addresses in binary format for better understandability. + Furthermore, it prints useful information on specific address types (e.g. + type, scope, interface ID, etc.). + ''; + homepage = "https://www.uni-due.de/~be0001/subnetcalc/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ atila ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9fef9911001..33acfebde100 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -839,6 +839,8 @@ with pkgs; srcOnly = callPackage ../build-support/src-only { }; + subnetcalc = callPackage ../tools/networking/subnetcalc { }; + substitute = callPackage ../build-support/substitute/substitute.nix { }; substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; From 3d957ef33b5603d025935b4950a423ddc5054f40 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Sun, 24 Apr 2022 15:07:21 -0500 Subject: [PATCH 46/58] parlatype: remove --- pkgs/applications/audio/parlatype/default.nix | 66 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/applications/audio/parlatype/default.nix diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix deleted file mode 100644 index c1bb1102bf1b..000000000000 --- a/pkgs/applications/audio/parlatype/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: - -stdenv.mkDerivation rec { - pname = "parlatype"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "gkarsay"; - repo = pname; - rev = "v${version}"; - sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25"; - }; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - appstream-glib - python3 - gobject-introspection - itstool - wrapGAppsHook - ]; - - buildInputs = [ - gtk3 - at-spi2-core - dbus - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav - sphinxbase - pocketsphinx - glib - gsettings-desktop-schemas - hicolor-icon-theme - ]; - - postPatch = '' - chmod +x data/meson_post_install.py - patchShebangs data/meson_post_install.py - ''; - - doCheck = false; - - buildPhase = '' - export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - - meta = with lib; { - description = "GNOME audio player for transcription"; - longDescription = '' - Parlatype is a minimal audio player for manual speech transcription, written for the GNOME desktop environment. - It plays audio sources to transcribe them in your favourite text application. - It’s intended to be useful for journalists, students, scientists and whoever needs to transcribe audio files. - ''; - homepage = "https://gkarsay.github.io/parlatype/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.melchips ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6a42ebc5b5be..e30d78aa9179 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -912,6 +912,7 @@ mapAliases ({ paperless-ng = paperless-ngx; # Added 2022-04-11 parity = openethereum; # Added 2020-08-01 parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 + parlatype = throw "parlatype has been removed: unmaintained"; # Added 2022-04-24 parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09 pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9fef9911001..2ded3578cae9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28642,8 +28642,6 @@ with pkgs; paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; - parlatype = callPackage ../applications/audio/parlatype { }; - packet = callPackage ../development/tools/packet { }; packet-sd = callPackage ../development/tools/packet-sd { }; From 33207688a35841a0625c1d98034c6a1e607e1a97 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Sun, 24 Apr 2022 15:09:08 -0500 Subject: [PATCH 47/58] pocketsphinx: remove --- .../libraries/pocketsphinx/default.nix | 48 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 pkgs/development/libraries/pocketsphinx/default.nix diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix deleted file mode 100644 index fadc14240831..000000000000 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv -, fetchurl -, sphinxbase -, pkg-config -, python27 # >= 2.6 -, swig2 # 2.0 -}: - -stdenv.mkDerivation rec { - pname = "pocketsphinx"; - version = "5prealpha"; - - src = fetchurl { - url = "mirror://sourceforge/cmusphinx/pocketsphinx-${version}.tar.gz"; - sha256 = "1n9yazzdgvpqgnfzsbl96ch9cirayh74jmpjf7svs4i7grabanzg"; - }; - - propagatedBuildInputs = [ sphinxbase ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python27 swig2 ]; - - meta = { - description = "Voice recognition library written in C"; - homepage = "http://cmusphinx.sourceforge.net"; - license = lib.licenses.free; - platforms = lib.platforms.linux; - }; -} - -/* Example usage: - - -1. - -$ cat << EOF > vocabulary.txt -oh mighty computer /1e-40/ -hello world /1e-30/ -EOF - -2. - -$ pocketsphinx_continuous -inmic yes -kws vocabulary.txt 2> /dev/null -# after you say "hello world": -hello world -... - -*/ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e30d78aa9179..b3c161679bff 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -999,6 +999,7 @@ mapAliases ({ plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22 pltScheme = racket; # just to be sure pmtools = throw "'pmtools' has been renamed to/replaced by 'acpica-tools'"; # Converted to throw 2022-02-22 + pocketsphinx = throw "pocketsphinx has been removed: unmaintained"; # Added 2022-04-24 polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22 polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ded3578cae9..004cdb60bb1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19929,8 +19929,6 @@ with pkgs; plib = callPackage ../development/libraries/plib { }; - pocketsphinx = callPackage ../development/libraries/pocketsphinx { }; - poco = callPackage ../development/libraries/poco { }; podofo = callPackage ../development/libraries/podofo { }; From 9a9735fd9a19cf3c6f80e8f4c531d8f04bee2093 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Sun, 24 Apr 2022 15:23:04 -0500 Subject: [PATCH 48/58] sphinxbase: remove --- .../libraries/sphinxbase/default.nix | 40 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/development/libraries/sphinxbase/default.nix diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix deleted file mode 100644 index 43a70c50fed4..000000000000 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv -, fetchurl -, bison -, pkg-config -, python27 # >= 2.6 -, swig2 # 2.0 -, multipleOutputs ? false #Uses incomplete features of nix! -}: - -stdenv.mkDerivation (rec { - pname = "sphinxbase"; - version = "5prealpha"; - - src = fetchurl { - url = "mirror://sourceforge/cmusphinx/sphinxbase-${version}.tar.gz"; - sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ swig2 python27 bison ]; - - meta = { - description = "Support Library for Pocketsphinx"; - homepage = "http://cmusphinx.sourceforge.net"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ]; - }; - -} // (lib.optionalAttrs multipleOutputs { - outputs = [ "out" "lib" "headers" ]; - - postInstall = '' - mkdir -p $lib - cp -av $out/lib* $lib - - mkdir -p $headers - cp -av $out/include $headers - ''; -})) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b3c161679bff..c7b3c44dc0df 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1199,6 +1199,7 @@ mapAliases ({ spectral = neochat; # Added 2020-12-27 speech_tools = throw "'speech_tools' has been renamed to/replaced by 'speech-tools'"; # Converted to throw 2022-02-22 speedtest_cli = throw "'speedtest_cli' has been renamed to/replaced by 'speedtest-cli'"; # Converted to throw 2022-02-22 + sphinxbase = throw "sphinxbase has been removed: unmaintained"; # Added 2022-04-24 spice_gtk = throw "'spice_gtk' has been renamed to/replaced by 'spice-gtk'"; # Converted to throw 2022-02-22 spice_protocol = throw "'spice_protocol' has been renamed to/replaced by 'spice-protocol'"; # Converted to throw 2022-02-22 spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011"; # added 2021-05-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 004cdb60bb1b..62d806a97478 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20556,8 +20556,6 @@ with pkgs; sphinx-serve = with python3Packages; toPythonApplication sphinx-serve; - sphinxbase = callPackage ../development/libraries/sphinxbase { }; - sphinxsearch = callPackage ../servers/search/sphinxsearch { }; spice = callPackage ../development/libraries/spice { }; From 79fe52c1c3073870427be1ebdade2af185cf3c63 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Apr 2022 22:26:08 +0200 Subject: [PATCH 49/58] python3Packages.zwave-me-ws: init at 0.2.4 --- .../python-modules/zwave-me-ws/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/zwave-me-ws/default.nix diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix new file mode 100644 index 000000000000..479b2d5193ed --- /dev/null +++ b/pkgs/development/python-modules/zwave-me-ws/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +, python-engineio +, python-socketio +, pythonOlder +, websocket-client +}: + +buildPythonPackage rec { + pname = "zwave-me-ws"; + version = "0.2.4"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Z-Wave-Me"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-x7P6fOYTe/u0GKUsO62cNVz2i/hVjUb8t8Bigijxgk0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + websocket-client + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "zwave_me_ws" + ]; + + meta = with lib; { + description = "Library to connect to a ZWave-Me instance"; + homepage = "https://github.com/Z-Wave-Me/zwave-me-ws"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a98d1765183f..049feab5981c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11225,6 +11225,8 @@ in { zulip = callPackage ../development/python-modules/zulip { }; + zwave-me-ws = callPackage ../development/python-modules/zwave-me-ws { }; + zwave-js-server-python = callPackage ../development/python-modules/zwave-js-server-python { }; zxcvbn = callPackage ../development/python-modules/zxcvbn { }; From 5ba1c5231f51df29c629ab1c0fb1dcf2d63bd6fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Apr 2022 22:27:30 +0200 Subject: [PATCH 50/58] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 18a9628d7ff4..e419db5df93a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3124,7 +3124,8 @@ ifaddr url-normalize zeroconf - ]; # missing inputs: zwave_me_ws + zwave-me-ws + ]; }; # components listed in tests/components for which all dependencies are packaged supportedComponentsWithTests = [ @@ -3739,5 +3740,6 @@ "zodiac" "zone" "zwave_js" + "zwave_me" ]; } From b9f25a978a728ac7e60acfbcaa0804785e9c869f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Apr 2022 22:44:22 +0200 Subject: [PATCH 51/58] python3Packages.arris-tg2492lg: init at 2.1.0 --- .../python-modules/arris-tg2492lg/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/arris-tg2492lg/default.nix diff --git a/pkgs/development/python-modules/arris-tg2492lg/default.nix b/pkgs/development/python-modules/arris-tg2492lg/default.nix new file mode 100644 index 000000000000..9a883b2f68ee --- /dev/null +++ b/pkgs/development/python-modules/arris-tg2492lg/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "arris-tg2492lg"; + version = "2.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "vanbalken"; + repo = pname; + rev = version; + sha256 = "sha256-C1o9HWWJ/G/7Pp6I0FbRmX2PQvUJx71L9wHRkUMtnL4="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ + "arris_tg2492lg" + ]; + + meta = with lib; { + description = "Library to connect to an Arris TG2492LG"; + homepage = "https://github.com/vanbalken/arris-tg2492lg"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a98d1765183f..3f9a3ce334c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -631,6 +631,8 @@ in { arrayqueues = callPackage ../development/python-modules/arrayqueues { }; + arris-tg2492lg = callPackage ../development/python-modules/arris-tg2492lg { }; + arrow = callPackage ../development/python-modules/arrow { }; arviz = callPackage ../development/python-modules/arviz { }; From 0edd0271dc4767c16009e746bba0f3a6c9503806 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Apr 2022 22:45:12 +0200 Subject: [PATCH 52/58] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 18a9628d7ff4..bfeeb6a550da 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -162,7 +162,8 @@ pyarlo ]; "arris_tg2492lg" = ps: with ps; [ - ]; # missing inputs: arris-tg2492lg + arris-tg2492lg + ]; "aruba" = ps: with ps; [ pexpect ]; From 440d748e1089ec1c2906fb3226d70ae799fcecc3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Apr 2022 23:05:32 +0200 Subject: [PATCH 53/58] python3Packages.peco: init at 0.0.29 --- .../python-modules/peco/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/peco/default.nix diff --git a/pkgs/development/python-modules/peco/default.nix b/pkgs/development/python-modules/peco/default.nix new file mode 100644 index 000000000000..72450237a542 --- /dev/null +++ b/pkgs/development/python-modules/peco/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pydantic +, pythonOlder +}: + +buildPythonPackage rec { + pname = "peco"; + version = "0.0.29"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zL0tBTwm+l5eyxlWr2xoE+nLpMfUKri1/yD+WgTUqHQ="; + }; + + propagatedBuildInputs = [ + aiohttp + pydantic + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "peco" + ]; + + meta = with lib; { + description = "Library for interacting with the PECO outage map"; + homepage = "https://github.com/IceBotYT/peco-outage-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a98d1765183f..1fbfea36e77b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6130,6 +6130,8 @@ in { pecan = callPackage ../development/python-modules/pecan { }; + peco = callPackage ../development/python-modules/peco { }; + peewee = callPackage ../development/python-modules/peewee { }; pefile = callPackage ../development/python-modules/pefile { }; From 910a7833de829c10230f03eb9d089331a33f0d80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Apr 2022 23:05:40 +0200 Subject: [PATCH 54/58] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 18a9628d7ff4..2e93f0fe7a59 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1958,7 +1958,8 @@ sqlalchemy ]; "peco" = ps: with ps; [ - ]; # missing inputs: peco + peco + ]; "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ @@ -3508,6 +3509,7 @@ "p1_monitor" "panel_custom" "panel_iframe" + "peco" "persistent_notification" "person" "philips_js" From 256d9e0aabe2d0336509d03c5c4d5f9094d22603 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Apr 2022 23:20:53 +0200 Subject: [PATCH 55/58] python3Packages.pysaj: init at 0.0.16 --- .../python-modules/pysaj/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pysaj/default.nix diff --git a/pkgs/development/python-modules/pysaj/default.nix b/pkgs/development/python-modules/pysaj/default.nix new file mode 100644 index 000000000000..15f8dd0fccf0 --- /dev/null +++ b/pkgs/development/python-modules/pysaj/default.nix @@ -0,0 +1,41 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, lxml +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysaj"; + version = "0.0.16"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fredericvl"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7mN6GPRbXfEUfCrCrCs71SSt4x2Ch2y3a5rfXnuwVA0="; + }; + + propagatedBuildInputs = [ + aiohttp + lxml + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pysaj" + ]; + + meta = with lib; { + description = "Library to communicate with SAJ inverters"; + homepage = "https://github.com/fredericvl/pysaj"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b79741bcf82..0d101cb5c4e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7709,6 +7709,8 @@ in { pyruckus = callPackage ../development/python-modules/pyruckus { }; + pysaj = callPackage ../development/python-modules/pysaj { }; + pysam = callPackage ../development/python-modules/pysam { }; pysaml2 = callPackage ../development/python-modules/pysaml2 { From a8a48a133e59d96bf1e7760209c3446c34e3b480 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Apr 2022 23:21:51 +0200 Subject: [PATCH 56/58] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4ae48dd319d0..0fe77b2539b5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2243,7 +2243,8 @@ sqlalchemy ]; "saj" = ps: with ps; [ - ]; # missing inputs: pysaj + pysaj + ]; "samsungtv" = ps: with ps; [ aiohttp-cors async-upnp-client From 6d57d53f5b3c8d58c099ee22ff9de04d1db08cc9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 25 Apr 2022 01:16:26 +0200 Subject: [PATCH 57/58] python3Packages.aiodiscover: 1.4.9 -> 1.4.11 --- pkgs/development/python-modules/aiodiscover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index f54ffc9d4ce9..d8fb5c6b38b6 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.9"; + version = "1.4.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KfNf09L8WF8Op+uVLRttROIgXpY79v0HfMv8b2qMSxE="; + sha256 = "sha256-s5g8otQSWTAOkN4q1LrM/FxVlOnGSv8XKtIDkdwcHMg="; }; propagatedBuildInputs = [ From aa4b8850a453b0cbe6266242f6ab52e361c8d0b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 25 Apr 2022 01:17:41 +0200 Subject: [PATCH 58/58] home-assistant: 2022.4.6 -> 2022.4.7 https://github.com/home-assistant/core/releases/tag/2022.4.7 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5ad61bd2be57..6d51b0a1dbc4 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.4.6"; + version = "2022.4.7"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index fbaba057ca47..b29f48310d05 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -168,7 +168,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.4.6"; + hassVersion = "2022.4.7"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -186,7 +186,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-f2cPkORh6DoNjqZFz7XjxQdZwej3k+8NtZTstYIbrc4="; + hash = "sha256-1m3t+AeHyuEyu3gT8P37A+L28mBdNKGmycU6eNOyb4M="; }; # leave this in, so users don't have to constantly update their downstream patch handling