From 061f514462387f40ba5898086166031592384708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 14 Feb 2021 00:38:09 +0100 Subject: [PATCH 01/27] doc: update multiple output section with more example paths --- doc/stdenv/multiple-output.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/stdenv/multiple-output.xml b/doc/stdenv/multiple-output.xml index 20658918db72..f710a9959ad2 100644 --- a/doc/stdenv/multiple-output.xml +++ b/doc/stdenv/multiple-output.xml @@ -154,7 +154,7 @@ - is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to dev or out by default. + is for development-only files. These include C(++) headers (include/), pkg-config (lib/pkgconfig/), cmake (lib/cmake/) and aclocal files (share/aclocal/). They go to dev or out by default. @@ -164,7 +164,7 @@ - is meant for user-facing binaries, typically residing in bin/. They go to bin or out by default. + is meant for user-facing binaries, typically residing in bin/. They go to bin or out by default. @@ -194,7 +194,7 @@ - is for developer documentation. Currently we count gtk-doc and devhelp books in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. + is for developer documentation. Currently we count gtk-doc and devhelp books, typically residing in share/gtk-doc/ and share/devhelp/, in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. @@ -204,7 +204,7 @@ - is for man pages (except for section 3). They go to man or $outputBin by default. + is for man pages (except for section 3), typically residing in share/man/man[0-9]/. They go to man or $outputBin by default. @@ -214,7 +214,7 @@ - is for section 3 man pages. They go to devman or $outputMan by default. + is for section 3 man pages, typically residing in share/man/man3/. They go to devman or $outputMan by default. @@ -224,7 +224,7 @@ - is for info pages. They go to info or $outputBin by default. + is for info pages, typically residing in share/info/. They go to info or $outputBin by default. From cfce2f382a104516b7956c863ec49abd16167f6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 06:03:33 +0000 Subject: [PATCH 02/27] mitmproxy: 5.3.0 -> 6.0.2 --- pkgs/development/python-modules/mitmproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index dd351931e062..28eea2f430b8 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "5.3.0"; + version = "6.0.2"; disabled = isPy27; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "04y7fxxssrs14i7zl7fwlwrpnms39i7a6m18481sg8vlrkbagxjr"; + sha256 = "sha256-FyIZKFQtf6qvwo4+NzPa/KOmBCcdGJ3jCqxz26+S2e4="; }; postPatch = '' From b5217c5d2a1425d1ff1304047856a60416b1a1d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 23 Jan 2021 12:17:51 +0100 Subject: [PATCH 03/27] pythonPackages.mitmproxy: disable for Python < 3.8 --- pkgs/development/python-modules/mitmproxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 28eea2f430b8..6dfac8224053 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "mitmproxy"; version = "6.0.2"; - disabled = isPy27; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; From ff770828bab9c7689c9e0badaa81975fccc3bc87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Feb 2021 13:20:42 +0100 Subject: [PATCH 04/27] python3Packages.mitmproxy: adjust requirement and update check part --- .../python-modules/mitmproxy/default.nix | 73 +++++++++++-------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 6dfac8224053..e9c12548269f 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -1,21 +1,25 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , buildPythonPackage -, isPy27 -, fetchpatch -# Mitmproxy requirements +, pythonOlder + # Mitmproxy requirements +, asgiref , blinker , brotli , certifi , click , cryptography , flask +, h11 , h2 , hyperframe , kaitaistruct , ldap3 +, msgpack , passlib , protobuf +, publicsuffix2 , pyasn1 , pyopenssl , pyparsing @@ -26,19 +30,17 @@ , tornado , urwid , wsproto -, publicsuffix2 , zstandard -# Additional check requirements + # Additional check requirements , beautifulsoup4 , glibcLocales -, pytest -, requests -, asynctest +, hypothesis , parver , pytest-asyncio -, hypothesis -, asgiref -, msgpack +, pytest-timeout +, pytest-xdist +, pytestCheckHook +, requests }: buildPythonPackage rec { @@ -47,24 +49,12 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; + owner = pname; + repo = pname; + rev = "v${version}"; sha256 = "sha256-FyIZKFQtf6qvwo4+NzPa/KOmBCcdGJ3jCqxz26+S2e4="; }; - postPatch = '' - # remove dependency constraints - sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py - ''; - - doCheck = (!stdenv.isDarwin); - - checkPhase = '' - export HOME=$(mktemp -d) - pytest -k 'not test_get_version' # expects a Git repository - ''; - propagatedBuildInputs = [ setuptools # setup.py @@ -75,6 +65,7 @@ buildPythonPackage rec { click cryptography flask + h11 h2 hyperframe kaitaistruct @@ -96,21 +87,39 @@ buildPythonPackage rec { ]; checkInputs = [ - asynctest beautifulsoup4 - flask glibcLocales hypothesis parver - pytest pytest-asyncio + pytest-timeout + pytest-xdist + pytestCheckHook requests ]; + doCheck = !stdenv.isDarwin; + + postPatch = '' + # remove dependency constraints + sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py + ''; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # Tests require a git repository + "test_get_version" + ]; + + pythonImportsCheck = [ "mitmproxy" ]; + meta = with lib; { description = "Man-in-the-middle proxy"; - homepage = "https://mitmproxy.org/"; - license = licenses.mit; + homepage = "https://mitmproxy.org/"; + license = licenses.mit; maintainers = with maintainers; [ fpletz kamilchm ]; }; } From fbc1d07e79a88d4be12675ca2b3ce3d5011c30d4 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Mon, 1 Mar 2021 23:54:54 -0800 Subject: [PATCH 05/27] aws-c-io: depend on Security.framework on darwin This is needed on `aarch64-darwin` with newer SDK. --- pkgs/development/libraries/aws-c-io/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index e2074cc835a6..9c7fcf11af83 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n, Security }: stdenv.mkDerivation rec { pname = "aws-c-io"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common s2n ]; + buildInputs = [ aws-c-cal aws-c-common s2n] ++ lib.optionals stdenv.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c8698a1701f..7f8b35aee21e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13287,7 +13287,9 @@ in aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; - aws-c-io = callPackage ../development/libraries/aws-c-io { }; + aws-c-io = callPackage ../development/libraries/aws-c-io { + inherit (darwin.apple_sdk.frameworks) Security; + }; aws-checksums = callPackage ../development/libraries/aws-checksums { }; From c54c8f8dfa382b9ecac1dcab2838aa16f4831b72 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Mar 2021 16:16:02 +0200 Subject: [PATCH 06/27] emacs26: Drop unsupported package --- pkgs/applications/editors/emacs/26.nix | 7 ------- pkgs/top-level/aliases.nix | 2 -- pkgs/top-level/all-packages.nix | 19 ------------------- pkgs/top-level/packages-config.nix | 1 - 4 files changed, 29 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/26.nix diff --git a/pkgs/applications/editors/emacs/26.nix b/pkgs/applications/editors/emacs/26.nix deleted file mode 100644 index 1667bec99321..000000000000 --- a/pkgs/applications/editors/emacs/26.nix +++ /dev/null @@ -1,7 +0,0 @@ -import ./generic.nix (rec { - version = "26.3"; - sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; - patches = [ - ./tramp-detect-wrapped-gvfsd-26.patch - ]; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1349ce993411..7f6990c4ffb6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -166,9 +166,7 @@ mapAliases ({ emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 emacsPackagesNg = emacs.pkgs; # added 2019-08-07 - emacs26Packages = emacs26.pkgs; # added 2020-12-18 emacs27Packages = emacs27.pkgs; # added 2020-12-18 - emacs26WithPackages = emacs26.pkgs.withPackages; # added 2020-12-18 emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18 emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18 emacsPackages = emacs.pkgs; # added 2020-12-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1849edcb4f..51c3b4002429 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21978,25 +21978,6 @@ in withGTK3 = false; })); - emacs26 = callPackage ../applications/editors/emacs/26.nix { - # use override to enable additional features - libXaw = xorg.libXaw; - Xaw3d = null; - gconf = null; - alsaLib = null; - imagemagick = null; - acl = null; - gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; - }; - - emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { - withX = false; - withNS = false; - withGTK2 = false; - withGTK3 = false; - })); - emacsMacport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index d0a71c43a962..84db6fa21ee6 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -34,7 +34,6 @@ "nvidiaPackages" "sourceHanPackages" "atomPackages" - "emacs26.pkgs" "emacs27.pkgs" "steamPackages" "ut2004Packages" From e37e954d71350c1356ce381abcc7861391ff342b Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 2 Mar 2021 18:26:22 +0000 Subject: [PATCH 07/27] claws-mail-gtk3: re-enable fancy plugin (#114871) It was inadvertently disabled by #113663. --- .../applications/networking/mailreaders/claws-mail/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index a9cea58902a1..6dc4ebea6792 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -34,6 +34,7 @@ , enablePluginBsfilter ? true , enablePluginClamd ? true , enablePluginDillo ? true +, enablePluginFancy ? useGtk3, libsoup, webkitgtk , enablePluginFetchInfo ? true , enablePluginLibravatar ? enablePluginRavatar , enablePluginLitehtmlViewer ? true, gumbo @@ -87,6 +88,7 @@ let { flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; } { flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; } { flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; } + { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ libsoup webkitgtk ]; } { flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; } { flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; } { flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; } @@ -153,7 +155,6 @@ in stdenv.mkDerivation rec { "--disable-jpilot" # Missing jpilot library "--disable-gdata-plugin" # Complains about missing libgdata, even when provided - "--disable-fancy-plugin" # Missing libwebkit-1.0 library ] ++ (map (feature: map (flag: strings.enableFeature feature.enabled flag) feature.flags) features); From c1180834cf5a9cd8b73fcf58a4efc81661620c76 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 2 Mar 2021 18:14:46 +0000 Subject: [PATCH 08/27] claws-mail: specify that gpl3 is gpl3Plus --- pkgs/applications/networking/mailreaders/claws-mail/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 6dc4ebea6792..4a13cf68a882 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -173,7 +173,7 @@ in stdenv.mkDerivation rec { meta = { description = "The user-friendly, lightweight, and fast email client"; homepage = "https://www.claws-mail.org/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 ]; }; From f4c885a79a8d4b66277fcb20022b86eb743320fd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 2 Mar 2021 20:27:04 +0100 Subject: [PATCH 09/27] chromiumBeta: 89.0.4389.69 -> 89.0.4389.72 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 2d6d6f47a378..89647f477577 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "89.0.4389.69", - "sha256": "09xs18jm1pvzh7qzi1cfb59bvy4qarympxxkcwj49khsxjy0y341", - "sha256bin64": "1w3vr929ssdh4q5zq5qpx7s09md99aam51j4hdslhq1ih9zva275", + "version": "89.0.4389.72", + "sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll", + "sha256bin64": "0w1972r71gp8jjr9370f9xb8v2f109mxjrsm8893sn4kbz8zmxby", "deps": { "gn": { "version": "2021-01-07", From a77d6a5f2e24f56e57bf0f3a99b82ce70b52ff53 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 2 Mar 2021 14:59:11 +0000 Subject: [PATCH 10/27] =?UTF-8?q?oh-my-zsh:=202021-02-21=20=E2=86=92=20202?= =?UTF-8?q?1-03-01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index c7d5ba0e7734..65175b82757e 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-02-21"; + version = "2021-03-01"; pname = "oh-my-zsh"; - rev = "9a9f3831925432fdf4352c24a002506a06d329c1"; + rev = "6fbad5bf72fad4ecf30ba4d4ffee62bac582f0ed"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "befalsEX/o5WwVn0bzDnMVhlZawmpGV4AGzvxl7UHLI="; + sha256 = "1sd9lhgrig4vpdy0d1ls551gzs7y9q4hq2m0jakslqliyx5d6mpn"; }; installPhase = '' From 2324d8a304c4cc246cc6dc0bf810eb935709e6eb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 2 Mar 2021 09:54:53 -0500 Subject: [PATCH 11/27] python3Packages.botocore: 1.20.17 -> 1.20.18 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index efcd275b00a1..514e63fdbbfe 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.17"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.18"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-F4zjFdGf4O8z6M5nVKSC0Ano0TLFrcxFf1zx2ZqYdTs="; + sha256 = "sha256-UZALENpK5FvksWBF5bL/fRFYp5VdnXzF5am6MXDxBYY="; }; propagatedBuildInputs = [ From df3bbc0dc7668a1935a87287a219961b1858588c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 2 Mar 2021 09:55:49 -0500 Subject: [PATCH 12/27] python3Packages.boto3: 1.17.17 -> 1.17.18 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 9e2f1e3080db..6077d6335fa1 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.17"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.18"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-RSPqs3/wBdUXQIO1k4LP1ia3iQwI1WzhYqS9kq99RN8="; + sha256 = "sha256-NXCjwPvYC8swRJ+Hz50vertn+sKl4xfQAvmSHFm+mxc="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 1af47271011ea0ce79c98da6074f3e955515ec73 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 2 Mar 2021 09:57:23 -0500 Subject: [PATCH 13/27] awscli: 1.19.17 -> 1.19.18 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index a513b3587f7e..41c5a72cf4c4 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.17"; # N.B: if you change this, change botocore and boto3 o a matching version too + version = "1.19.18"; # N.B: if you change this, change botocore and boto3 o a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-YdkkeE2POxeHgaGjp0ufzbP/Lqvt4ytStHkRZ+2KsTs="; + sha256 = "sha256-K+Q2IXMHywtyyjPz1jtkFAHy9vkSFH4znjdD+0GnU1o="; }; # https://github.com/aws/aws-cli/issues/4837 From f4fcfce627815489d2028e792584592af1a6ec86 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 2 Mar 2021 11:40:57 -0500 Subject: [PATCH 14/27] awscli: Fix comments Co-authored-by: Sandro --- pkgs/tools/admin/awscli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 41c5a72cf4c4..23c37ef3ebda 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,7 +28,7 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.18"; # N.B: if you change this, change botocore and boto3 o a matching version too + version = "1.19.18"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; From cc8f96f8c59e256100c08a9b518478430827dd05 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 2 Mar 2021 20:50:55 +0100 Subject: [PATCH 15/27] ocamlPackages.mirage-clock: use Dune 2 --- pkgs/development/ocaml-modules/mirage-clock/default.nix | 2 ++ pkgs/development/ocaml-modules/mirage-clock/unix.nix | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-clock/default.nix b/pkgs/development/ocaml-modules/mirage-clock/default.nix index 77d6b4ef7788..d0d8661dd7dd 100644 --- a/pkgs/development/ocaml-modules/mirage-clock/default.nix +++ b/pkgs/development/ocaml-modules/mirage-clock/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "mirage-clock"; version = "3.1.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-v${version}.tbz"; sha256 = "0cqa07aqkamw0dvis1fl46brvk81zvb92iy5076ik62gv9n5a0mn"; diff --git a/pkgs/development/ocaml-modules/mirage-clock/unix.nix b/pkgs/development/ocaml-modules/mirage-clock/unix.nix index 5918d89221f2..355cffaaa157 100644 --- a/pkgs/development/ocaml-modules/mirage-clock/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-clock/unix.nix @@ -1,9 +1,11 @@ -{ buildDunePackage, mirage-clock }: +{ buildDunePackage, mirage-clock, dune-configurator }: buildDunePackage { pname = "mirage-clock-unix"; - inherit (mirage-clock) version src; + inherit (mirage-clock) version useDune2 src; + + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ mirage-clock ]; From 544139a32bd150cdca8ca0bfa35e8fb9c8aada19 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 2 Mar 2021 09:58:38 -0500 Subject: [PATCH 16/27] python3Packages.sagemaker: 2.26.0 -> 2.27.0 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index ddb93a21357e..ad25df58b105 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.26.0"; + version = "2.27.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CT0vXt6x+cp4yHZtfBiRq+/Aurd4Q7Zagn4lNRqji/o="; + sha256 = "sha256-1u5icjqz23j0QUToStZZMklBAYF4A1cfBqzg83MQAQI="; }; pythonImportsCheck = [ From e763719a207aee3716df247d940da13cdc0545c8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 2 Mar 2021 17:20:01 -0300 Subject: [PATCH 17/27] grc: 1.12 -> 1.13 --- pkgs/tools/misc/grc/default.nix | 27 ++++++++++++--------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 8fe35012090d..e47ea74bbe98 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, buildPythonApplication }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "grc"; - version = "1.11.3"; + version = "1.12"; format = "other"; src = fetchFromGitHub { - owner = "garabik"; - repo = "grc"; - rev = "v${version}"; - sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35"; + owner = "garabik"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XJj1j6sDt0iL3U6uMbB1j0OfpXRdP+x66gc6sKxrQIA="; }; postPatch = '' @@ -21,23 +21,20 @@ python3Packages.buildPythonApplication rec { installPhase = '' runHook preInstall - ./install.sh "$out" "$out" install -Dm444 -t $out/share/zsh/vendor-completions _grc - runHook postInstall ''; meta = with lib; { - description = "Yet another colouriser for beautifying your logfiles or output of commands"; - homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; - license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; - platforms = platforms.unix; - + homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; + description = "A generic text colouriser"; longDescription = '' Generic Colouriser is yet another colouriser (written in Python) for beautifying your logfiles or output of commands. ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f745c2e7adbe..4314e21805e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1344,7 +1344,7 @@ in gucci = callPackage ../tools/text/gucci { }; - grc = callPackage ../tools/misc/grc { }; + grc = python3Packages.callPackage ../tools/misc/grc { }; green-pdfviewer = callPackage ../applications/misc/green-pdfviewer { SDL = SDL_sixel; From 3d3e3f36ee32e60672f5a6e419685383682103d6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 2 Mar 2021 17:51:32 -0300 Subject: [PATCH 18/27] udiskie: 2.2.0 -> 2.3.2 --- pkgs/applications/misc/udiskie/default.nix | 59 ++++++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 44 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 87c49a19a196..d780f9e35d55 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,37 +1,50 @@ -{ lib, fetchFromGitHub, asciidoc-full, gettext -, gobject-introspection, gtk3, libappindicator-gtk3, libnotify, librsvg -, udisks2, wrapGAppsHook -, python3Packages +{ lib +, fetchFromGitHub +, asciidoc-full +, buildPythonApplication +, docopt +, gettext +, gobject-introspection +, gtk3 +, keyutils +, libappindicator-gtk3 +, libnotify +, librsvg +, nose +, pygobject3 +, pyyaml +, udisks2 +, wrapGAppsHook }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "udiskie"; - version = "2.2.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; - rev = version; - sha256 = "0kn5w6bm3rmbszphzbxpjfnkawb2naa230svzkpmh3n6dcdvk4qa"; + rev = "v${version}"; + hash = "sha256-eucAFMzLf2RfMfVgFTfPAgVNpDADddvTUZQO/XbBhGo="; }; nativeBuildInputs = [ + asciidoc-full # Man page gettext - asciidoc-full # For building man page. gobject-introspection wrapGAppsHook ]; buildInputs = [ - librsvg # required for loading svg icons (udiskie uses svg icons) gobject-introspection - libnotify gtk3 - udisks2 libappindicator-gtk3 + libnotify + librsvg # Because it uses SVG icons + udisks2 ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ docopt pygobject3 pyyaml @@ -44,7 +57,7 @@ python3Packages.buildPythonApplication rec { cp -v doc/udiskie.8 $out/share/man/man8/ ''; - checkInputs = with python3Packages; [ + checkInputs = [ nose keyutils ]; @@ -54,9 +67,23 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "Removable disk automounter for udisks"; - license = licenses.mit; homepage = "https://github.com/coldfix/udiskie"; + description = "Removable disk automounter for udisks"; + longDescription = '' + udiskie is a udisks2 front-end that allows to manage removeable media such + as CDs or flash drives from userspace. + + Its features include: + - automount removable media + - notifications + - tray icon + - command line tools for manual un-/mounting + - LUKS encrypted devices + - unlocking with keyfiles (requires udisks 2.6.4) + - loop devices (mounting iso archives) + - password caching (requires python keyutils 0.3) + ''; + license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4314e21805e1..b22353cd2301 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24906,7 +24906,7 @@ in udevil = callPackage ../applications/misc/udevil {}; - udiskie = callPackage ../applications/misc/udiskie { }; + udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; sacc = callPackage ../applications/networking/gopher/sacc { }; From dd5f27ad1ea279e2c3bd9e5c998de91bb18830dd Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Tue, 2 Mar 2021 20:47:41 +0000 Subject: [PATCH 19/27] google-cloud-cpp: add missing dependency --- .../libraries/google-cloud-cpp/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index fdf425432817..af4512814026 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,4 +1,20 @@ -{ lib, stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }: +{ lib +, stdenv +, clang-tools +, grpc +, curl +, cmake +, pkg-config +, fetchFromGitHub +, doxygen +, protobuf +, crc32c +, c-ares +, fetchurl +, openssl +, zlib +, libnsl +}: let googleapis = fetchFromGitHub { owner = "googleapis"; @@ -39,7 +55,7 @@ in stdenv.mkDerivation rec { sha256 = "15wci4m8h6py7fqfziq8mp5m6pxp2h1cbh5rp2k90mk5js4jb9pa"; }; - buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf ]; + buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf libnsl ]; nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ]; outputs = [ "out" "dev" ]; @@ -58,6 +74,5 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; maintainers = with maintainers; [ ]; - broken = true; # Broken on Hydra since 2020-05-19 }; } From bf6d8c3c15637fabf6938727615eee4a0646907d Mon Sep 17 00:00:00 2001 From: Florian Beeres Date: Tue, 2 Mar 2021 21:59:16 +0100 Subject: [PATCH 20/27] cypress: from 6.0.0 to 6.5.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 927414993231..dae3243e1e70 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "6.0.0"; + version = "6.5.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0hii7kp48ba07gsd521wwl288p808xr2wqgk1iidxkzj2v6g71by"; + sha256 = "b4LOgNCu7zBlhpiiNFkNH/7mAYnm+OAEdxNMX2/h+3o="; }; # don't remove runtime deps From 7a6be9dca9b281dce6ac860af14253d7d181b3e6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 2 Mar 2021 18:07:55 -0300 Subject: [PATCH 21/27] stella: 6.5.1 -> 6.5.2 --- pkgs/misc/emulators/stella/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index f6a3d65c4bde..ff90ae8908be 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "stella"; - version = "6.5.1"; + version = "6.5.2"; src = fetchFromGitHub { owner = "stella-emu"; repo = pname; rev = version; - sha256 = "2O7pN0xByEbWVL32VZw9191tG+kCMOuivJZRpXssQIw="; + hash = "sha256-CDLMOqSgRx75tjBoLycis/cckCNwgdlb9TRBlD3Dd04="; }; nativeBuildInputs = [ pkg-config ]; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { As of its 3.5 release, Stella is officially donationware. ''; - license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; }; } From e1fdf1336492d6491af0eb3d42f5e43331b6421e Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 2 Mar 2021 22:26:38 +0100 Subject: [PATCH 22/27] licensee: 9.15.0 -> 9.15.1 --- pkgs/tools/package-management/licensee/Gemfile.lock | 2 +- pkgs/tools/package-management/licensee/gemset.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/licensee/Gemfile.lock b/pkgs/tools/package-management/licensee/Gemfile.lock index b6ac2fe182ed..e631b63963c3 100644 --- a/pkgs/tools/package-management/licensee/Gemfile.lock +++ b/pkgs/tools/package-management/licensee/Gemfile.lock @@ -9,7 +9,7 @@ GEM multipart-post (>= 1.2, < 3) ruby2_keywords faraday-net_http (1.0.1) - licensee (9.15.0) + licensee (9.15.1) dotenv (~> 2.0) octokit (~> 4.20) reverse_markdown (~> 1.0) diff --git a/pkgs/tools/package-management/licensee/gemset.nix b/pkgs/tools/package-management/licensee/gemset.nix index 3c48ad8f9bbf..b9b11b465f69 100644 --- a/pkgs/tools/package-management/licensee/gemset.nix +++ b/pkgs/tools/package-management/licensee/gemset.nix @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1di15x50kpqdhw1fvba4c1j6b106nfld85jxdc72xj4iyj1l6vi1"; + sha256 = "1pvrz9fjvxzk3aq85zgh8dkw98kz54jmwi10k3shc8dqbrlvragy"; type = "gem"; }; - version = "9.15.0"; + version = "9.15.1"; }; mini_portile2 = { groups = ["default"]; From c3554253abb7e6aa137a4007752d0980ec12099c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 2 Mar 2021 22:16:39 +0000 Subject: [PATCH 23/27] element: 1.7.21 -> 1.7.22 https://github.com/vector-im/element-web/releases/tag/v1.7.22 https://nvd.nist.gov/vuln/detail/CVE-2021-21320 --- .../instant-messengers/element/element-desktop-package.json | 4 ++-- .../networking/instant-messengers/element/element-desktop.nix | 4 ++-- .../networking/instant-messengers/element/element-web.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index f5f20202fc20..caf80c2460fe 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.21", + "version": "1.7.22", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -62,7 +62,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "10.2.0", + "electronVersion": "11.2.3", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index f706a4399be5..f147918cdc53 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.21"; + version = "1.7.22"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-tpFiKaJB6KN97ipN3OCTyxpiS0b980MQ1Ynxj8CjCuI="; + sha256 = "152ggkkk997pg3xdcdzn3samv3vsb6qifgkyl82bnwchy8y3611d"; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 285e525efbbf..a75b02ef8a5a 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.21"; + version = "1.7.22"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-JJXl+jDlXw8fZ1ZeeAACvilbqG9zanCmBsHy6BEla8M="; + sha256 = "1aaa986h38kkrnyhb1y65d73idsxmkmi201511az9zlz9210ih59"; }; installPhase = '' From a3a043a624d0f1e6f7840936a0f0dc1f8bdd1635 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Mar 2021 23:30:08 +0100 Subject: [PATCH 24/27] python3Packages.glasgow: unstable-2020-06-29 -> unstable-2021-03-02 --- .../development/python-modules/glasgow/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix index 8a63f78728e2..398ee8eedf13 100644 --- a/pkgs/development/python-modules/glasgow/default.nix +++ b/pkgs/development/python-modules/glasgow/default.nix @@ -2,7 +2,8 @@ , buildPythonPackage , fetchFromGitHub , setuptools -, setuptools_scm +, setuptools-scm +, pythonOlder , sdcc , nmigen , fx2 @@ -18,18 +19,19 @@ buildPythonPackage rec { pname = "glasgow"; - version = "unstable-2020-06-29"; + version = "unstable-2021-03-02"; + disabled = pythonOlder "3.7"; # python software/setup.py --version - realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev1660+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "f885790d7927b893e631c33744622d6ebc18b5e3"; - sha256 = "sha256-fSorSEa5K09aPEOk4XPWOFRxYl1KGVy29jOBqIvs2hk="; + rev = "41c48bbcee284d024e4249a81419fbbae674cf40"; + sha256 = "1fg8ps228930d70bczwmcwnrd1gvm02a58mxbpn8pyakwbwwa6hq"; }; - nativeBuildInputs = [ setuptools_scm sdcc ]; + nativeBuildInputs = [ setuptools-scm sdcc ]; propagatedBuildInputs = [ setuptools From d2146d7b38c52b3651731b19f2a5d4e04ce575a5 Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Tue, 2 Mar 2021 22:40:37 +0000 Subject: [PATCH 25/27] snippetpixie: 1.5.0 -> 1.5.1 --- pkgs/tools/text/snippetpixie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index bfbfd8993163..935f593177bb 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "1cb76kzw34yr1r135lyd75ddm9v99m7i3lyirm353cdch8qspfmv"; + sha256 = "047ghk0zfmcsnbr4h2h5ar7g1sw2mnk8r2887v81dh3vf767rqg2"; }; nativeBuildInputs = [ From b1718d879a08b5d1f0c80b67ee8e14df7e09e20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Wed, 3 Mar 2021 01:03:37 +0100 Subject: [PATCH 26/27] librepcb: fix use of wrapQtApp (#114891) --- .../science/electronics/librepcb/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 394a17876155..53a67cea40bc 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -18,30 +18,25 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; qmakeFlags = ["-r"]; - enableParallelBuilding = true; + + # the build system tries to use 'git' at build time to find the HEAD hash. + # that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment + # at the end of the line to remove the git call. + postPatch = '' + substituteInPlace ./libs/librepcb/common/common.pro \ + --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # ' + ''; postInstall = '' mkdir -p $out/share/librepcb/fontobene cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/ ''; - # the build system tries to use 'git' at build time to find the HEAD hash. - # that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment - # at the end of the line to remove the git call. - patchPhase = '' - substituteInPlace ./libs/librepcb/common/common.pro \ - --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # ' - ''; - - preFixup = '' - wrapQtApp $out/bin/librepcb - ''; - meta = with lib; { description = "A free EDA software to develop printed circuit boards"; homepage = "https://librepcb.org/"; maintainers = with maintainers; [ luz thoughtpolice ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } From ea22dee42bf32fe69ba92a2ba79c33c9e456983a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Mar 2021 16:13:29 -0800 Subject: [PATCH 27/27] python37Packages.bitarray: 1.6.3 -> 1.7.0 (#114860) Co-authored-by: Fabian Affolter --- pkgs/development/python-modules/bitarray/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 2f98f3917b84..53633b041f7e 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -2,13 +2,15 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.6.3"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "ae27ce4bef4f35b4cc2c0b0d9cf02ed49eee567c23d70cb5066ad215f9b62b3c"; + sha256 = "e31b472ac92e04ea943723cf781ec168e15049d91a3052203defb81652d2b086"; }; + pythonImportsCheck = [ "bitarray" ]; + meta = with lib; { description = "Efficient arrays of booleans"; homepage = "https://github.com/ilanschnell/bitarray";