From 1f6d8426fd03d24b415b96f3e2c3cc05a627f26b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 13 Aug 2020 20:45:40 +0200 Subject: [PATCH 01/65] chroma: init at 0.8.0 --- pkgs/tools/text/chroma/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/text/chroma/default.nix diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix new file mode 100644 index 00000000000..ae4e26e2ca4 --- /dev/null +++ b/pkgs/tools/text/chroma/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "chroma"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "alecthomas"; + repo = "chroma"; + rev = "v${version}"; + sha256 = "066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1"; + }; + + vendorSha256 = "16cnc4scgkx8jan81ymha2q1kidm6hzsnip5mmgbxpqcc2h7hv9m"; + + subPackages = [ "cmd/chroma" ]; + + meta = with lib; { + homepage = "https://github.com/alecthomas/chroma"; + description = "A general purpose syntax highlighter in pure Go"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79a8951e8ab..7486f1ace9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -902,6 +902,8 @@ in withDriver = false; }; + chroma = callPackage ../tools/text/chroma { }; + clair = callPackage ../tools/admin/clair { }; cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; From 5ac88239e0d4390425574611438359c19e41d42e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 21 Aug 2020 22:11:36 +0200 Subject: [PATCH 02/65] tt-rss-theme-feedly: 2.3.1 -> 2.5.0 --- pkgs/servers/tt-rss/theme-feedly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix index 8ad511e5b5b..1f47f5b2226 100644 --- a/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "tt-rss-theme-feedly"; - version = "2.3.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "levito"; repo = "tt-rss-feedly-theme"; rev = "v${version}"; - sha256 = "0rl5g664grx3m7yxa14rgnbvnlc3xnn44kzjji5layxww6jd8h2s"; + sha256 = "sha256-wZ6Q4cxvJKot1TWE8tOVZeaaeBSXghmkYkOK9GjAnEM="; }; dontBuild = true; From 7179b10f142ab13a1dc18ecaf431d1bd22423212 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 14 Aug 2020 20:26:05 +0300 Subject: [PATCH 03/65] sequoia: 0.18.0 -> 0.19.0 Format inputs with newlines for easier future diffs. Use pkg-config instead of pkgconfig. Use llvmPackages_10 - the same version used by rustc. Remove a substituteInPlace hook not doing anything since 0.11.0. --- pkgs/tools/security/sequoia/default.nix | 53 +++++++++++++++---------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 6b389a379d6..a54433b92c9 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -1,32 +1,46 @@ -{ stdenv, fetchFromGitLab, lib, darwin -, git, nettle, llvmPackages, cargo, rustc -, rustPlatform, pkgconfig, glib -, openssl, sqlite, capnproto -, ensureNewerSourcesForZipFilesHook, pythonSupport ? true, pythonPackages ? null +{ stdenv +, fetchFromGitLab +, lib +, darwin +, git +, nettle +# Use the same llvmPackages version as Rust +, llvmPackages_10 +, cargo +, rustc +, rustPlatform +, pkg-config +, glib +, openssl +, sqlite +, capnproto +, ensureNewerSourcesForZipFilesHook +, pythonSupport ? true +, pythonPackages ? null }: assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; - repo = pname; + repo = "sequoia"; rev = "v${version}"; - sha256 = "18acv0185y51yz6jwchi1vf701shz37z5qmnzpq6z419lpjdaskd"; + sha256 = "1870wd03c3x0da9p3jmkvfx8am87ak0dcsvp2qkjvglbl396kd8y"; }; - cargoSha256 = "1jazwpv5mrsd0hxfavk0lvq8n26iglzl8pggw311ysi0lwabjq0y"; + cargoSha256 = "0bb51vdppdjhsxbfy3lyqvw5r5j58r3wi0qb68m2a45k3za7liss"; nativeBuildInputs = [ - pkgconfig + pkg-config cargo rustc git - llvmPackages.libclang - llvmPackages.clang + llvmPackages_10.libclang + llvmPackages_10.clang ensureNewerSourcesForZipFilesHook capnproto ] ++ @@ -54,27 +68,24 @@ rustPlatform.buildRustPackage rec { "build-release" ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages_10.libclang}/lib"; - # Please check if this is still needed when updating. - # Exlude tests for sequoia-store, they often error with 'Too many open files' Hydra. - CARGO_TEST_ARGS = " --all --exclude sequoia-store"; + # Sometimes, tests fail on CI (ofborg) & hydra without this + CARGO_TEST_ARGS = "--workspace --exclude sequoia-store"; + # Without this, the examples won't build postPatch = '' - # otherwise, the check fails because we delete the `.git` in the unpack phase - substituteInPlace openpgp-ffi/Makefile \ - --replace 'git grep' 'grep -R' - # Without this, the check fails substituteInPlace openpgp-ffi/examples/Makefile \ --replace '-O0 -g -Wall -Werror' '-g' substituteInPlace ffi/examples/Makefile \ --replace '-O0 -g -Wall -Werror' '-g' ''; + preInstall = lib.optionalString pythonSupport '' export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}" '' + lib.optionalString (!pythonSupport) '' - export installFlags="PYTHON=disable" + export makeFlags="PYTHON=disable" ''; # Don't use buildRustPackage phases, only use it for rust deps setup From 041bf6e6ba377fc41601a6b73063acd480927430 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Tue, 1 Sep 2020 23:14:47 +0300 Subject: [PATCH 04/65] super-slicer: init at 2.2.53.1 --- .../misc/prusa-slicer/super-slicer.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/misc/prusa-slicer/super-slicer.nix diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix new file mode 100644 index 00000000000..e2ef645e70a --- /dev/null +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -0,0 +1,50 @@ +{ + stdenv, lib, fetchFromGitHub, makeDesktopItem, prusa-slicer +}: +let + appname = "SuperSlicer"; + version = "2.2.53.1"; + pname = "super-slicer"; + description = "PrusaSlicer fork with more features and faster development cycle"; + override = super: { + inherit version pname; + + src = fetchFromGitHub { + owner = "supermerill"; + repo = "SuperSlicer"; + sha256 = "sha256-CAhwmQ63N/XJYToTnIV84lNnjDGNbkmYPzNKNL/wVxs="; + rev = version; + }; + + # See https://github.com/supermerill/SuperSlicer/issues/432 + cmakeFlags = super.cmakeFlags ++ [ + "-DSLIC3R_BUILD_TESTS=0" + ]; + + postInstall = '' + mkdir -p "$out/share/pixmaps/" + # Change slic3r++ to SuperSlicer at the next release! + ln -s "$out/share/slic3r++/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png" + mkdir -p "$out/share/applications" + cp "$desktopItem"/share/applications/* "$out/share/applications/" + ''; + + desktopItem = makeDesktopItem { + name = appname; + exec = "superslicer"; + icon = appname; + comment = description; + desktopName = appname; + genericName = "3D printer tool"; + categories = "Development;"; + }; + + meta = with stdenv.lib; { + inherit description; + homepage = "https://github.com/supermerili/SuperSlicer"; + license = licenses.agpl3; + maintainers = with maintainers; [ cab404 moredread ]; + }; + + }; +in prusa-slicer.overrideAttrs override diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e27ff02b046..608fe85a9cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22992,6 +22992,8 @@ in prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; + super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; + robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; From 9fdb1e6168ba6fc479fa136ec7aba86aa7690172 Mon Sep 17 00:00:00 2001 From: yoctocell Date: Fri, 4 Sep 2020 19:34:24 +0200 Subject: [PATCH 05/65] gomuks: 0.1.2 -> 0.2.0 --- .../networking/instant-messengers/gomuks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 8df4e4b3ea3..c98fd9e8040 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gomuks"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v" + version; - sha256 = "11bainw4w9fdrhv2jm0j9fw0f7r4cxlblyazbhckgr4j9q900383"; + sha256 = "0sf1nqwimxqql8wm6763jyc5rclhd4zxgg9gfi0qvg5ccm1r1z5q"; }; - vendorSha256 = "11rk7pma6dr6fsyz8hpjyr7nc2c7ichh5m7ds07m89gzk6ar55gb"; + vendorSha256 = "sha256:0n9mwbzjkvlljlns7sby8nb9gm4vj0v4idp1zxv5xssqr5qalihf"; doCheck = false; From 531c08a1d97dd2e4076619e91316f5ddacb42345 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 9 Sep 2020 22:10:48 -0700 Subject: [PATCH 06/65] nixos/jitsi-meet: add docs --- nixos/doc/manual/release-notes/rl-2009.xml | 6 ++ .../modules/services/web-apps/jitsi-meet.nix | 1 + .../modules/services/web-apps/jitsi-meet.xml | 55 +++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 nixos/modules/services/web-apps/jitsi-meet.xml diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 1b51fbd566d..484aaaa022a 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -26,6 +26,12 @@ GNOME desktop environment was upgraded to 3.36, see its release notes. + + + Quickly configure a complete, private, self-hosted video + conferencing solution with the new Jitsi Meet module. + + maxx package removed along with services.xserver.desktopManager.maxx module. diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 3b2b2440491..2df762882fa 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -329,5 +329,6 @@ in }; }; + meta.doc = ./jitsi-meet.xml; meta.maintainers = lib.teams.jitsi.members; } diff --git a/nixos/modules/services/web-apps/jitsi-meet.xml b/nixos/modules/services/web-apps/jitsi-meet.xml new file mode 100644 index 00000000000..97373bc6d9a --- /dev/null +++ b/nixos/modules/services/web-apps/jitsi-meet.xml @@ -0,0 +1,55 @@ + + Jitsi Meet + + With Jitsi Meet on NixOS you can quickly configure a complete, + private, self-hosted video conferencing solution. + + +
+ Basic usage + + A minimal configuration using Let's Encrypt for TLS certificates looks like this: +{ + services.jitsi-meet = { + enable = true; + hostName = "jitsi.example.com"; + }; + services.jitsi-videobridge.openFirewall = true; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + security.acme.email = "me@example.com"; + security.acme.acceptTerms = true; +} + +
+ +
+ Configuration + + Here is the minimal configuration with additional configurations: +{ + services.jitsi-meet = { + enable = true; + hostName = "jitsi.example.com"; + config = { + enableWelcomePage = false; + prejoinPageEnabled = true; + defaultLang = "fi"; + }; + interfaceConfig = { + SHOW_JITSI_WATERMARK = false; + SHOW_WATERMARK_FOR_GUESTS = false; + }; + }; + services.jitsi-videobridge.openFirewall = true; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + security.acme.email = "me@example.com"; + security.acme.acceptTerms = true; +} + +
+ + From 9210c8e8ed1cc33931bac44eb89d62a78f7e4a67 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 27 Aug 2020 09:48:36 +0200 Subject: [PATCH 07/65] kubernetes: 1.18.8 -> 1.19.1 Signed-off-by: Sascha Grunert --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 91fa9e8b4ff..691effa3923 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.18.8"; + version = "1.19.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1dswgxxbybwllf2lf89saarsrn4pkb2617wycim07cd7i1l1dv5n"; + sha256 = "1wnlw2rl14q7cb8shhldbavdamvl3w3mlfvymwfvmvxfxzhrjlaq"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; From 35f7a3347c3844dc2f41d66a6fb898d9d45d15b9 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 31 Aug 2020 13:07:58 +0200 Subject: [PATCH 08/65] kubernetes: fix certificate generation Signed-off-by: Sascha Grunert --- nixos/modules/services/cluster/kubernetes/pki.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 4275563f1a3..933ae481e96 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -20,7 +20,7 @@ let size = 2048; }; CN = top.masterAddress; - hosts = cfg.cfsslAPIExtraSANs; + hosts = [top.masterAddress] ++ cfg.cfsslAPIExtraSANs; }); cfsslAPITokenBaseName = "apitoken.secret"; @@ -228,7 +228,8 @@ in }; private_key = cert.privateKeyOptions; request = { - inherit (cert) CN hosts; + hosts = [cert.CN] ++ cert.hosts; + inherit (cert) CN; key = { algo = "rsa"; size = 2048; From 0d8400aa823e30720f4a4cd044eccc77ccd8a22b Mon Sep 17 00:00:00 2001 From: Aldwin Vlasblom Date: Thu, 10 Sep 2020 17:39:34 +0200 Subject: [PATCH 09/65] minecraft-server: 1.16.2 -> 1.16.3 --- pkgs/games/minecraft-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 3c2ab9b3fcd..7216a42b00f 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.16.2"; + version = "1.16.3"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/server.jar"; + url = "https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/server.jar"; # sha1 because that comes from mojang via api - sha1 = "c5f6fb23c3876461d46ec380421e42b289789530"; + sha1 = "f02f4473dbf152c23d7d484952121db0b36698cb"; }; preferLocalBuild = true; From b89327579e2b195126b4d975d697d3a2c8895e72 Mon Sep 17 00:00:00 2001 From: Jiehong Ma Date: Thu, 10 Sep 2020 19:07:44 +0200 Subject: [PATCH 10/65] sublime-merge: use 2033 as dev and 2032 as stable versions --- .../version-management/sublime-merge/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index e5f7f8cbeb0..d5713ea2345 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2033"; - sha256 = "1ym806df2hsw1ml932mshlw7cdxfi6jwa3mkh5m7gbmn7qwpm4xb"; + buildVersion = "2032"; + sha256 = "b782c768383893ba7803c2cffd428b09bec46be8a65e61a5f17964bdcc2aaf7c"; } {}; sublime-merge-dev = common { - buildVersion = "2031"; - sha256 = "1vv3qcggicy5fb4nm2k5a6nw1f20cwxgrmn3xv2dvgx7mpzbhknp"; + buildVersion = "2033"; + sha256 = "ab937a393eb6ae776a81b30ec5a589ae37763885ba8a91680d5c43e19a01a8fa"; dev = true; } {}; } From a45e68be364d751414a406bf78fadf9b60f8c606 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 10 Sep 2020 20:35:33 +0200 Subject: [PATCH 11/65] =?UTF-8?q?inkscape:=201.0=20=E2=86=92=201.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://inkscape.org/news/2020/09/06/inkscape-version-101-patches-crashes-bugs/ https://inkscape.org/release/inkscape-1.0.1/ --- pkgs/applications/graphics/inkscape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 3f8b306acf8..810b19ba90a 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.0"; + version = "1.0.1"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "1fwl7yjkykqb86555k4fm24inhc40mrvxqwgl2v2vi9alv8j7hc9"; + sha256 = "1hjp5nnyx2m3miji6q4lcb6zgbi498v641dc7apkqqvayknrb4ng"; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be From 35deaa45a182d18858ae56c300ab786bdb6cb621 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 10 Sep 2020 20:38:25 +0200 Subject: [PATCH 12/65] inkscape_0: drop Inkscape 1.0.1 re-added the old CLI flags: https://gitlab.com/inkscape/inkscape/-/commit/3ca6a4ed08405f2a530a9ed3065f77443f9f7ebe --- pkgs/applications/graphics/inkscape/0.x.nix | 133 ------------------ pkgs/data/fonts/emojione/default.nix | 4 +- .../data/fonts/twemoji-color-font/default.nix | 4 +- pkgs/data/icons/bibata-cursors/default.nix | 4 +- pkgs/data/icons/bibata-cursors/extra.nix | 4 +- .../data/icons/bibata-cursors/translucent.nix | 6 +- pkgs/data/icons/capitaine-cursors/default.nix | 4 +- .../data/icons/numix-cursor-theme/default.nix | 4 +- pkgs/data/themes/adapta/default.nix | 4 +- pkgs/data/themes/arc/default.nix | 4 +- pkgs/data/themes/mojave/default.nix | 6 +- pkgs/data/themes/numix-solarized/default.nix | 6 +- pkgs/data/themes/plata/default.nix | 4 +- pkgs/data/themes/pop-gtk/default.nix | 6 +- .../gnome-3/apps/gnome-documents/default.nix | 4 +- pkgs/desktops/mate/mate-utils/default.nix | 4 +- pkgs/games/arx-libertatis/default.nix | 4 +- pkgs/tools/graphics/fim/default.nix | 4 +- .../tools/typesetting/tex/dblatex/default.nix | 6 +- pkgs/top-level/all-packages.nix | 4 - 20 files changed, 41 insertions(+), 178 deletions(-) delete mode 100644 pkgs/applications/graphics/inkscape/0.x.nix diff --git a/pkgs/applications/graphics/inkscape/0.x.nix b/pkgs/applications/graphics/inkscape/0.x.nix deleted file mode 100644 index 880ecfb9f0b..00000000000 --- a/pkgs/applications/graphics/inkscape/0.x.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ stdenv -, boehmgc -, boost -, cairo -, cmake -, fetchpatch -, fetchurl -, gettext -, glib -, glibmm -, gsl -, gtkmm2 -, gtkspell2 -, imagemagick -, lcms -, libcdr -, libexif -, libpng -, librevenge -, librsvg -, libsigcxx -, libvisio -, libwpg -, libXft -, libxml2 -, libxslt -, makeWrapper -, perlPackages -, pkg-config -, poppler -, popt -, potrace -, python3 -, wrapGAppsHook -, zlib -}: -let - python3Env = python3.withPackages - (ps: with ps; [ - numpy - lxml - scour - ]); -in -stdenv.mkDerivation rec { - pname = "inkscape_0"; - version = "0.92.5"; - - src = fetchurl { - url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.bz2"; - sha256 = "ge5/aeK9ZKlzQ9g5Wkp6eQWyG4YVZu1eXZF5F41Rmgs="; - }; - - # Inkscape hits the ARGMAX when linking on macOS. It appears to be - # CMake’s ARGMAX check doesn’t offer enough padding for NIX_LDFLAGS. - # Setting strictDeps it avoids duplicating some dependencies so it - # will leave us under ARGMAX. - strictDeps = true; - - postPatch = '' - patchShebangs share/extensions - patchShebangs fix-roff-punct - - # Python is used at run-time to execute scripts, e.g., those from - # the "Effects" menu. - substituteInPlace src/extension/implementation/script.cpp \ - --replace '"python-interpreter", "python"' '"python-interpreter", "${python3Env}/bin/python"' - ''; - - nativeBuildInputs = [ - pkg-config - cmake - makeWrapper - python3Env - wrapGAppsHook - ] ++ (with perlPackages; [ - perl - XMLParser - ]); - - buildInputs = [ - boehmgc - boost - gettext - glib - glibmm - gsl - gtkmm2 - imagemagick - lcms - libcdr - libexif - libpng - librevenge - librsvg # for loading icons - libsigcxx - libvisio - libwpg - libXft - libxml2 - libxslt - perlPackages.perl - poppler - popt - potrace - python3Env - zlib - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ - gtkspell2 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - cairo - ]; - - # Make sure PyXML modules can be found at run-time. - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview - ''; - - meta = with stdenv.lib; { - description = "Legacy version of vector graphics editor"; - homepage = "https://www.inkscape.org"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.jtojnar ]; - platforms = platforms.all; - longDescription = '' - Inkscape is a feature-rich vector graphics editor that edits - files in the W3C SVG (Scalable Vector Graphics) file format. - - If you want to import .eps files install ps2edit. - ''; - }; -} diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 71bd2216da2..6f5168e90d5 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }: +{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "emojione"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { export HOME="$NIX_BUILD_ROOT" ''; - nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ]; + nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; enableParallelBuilding = true; diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index ed04aa78ae1..a9bf3720c07 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }: +{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "twemoji-color-font"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2"; }; - nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ]; + nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; # silence inkscape errors about non-writable home preBuild = "export HOME=\"$NIX_BUILD_ROOT\""; makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ]; diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index 670746d5d1a..66ed71f1f9e 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen, python3 }: +{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: let py = python3.withPackages(ps: [ ps.pillow ]); @@ -25,7 +25,7 @@ in stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ gnome-themes-extra - inkscape_0 + inkscape xcursorgen py ]; diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index c353a049f07..7977566cb61 100644 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ b/pkgs/data/icons/bibata-cursors/extra.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen, python3 }: +{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: let py = python3.withPackages(ps: [ ps.pillow ]); @@ -25,7 +25,7 @@ in stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ gnome-themes-extra - inkscape_0 + inkscape xcursorgen py ]; diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index 4b215d071ab..afdd92600fa 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -1,9 +1,9 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen }: +{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }: stdenvNoCC.mkDerivation rec { pname = "bibata-cursors-translucent"; version = "unstable-2019-09-13"; - + src = fetchFromGitHub { owner = "Silicasandwhich"; repo = "Bibata_Cursor_Translucent"; @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ gnome-themes-extra - inkscape_0 + inkscape xcursorgen ]; diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/data/icons/capitaine-cursors/default.nix index 73ae4fe915f..09491b904ef 100644 --- a/pkgs/data/icons/capitaine-cursors/default.nix +++ b/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, inkscape_0, xcursorgen, bc }: +, inkscape, xcursorgen, bc }: stdenv.mkDerivation rec { pname = "capitaine-cursors"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; buildInputs =[ - inkscape_0 + inkscape xcursorgen bc ]; diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index 6445628e9bb..d0411a8c569 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape_0, xcursorgen }: +{ stdenv, fetchFromGitHub, inkscape, xcursorgen }: stdenv.mkDerivation rec { version = "1.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi"; }; - nativeBuildInputs = [ inkscape_0 xcursorgen ]; + nativeBuildInputs = [ inkscape xcursorgen ]; buildPhase = '' patchShebangs . diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index a9a80143fc9..ca8e908009f 100644 --- a/pkgs/data/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape_0, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: stdenv.mkDerivation rec { pname = "adapta-gtk-theme"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pkgconfig parallel sassc - inkscape_0 + inkscape libxml2 glib.dev gnome3.gnome-shell diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 46664eaaf58..66be070bdf4 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -7,7 +7,7 @@ , gnome3 , gtk-engine-murrine , optipng -, inkscape_0 +, inkscape , cinnamon }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pkgconfig sassc optipng - inkscape_0 + inkscape gtk3 ]; diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index a98218b6392..751dd690d11 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape_0, optipng, sassc, which }: +{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sourceRoot = "source"; - nativeBuildInputs = [ glib inkscape_0 optipng sassc which ]; + nativeBuildInputs = [ glib inkscape optipng sassc which ]; buildInputs = [ gtk_engines ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src/assets/xfwm4/render-assets.sh do substituteInPlace $f \ - --replace /usr/bin/inkscape ${inkscape_0}/bin/inkscape \ + --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ --replace /usr/bin/optipng ${optipng}/bin/optipng done diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix index a3da60e243e..ae8a1d7145e 100644 --- a/pkgs/data/themes/numix-solarized/default.nix +++ b/pkgs/data/themes/numix-solarized/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2, - inkscape_0, optipng, gtk-engine-murrine + inkscape, optipng, gtk-engine-murrine }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1kda0lyqi3cxh163fbj8yyi6jj6pf0y980k4s0cmyi3hkh4cqyd5"; }; - nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape_0 optipng ]; + nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patchShebangs . substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out substituteInPlace scripts/render-assets.sh \ - --replace /usr/bin/inkscape ${inkscape_0}/bin/inkscape \ + --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ --replace /usr/bin/optipng ${optipng}/bin/optipng ''; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 2e23e9a5bbe..6437bb1543d 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel -, sassc, inkscape_0, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine +, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true , gnomeShellSupport ? true @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pkgconfig parallel sassc - inkscape_0 + inkscape libxml2 glib.dev ] diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index feb2ddebb39..317d0ba8601 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -4,7 +4,7 @@ , ninja , sassc , gtk3 -, inkscape_0 +, inkscape , optipng , gtk-engine-murrine , gdk-pixbuf @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ninja sassc gtk3 - inkscape_0 + inkscape optipng python3 ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { for file in $(find -name render-\*.sh); do substituteInPlace "$file" \ --replace 'INKSCAPE="/usr/bin/inkscape"' \ - 'INKSCAPE="${inkscape_0}/bin/inkscape"' \ + 'INKSCAPE="${inkscape}/bin/inkscape"' \ --replace 'OPTIPNG="/usr/bin/optipng"' \ 'OPTIPNG="${optipng}/bin/optipng"' done diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 8d1208d4c68..8d5501537a0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -23,7 +23,7 @@ , docbook_xsl , docbook_xml_dtd_42 , gobject-introspection -, inkscape_0 +, inkscape , poppler_utils , desktop-file-utils , wrapGAppsHook @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { python3 # building getting started - inkscape_0 + inkscape poppler_utils ]; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 35ff2635bbd..e36ff69a6fa 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape_0, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-utils"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pkgconfig gettext itstool - inkscape_0 + inkscape wrapGAppsHook ]; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 2e60f81f4d3..8b2cf83e509 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, zlib, boost , openal, glm, freetype, libGLU, SDL2, epoxy -, dejavu_fonts, inkscape_0, optipng, imagemagick +, dejavu_fonts, inkscape, optipng, imagemagick , withCrashReporter ? !stdenv.isDarwin , qtbase ? null , wrapQtAppsHook ? null @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - cmake inkscape_0 imagemagick optipng + cmake inkscape imagemagick optipng ] ++ optionals withCrashReporter [ wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index dd2dcc1f5bf..6a3d9a29db3 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, automake, pkgconfig , perl, flex, bison, readline, libexif , x11Support ? true, SDL -, svgSupport ? true, inkscape_0 +, svgSupport ? true, inkscape , asciiArtSupport ? true, aalib , gifSupport ? true, giflib , tiffSupport ? true, libtiff @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ perl flex bison readline libexif ] ++ optional x11Support SDL - ++ optional svgSupport inkscape_0 + ++ optional svgSupport inkscape ++ optional asciiArtSupport aalib ++ optional gifSupport giflib ++ optional tiffSupport libtiff diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 5fde58251e0..1f6939e1b11 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2, libxslt, texlive -, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape_0 ? null, fontconfig ? null, ghostscript ? null +, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null , tex ? texlive.combine { # satisfy all packages that ./configure mentions inherit (texlive) scheme-basic epstopdf anysize appendix changebar @@ -16,7 +16,7 @@ assert enableAllFeatures -> imagemagick != null && transfig != null && - inkscape_0 != null && + inkscape != null && fontconfig != null && ghostscript != null; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { -e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \ -e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \ -e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \ - -e 's|cmd = "inkscape|cmd = "${inkscape_0}/bin/inkscape|g' \ + -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \ -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \ -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \ -e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f10a4490282..816e1f7903b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21206,10 +21206,6 @@ in inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); - inkscape_0 = callPackage ../applications/graphics/inkscape/0.x.nix { - lcms = lcms2; - }; - inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { From 309fb9c03b85e8849869029e8787f70d342f9c0e Mon Sep 17 00:00:00 2001 From: Alex Whitt Date: Thu, 10 Sep 2020 15:20:44 -0400 Subject: [PATCH 13/65] allegro: Add patch to fix fatal build error --- pkgs/development/libraries/allegro/default.nix | 1 + pkgs/development/libraries/allegro/encoding.patch | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/development/libraries/allegro/encoding.patch diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 6071f63255d..c7534134397 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./nix-unstable-sandbox-fix.patch + ./encoding.patch ]; buildInputs = [ diff --git a/pkgs/development/libraries/allegro/encoding.patch b/pkgs/development/libraries/allegro/encoding.patch new file mode 100644 index 00000000000..1dca9475280 --- /dev/null +++ b/pkgs/development/libraries/allegro/encoding.patch @@ -0,0 +1,10 @@ +--- allegro-4.4.3/docs/src/allegro._tx.orig 2019-02-02 20:28:46.000000000 +0100 ++++ allegro-4.4.3/docs/src/allegro._tx 2019-11-04 11:12:39.352699777 +0100 +@@ -23,6 +23,7 @@ + @man_shortdesc_force1=allegro + @man_shortdesc_force2=Allegro game programming library. + @$\input texinfo ++@$@documentencoding ISO-8859-1 + @$@setfilename allegro.inf + @$@settitle Allegro Manual + @$@setchapternewpage odd \ No newline at end of file From c85fc341b04548c3442ceb7027004f822f0a052a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 10 Sep 2020 14:23:15 -0500 Subject: [PATCH 14/65] pytorch: update to use passthru's for checks This makes the checks a little easier to understand - we can just check it in the passthru. Also increase major check for cuda 11. --- .../libraries/science/math/magma/default.nix | 2 ++ pkgs/development/python-modules/pytorch/default.nix | 10 +++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 38700c963bf..2079ace021b 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -50,4 +50,6 @@ in stdenv.mkDerivation { platforms = platforms.unix; maintainers = with maintainers; [ tbenst ]; }; + + passthru.cudatoolkit = cudatoolkit; } diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 9bdead706d7..4635f813c3a 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -25,15 +25,11 @@ assert !openMPISupport || openmpi != null; assert !cudaSupport || cudatoolkit != null; assert cudnn == null || cudatoolkit != null; assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; - in majorIs == "9" || majorIs == "10"); + in majorIs == "9" || majorIs == "10" || majorIs == "11"); -let - hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs; - matchesCudatoolkit = hasDependency cudatoolkit; -in # confirm that cudatoolkits are sync'd across dependencies -assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi; -assert !cudaSupport || matchesCudatoolkit magma; +assert !(openMPISupport && cudaSupport) || openmpi.cudatoolkit == cudatoolkit; +assert !cudaSupport || magma.cudatoolkit == cudatoolkit; let cudatoolkit_joined = symlinkJoin { From e45ddaeddfbf6dabeffa0c5db8a4357807fe8c44 Mon Sep 17 00:00:00 2001 From: Ted Reed Date: Thu, 10 Sep 2020 21:59:50 -0700 Subject: [PATCH 15/65] acme-client: build with gcc acme-client fails to build with clang, which breaks the build on darwin. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30889e14d57..d62a47252ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -619,7 +619,7 @@ in aescrypt = callPackage ../tools/misc/aescrypt { }; - acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; }; + acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; stdenv = gccStdenv; }; amass = callPackage ../tools/networking/amass { }; From f3db33e5229b4863021c3f2463fac43a04ddb5df Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 10 Sep 2020 13:05:39 +0200 Subject: [PATCH 16/65] Add NixOS 20.03 release note for Kubernetes v1.19.x Signed-off-by: Sascha Grunert --- nixos/doc/manual/release-notes/rl-2009.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 8a2d1566018..19617f9aa13 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -1125,5 +1125,20 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; + + + + + Kubernetes has been upgraded to 1.19.1, which also means that the + golang version to build it has been bumped to 1.15. This may have + consequences for your existing clusters and their certificates. Please + consider + + the release notes for Kubernetes 1.19 carefully + + before upgrading. + + + From 791f69a30d294aa3ea7607762b37411419c4c977 Mon Sep 17 00:00:00 2001 From: Christian Mainka Date: Fri, 11 Sep 2020 15:42:56 +0200 Subject: [PATCH 17/65] joplin-desktop: 1.0.241 -> 1.0.245 --- pkgs/applications/misc/joplin-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index f3a0d4ae9ae..7b99f829224 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "joplin-desktop"; - version = "1.0.241"; + version = "1.0.245"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "0q0vwjch6m0n461x4llhidkqvy492dqnk8q1al8gnfz2grav6537"; + sha256 = "1xybzjixqmp95b2a97kbbygn0jwndws9115cd7mbw8czl7nshdq6"; }; appimageContents = appimageTools.extractType2 { From e3912be86a9c75a22297e6d6e82e9248e25465d1 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 11 Sep 2020 13:44:30 +0200 Subject: [PATCH 18/65] cx_Freeze: disable python2.7 --- pkgs/development/python-modules/cx_freeze/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index e9292bfa737..dd8b1dccc1c 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, ncurses }: +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses }: buildPythonPackage rec { pname = "cx_Freeze"; @@ -9,6 +9,8 @@ buildPythonPackage rec { sha256 = "44bbbcea3196b79da77cc22637cb28a825b51182d32209e8a3f6cd4042edc247"; }; + disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ ncurses ]; # timestamp need to come after 1980 for zipfiles and nix store is set to epoch From d44f9f2316ed0eb149b9a87550e53deab08d1e99 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Fri, 11 Sep 2020 12:45:20 -0400 Subject: [PATCH 19/65] gitkraken: 7.3.0 -> 7.3.2 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index dedddb6b39d..827d9539dba 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.3.0"; + version = "7.3.2"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0q9imaka79p3krmcrxvnxzb2gprczybnw8d4y9p4icbmdbyb6h70"; + sha256 = "0bw75m87qbnnn1gjphik3xcjx2zwczsa37rpr16la1zjhqjl5m7j"; }; dontBuild = true; From c4b869efc5e2e82a794d72d26d2fb35f03ece6e9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 11 Sep 2020 14:41:55 -0300 Subject: [PATCH 20/65] openmsx: 0.15.0 -> 16.0 --- .../openmsx/{custom-nixos.mk => custom-nix.mk} | 0 pkgs/misc/emulators/openmsx/default.nix | 18 ++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) rename pkgs/misc/emulators/openmsx/{custom-nixos.mk => custom-nix.mk} (100%) diff --git a/pkgs/misc/emulators/openmsx/custom-nixos.mk b/pkgs/misc/emulators/openmsx/custom-nix.mk similarity index 100% rename from pkgs/misc/emulators/openmsx/custom-nixos.mk rename to pkgs/misc/emulators/openmsx/custom-nix.mk diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index f0ab48aa625..dc533c4f17c 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -2,21 +2,19 @@ , python , alsaLib, glew, libGL, libpng , libogg, libtheora, libvorbis -, SDL, SDL_image, SDL_ttf +, SDL2, SDL2_image, SDL2_ttf , freetype, tcl, zlib }: -with stdenv.lib; stdenv.mkDerivation rec { - pname = "openmsx"; - version = "0.15.0"; + version = "16.0"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; - rev = "RELEASE_0_15_0"; - sha256 = "1lv5kdw0812mkf7k20z2djzk0pbs792xq2mibbnz9rfjf02whi7l"; + rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "04sphn9ph378r0qv881riv90cgz58650jcqcwmi1mv6gbcb3img5"; fetchSubmodules = true; }; @@ -24,10 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib glew libGL libpng libogg libtheora libvorbis freetype - SDL SDL_image SDL_ttf tcl zlib ]; + SDL2 SDL2_image SDL2_ttf tcl zlib ]; postPatch = '' - cp ${./custom-nixos.mk} build/custom.mk + cp ${./custom-nix.mk} build/custom.mk ''; dontAddPrefix = true; @@ -36,8 +34,8 @@ stdenv.mkDerivation rec { # for providing support to Nixpkgs :) TCL_CONFIG="${tcl}/lib/"; - meta = { - description = "A MSX emulator"; + meta = with stdenv.lib;{ + description = "The MSX emulator that aims for perfection"; longDescription = '' OpenMSX is an emulator for the MSX home computer system. Its goal is to emulate all aspects of the MSX with 100% accuracy. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91d9790fca8..71b69ad4263 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27664,7 +27664,7 @@ in snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; openmsx = callPackage ../misc/emulators/openmsx { - python = python27; + python = python3; }; higan = callPackage ../misc/emulators/higan { From 87c7d1d4f8aa9d4d108a2e404756744fe27b7833 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 11 Sep 2020 14:38:43 -0500 Subject: [PATCH 21/65] z3: 4.8.8 -> 4.8.9 --- pkgs/applications/science/logic/z3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 350a4f99af8..84c1544071f 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "z3"; - version = "4.8.8"; + version = "4.8.9"; src = fetchFromGitHub { owner = "Z3Prover"; repo = pname; rev = "z3-${version}"; - sha256 = "1rn538ghqwxq0v8i6578j8mflk6fyv0cp4hjfqynzvinjbps56da"; + sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx"; }; buildInputs = [ python fixDarwinDylibNames ] ++ optional javaBindings jdk; From 8382b690af3f1620c07293f1b9ab93a9af96900e Mon Sep 17 00:00:00 2001 From: sohalt Date: Sat, 12 Sep 2020 00:33:07 +0200 Subject: [PATCH 22/65] choose: init at 1.3.1 --- pkgs/tools/text/choose/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/text/choose/default.nix diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix new file mode 100644 index 00000000000..26192732511 --- /dev/null +++ b/pkgs/tools/text/choose/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "choose"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "theryangeary"; + repo = pname; + rev = "v${version}"; + sha256 = "0j3861pxqw0lnamb201c7h5w7npzyiwwb6c1xzxjv72m2ccvz76j"; + }; + + cargoSha256 = "1p18926pfff1yayb2i28v0nz37j52hqqv7244yfrzgidi29kyvbc"; + + meta = with stdenv.lib; { + description = "A human-friendly and fast alternative to cut and (sometimes) awk"; + homepage = "https://github.com/theryangeary/choose"; + license = licenses.gpl3; + maintainers = with maintainers; [ sohalt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91d9790fca8..538559bb407 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3401,6 +3401,8 @@ in cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { }; + choose = callPackage ../tools/text/choose { }; + emscripten = callPackage ../development/compilers/emscripten { }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); From a08c1d6a149becaa5025b87c17691e78dc7a9daf Mon Sep 17 00:00:00 2001 From: dawidsowa Date: Sat, 12 Sep 2020 01:04:34 +0200 Subject: [PATCH 23/65] gallery-dl: 1.14.3 -> 1.14.5 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index ef882ac9b95..ef634fcf72b 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.14.3"; + version = "1.14.5"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0lyy48za81vfw4a5l7fsczsv889dk829nby941xvswp3scclpvfy"; + sha256 = "03xkrmwk4bvkqai9ghdm5arw9i4zhnfbabdn99lr1cv5prq7m4p3"; }; doCheck = false; From c9c5be8a1e399437b9876dabe7effda913906d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Sep 2020 00:52:12 +0200 Subject: [PATCH 24/65] python.pkgs.zulip: init at 0.7.0 --- .../python-modules/zulip/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/zulip/default.nix diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix new file mode 100644 index 00000000000..229a4f17bd3 --- /dev/null +++ b/pkgs/development/python-modules/zulip/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, requests +, matrix-client +, distro +}: + +buildPythonPackage rec { + pname = "zulip"; + version = "0.7.0"; + + disabled = !isPy3k; + + # no sdist on PyPI + src = fetchFromGitHub { + owner = "zulip"; + repo = "python-zulip-api"; + rev = version; + sha256 = "0waldgpzq3ms1r1z14lxdj56lf082fnmi83l3fn8i8gqr8nvnch1"; + }; + sourceRoot = "source/zulip"; + + propagatedBuildInputs = [ + requests + matrix-client + distro + ]; + + preCheck = '' + export COLUMNS=80 + ''; + + meta = with lib; { + description = "Bindings for the Zulip message API"; + homepage = "https://github.com/zulip/python-zulip-api"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24eecdd196c..138041aefd7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7693,6 +7693,8 @@ in { zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkgconfig; }; + zulip = callPackage ../development/python-modules/zulip { }; + zxcvbn = callPackage ../development/python-modules/zxcvbn { }; }); From bc402f3e4d83ec6a54519779b04066cbe6369981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Sep 2020 01:07:32 +0200 Subject: [PATCH 25/65] python.pkgs.urwid-readline: init at 0.11 --- .../python-modules/urwid-readline/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/urwid-readline/default.nix diff --git a/pkgs/development/python-modules/urwid-readline/default.nix b/pkgs/development/python-modules/urwid-readline/default.nix new file mode 100644 index 00000000000..1ded152cba9 --- /dev/null +++ b/pkgs/development/python-modules/urwid-readline/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, urwid +, glibcLocales +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "urwid_readline"; + version = "0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "24e376d4b75940d19e8bc81c264be5d383f8d4da560f68f648dd16c85f6afdb5"; + }; + + propagatedBuildInputs = [ + urwid + ]; + + checkInputs = [ + glibcLocales + pytestCheckHook + ]; + + meta = with lib; { + description = "A textbox edit widget for urwid that supports readline shortcuts"; + homepage = "https://github.com/rr-/urwid_readline"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 138041aefd7..55fb080d3b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7230,6 +7230,8 @@ in { urwidtrees = callPackage ../development/python-modules/urwidtrees { }; + urwid-readline = callPackage ../development/python-modules/urwid-readline { }; + usbtmc = callPackage ../development/python-modules/usbtmc { }; us = callPackage ../development/python-modules/us { }; From f1eeb3245e32a8022975125f0d6750fae6855966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Sep 2020 01:36:36 +0200 Subject: [PATCH 26/65] zulip-term: init at 0.5.2 --- .../instant-messengers/zulip-term/default.nix | 46 +++++++++++++++++++ .../zulip-term/pytest-executable-name.patch | 13 ++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 61 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/zulip-term/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix new file mode 100644 index 00000000000..8f4b2200cc5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -0,0 +1,46 @@ +{ lib +, python3 +, fetchFromGitHub +, glibcLocales +}: + +python3.pkgs.buildPythonApplication rec { + pname = "zulip-term"; + version = "0.5.2"; + + # no tests on PyPI + src = fetchFromGitHub { + owner = "zulip"; + repo = "zulip-terminal"; + rev = version; + sha256 = "1xhhy3v4wck74a83avil0rnmsi2grrh03cww19n5mv80p2q1cjmf"; + }; + + patches = [ + ./pytest-executable-name.patch + ]; + + propagatedBuildInputs = with python3.pkgs; [ + urwid + zulip + urwid-readline + beautifulsoup4 + lxml + mypy-extensions + ]; + + checkInputs = [ + glibcLocales + ] ++ (with python3.pkgs; [ + pytestCheckHook + pytestcov + pytest-mock + ]); + + meta = with lib; { + description = "Zulip's official terminal client"; + homepage = "https://github.com/zulip/zulip-terminal"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch b/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch new file mode 100644 index 00000000000..4602a254ab8 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch @@ -0,0 +1,13 @@ +diff --git a/tests/cli/test_run.py b/tests/cli/test_run.py +index 459aa82..c6e434e 100644 +--- a/tests/cli/test_run.py ++++ b/tests/cli/test_run.py +@@ -180,7 +180,7 @@ def test_main_multiple_autohide_options(capsys, options): + assert str(e.value) == "2" + captured = capsys.readouterr() + lines = captured.err.strip('\n') +- lines = lines.split("pytest: ", 1)[1] ++ lines = lines.split("__main__.py: ", 1)[1] + expected = ("error: argument {}: not allowed " + "with argument {}".format(options[1], options[0])) + assert lines == expected diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8de40a13e7..44f404d5e8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9839,6 +9839,8 @@ in zulip = callPackage ../applications/networking/instant-messengers/zulip { }; + zulip-term = callPackage ../applications/networking/instant-messengers/zulip-term { }; + zulu8 = callPackage ../development/compilers/zulu/8.nix { }; zulu = callPackage ../development/compilers/zulu { }; From 0a10ec483bd9ffd85552176bbec13869cd639872 Mon Sep 17 00:00:00 2001 From: William Kral Date: Fri, 11 Sep 2020 17:26:40 -0700 Subject: [PATCH 27/65] ytree: fix build --- pkgs/tools/misc/ytree/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/tools/misc/ytree/default.nix b/pkgs/tools/misc/ytree/default.nix index 0400e59d22f..b8818ba6e5e 100644 --- a/pkgs/tools/misc/ytree/default.nix +++ b/pkgs/tools/misc/ytree/default.nix @@ -22,16 +22,6 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'gzip' 'gzip -n' ''; - preBuild = '' - makeFlagsArray+=(CC="cc" - ADD_CFLAGS="" - COLOR="-DCOLOR_SUPPORT" - CLOCK="-DCLOCK_SUPPORT" - READLINE="-DREADLINE_SUPPORT" - CFLAGS="-D_GNU_SOURCE -DWITH_UTF8 $(ADD_CFLAGS) $(COLOR) $(CLOCK) $(READLINE)" - LDFLAGS="-lncursesw -lreadline") - ''; - installFlags = [ "DESTDIR=${placeholder "out"}" ]; preInstall = '' From 4124ce1029eb2a8a67de7354e6321c02973ac290 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 11 Sep 2020 17:39:53 -0700 Subject: [PATCH 28/65] diffoscope: 156 -> 160 --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 324b31a186b..011c5432089 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "156"; + version = "160"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1irmsa0g0hggxijqyy7mghc8zy82cr6zn8qil253pm426j7gf7vm"; + sha256 = "1nshcgq31nrbh4r70i5azs7s0wfc4llb60ka1w8rncy22rg8rabc"; }; outputs = [ "out" "man" ]; From 8696388e4845a5e8184ff0ea55505fb3b201de33 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 12 Sep 2020 04:20:00 +0000 Subject: [PATCH 29/65] flexget: 3.1.67 -> 3.1.71 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index c5998796145..d6a253efdaa 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.67"; + version = "3.1.71"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "d3f4b7bebff80a3a3aa00daf60145a6bc3d12847d7339b39846b2341bca75ef3"; + sha256 = "4c25d8733c8eb54c7d3ce60a17d8020049fb137b796e5ada9d15f41cdd0e1655"; }; postPatch = '' From e30fea932c8929e8d69f4d97578640f1efbfe89a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 12 Sep 2020 11:10:17 +0200 Subject: [PATCH 30/65] html-proofer: 3.15.3 -> 3.16.0 --- pkgs/tools/misc/html-proofer/Gemfile.lock | 12 ++++++------ pkgs/tools/misc/html-proofer/gemset.nix | 24 +++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 0ba32818d21..489fa555c5d 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -5,8 +5,8 @@ GEM public_suffix (>= 2.0.2, < 5.0) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.12.2) - html-proofer (3.15.3) + ffi (1.13.1) + html-proofer (3.16.0) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -16,14 +16,14 @@ GEM yell (~> 2.0) mercenary (0.4.0) mini_portile2 (2.4.0) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) - parallel (1.19.1) - public_suffix (4.0.4) + parallel (1.19.2) + public_suffix (4.0.6) rainbow (3.0.0) - typhoeus (1.3.1) + typhoeus (1.4.0) ethon (>= 0.9.0) yell (2.2.2) diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index c5836bc74ba..bdd0bbc20c9 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -26,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; html-proofer = { dependencies = ["addressable" "mercenary" "nokogumbo" "parallel" "rainbow" "typhoeus" "yell"]; @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18afz6rz72j8hnfgzhyr21wh1rfy1x41iyhbcgaq0r1bd7ng1vni"; + sha256 = "18s8l3nys0lvdkqpfg3c1rd84c5j4dmlx503wnksw9skbzn7l93m"; type = "gem"; }; - version = "3.15.3"; + version = "3.16.0"; }; mercenary = { groups = ["default"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; + sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; type = "gem"; }; - version = "1.10.9"; + version = "1.10.10"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -89,20 +89,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; + sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; type = "gem"; }; - version = "1.19.1"; + version = "1.19.2"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.4"; + version = "4.0.6"; }; rainbow = { groups = ["default"]; @@ -120,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; + sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; yell = { groups = ["default"]; From ffdb3d65e475f96dc7f60d367e44a94174c60c7a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 15 Apr 2020 02:08:48 +0300 Subject: [PATCH 31/65] trojita: enable localization --- .../mailreaders/trojita/default.nix | 26 ++++++++++++++++++- .../trojita/fix-qttranslations-path.patch | 13 ++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index 6f885dd18be..52d4d77a400 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -1,6 +1,7 @@ { akonadi-contacts , cmake , fetchgit +, fetchsvn , gnupg , gpgme , kcontacts @@ -15,11 +16,14 @@ , qtkeychain , qttools , qtwebkit +, qttranslations +, substituteAll +, withI18n ? true }: mkDerivation rec { pname = "trojita"; - version = "0.7.20200706"; + version = "unstable-2020-07-06"; src = fetchgit { url = "https://anongit.kde.org/trojita.git"; @@ -27,6 +31,18 @@ mkDerivation rec { sha256 = "0r8nmlqwgsqkk0k8xh32fkwvv6iylj35xq2h8b7l3g03yc342kbn"; }; + l10n = fetchsvn { + url = "svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5"; + rev = "1566642"; + sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q"; + }; + + patches = (substituteAll { + # See https://github.com/NixOS/nixpkgs/issues/86054 + src = ./fix-qttranslations-path.patch; + inherit qttranslations; + }); + buildInputs = [ akonadi-contacts gpgme @@ -48,6 +64,14 @@ mkDerivation rec { gnupg ]; + postPatch = "echo ${version} > src/trojita-version" + + lib.optionalString withI18n '' + mkdir -p po + for f in `find ${l10n} -name "trojita_common.po"`; do + cp $f po/trojita_common_$(echo $f | cut -d/ -f5).po + done + ''; + meta = with lib; { description = "A Qt IMAP e-mail client"; homepage = "http://trojita.flaska.net/"; diff --git a/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch b/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch new file mode 100644 index 00000000000..c4eac395650 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch @@ -0,0 +1,13 @@ +diff --git i/src/Gui/main.cpp w/src/Gui/main.cpp +index 851db4f1..e997f46e 100644 +--- i/src/Gui/main.cpp ++++ w/src/Gui/main.cpp +@@ -52,7 +52,7 @@ int main(int argc, char **argv) + + QTranslator qtTranslator; + qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), +- QLibraryInfo::location(QLibraryInfo::TranslationsPath)); ++ QLatin1String("@qttranslations@/translations")); + app.installTranslator(&qtTranslator); + + QLatin1String localeSuffix("/locale"); From 51ccf2d4badea4d709f8087e3fdb3fff3956d556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 12 Sep 2020 11:48:58 +0200 Subject: [PATCH 32/65] gcc10: 10.1.0 -> 10.2.0 It's supposed to be just bugfixes. I tested building some projects with gcc10. Also gfortran10 still builds. I don't expect issues. This causes basically no rebuilds, as we use 9 by default. --- pkgs/development/compilers/gcc/10/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index aa34798cc58..4f05cd3144c 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -47,7 +47,7 @@ with stdenv.lib; with builtins; let majorVersion = "10"; - version = "${majorVersion}.1.0"; + version = "${majorVersion}.2.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -81,7 +81,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2"; + sha256 = "130xdkhmz1bc2kzx061s3sfwk36xah1fw5w332c0nzwwpdl47pdq"; }; inherit patches; From 9eaddfda7f9d6d3117feff34198b5723136cbeca Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sat, 5 Sep 2020 00:22:31 -0700 Subject: [PATCH 33/65] google-chrome: add libxkbcommon+wayland for ozone/wayland --- pkgs/applications/networking/browsers/google-chrome/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index fa19c4efa9d..5c20af4bc87 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -6,6 +6,7 @@ , alsaLib, libXdamage, libXtst, libXrandr, expat, cups , dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , kerberos, libdrm, mesa +, libxkbcommon, wayland # ozone/wayland # Command line programs , coreutils @@ -62,6 +63,7 @@ let flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core kerberos libdrm mesa coreutils + libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; From f9fbbd519e9cf1287c76d3122d0e8f738f17fdc7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 13:12:14 +0200 Subject: [PATCH 34/65] fwupd: clean up * reorder attributes to match standard * do not use package aliases * add some comments * fix license (https://github.com/fwupd/fwupd/issues/526) --- .../linux/firmware/fwupd/default.nix | 143 ++++++++++-------- 1 file changed, 76 insertions(+), 67 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 66edb34d244..22d1c3625b7 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -5,7 +5,7 @@ , fetchpatch , substituteAll , gtk-doc -, pkgconfig +, pkg-config , gobject-introspection , intltool , libgudev @@ -29,7 +29,7 @@ , libuuid , colord , docbook_xml_dtd_43 -, docbook_xsl +, docbook-xsl-nons , ninja , gcab , python3 @@ -67,10 +67,6 @@ let requests ]); - fontsConf = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; - isx86 = stdenv.isx86_64 || stdenv.isi686; # Dell isn't supported on Aarch64 @@ -95,28 +91,53 @@ let pname = "fwupd"; version = "1.4.5"; - src = fetchurl { - url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "0hpqxwqbbqn440c2swpnc06z8dskisrli4ynsxrzzqyp0dan46xw"; - }; - # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out # CLI programs go to out outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; + src = fetchurl { + url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; + sha256 = "0hpqxwqbbqn440c2swpnc06z8dskisrli4ynsxrzzqyp0dan46xw"; + }; + + patches = [ + # Do not try to create useless paths in /var. + ./fix-paths.patch + + # Allow installing + ./add-option-for-installation-sysconfdir.patch + + # Install plug-ins and libfwupdplugin to out, + # they are not really part of the library. + ./install-fwupdplugin-to-out.patch + + # Installed tests are installed to different output + # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. + (substituteAll { + src = ./installed-tests-path.patch; + # Needs a different set of modules than po/make-images. + inherit installedTestsPython; + }) + + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/3e82beeddac31292c50229e59e2404865edee5ad.patch"; + sha256 = "17p9r8qddqkrnhy9bvp9207afh5fcl1whn79nqcp57b4q4c17zgk"; + }) + ]; + nativeBuildInputs = [ meson ninja gtk-doc - pkgconfig + pkg-config gobject-introspection intltool shared-mime-info valgrind gcab docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons help2man libxslt python @@ -152,55 +173,6 @@ let libsmbios ]; - patches = [ - ./fix-paths.patch - ./add-option-for-installation-sysconfdir.patch - - # Install plug-ins and libfwupdplugin to out, - # they are not really part of the library. - ./install-fwupdplugin-to-out.patch - - # Installed tests are installed to different output - # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. - (substituteAll { - src = ./installed-tests-path.patch; - # Needs a different set of modules than po/make-images. - inherit installedTestsPython; - }) - - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/3e82beeddac31292c50229e59e2404865edee5ad.patch"; - sha256 = "17p9r8qddqkrnhy9bvp9207afh5fcl1whn79nqcp57b4q4c17zgk"; - }) - ]; - - postPatch = '' - patchShebangs \ - contrib/get-version.py \ - contrib/generate-version-script.py \ - meson_post_install.sh \ - po/make-images \ - po/make-images.sh \ - po/test-deps - ''; - - # /etc/os-release not available in sandbox - # doCheck = true; - - preFixup = let - binPath = [ - efibootmgr - bubblewrap - tpm2-tools - ] ++ stdenv.lib.optional haveFlashrom flashrom; - in '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - # See programs reached with fu_common_find_program_in_path in source - --prefix PATH : "${stdenv.lib.makeBinPath binPath}" - ) - ''; - mesonFlags = [ "-Dgtkdoc=true" "-Dplugin_dummy=true" @@ -228,20 +200,57 @@ let "-Dplugin_flashrom=true" ]; - FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF + dontWrapGApps = true; + + # /etc/os-release not available in sandbox + # doCheck = true; + + # Environment variables + + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = + let + fontsConf = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + in fontsConf; # error: “PolicyKit files are missing” # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428 PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions"; - # TODO: wrapGAppsHook wraps efi capsule even though it is not elf - dontWrapGApps = true; + # Phase hooks + + postPatch = '' + patchShebangs \ + contrib/get-version.py \ + contrib/generate-version-script.py \ + meson_post_install.sh \ + po/make-images \ + po/make-images.sh \ + po/test-deps + ''; preCheck = '' addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" ''; - # so we need to wrap the executables manually + preFixup = let + binPath = [ + efibootmgr + bubblewrap + tpm2-tools + ] ++ stdenv.lib.optional haveFlashrom flashrom; + in '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + # See programs reached with fu_common_find_program_in_path in source + --prefix PATH : "${stdenv.lib.makeBinPath binPath}" + ) + ''; + + # Since we had to disable wrapGAppsHook, we need to wrap the executables manually. postFixup = '' find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ | while IFS= read -r -d ''' file; do @@ -312,7 +321,7 @@ let meta = with stdenv.lib; { homepage = "https://fwupd.org/"; maintainers = with maintainers; [ jtojnar ]; - license = [ licenses.gpl2 ]; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; }; From 31081be0d90848e601ac86051c0f1ec55d0ffe70 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 13:26:44 +0200 Subject: [PATCH 35/65] =?UTF-8?q?fwupd:=201.4.5=20=E2=86=92=201.4.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/fwupd/fwupd/releases/tag/1.4.6 Also drop some unneeded dependencies. --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 22d1c3625b7..d502d049ace 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -7,7 +7,7 @@ , gtk-doc , pkg-config , gobject-introspection -, intltool +, gettext , libgudev , polkit , libxmlb @@ -23,7 +23,6 @@ , libsmbios , efivar , gnu-efi -, libyaml , valgrind , meson , libuuid @@ -89,7 +88,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.4.5"; + version = "1.4.6"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -98,7 +97,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "0hpqxwqbbqn440c2swpnc06z8dskisrli4ynsxrzzqyp0dan46xw"; + sha256 = "AKG5stioIveQc7ooYb/2UoOaBzbPUFzYk8tZK0rzvK0="; }; patches = [ @@ -119,11 +118,6 @@ let # Needs a different set of modules than po/make-images. inherit installedTestsPython; }) - - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/3e82beeddac31292c50229e59e2404865edee5ad.patch"; - sha256 = "17p9r8qddqkrnhy9bvp9207afh5fcl1whn79nqcp57b4q4c17zgk"; - }) ]; nativeBuildInputs = [ @@ -132,7 +126,7 @@ let gtk-doc pkg-config gobject-introspection - intltool + gettext shared-mime-info valgrind gcab @@ -154,7 +148,6 @@ let libsoup elfutils gnu-efi - libyaml libgudev colord libjcat From edeccedd869bf80771c3740ab1958db435fc3b5d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 11 Sep 2020 18:54:57 +0200 Subject: [PATCH 36/65] electrum: 4.0.2 -> 4.0.3 --- pkgs/applications/misc/electrum/default.nix | 8 +++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index db6b6f2e181..ad26a912e78 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -19,7 +19,7 @@ }: let - version = "4.0.2"; + version = "4.0.3"; # electrum is not compatible with dnspython 2.0.0 yet # use the latest 1.x release instead @@ -43,7 +43,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1xpkbard994n1gwl95b558x69k1m1m258bc220nxrajg1pywh90f"; + sha256 = "1r40i0v7nm35m3pzbd0l5z4qphl13s31l9v5njmyvpfjirdmhjbv"; extraPostFetch = '' mv $out ./all @@ -58,7 +58,7 @@ py.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "05ibrr6ysf6fncs1pimhxvyr7d659jwj2r2a9pdd3cmn1dxzy2w1"; + sha256 = "0q891fgzxvyzjxfczynx92hvclfs8i3nr5nr9sgbvz13hsg4s6lg"; }; postUnpack = '' @@ -80,13 +80,11 @@ py.pkgs.buildPythonApplication { matplotlib pbkdf2 protobuf - pyaes pycryptodomex pysocks qrcode requests tlslite-ng - # plugins ckcc-protocol keepkey diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 538559bb407..c32428284d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20136,7 +20136,7 @@ in electron-cash = libsForQt514.callPackage ../applications/misc/electron-cash { }; - electrum = libsForQt514.callPackage ../applications/misc/electrum { }; + electrum = libsForQt5.callPackage ../applications/misc/electrum { }; electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; From 79044dc453ca210d39caa0e770819a6d0b359a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Sep 2020 14:45:09 +0200 Subject: [PATCH 37/65] setzer: 0.3.0 -> 0.3.2 --- pkgs/applications/editors/setzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 0b1dd8fcb9f..46dc413971d 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - sha256 = "0gx5fnyi932lswkhdvxfqs0wxx7hz690cbnpv4m3ysydi96mxwiv"; + sha256 = "1c7jrq20m53y2k8lmh37zldgc3bndldxipx4xq0lz3qq2fv1gg07"; }; format = "other"; From 595e61d8377285b2cac5fe42f4cfb7aa43b2b197 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 13:32:22 +0200 Subject: [PATCH 38/65] =?UTF-8?q?flatpak:=201.8.1=20=E2=86=92=201.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/flatpak/releases/tag/1.8.2 --- pkgs/development/libraries/flatpak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 40cea4f730e..6f8634c01ef 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -57,14 +57,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.8.1"; + version = "1.8.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "ZpFLZvmmQHk4bMCXpAoZ+oQZVo33+0VvLkB/D3asnq0="; + sha256 = "eSZiXffCKCpe4aizwxevU9QKZjsbxrGKLch0fiZQhbA="; }; patches = [ From f16e6f5f66fa6cc4e7ba63b62de778c25da94d3b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 13:37:06 +0200 Subject: [PATCH 39/65] =?UTF-8?q?libxmlb:=200.2.0=20=E2=86=92=200.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/hughsie/libxmlb/compare/0.2.0...0.2.1 --- pkgs/development/libraries/libxmlb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 0b0524e163c..97e8d23c070 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.2.0"; + version = "0.2.1"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "VBIQo+6WqJUbkBZnG6eihx3eJFFWF68A7RpZ7gPVbEI="; + sha256 = "XD66YfD8fjaqp5pkcR8qNh7Srjh+atAIC2qkDTF7KdM="; }; patches = [ From 1510876ee95c5be8610b5e24cb89f1308ccc88be Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 15:08:04 +0200 Subject: [PATCH 40/65] =?UTF-8?q?enchant:=202.2.10=20=E2=86=92=202.2.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/AbiWord/enchant/releases/tag/v2.2.11 --- pkgs/development/libraries/enchant/2.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 5788bbe9c17..b7b86de92c0 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , aspell -, pkgconfig +, pkg-config , glib , hunspell , hspell @@ -10,17 +10,17 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.10"; + version = "2.2.11"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1hxx5kb015a5rvjimrpcb5050xb3988dgc52fd5m5n270v238nva"; + sha256 = "opxXd8TkX8rCWVwVxJ1tKqQ0+l58mT3/P582e2X+Ryo="; }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ From 1bdad26c20b294bb2d953ae3c8290e93b97a516b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 15:25:49 +0200 Subject: [PATCH 41/65] =?UTF-8?q?malcontent:=200.8.0=20=E2=86=92=200.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/pwithnall/malcontent/-/releases/0.9.0 --- pkgs/development/libraries/malcontent/default.nix | 4 ++-- pkgs/development/libraries/malcontent/ui.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 3371bd45e71..97cc4f7ff2a 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.8.0"; + version = "0.9.0"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "Y9HzysChzzmKW5PuCLm9AZ4oaBLMpB0I5NyZUOYFzm4="; + sha256 = "DEtibrGgHSgRjaarAzizzLN1xsJKXl+LCQ29FmpPoJo="; }; patches = [ diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix index c69f987c70e..54382cfc0d5 100644 --- a/pkgs/development/libraries/malcontent/ui.nix +++ b/pkgs/development/libraries/malcontent/ui.nix @@ -11,6 +11,7 @@ , flatpak , malcontent , gtk3 +, appstream-glib , desktop-file-utils , polkit , glib-testing @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream-glib dbus polkit glib-testing From 52df62ec9b04cf644043de500e884a85467de252 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 15:37:15 +0200 Subject: [PATCH 42/65] =?UTF-8?q?almanah:=200.12.0=20=E2=86=92=200.12.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/almanah/-/compare/0.12.0...0.12.2 --- pkgs/applications/misc/almanah/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index ff878578526..7d5c468ab97 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , atk , cairo , desktop-file-utils @@ -17,36 +16,29 @@ , libxml2 , meson , ninja -, pkgconfig +, pkg-config +, python3 , sqlite , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "almanah"; - version = "0.12.0"; + version = "0.12.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09rxx4s4c34d1axza6ayss33v78p44r9bpx058shllh1sf5avpcb"; + sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24="; }; - patches = [ - # Fix gpgme detection - # https://gitlab.gnome.org/GNOME/almanah/merge_requests/7 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/almanah/commit/4b979c4145ef2fbceebb3849a70df1d0ceb1bb93.patch"; - sha256 = "0wwkgqr5vi597j734xq0fwgk1zpcabp8wi8b1lnb1ksnqfi3wwxb"; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext libxml2 meson ninja - pkgconfig + pkg-config + python3 wrapGAppsHook ]; From b31de37eba0f287e2e827ee0fbfb02a65c898fca Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 14:36:34 +0200 Subject: [PATCH 43/65] =?UTF-8?q?deja-dup:=2040.6=20=E2=86=92=2042.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/deja-dup/-/releases#42.4 - Nautilus extension no longer supported (https://gitlab.gnome.org/World/deja-dup/merge_requests/42) --- pkgs/applications/backup/deja-dup/default.nix | 53 ++++--------------- .../backup/deja-dup/hardcode-gsettings.patch | 16 ------ 2 files changed, 9 insertions(+), 60 deletions(-) delete mode 100644 pkgs/applications/backup/deja-dup/hardcode-gsettings.patch diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index d283dc7107d..5d1d75e31eb 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -3,44 +3,32 @@ , substituteAll , meson , ninja -, pkgconfig +, pkg-config , vala , gettext -, gnome3 -, libnotify , itstool , glib , gtk3 -, libxml2 -, gnome-online-accounts , coreutils , libsoup , libsecret -, pcre -, libxkbcommon +, libhandy , wrapGAppsHook -, libpthreadstubs -, libXdmcp -, epoxy -, at-spi2-core -, dbus , libgpgerror , json-glib -, appstream-glib -, desktop-file-utils , duplicity }: stdenv.mkDerivation rec { pname = "deja-dup"; - version = "40.6"; + version = "42.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "1d4g34g660wv42a4k2511bxrh90z0vdl3v7ahg0m45phijg9n2n1"; + sha256 = "c4E6mHYVb8TWVTVlmHidcLa9ebHJ27iStsNNLJhY8vY="; }; patches = [ @@ -48,54 +36,31 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit coreutils; }) - - # Hardcode GSettings path for Nautilus extension to avoid crashes from missing schemas - ./hardcode-gsettings.patch ]; - postPatch = '' - # substitute variable from hardcode-gsettings.patch - substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH "${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}" - ''; - nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gettext itstool - appstream-glib - desktop-file-utils - libxml2 wrapGAppsHook ]; buildInputs = [ - libnotify libsoup glib gtk3 libsecret - pcre - libxkbcommon - libpthreadstubs - libXdmcp - epoxy - gnome3.nautilus - at-spi2-core - dbus - gnome-online-accounts # GOA not used any more, only for transferring legacy keys + libhandy libgpgerror json-glib ]; - # TODO: hard code the path - # https://gitlab.gnome.org/World/deja-dup/merge_requests/32 - propagatedUserEnvPkgs = [ duplicity ]; - - # install nautilus plug-in to correct path - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + mesonFlags = [ + "-Dduplicity_command=${duplicity}/bin/duplicity" + ]; meta = with stdenv.lib; { description = "A simple backup tool"; diff --git a/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch deleted file mode 100644 index f74dbf73543..00000000000 --- a/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/deja-dup/nautilus/NautilusExtension.c -+++ b/deja-dup/nautilus/NautilusExtension.c -@@ -313,7 +313,12 @@ - bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - -- settings = g_settings_new(APPLICATION_ID); -+ g_autoptr (GSettingsSchemaSource) schema_source = g_settings_schema_source_new_from_directory ("@DEJA_DUP_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default (), TRUE, NULL); -+ -+ g_autoptr (GSettingsSchema) schema = g_settings_schema_source_lookup (schema_source, APPLICATION_ID, FALSE); -+ -+ settings = g_settings_new_full (schema, NULL, NULL); - g_signal_connect(settings, "changed::include-list", - update_include_excludes, NULL); - g_signal_connect(settings, "changed::exclude-list", From 272e4273f0cd60e0b92019b09a78a8626b383e12 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 17:20:14 +0200 Subject: [PATCH 44/65] alsa-utils: do not sed info script (#97841) The script contains lspci.log file names and the overeager replacement breaks it. --- pkgs/os-specific/linux/alsa-utils/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 470536db4b7..91d7e05a882 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}: +{stdenv, fetchurl, alsaLib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: stdenv.mkDerivation rec { pname = "alsa-utils"; @@ -9,18 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1ai1z4kf91b1m3qrpwqkc1af5vm2fkdkknqv95xdwf19q94aw6gz"; }; - patchPhase = '' - substituteInPlace alsa-info/alsa-info.sh \ - --replace "which" "type -p" \ - --replace "lspci" "${pciutils}/bin/lspci" - ''; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ gettext makeWrapper ]; buildInputs = [ alsaLib ncurses libsamplerate fftw ]; configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; + postFixup = '' + wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${stdenv.lib.makeBinPath [ which pciutils ]}" + ''; + meta = with stdenv.lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture utils"; From 5d50bb69bf48c117487728ade24464ade703b87f Mon Sep 17 00:00:00 2001 From: dawidsowa Date: Sat, 12 Sep 2020 17:23:43 +0200 Subject: [PATCH 45/65] gnomeExtensions.dash-to-panel: 38 -> 39 (#97840) --- pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index a41719f2b9b..8a0314cd8b4 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-panel"; - version = "38"; + version = "39"; src = fetchFromGitHub { owner = "home-sweet-gnome"; repo = "dash-to-panel"; rev = "v${version}"; - sha256 = "1kvybb49l1vf0fvh8d0c6xkwnry8m330scamf5x40y63d4i213j1"; + sha256 = "0r7kbmrizl9ilqy7gzzvjwxcv8xpp13n5n0a8s84blg97cih0hw2"; }; buildInputs = [ From c5fa0e35beed2b779b00b1a44ae82b3edda27691 Mon Sep 17 00:00:00 2001 From: Alvar <8402811+oxzi@users.noreply.github.com> Date: Sat, 12 Sep 2020 17:25:27 +0200 Subject: [PATCH 46/65] arduino-cli: 0.11.0 -> 0.12.1 (#97836) --- pkgs/development/arduino/arduino-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/arduino/arduino-cli/default.nix b/pkgs/development/arduino/arduino-cli/default.nix index 0fe9ed435d1..1b1116a74b5 100644 --- a/pkgs/development/arduino/arduino-cli/default.nix +++ b/pkgs/development/arduino/arduino-cli/default.nix @@ -4,18 +4,18 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "0.11.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = version; - sha256 = "0k9091ci7n7hl44nyzlxkmbwibgrrh9s6z7pgyj9v0mzxjmgz8h2"; + sha256 = "1jlxs4szss2250zp8rz4bislgnzvqhxyp6z48dhx7zaam03hyf0w"; }; subPackages = [ "." ]; - vendorSha256 = "1qybym95a38az8lk8bqc53ngn08hijckajv8v2giifc4q7sb17d2"; + vendorSha256 = "03yj2iar63qm10fw3jh9fvz57c2sqcmngb0mj5jkhbnwf8nl7mhc"; doCheck = false; From 7b3cbc600f0ffc36eb0da3b5a474478eed12e57d Mon Sep 17 00:00:00 2001 From: Alvar <8402811+oxzi@users.noreply.github.com> Date: Sat, 12 Sep 2020 17:27:02 +0200 Subject: [PATCH 47/65] platformio: 4.3.4 -> 5.0.1 (#97833) --- .../arduino/platformio/chrootenv.nix | 4 +- pkgs/development/arduino/platformio/core.nix | 56 +++++++++++++------ .../platformio/missing-udev-rules-nixos.patch | 10 ++-- .../use-local-spdx-license-list.patch | 13 ++--- 4 files changed, 50 insertions(+), 33 deletions(-) diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index 62a1d190a00..91300bda8f1 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -22,8 +22,8 @@ let src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; - rev = "v4.3.4"; - sha256 = "0vf2j79319ypr4yrdmx84853igkb188sjfvlxgw06rlsvsm3kacq"; + rev = "v5.0.1"; + sha256 = "01xh61ldilg6fg95l1p870rld2xffhnl9f9ndvbi5jdn8q634pmw"; }; diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 891d613da51..835e0c692e4 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -9,33 +9,57 @@ let args = lib.concatStringsSep " " ((map (e: "--deselect tests/${e}") [ "commands/test_ci.py::test_ci_boards" - "commands/test_ci.py::test_ci_project_conf" - "commands/test_ci.py::test_ci_lib_and_board" "commands/test_ci.py::test_ci_build_dir" "commands/test_ci.py::test_ci_keep_build_dir" - "commands/test_init.py::test_init_enable_auto_uploading" + "commands/test_ci.py::test_ci_lib_and_board" + "commands/test_ci.py::test_ci_project_conf" "commands/test_init.py::test_init_custom_framework" - "commands/test_init.py::test_init_incorrect_board" + "commands/test_init.py::test_init_duplicated_boards" + "commands/test_init.py::test_init_enable_auto_uploading" "commands/test_init.py::test_init_ide_atom" "commands/test_init.py::test_init_ide_eclipse" - "commands/test_init.py::test_init_duplicated_boards" + "commands/test_init.py::test_init_ide_vscode" + "commands/test_init.py::test_init_incorrect_board" "commands/test_init.py::test_init_special_board" - "commands/test_lib.py::test_search" - "commands/test_lib.py::test_install_duplicates" - "commands/test_lib.py::test_global_lib_update_check" - "commands/test_lib.py::test_global_lib_update" - "commands/test_lib.py::test_global_lib_uninstall" - "commands/test_lib.py::test_lib_show" - "commands/test_lib.py::test_lib_stats" - "commands/test_lib.py::test_global_install_registry" "commands/test_lib.py::test_global_install_archive" + "commands/test_lib.py::test_global_install_registry" "commands/test_lib.py::test_global_install_repository" "commands/test_lib.py::test_global_lib_list" + "commands/test_lib.py::test_global_lib_uninstall" + "commands/test_lib.py::test_global_lib_update" + "commands/test_lib.py::test_global_lib_update_check" + "commands/test_lib.py::test_install_duplicates" + "commands/test_lib.py::test_lib_show" + "commands/test_lib.py::test_lib_stats" + "commands/test_lib.py::test_saving_deps" + "commands/test_lib.py::test_search" + "commands/test_lib.py::test_update" + "commands/test_lib_complex.py::test_global_install_archive" + "commands/test_lib_complex.py::test_global_install_registry" + "commands/test_lib_complex.py::test_global_install_repository" + "commands/test_lib_complex.py::test_global_lib_list" + "commands/test_lib_complex.py::test_global_lib_uninstall" + "commands/test_lib_complex.py::test_global_lib_update" + "commands/test_lib_complex.py::test_global_lib_update_check" + "commands/test_lib_complex.py::test_install_duplicates" + "commands/test_lib_complex.py::test_lib_show" + "commands/test_lib_complex.py::test_lib_stats" + "commands/test_lib_complex.py::test_search" "commands/test_test.py::test_local_env" + "commands/test_test.py::test_multiple_env_build" + "commands/test_test.py::test_setup_teardown_are_compilable" + "package/test_manager.py::test_download" + "package/test_manager.py::test_install_force" + "package/test_manager.py::test_install_from_registry" + "package/test_manager.py::test_install_lib_depndencies" + "package/test_manager.py::test_registry" + "package/test_manager.py::test_uninstall" + "package/test_manager.py::test_update_with_metadata" + "package/test_manager.py::test_update_without_metadata" "test_builder.py::test_build_flags" "test_builder.py::test_build_unflags" - "test_builder.py::test_debug_default_build_flags" "test_builder.py::test_debug_custom_build_flags" + "test_builder.py::test_debug_default_build_flags" "test_misc.py::test_api_cache" "test_misc.py::test_ping_internet_ips" "test_misc.py::test_platformio_cli" @@ -51,14 +75,14 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "4.3.4"; + version = "5.0.1"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "0vf2j79319ypr4yrdmx84853igkb188sjfvlxgw06rlsvsm3kacq"; + sha256 = "01xh61ldilg6fg95l1p870rld2xffhnl9f9ndvbi5jdn8q634pmw"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch b/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch index f29b93cef4d..36af82245c5 100644 --- a/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch +++ b/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch @@ -1,13 +1,11 @@ diff --git a/platformio/exception.py b/platformio/exception.py -index d291ad7f..4761a35b 100644 +index ef1d3bab..445174fc 100644 --- a/platformio/exception.py +++ b/platformio/exception.py -@@ -195,7 +195,8 @@ class MissedUdevRules(InvalidUdevRules): - +@@ -57,6 +57,7 @@ class MissedUdevRules(InvalidUdevRules): MESSAGE = ( - "Warning! Please install `99-platformio-udev.rules`. \nMode details: " -- "https://docs.platformio.org/en/latest/faq.html#platformio-udev-rules" -+ "https://docs.platformio.org/en/latest/faq.html#platformio-udev-rules\n" + "Warning! Please install `99-platformio-udev.rules`. \nMore details: " + "https://docs.platformio.org/page/faq.html#platformio-udev-rules" + "On NixOS add the platformio package to services.udev.packages" ) diff --git a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch index 953eb3c9289..511d81c3b01 100644 --- a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch @@ -1,16 +1,11 @@ diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py -index be49b3ee..d1390a88 100644 +index f293ba5a..a818271f 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py -@@ -240,9 +240,5 @@ class ManifestSchema(BaseSchema): +@@ -252,5 +252,4 @@ class ManifestSchema(BaseSchema): @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- r = requests.get( -- "https://raw.githubusercontent.com/spdx/license-list-data" -- "/v3.9/json/licenses.json" -- ) -- r.raise_for_status() -- return r.json() -+ import json +- spdx_data_url = "https://dl.bintray.com/platformio/dl-misc/spdx-licenses-3.json" +- return json.loads(fetch_remote_content(spdx_data_url)) + return json.load(open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json")) From 0065551641cccec146f6232df213d5cd30109e09 Mon Sep 17 00:00:00 2001 From: Mrinal Date: Sat, 12 Sep 2020 21:03:37 +0530 Subject: [PATCH 48/65] rescuetime: 2.16.3.1 -> 2.16.4.2 (#97825) --- pkgs/applications/misc/rescuetime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 6b28b52dcf0..3b989a75c9b 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }: let - version = "2.16.3.1"; + version = "2.16.4.2"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_${version}_i386.deb"; - sha256 = "1374nmj6g6w24cv604kzac0v57gcl1pwpw0nxpr7kv2786x1aqg2"; + sha256 = "0zyal9n3rfj8i13v1q25inq6qyil7897483cdhqvwpb8wskrij4c"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb"; - sha256 = "05qs6wbc3705z8w9c3n83m4j8xfmzm673lyh5j95x1ak5czkrphk"; + sha256 = "03bmnkxhip1wilnfqs8akmy1hppahxrmnm8gasnmw5s922vn06cv"; }; in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html From 1d86636aca9f795215668e3c5d297e20b84bf272 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Sat, 12 Sep 2020 11:29:32 -0400 Subject: [PATCH 49/65] python27Packages.anytree: fix build Tests fail on python2.7 b/c the tests use enums (python 3.4+). Follow-on from #97761. Converts tests to use pytestCheckHook for easier test disabling. --- .../python-modules/anytree/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index 6b25952493b..c11833ba579 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -1,13 +1,15 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , substituteAll -, fetchpatch -, nose , six , withGraphviz ? true , graphviz , fontconfig +# Tests +, pytestCheckHook +, nose }: buildPythonPackage rec { @@ -26,10 +28,6 @@ buildPythonPackage rec { }) ]; - checkInputs = [ - nose - ]; - propagatedBuildInputs = [ six ]; @@ -42,13 +40,13 @@ buildPythonPackage rec { # circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree doCheck = withGraphviz; - checkPhase = '' - runHook preCheck + checkInputs = [ pytestCheckHook nose ]; - nosetests - - runHook postCheck - ''; + pytestFlagsArray = lib.optionals (pythonOlder "3.4") [ + # Use enums, which aren't available pre-python3.4 + "--ignore=tests/test_resolver.py" + "--ignore=tests/test_search.py" + ]; meta = with lib; { description = "Powerful and Lightweight Python Tree Data Structure"; From c70aaa40fc01fbebf46048790255e8a91bc779f8 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 12 Sep 2020 17:57:39 +0200 Subject: [PATCH 50/65] flask-api: disable python2.7 (#97766) --- pkgs/development/python-modules/flask-api/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix index bbac045675f..3bc3061b3b5 100644 --- a/pkgs/development/python-modules/flask-api/default.nix +++ b/pkgs/development/python-modules/flask-api/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, flask, markdown }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi, flask, markdown }: buildPythonPackage rec { pname = "Flask-API"; version = "2.0"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "6986642e5b25b7def710ca9489ed2b88c94006bfc06eca01c78da7cf447e66e5"; From d0edb000191b5fc19971d2dec01decd65aa1957d Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 12 Sep 2020 19:14:15 +0200 Subject: [PATCH 51/65] iproute_mptcp: fix preConfigure (#97747) --- pkgs/os-specific/linux/iproute/mptcp.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix index 4a58ae9e046..63f0abcd2a2 100644 --- a/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/pkgs/os-specific/linux/iproute/mptcp.nix @@ -11,6 +11,12 @@ iproute.overrideAttrs (oa: rec { sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3"; }; + preConfigure = '' + # Don't try to create /var/lib/arpd: + sed -e '/ARPDDIR/d' -i Makefile + patchShebangs configure + ''; + meta = with stdenv.lib; { homepage = "https://github.com/multipath-tcp/iproute-mptcp"; description = "IP-Route extensions for MultiPath TCP"; From b5fcd79c3f97f1fae6f73979db41be719237a7e9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 12 Sep 2020 19:20:11 +0200 Subject: [PATCH 52/65] python3Packages.websockets: make tests deterministic --- pkgs/development/python-modules/websockets/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 1e1e1ef58a8..eeb12bd5b75 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -22,6 +22,13 @@ buildPythonPackage rec { # Tests fail on Darwin with `OSError: AF_UNIX path too long` doCheck = !stdenv.isDarwin; + # Disable all tests that need to terminate within a predetermined amount of + # time. This is nondeterministic. + patchPhase = '' + sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ + tests/test_protocol.py + ''; + meta = with lib; { description = "WebSocket implementation in Python 3"; homepage = "https://github.com/aaugustin/websockets"; From 4a559f8fee64bf8dc6017d66667eb42e778f819e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Sep 2020 19:02:09 +0200 Subject: [PATCH 53/65] gotify-server: fix UI In version 2.0.15 `gotify` switched to `packr` at 2.x which is why the UI can't be served properly via HTTP and causes an empty 500 response and the following errors in `journald`: ``` 2020/09/12 19:18:33 [Recovery] 2020/09/12 - 19:18:33 panic recovered: GET / HTTP/1.1 Host: localhost:8080 Accept: */* User-Agent: curl/7.72.0 stat /home/ma27/Projects/ui/build/index.html: no such file or directory ``` This wasn't caught by the VM-test as it only tested the REST and push APIs. Using their internal `packr.go` script in our build as it's the case in the upstream build-system[1] fixes the issue. [1] https://github.com/gotify/server/pull/277/files#diff-b67911656ef5d18c4ae36cb6741b7965R48 --- nixos/tests/gotify-server.nix | 5 +++++ pkgs/servers/gotify/default.nix | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/tests/gotify-server.nix b/nixos/tests/gotify-server.nix index c6e00686aed..c0b8ba43548 100644 --- a/nixos/tests/gotify-server.nix +++ b/nixos/tests/gotify-server.nix @@ -41,5 +41,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { ) assert title == "Gotify" + + # Ensure that the UI responds with a successfuly code and that the + # response is not empty + result = machine.succeed("curl -fsS localhost:3000") + assert result, "HTTP response from localhost:3000 must not be empty!" ''; }) diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 88617d0cd8b..4360ac95b0b 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -3,7 +3,6 @@ , lib , fetchFromGitHub , buildGoModule -, packr , sqlite , callPackage }: @@ -32,12 +31,10 @@ buildGoModule rec { buildInputs = [ sqlite ]; - nativeBuildInputs = [ packr ]; - ui = callPackage ./ui.nix { }; preBuild = '' - cp -r ${ui}/libexec/gotify-ui/deps/gotify-ui/build ui/build && packr + cp -r ${ui}/libexec/gotify-ui/deps/gotify-ui/build ui/build && go run hack/packr/packr.go ''; passthru = { From 1890b22296b26c9e93ea6176f1eb2087ba6a3fb1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 11 Sep 2020 16:22:33 -0300 Subject: [PATCH 54/65] windowmaker: 0.95.8 -> 0.95.9 --- .../applications/window-managers/windowmaker/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index 64783ac5fbe..9f5d2e2539d 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "windowmaker"; - version = "0.95.8"; + version = "0.95.9"; srcName = "WindowMaker-${version}"; src = fetchurl { url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz"; - sha256 = "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx"; + sha256 = "055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { "--with-x" "--enable-modelock" "--enable-randr" - "--enable-magick" + "--enable-webp" + "--disable-magick" # Many distros reported imagemagick fails to be found ]; meta = with stdenv.lib; { @@ -40,5 +41,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.AndersonTorres ]; }; } - -# TODO: investigate support for WEBP (its autodetection is failing) From 2865a8867faab01af76946d146c880800e1cb2e2 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 12 Sep 2020 21:02:20 +0200 Subject: [PATCH 55/65] nixos/datadog: allow specifying dd_url (#97775) Useful when you want to point datadog to another endpoint, either because you need a proxy to send out data, or because you use their EU endpoint. --- .../modules/services/monitoring/datadog-agent.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index f1cb890794e..673bc7b02b2 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -6,7 +6,7 @@ let cfg = config.services.datadog-agent; ddConf = { - dd_url = "https://app.datadoghq.com"; + dd_url = cfg.ddUrl; skip_ssl_validation = false; confd_path = "/etc/datadog-agent/conf.d"; additional_checksd = "/etc/datadog-agent/checks.d"; @@ -77,6 +77,18 @@ in { type = types.path; }; + ddUrl = mkOption { + description = '' + Custom dd_url to configure the agent with. + Useful when you want to point datadog to another endpoint, either + because you need a proxy to send out data, or because you use their EU + endpoint. + ''; + default = "https://app.datadoghq.com"; + example = "https://app.datadoghq.eu"; + type = types.str; + }; + tags = mkOption { description = "The tags to mark this Datadog agent"; example = [ "test" "service" ]; From d3e701f5f739193ee530155a1ff7280f102cd6b7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 9 Sep 2020 06:26:58 +0200 Subject: [PATCH 56/65] =?UTF-8?q?reason:=203.6.0=20=E2=86=92=203.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/reason/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 5c452d69253..4c0e9c29851 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.6.0"; + version = "3.6.2"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "2860cc274b1b5b76a71d0e5190bf67a133d6f809"; - sha256 = "05wcg0gfln85spjfgsij818h2sp4y6s8bvdcwmzv0r8jblr8402b"; + rev = "6017d6dd930f4989177c3f7c3c20cffbaabaa49a"; + sha256 = "17wkcl3r0ckhlki9fk0mcwbnd7kpkqm1h0xjw2j2x1097n470df0"; }; nativeBuildInputs = [ makeWrapper ]; From b2f814144e35ab9929055634a5b7bd8748f67ccc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Sep 2020 10:42:53 +0200 Subject: [PATCH 57/65] ocamlPackages.ptset: init at 1.0.1 --- .../ocaml-modules/ptset/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ptset/default.nix diff --git a/pkgs/development/ocaml-modules/ptset/default.nix b/pkgs/development/ocaml-modules/ptset/default.nix new file mode 100644 index 00000000000..b9c534e763d --- /dev/null +++ b/pkgs/development/ocaml-modules/ptset/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildDunePackage +, stdlib-shims +}: + +buildDunePackage rec { + pname = "ptset"; + version = "1.0.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/backtracking/ptset/releases/download/${version}/ptset-${version}.tbz"; + sha256 = "1pr80mgk12l93mdq1wfsv2b6ccraxs334d5h92qzjh7bw2g13424"; + }; + + doCheck = true; + + propagatedBuildInputs = [ stdlib-shims ]; + + meta = { + description = "Integer set implementation using Patricia trees"; + homepage = "https://github.com/backtracking/ptset"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4ce0c1a96dd..a7d9f04ee67 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -882,6 +882,8 @@ let ptmap = callPackage ../development/ocaml-modules/ptmap { }; + ptset = callPackage ../development/ocaml-modules/ptset { }; + pycaml = callPackage ../development/ocaml-modules/pycaml { }; qcheck = callPackage ../development/ocaml-modules/qcheck { }; From 5f83bf30120d671f0502bc6a0ecc93fd809c314b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 10 Sep 2020 07:53:26 +0200 Subject: [PATCH 58/65] =?UTF-8?q?ocamlPackages.ptmap:=202.0.4=20=E2=86=92?= =?UTF-8?q?=202.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ptmap/default.nix | 46 +++++++------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index f635fadd6d0..018f1e3edf0 100644 --- a/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -1,43 +1,29 @@ -{ stdenv, fetchzip, ocaml, findlib, obuild }: +{ lib, buildDunePackage, fetchurl +, seq +, stdlib-shims +}: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.07" - then { - version = "2.0.4"; - sha256 = "05a391m1l04zigi6ghywj7f5kxy2w6186221k7711wmg56m94yjw"; - } else { - version = "2.0.3"; - sha256 = "19xykhqk7q25r1pj8rpfj53j2r9ls8mxi1w5m2wqshrf20gf078h"; - } -; in +buildDunePackage rec { + pname = "ptmap"; + version = "2.0.5"; -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ptmap-${param.version}"; + useDune2 = true; - src = fetchzip { - url = "https://github.com/backtracking/ptmap/archive/v${param.version}.tar.gz"; - inherit (param) sha256; + src = fetchurl { + url = "https://github.com/backtracking/ptmap/releases/download/${version}/ptmap-${version}.tbz"; + sha256 = "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb"; }; - buildInputs = [ ocaml findlib obuild ]; + propagatedBuildInputs = [ seq ]; - createFindlibDestdir = true; + doCheck = true; - buildPhase = '' - substituteInPlace ptmap.obuild --replace 'build-deps: qcheck' "" - obuild configure - obuild build lib-ptmap - ''; - - installPhase = '' - obuild install --destdir $out/lib/ocaml/${ocaml.version}/site-lib - ''; + checkInputs = [ stdlib-shims ]; meta = { homepage = "https://www.lri.fr/~filliatr/software.en.html"; - platforms = ocaml.meta.platforms or []; description = "Maps over integers implemented as Patricia trees"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ volth ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ volth ]; }; } From bc62fff2cfbcaf22fd18dac8a360d8e3a3410cfb Mon Sep 17 00:00:00 2001 From: Geoffrey Huntley Date: Sun, 13 Sep 2020 06:13:27 +1000 Subject: [PATCH 59/65] lib.licenses: add Prosperity-3.0.0 license (#97832) --- lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 8492cf2495b..a704a6884c7 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -644,6 +644,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { url = "https://enterprise.dejacode.com/licenses/public/purdue-bsd"; }; + prosperity30 = { + fullName = "Prosperity-3.0.0"; + free = false; + url = "https://prosperitylicense.com/versions/3.0.0.html"; + }; + qhull = spdx { spdxId = "Qhull"; fullName = "Qhull License"; From 68c4099d7349236870e91eafd251edba245634c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Sep 2020 01:05:48 +0200 Subject: [PATCH 60/65] home-assistant: drop protobuf override aioesphome was updated to 2.6.3 which requires protobuf>=3.12.2,<4.0. --- pkgs/servers/home-assistant/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8f4d65066d0..17ce095e393 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -35,13 +35,6 @@ let (mkOverride "bcrypt" "3.1.7" "0hhywhxx301cxivgxrpslrangbfpccc8y83qbwn1f57cab3nj00b") - # required by aioesphomeapi - (self: super: { - protobuf = super.protobuf.override { - protobuf = protobuf3_6; - }; - }) - # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; From c6142831013aec5668f1b3dcb096a1f8a2ddad5f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 13 Sep 2020 01:36:22 +0200 Subject: [PATCH 61/65] asciinema-scenario: init at 0.1.0 --- .../tools/misc/asciinema-scenario/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/asciinema-scenario/default.nix diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/tools/misc/asciinema-scenario/default.nix new file mode 100644 index 00000000000..29538f94017 --- /dev/null +++ b/pkgs/tools/misc/asciinema-scenario/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "asciinema-scenario"; + version = "0.1.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-ubiVpKFU81Ot9V9oMexWSiUXHepoJ6nXtrWVAFhgcYw="; + }; + + cargoSha256 = "109ij5h31bhn44l0wywgpnnlfjgyairxr5l19s6bz47sbka0xyxk"; + + meta = with stdenv.lib; { + description = "Create asciinema videos from a text file."; + homepage = "https://github.com/garbas/asciinema-scenario/"; + maintainers = with maintainers; [ garbas ]; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2392a0a262e..a8b1ee4c83a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -772,6 +772,8 @@ in asciinema = callPackage ../tools/misc/asciinema {}; + asciinema-scenario = callPackage ../tools/misc/asciinema-scenario {}; + asciiquarium = callPackage ../applications/misc/asciiquarium {}; ashuffle = callPackage ../applications/audio/ashuffle {}; From 9b55d123bc6b1f81ab07039b505e0df9515b64bb Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 12 Sep 2020 16:02:13 -0400 Subject: [PATCH 62/65] zenith: 0.10.0 -> 0.10.1 --- pkgs/tools/system/zenith/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 6e3024a3f7d..084dd044feb 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; rev = version; - sha256 = "04nd5gq49y1k9xxrc9ll155k9j42ivscjzx405qyyxv7dpgyw131"; + sha256 = "0jz0pjibjiyg0rjmpihxxjhg9cbccvqfr5si5rji585l0zrpdwsg"; }; - cargoSha256 = "0ggpr2skl3d47y771npmbbqb9vga4y4iyry3qn0xj2hg9d7msf4l"; + cargoSha256 = "1zkx6sr5xlj7pb91bxvqjib5awscy1rmv4g89xb76dahac8fan6z"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; @@ -21,6 +21,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ bbigras ]; # doesn't build on aarch64 https://github.com/bvaisvil/zenith/issues/19 + # see https://github.com/NixOS/nixpkgs/pull/88616 platforms = platforms.x86; }; } From 8e29e178ac6a4af09237847bdb7dd6e843a7f05b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 12 Sep 2020 21:06:30 +0200 Subject: [PATCH 63/65] pythonPackages.mocket: 3.8.8 -> 3.8.9 --- pkgs/development/python-modules/mocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 3ff85f9f5c7..a7de28afcc3 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.8.8"; + version = "3.8.9"; src = fetchPypi { inherit pname version; - sha256 = "0yqls2hqmfs6i4p2nb89j5icyrqwabalsmwfixfvbjir4fmgad2l"; + sha256 = "12gfqp7y7w6bgky3daxdggdzp08cg9ss64hbf5f49kywvsmcs01i"; }; patchPhase = '' From 037b8aefefc3439acaa29734c5a6360c1e8d2cbf Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 11 Sep 2020 13:38:27 +0200 Subject: [PATCH 64/65] cfn-lint: fixed importlib_resources version bounds Also, added import checks to have a minimal test for the package --- .../python-modules/cfn-lint/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 5a80f9253ba..f18e307c61c 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -25,6 +25,10 @@ buildPythonPackage rec { sha256 = "42023d89520e3a29891ec2eb4c326eef9d1f7516fe9abee8b6c97ce064187b45"; }; + postPatch = '' + substituteInPlace setup.py --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"' + ''; + propagatedBuildInputs = [ pyyaml six @@ -40,6 +44,21 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; + pythonImportsCheck = [ + "cfnlint" + "cfnlint.conditions" + "cfnlint.core" + "cfnlint.decode.node" + "cfnlint.decode.cfn_yaml" + "cfnlint.decode.cfn_json" + "cfnlint.decorators.refactored" + "cfnlint.graph" + "cfnlint.helpers" + "cfnlint.rules" + "cfnlint.runner" + "cfnlint.template" + "cfnlint.transform" + ]; meta = with lib; { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; From 97e2ca34472734d24b0468c95340fb13a532e1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 13 Sep 2020 08:13:00 +0200 Subject: [PATCH 65/65] Revert "Merge #97847 python27Packages.anytree: fix build" Moving to staging. It's a really large rebuild. This reverts commit 9a8bd1e564ed033a6f5773fd95297a3cfe2e43ed, reversing changes made to 9866abf63babc2bc9578e5fc23d5d006850464bc. --- .../python-modules/anytree/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index c11833ba579..6b25952493b 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -1,15 +1,13 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , substituteAll +, fetchpatch +, nose , six , withGraphviz ? true , graphviz , fontconfig -# Tests -, pytestCheckHook -, nose }: buildPythonPackage rec { @@ -28,6 +26,10 @@ buildPythonPackage rec { }) ]; + checkInputs = [ + nose + ]; + propagatedBuildInputs = [ six ]; @@ -40,13 +42,13 @@ buildPythonPackage rec { # circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree doCheck = withGraphviz; - checkInputs = [ pytestCheckHook nose ]; + checkPhase = '' + runHook preCheck - pytestFlagsArray = lib.optionals (pythonOlder "3.4") [ - # Use enums, which aren't available pre-python3.4 - "--ignore=tests/test_resolver.py" - "--ignore=tests/test_search.py" - ]; + nosetests + + runHook postCheck + ''; meta = with lib; { description = "Powerful and Lightweight Python Tree Data Structure";