From ad8e836cf8a5b021b73c402d09c6b4b764ebaf7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 11:22:34 +0200 Subject: [PATCH 001/135] python3Packages.python-engineio: 4.0.0 -> 4.2.0 --- pkgs/development/python-modules/python-engineio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index ed03d9663076..1ea958eb763f 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.0.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "00x9pmmnl1yd59wd96ivkiqh4n5nphl8cwk43hf4nqr0icgsyhar"; + sha256 = "sha256-QfX8Volz5nabGVhQLXfSD/QooxLsU6DvCq1WRkRZ6hU="; }; checkInputs = [ From 237490ebb6702037fb06e78d977e03e2e241d6ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 11:27:38 +0200 Subject: [PATCH 002/135] python3Packages.python-socketio: 5.0.4 -> 5.3.0 --- pkgs/development/python-modules/python-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 8eb58b244e14..2b5c9c84a849 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.0.4"; + version = "5.3.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "0mpqr53mrdzk9ki24y1inpsfvjlvm7pvxf8q4d52m80i5pcd5v5q"; + sha256 = "sha256-jyTTWxShLDDnbT+MYIJIjwpn3xfIB04je78doIOG+FQ="; }; propagatedBuildInputs = [ From ea00f991c09c2e77781cbe1e9d72ee1bd632774b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 6 Aug 2021 01:20:09 +0200 Subject: [PATCH 003/135] nixos/users: Populate group members option This change makes it so that accessing config.users.groups.*.members isn't empty by default, but instead contains all the users whose `extraGroups` includes that group, allowing fancy things like { config, ... }: { users.groups.libvirt.members = config.users.groups.wheel.members; } to add all users in the wheel group to the libvirt group --- nixos/modules/config/users-groups.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index d5e7745c53f9..f86be3be2c65 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -324,7 +324,7 @@ let }; - groupOpts = { name, ... }: { + groupOpts = { name, config, ... }: { options = { @@ -358,6 +358,10 @@ let config = { name = mkDefault name; + + members = mapAttrsToList (n: u: u.name) ( + filterAttrs (n: u: elem config.name u.extraGroups) cfg.users + ); }; }; @@ -419,12 +423,7 @@ let initialPassword initialHashedPassword; shell = utils.toShellPath u.shell; }) cfg.users; - groups = mapAttrsToList (n: g: - { inherit (g) name gid; - members = g.members ++ (mapAttrsToList (n: u: u.name) ( - filterAttrs (n: u: elem g.name u.extraGroups) cfg.users - )); - }) cfg.groups; + groups = attrValues cfg.groups; }); systemShells = From dd38ae1f2c0ae9eb53a3454b0633c2b29f14a0ef Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 9 Aug 2021 23:39:54 +0200 Subject: [PATCH 004/135] nixos/fonts: scale X11 core cursor Most desktop environments manage the cursor using the Xcursor library by default; this comes with scalable or multiple-sized cursor themes. However, when running just a simple WM (twm, bspwm, ...) the cursor handling is left to the X server, which uses a very simple fixed bitmap font (this is called a "core" cursor). The font is uncomfortably small on a high DPI display and must be replaced with a saner default. Up until recently[1] it used to be possible to change the font on the xserver command line, however the font name is now hardcoded. It's still possible to change it, though: here I override the `fontcursormisc` package and set an alias that points to a vector variant of the original cursor font. The font size is set to match the standard cursor dimensions on a 96dpi display. It's not perfect but it's a very simple and effective solution. [1]: https://gitlab.freedesktop.org/xorg/xserver/-/commit/56ea4c769c2d65df2de86009e8e499f39a8a3d4d --- nixos/modules/config/fonts/fonts.nix | 70 ++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 20 deletions(-) diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index 3911196c1013..60a0885103d2 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -2,6 +2,52 @@ with lib; +let + # A scalable variant of the X11 "core" cursor + # + # If not running a fancy desktop environment, the cursor is likely set to + # the default `cursor.pcf` bitmap font. This is 17px wide, so it's very + # small and almost invisible on 4K displays. + fontcursormisc_hidpi = pkgs.xorg.fontcursormisc.overrideAttrs (old: + let + # The scaling constant is 230/96: the scalable `left_ptr` glyph at + # about 23 points is rendered as 17px, on a 96dpi display. + # Note: the XLFD font size is in decipoints. + size = 2.39583 * config.services.xserver.dpi; + sizeString = builtins.head (builtins.split "\\." (toString size)); + in + { + postInstall = '' + alias='cursor -xfree86-cursor-medium-r-normal--0-${sizeString}-0-0-p-0-adobe-fontspecific' + echo "$alias" > $out/lib/X11/fonts/Type1/fonts.alias + ''; + }); + + hasHidpi = + config.hardware.video.hidpi.enable && + config.services.xserver.dpi != null; + + defaultFonts = + [ pkgs.dejavu_fonts + pkgs.freefont_ttf + pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts + pkgs.liberation_ttf + pkgs.unifont + pkgs.noto-fonts-emoji + ]; + + defaultXFonts = + [ (if hasHidpi then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc) + pkgs.xorg.fontmiscmisc + ] ++ optionals (config.nixpkgs.config.allowUnfree or false) + [ # these are unfree, and will make usage with xserver fail + pkgs.xorg.fontbhlucidatypewriter100dpi + pkgs.xorg.fontbhlucidatypewriter75dpi + pkgs.xorg.fontbh100dpi + ]; + +in + { imports = [ (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.") @@ -32,25 +78,9 @@ with lib; }; - config = { - - fonts.fonts = mkIf config.fonts.enableDefaultFonts - ([ - pkgs.dejavu_fonts - pkgs.freefont_ttf - pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts - pkgs.liberation_ttf - pkgs.xorg.fontmiscmisc - pkgs.xorg.fontcursormisc - pkgs.unifont - pkgs.noto-fonts-emoji - ] ++ lib.optionals (config.nixpkgs.config.allowUnfree or false) [ - # these are unfree, and will make usage with xserver fail - pkgs.xorg.fontbhlucidatypewriter100dpi - pkgs.xorg.fontbhlucidatypewriter75dpi - pkgs.xorg.fontbh100dpi - ]); - - }; + config = mkMerge [ + { fonts.fonts = mkIf config.fonts.enableDefaultFonts defaultFonts; } + { fonts.fonts = mkIf config.services.xserver.enable defaultXFonts; } + ]; } From 829ed287f07b36bba577a83dcaaa0f6ff0e32f90 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 16 Aug 2021 21:32:45 +0200 Subject: [PATCH 005/135] elpa-packages: deprecate phases --- .../applications/editors/emacs/elisp-packages/elpa-packages.nix | 2 +- pkgs/build-support/emacs/elpa.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index adf7d75ed5fc..c708fa56ef73 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -66,7 +66,7 @@ self: let # actually unpack source of ada-mode and wisi # which are both needed to compile the tools # we need at runtime - phases = "unpackPhase " + old.phases; # not a list, interestingly… + dontUnpack = false; srcs = [ super.ada-mode.src # ada-mode needs a specific version of wisi, check NEWS or ada-mode's diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 08257ff25425..f7027dc499d8 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -21,7 +21,7 @@ in import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ - phases = "installPhase fixupPhase distPhase"; + dontUnpack = true; installPhase = '' runHook preInstall From d97fcbee7b2e4af5f33803a29bddfb4b6166e783 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 18 Aug 2021 20:43:19 -0400 Subject: [PATCH 006/135] python3Packages.omegaconf: 1.4.1 -> 2.1.0 --- .../python-modules/omegaconf/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 42249e933789..72823b013fc2 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,20 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest, pytest-runner, pyyaml, six, pathlib2, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest-mock +, pytestCheckHook, pyyaml, isPy27, jre_minimal, antlr4-python3-runtime }: buildPythonPackage rec { pname = "omegaconf"; - version = "1.4.1"; + version = "2.1.0"; + + disabled = isPy27; src = fetchFromGitHub { owner = "omry"; repo = pname; - rev = version; - sha256 = "1vpcdjlq54pm8xmkv2hqm2n1ysvz2a9iqgf55x0w6slrb4595cwb"; + rev = "v${version}"; + sha256 = "sha256-0aDlqPXELxQ/lnw4Hd9es8ldYhUP/TacH9AIyaffwnI="; }; - checkInputs = [ pytest ]; - buildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2; + checkInputs = [ pytestCheckHook pytest-mock ]; + nativeBuildInputs = [ jre_minimal pytest-runner ]; + propagatedBuildInputs = [ antlr4-python3-runtime pyyaml ]; + + disabledTestPaths = [ "tests/test_pydev_resolver_plugin.py" ]; # needs pydevd - not in Nixpkgs meta = with lib; { description = "A framework for configuring complex applications"; From e7970880d98302f8a67f56d104409895432f2d9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Jul 2021 09:12:25 +0200 Subject: [PATCH 007/135] python3Packages.pymemcache: 3.4.4 -> 3.5.0 --- pkgs/development/python-modules/pymemcache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index ab01259a77fe..f30b6ea06b4c 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pymemcache"; - version = "3.4.4"; + version = "3.5.0"; src = fetchFromGitHub { owner = "pinterest"; repo = pname; rev = "v${version}"; - sha256 = "1ajlhirxhd4pbzgd84k44znjazjbnbdfm3sk64avs0vgcgclq2n7"; + sha256 = "sha256-O2qmcLWCUSc1f32irelIZOOuOziOUQXFGcuQJBXPvvM="; }; checkInputs = [ From bac10a57e982e7ed7e4e4633197d98b2994edb4a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 05:35:45 +0000 Subject: [PATCH 008/135] thanos: 0.19.0 -> 0.22.0 --- pkgs/servers/monitoring/thanos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index ac19ddda793d..03811314f456 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.19.0"; + version = "0.22.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-FryVKOabokw2+RyD94QLVpC9ZGIHPuSXZf5H+eitj80="; + sha256 = "sha256-3jEPfYRewuXTk39sfp6MFKu0LYCzj/VEQTJVUUSkbZk="; }; - vendorSha256 = "sha256-GBjPMZ6BwUOKywNf1Bc2WeA14qvKQ0R5gWvVxgO/7Lo="; + vendorSha256 = "sha256-rXfYlrTm0Av9Sxq+jdxsxIDvJQIo3rcBTydtiXnifTw="; doCheck = false; From 3e353567f82aaa4ca7148e2b177c04b0edee0f84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 06:05:48 +0000 Subject: [PATCH 009/135] lsix: 1.7.4 -> 1.8 --- pkgs/tools/graphics/lsix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix index ba07e2886b53..a9f8aa21bf1d 100644 --- a/pkgs/tools/graphics/lsix/default.nix +++ b/pkgs/tools/graphics/lsix/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "lsix"; - version = "1.7.4"; + version = "1.8"; src = fetchFromGitHub { owner = "hackerb9"; repo = pname; rev = version; - sha256 = "sha256-mOueSNhf1ywG4k1kRODBaWRjy0L162BAO1HRPaMMbFM="; + sha256 = "sha256-Qx6/PFm1XBmEI6iI+Ref9jNe6sXIhsVL4VQ1CX+caZE="; }; nativeBuildInputs = [ makeWrapper ]; From 0ee218ee36529afcbb89eccc06a96ed7a71ae294 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 18:49:40 +0000 Subject: [PATCH 010/135] tfswitch: 0.12.1119 -> 0.12.1168 --- pkgs/applications/networking/cluster/tfswitch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index f56f8bc6d652..404d40e89f8d 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "0.12.1119"; + version = "0.12.1168"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = version; - sha256 = "1xsmr4hnmdg2il3rp39cyhv55ha4qcilcsr00iiija3bzxsm4rya"; + sha256 = "sha256-BKqbxja19JxAr9/Cy7LpbZTJrt/pYfwtCbZMY0wwvZc="; }; - vendorSha256 = "0mpm4m07v8w02g95cnj73m5gvd118id4ag2pym8d9r2svkyz5n70"; + vendorSha256 = "sha256-y8T1MV2xHr9n7XWmB4LikIzyGx+0XKhsxmatnCZFN9I="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com From 36fa861a293f428e7d499ba69530383eba427533 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 19:24:02 +0000 Subject: [PATCH 011/135] gitui: 0.16.2 -> 0.17 --- .../version-management/git-and-tools/gitui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 4fc1bce44741..5d1e50d12135 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.16.2"; + version = "0.17"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FRPRkFGf6Z/+smK651wR6ETWrvvQ1AKalxXW6d6otIo="; + sha256 = "sha256-UM1L95VKmUh2E56dlKo3TkNYRlib5Hg5VHGokBqTP+s="; }; - cargoSha256 = "sha256-3ubeZgB7XNKysy6s+cdg4GDj/Mn4Mdp9VupcbBRTRh4="; + cargoSha256 = "sha256-i/Z1pOrg7rKH5uDqkyh7V9jZRHXZ3Bhhw5UpzKWOjJ0="; nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ] From 7e8aaf4775e551523f325d10f536557d55236778 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 21:09:18 +0000 Subject: [PATCH 012/135] imath: 3.0.5 -> 3.1.2 --- pkgs/development/libraries/imath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix index 7950667c190c..f3678064f3c5 100644 --- a/pkgs/development/libraries/imath/default.nix +++ b/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.0.5"; + version = "3.1.2"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "0nwf8622j01p699nkkbal6xxs1snzzhz4cn6d76yppgvdhgyahsc"; + sha256 = "sha256-X+LY1xtMeYMO6Ri6fmBF2JEDuY6MF7j5XO5YhWMuffM="; }; nativeBuildInputs = [ cmake ]; From 6df214b21bfeda09736abe3b72658a0b9f337caf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 04:19:45 +0000 Subject: [PATCH 013/135] step-ca: 0.16.0 -> 0.16.2 --- pkgs/tools/security/step-ca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 127e7e9805e6..63291946e38c 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-8gesSfyL5ne0JqbB/TvEkQDZziTzJmsnIV+MTOfy3jk="; + sha256 = "sha256-JDoiz/BX8zB+qdwlGPUCa30R+pwWWtjEiXHP5LxdPAE="; }; - vendorSha256 = "sha256-q5hwgx54ca9SwQfkLB5NKvon9o1Djb1Y5rXPKx3HQDU="; + vendorSha256 = "sha256-cFuLW0qkI/l/TvYwQZA2bLlWYjs1hdbQJ5jU7xiuFZI="; buildFlagsArray = [ "-ldflags=-buildid=" ]; From da9ca1923bbe6a035f299880849dd42b5163d220 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 04:47:02 +0000 Subject: [PATCH 014/135] python38Packages.stravalib: 0.10.2 -> 0.10.4 --- pkgs/development/python-modules/stravalib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index 1615f57d5e59..a06a375be0e5 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "stravalib"; - version = "0.10.2"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "76db248b24cbd6c51cf93b475d8a8df04ec4b6c6287dca244e47f37a433276d7"; + sha256 = "451817c68a11e0c77db9cb628e3c4df0f4806c5a481536598ab3baa1d1c21215"; }; checkInputs = [ From f0ed982c2f445c4c8daa731f1db5340ca626fdf5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 05:36:18 +0000 Subject: [PATCH 015/135] python38Packages.playsound: 1.2.2 -> 1.3.0 --- pkgs/development/python-modules/playsound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/playsound/default.nix b/pkgs/development/python-modules/playsound/default.nix index 589a8f3db819..799bf70457bf 100644 --- a/pkgs/development/python-modules/playsound/default.nix +++ b/pkgs/development/python-modules/playsound/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "playsound"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "TaylorSMarks"; repo = "playsound"; - rev = "907f1fe73375a2156f7e0900c4b42c0a60fa1d00"; - sha256 = "1fh3m115h0c57lj2pfhhqhmsh5awzblb7csi1xc5a6f6slhl059k"; + rev = "v${version}"; + sha256 = "0jbq641lmb0apq4fy6r2zyag8rdqgrz8c4wvydzrzmxrp6yx6wyd"; }; doCheck = false; From 4be13dc00b88a451bf1115cd8e7d12daa5342e9e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Aug 2021 08:05:56 +0200 Subject: [PATCH 016/135] python3Packages.pylev: 1.3.0 -> 1.4.0 --- .../python-modules/pylev/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pylev/default.nix b/pkgs/development/python-modules/pylev/default.nix index 5df0ce4690ef..c9c3340db192 100644 --- a/pkgs/development/python-modules/pylev/default.nix +++ b/pkgs/development/python-modules/pylev/default.nix @@ -1,23 +1,29 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: -buildPythonPackage { +buildPythonPackage rec { pname = "pylev"; - version = "1.3.0"; + version = "1.4.0"; - # No tests in PyPi tarball src = fetchFromGitHub { owner = "toastdriven"; repo = "pylev"; - # Can't use a tag because it's missing - # https://github.com/toastdriven/pylev/issues/10 - # rev = "v${version}; - rev = "72e3d490515c3188e2acac9c15ea1b466f9ff938"; - sha256 = "18dg1rfnqgfl6x4vafiq4la9d7f65xak19gcvngslq0bm1z6hyd8"; + rev = "v${version}"; + sha256 = "0fgxjdnvnvavnxmxxd0fl5jyr2f31g3a26bwyxcpy56mgpd095c1"; }; + checkPhase = '' + ${python.interpreter} -m unittest tests + ''; + + pythonImportsCheck = [ "pylev" ]; + meta = with lib; { + description = "Python Levenshtein implementation"; homepage = "https://github.com/toastdriven/pylev"; - description = "A pure Python Levenshtein implementation that's not freaking GPL'd"; license = licenses.bsd3; maintainers = with maintainers; [ jakewaksbaum ]; }; From f8d1f6758fd348db8ce251ce6a696071d90de857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:01:07 +0200 Subject: [PATCH 017/135] python39Packages.google-api-core: 1.30.0 -> 2.0.0 --- .../python-modules/google-api-core/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 653786ace63f..e53346510dec 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -5,7 +5,7 @@ , googleapis-common-protos , grpcio , protobuf -, pytz +, proto-plus , requests , mock , pytest @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.30.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0724d354d394b3d763bc10dfee05807813c5210f0bd9b8e2ddf6b6925603411c"; + sha256 = "sha256-vZ6wcJ9OEN1v3bMv0HiKGQtDRCbCWL5uAO9A2hNtdo0="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { google-auth grpcio protobuf - pytz + proto-plus requests ]; @@ -47,8 +47,7 @@ buildPythonPackage rec { helpers used by all Google API clients. ''; homepage = "https://github.com/googleapis/python-api-core"; - changelog = - "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 6239f1cf817ec8abca97bf671b7aeae8370fbf94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:03:42 +0200 Subject: [PATCH 018/135] python39Packages.google-auth: 1.34.0 -> 2.0.1 --- pkgs/development/python-modules/google-auth/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index bfca445a961f..c10e3807f200 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -14,24 +14,22 @@ , pytest-localserver , responses , rsa -, six , pyopenssl }: buildPythonPackage rec { pname = "google-auth"; - version = "1.34.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8QlAiLrgRvsG89Gj198UcX6NlZ6RBbecV3Jb1OF1l6I="; + sha256 = "sha256-6hrwULPgbrc+RHD3BNIwBzB7wOh8E+AV9rkEYPFAe9M="; }; propagatedBuildInputs = [ cachetools pyasn1-modules rsa - six pyopenssl pyu2f ]; From d13745ec9b2b5795bc0b427c8e12015851a53c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:05:49 +0200 Subject: [PATCH 019/135] python39Packages.google-cloud-bigquery: 2.23.3 -> 2.24.1 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 0bd663b4f151..f30fa659720c 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.23.3"; + version = "2.24.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FQXtRM7YaU+S+Jqkn9dTQqJR3A1hL/XQjgPTXmANO0I="; + sha256 = "sha256-gRHSPir4epbAZGqCqD9i1pS2yIKeeIHrTkN7dURxZJ8="; }; propagatedBuildInputs = [ From fcb5dabb174f9ad13a9611ca2ae13128459e5438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:07:59 +0200 Subject: [PATCH 020/135] python39Packages.google-cloud-core: 1.7.2 -> 2.0.0 --- pkgs/development/python-modules/google-cloud-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index b9edb4224d8c..a51ed3840207 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.7.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sQMKrcuyrrTuUUdUJjUa+DwQckVrkY+4/bgGZsS7Y7U="; + sha256 = "sha256-kO6ZZIzPnhGhZ4Gn/FjRPlj2YrQ5xzfUjCTvGGYsJwI="; }; propagatedBuildInputs = [ google-api-core ]; From 0683b38c384601220dd438e2c2d9b32779e0c495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:13:08 +0200 Subject: [PATCH 021/135] python39Packages.google-cloud-spanner: 3.7.0 -> 3.8.0 --- .../python-modules/google-cloud-spanner/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 5f03a181183b..c6e1021f3430 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4LGSB7KU+RGvjSQ/w1vXxa5fkfFT4C5omhk/LnGSUng="; + sha256 = "sha256-K8K0JjKHWojSVFnUr3GhJP4gflYTXH6V7Mywu4hTvRQ="; }; propagatedBuildInputs = [ @@ -43,8 +43,13 @@ buildPythonPackage rec { disabledTestPaths = [ # Requires credentials - "tests/system/test_system.py" - "tests/system/test_system_dbapi.py" + "tests/system/test_backup_api.py" + "tests/system/test_database_api.py" + "tests/system/test_dbapi.py" + "tests/system/test_instance_api.py" + "tests/system/test_session_api.py" + "tests/system/test_streaming_chunking.py" + "tests/system/test_table_api.py" "tests/unit/spanner_dbapi/test_connect.py" "tests/unit/spanner_dbapi/test_connection.py" "tests/unit/spanner_dbapi/test_cursor.py" From 3f9ad23520bc1aa384ee6af656632d42de3bba16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:14:53 +0200 Subject: [PATCH 022/135] python39Packages.google-resumable-media: 1.3.3 -> 2.0.0 --- .../python-modules/google-resumable-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 83b192522f37..c76cd53a8296 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "1.3.3"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zjhVXSUL1wsMJZi/YemQA8uMVpsBduwOPzi4b5//9YE="; + sha256 = "sha256-CUwDgXNGSayTkIPqODO9I5t/upBNJGNC0SaJhAKfIWc="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; From 914705b89520b0dc43c316a8c527124d437075aa Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 23 Aug 2021 15:59:10 +0200 Subject: [PATCH 023/135] beamPackages: Use nixpkgs fixed-point instead of rec Ensures that overlays are properly applied --- pkgs/top-level/beam-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 334aac359b37..0e17410a21dc 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,10 +1,10 @@ -{ callPackage, wxGTK30, buildPackages, wxSupport ? true }: +{ beam, callPackage, wxGTK30, buildPackages, wxSupport ? true }: -rec { +with beam; { lib = callPackage ../development/beam-modules/lib.nix { }; # Each - interpreters = rec { + interpreters = with beam.interpreters; { # R24 is the default version. erlang = erlangR24; # The main switch to change default Erlang version. From 2508d1e2a56259fd44091cf9acffd7745a8d7267 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 23 Aug 2021 16:06:41 +0200 Subject: [PATCH 024/135] beamPackages: Deduplicate default package set Previously there were two package sets for the default Erlang version, beam.packages.erlang and beam.packages.erlangR24, which didn't share their evaluation. This commit fixes this by pointing the former to the latter. It also introduces a `beam.defaultVersion` attribute which can be used to get or set the default version to something other than `erlangR24`. --- pkgs/top-level/beam-packages.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 0e17410a21dc..1b5ff3a3f25a 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -3,14 +3,17 @@ with beam; { lib = callPackage ../development/beam-modules/lib.nix { }; + # R24 is the default version. + # The main switch to change default Erlang version. + defaultVersion = "erlangR24"; + # Each interpreters = with beam.interpreters; { - # R24 is the default version. - erlang = erlangR24; # The main switch to change default Erlang version. - erlang_odbc = erlangR24_odbc; - erlang_javac = erlangR24_javac; - erlang_odbc_javac = erlangR24_odbc_javac; + erlang = beam.interpreters.${defaultVersion}; + erlang_odbc = beam.interpreters."${defaultVersion}_odbc"; + erlang_javac = beam.interpreters."${defaultVersion}_javac"; + erlang_odbc_javac = beam.interpreters."${defaultVersion}_odbc_javac"; # Standard Erlang versions, using the generic builder. @@ -98,7 +101,7 @@ with beam; { # appropriate Erlang/OTP version. packages = { # Packages built with default Erlang version. - erlang = packagesWith interpreters.erlang; + erlang = packages.${defaultVersion}; erlangR24 = packagesWith interpreters.erlangR24; erlangR23 = packagesWith interpreters.erlangR23; From d6fa8006df9c7dd219dab9904231b35720d8cc76 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 23 Aug 2021 10:28:36 -0400 Subject: [PATCH 025/135] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 132 ++++++++++++++-------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b607ff014234..9e56208cdd15 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -389,12 +389,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline-nvim"; - version = "2021-08-21"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "35ac1c1e2e6f7cbf6a1ad027d8bf019a284b28d5"; - sha256 = "1sdq5yjav7ak5lkw0kiz8mwffnxva94w1xav8y8kxy8f95b78a2g"; + rev = "21fda2cfb4c692f91e4df486dc2e28a37c628a76"; + sha256 = "05wi1zb1b3b08av3l8i40jggvb2mpkqmg0w8dqhxannblfkk8h8c"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "b84f08364a3b3a6eb9795ecdab418d1e786b0be4"; - sha256 = "0jh6xbiqrnldk1l2p1jqfi34wwci7nx2pxhvcv0fi9mb7r5bzvmw"; + rev = "d8089b752346fdccdd4fe85cec82c0f9919823fa"; + sha256 = "12nn4467jhhfi2vwsywzf6fqadwjsymmmmny5d4jsbz3l5xhcfmz"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -581,12 +581,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2021-08-16"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "09e4ab0fb66ad07d64b311d1bd7916905bf3364b"; - sha256 = "0573ywym8favv12g78qln4zx15j1ic26y8j2rbdlh8n22zll0v1x"; + rev = "899f70af0786d4100fb29987b9ab03eac7eedd6a"; + sha256 = "1gw478b77smkn3k42h2q3ddq2kcd7vm6mnmjmksvbsfv5xp9pln0"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -713,12 +713,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "5f5e3135de04c9e245c1ecf53b67836c692fd06a"; - sha256 = "1cljdxgqxiyq6gg71pg9k5b8iwvj8nzg4m7llzj957lrhfpavfxg"; + rev = "595e60210f7d0c9e5a21672428bae8c3f518a3b9"; + sha256 = "0mdqb07avwk2f5h5xylq2lkg56jk82dccyrxb17cxfw2dsgbs93m"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -966,12 +966,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-08-16"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "358747255db85579498dfc6e03dcd808d5b81d34"; - sha256 = "086q1bx6xz3qzkyll6lszcgljyz8b5w4ywa8wvcv71al3cxd9n7b"; + rev = "b292682c16176f961e11e1e68eb799d9b1b3e4e9"; + sha256 = "1278z0rgvg65kprxyg02yl2fixrfy9pg5fj3d796nc607ipzdhvb"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1508,12 +1508,12 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2021-08-06"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "074a6b34952f2d14be196c217a3995749670f627"; - sha256 = "0vvz81dg64pp0x08imcicrqkp4z90ahfxsikhswraslklc1k1ar1"; + rev = "d1ff992bf605c098577b7f0e632e3ea887b71520"; + sha256 = "04zmqz270willnpfsf61pa9xx5i5phx1g6r6nw317r9rs0dnk0wj"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1823,12 +1823,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-19"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "2d7bcab215c8b7a8f889b371c4060dda2a6c6541"; - sha256 = "0kxm6nl167b51gjwli64d9qp5s1cdy9za0zfq9hy8phivjk2pmyl"; + rev = "d438b0fc71447c502029320377f0ed53603b9e0c"; + sha256 = "0hnn5rlm9gb59afbfi78rs5lp9fq844x8qrpqnwi0kcz8b3d6bp7"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2039,12 +2039,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-08-16"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "70705a33ab816c61011ed9c97ebb5925eaeb89c1"; - sha256 = "1bcrba17icpdmk69p284kb2k3jpwimnbcn5msa7xq46wj97hy12k"; + rev = "1ddb1f64f5fb15dac2d02e52af918d1fb11feb2d"; + sha256 = "0y33dsxhw55h28kvqq3655cmnl4nq4z497v69xa72872gf1dsi80"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2808,12 +2808,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-08-21"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "177ef542f6f26147f16be7b07c1e6fcfa66bf128"; - sha256 = "0c6bwdgi2d43jar05zcfarsas3r7y9v7igr3ldsgd7491wf8hjhg"; + rev = "9a613fb6ea8b8a41e7956f272c8cd0dc9a65102b"; + sha256 = "1l19cn04ibw0pd1isw02mllqxzp4gy4jd0mnv4mzf24ydjkyixkn"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2964,12 +2964,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "6d398e3443933a68607215538e614662d2ffa5c8"; - sha256 = "0ll54nqa3lxzhxyjsya8y4qiyyicfsp5yz25mjdgqmvvf4i39jxz"; + rev = "2ee1dfa64e14201a1016cd7088b612a0d2a116e2"; + sha256 = "0hqj4xv3mxdcknjqhazvnsk01jdc3x6qqgyyf6sy5d4kxm5q9q0w"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3468,12 +3468,12 @@ final: prev: neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2021-08-20"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "c1634915a8f798cded2bef39c6f24a9d988aca10"; - sha256 = "02cvrxfy6n7z5xl5ijw2fkz81j7lm18agyx6qs11a5l5f515h4a2"; + rev = "3f6f5f8ad34d63ecb1060dbd6d7e2513238da528"; + sha256 = "14f0ksrn4grkpjfn766hxg1p19dryngxai33b2322dy0qaw244d2"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -3696,12 +3696,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-08-18"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "f907d945d0285f42dc9ebffbc075ea725b93b6aa"; - sha256 = "1jg6wxknbzirq9j880yki8bm8v1zdkk60fyis67syf722vric9i8"; + rev = "414ed4690583315705955c80cdf52e86cfc134aa"; + sha256 = "084n4x0ikhxh9h33cqyzr3ajxd9zm9x7lh2q8dv0i5jlyxyb1grf"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3864,12 +3864,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-08-15"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "c9fc568ca157429cd76986ca2bfaa60488a7d2fb"; - sha256 = "09jk0v2ki0hsy1m2hg3dwi66yaqn670vnjbbrbdxrq55n260gds3"; + rev = "8f34bb2e4700d83a84402ec776d4d3336e0e63f9"; + sha256 = "1lfrmi48vkkr92zfwzr5mbdczfw2w9lw04bvwnx77ir798lbp6mc"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3912,24 +3912,24 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "f365bc331c1fd752429427cdfed4aa142e9fc74f"; - sha256 = "1phzrw37y9gzcimy5r3phy2x53c9b2q5l3v5ipcx1k4q6pfkh026"; + rev = "a4be468d8991840641c8db5cc6bbbffc3dafd79d"; + sha256 = "09mn8gysbs54bhicg9s52s87c472h10cmvi76fyljgxrkpbjssw3"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-08-21"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "dd827f091554065736105c72e1256d1fc8f4f445"; - sha256 = "11jndab13dhd6pqzbd385awzhmxvzz68aza09qmfqkjvmcs1gy8c"; + rev = "671869d981c47ccb2f7370145062a9cd9967d17b"; + sha256 = "14fs6h79ccb0mp9mcllqz42pkqialvs7gwp83xlpgy0kphgksndf"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -3984,12 +3984,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-20"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "9adbacf29835bf521a99a8d3f0b6f2157b1b9166"; - sha256 = "0k4b6qsrvlgxr600x9wgkfdraqczx49zqyqfz88xf6pjbx0zyach"; + rev = "5b0fa84ee35006e06142f98b8a5b28d79cfa5000"; + sha256 = "0in0r3irawmgxp1prwryw3dpxj7gd6pviv14w8a7hnw1sd2g84l8"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5139,12 +5139,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-08-21"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "eb1f0512c3b781740090877b39bc9332c01edb46"; - sha256 = "1dykwqv01fcf8k2q8fz7z4zgc9wh4v551b9mwm44n2lqzg35swzg"; + rev = "a0370391af2998e11c6320ba08a57d5a1827c0ed"; + sha256 = "13k9rdjwrmrv6vm2rn2b3ga02fcmig2ainllh8dxzpln3c3idwbp"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -5247,12 +5247,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline-nvim"; - version = "2021-08-21"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "40b7d5cbaa51c031061827c48e6a05748db7e91d"; - sha256 = "1mk4g1kgg2as3kk010wd9x2f4v60an68mqflpk97ng6a52laj5nw"; + rev = "6f376ef4ceb88ff7f0d9e3141dbe2a2e0854e785"; + sha256 = "1882gb76hp4zpwyljrzl26qjwyyvnavhfv529nj5z5x41vyhsks5"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5501,12 +5501,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-08-21"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "8381a215e091dc9e1f6ad9ceaeadf35ef3cfed8f"; - sha256 = "0cn1ynvva8nzjyrp285ficfa74wky0gikii2hysdi0g4ndnh6ypa"; + rev = "79dc995f820150d5de880c08e814af327ff7e965"; + sha256 = "0acyzc0k14dvd7j4ihvg84fz9lp1alwbf6qbnq083y6pd37mhj7b"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5622,12 +5622,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm-nvim"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "5a4429d33cc8f286a0ad30b89084ec5284d6a652"; - sha256 = "0rflwn9bbnffly5i66n3hxrf9cgbpqphqc2p6bjpxlyydda1vdx3"; + rev = "317caf587448fc8d42189d2dc27dab076857aeb0"; + sha256 = "1gl27njvik0dfg9412gwnqi6ar6nqhpfhliyjm5w96pxaa6xlafp"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6654,12 +6654,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-06-02"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "9e4fdb8ab029c0436728a96e1c92677737c2e784"; - sha256 = "1rmiza1km214mvlrdaqycv5hk8ki35giab11b9ggwcigbh743h01"; + rev = "6f8b99868fd5560d6eb47f82ca76ec62e3d5ae78"; + sha256 = "0n1hvyv9555rgi3qajy3d59v1nqdwcrr0l4nqzc0pr0cg9q7d6g3"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -7170,12 +7170,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5d1a276b455dd9a32375a5ac84050adff67062e3"; - sha256 = "1bm3fwbg9nmdxpvaqrs31g88ij5b5wxip2s4j9v1i0c0w5jplxjn"; + rev = "8cdb51622fbdbf780edff35ee22d74ad9983698e"; + sha256 = "18073gnl90n7h8j3rk6shs79455svwa47n5jxyb44m1957hvzfgb"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; From b86e9a8c4eff5b16f4cbfa99c92487adec161a11 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 23 Aug 2021 10:29:07 -0400 Subject: [PATCH 026/135] vimPlugins.editorconfig-nvim: init at 2021-08-18 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9e56208cdd15..45e72bc23cd2 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1555,6 +1555,18 @@ final: prev: meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; }; + editorconfig-nvim = buildVimPluginFrom2Nix { + pname = "editorconfig-nvim"; + version = "2021-08-18"; + src = fetchFromGitHub { + owner = "gpanders"; + repo = "editorconfig.nvim"; + rev = "8840aacb025af17e42c6c215a34568f3dbcf94f6"; + sha256 = "1flr9mhz33bcrqp6iwnvhsz18hrd4ynvh7qdihnpd5qn0mwf034w"; + }; + meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; + }; + elm-vim = buildVimPluginFrom2Nix { pname = "elm-vim"; version = "2020-09-23"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e0028c854782..b3a956aa78a5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -193,6 +193,7 @@ google/vim-jsonnet google/vim-maktaba gorkunov/smartpairs.vim gotcha/vimelette +gpanders/editorconfig.nvim gregsexton/gitv gruvbox-community/gruvbox as gruvbox-community gu-fan/riv.vim From a049d842292fc891a13a80e8725df31657308195 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 1 Jul 2021 00:11:35 +1000 Subject: [PATCH 027/135] nixos/filesystems/exfat: use "exfatprogs" instead of "exfat" if kernel > 5.7 5.7+ comes with a native exfat implementation, exfatprogs should be used instead. The exfat package puts a "mount.exfat" binary in the path, which causes mount to prefer the FUSE version to the non-fuse one. There's no way to disable the binary, so switch to exfatprogs. --- nixos/modules/tasks/filesystems/exfat.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix index 1527f993fdd4..540b9b91c3ec 100644 --- a/nixos/modules/tasks/filesystems/exfat.nix +++ b/nixos/modules/tasks/filesystems/exfat.nix @@ -4,8 +4,10 @@ with lib; { config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { - - system.fsPackages = [ pkgs.exfat ]; - + system.fsPackages = if config.boot.kernelPackages.kernelOlder "5.7" then [ + pkgs.exfat # FUSE + ] else [ + pkgs.exfatprogs # non-FUSE + ]; }; } From 57b933a911666922d6fc329ccc02446228ac5f6f Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 1 Jul 2021 00:11:47 +1000 Subject: [PATCH 028/135] nixos/doc: add note about switching to exfatprogs --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a138d4c8780c..dd6245273c5b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -847,6 +847,15 @@ Superuser created successfully. release instead of 1.0.x + + + If exfat is included in + boot.supportedFilesystems and when using + kernel 5.7 or later, the exfatprogs + user-space utilities are used instead of + exfat. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 35d65dc43cf3..64f3f495651a 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -246,6 +246,9 @@ To be able to access the web UI this port needs to be opened in the firewall. - The `nomad` package now defaults to a 1.1.x release instead of 1.0.x +- If `exfat` is included in `boot.supportedFilesystems` and when using kernel 5.7 + or later, the `exfatprogs` user-space utilities are used instead of `exfat`. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. From 6ae24c90f0b9173243e5c6ec5b8e4a91f9051145 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 18 Aug 2021 21:04:56 -0400 Subject: [PATCH 029/135] python3Packages.hydra: 0.11.3 -> 1.1.1 --- .../python-modules/hydra/default.nix | 28 +++++++++++-------- .../python-modules/omegaconf/default.nix | 12 +++++--- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra/default.nix index 42f2812a6e1d..5fb15be0a3f9 100644 --- a/pkgs/development/python-modules/hydra/default.nix +++ b/pkgs/development/python-modules/hydra/default.nix @@ -1,24 +1,30 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytest, omegaconf, pathlib2 }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pytestCheckHook +, importlib-resources, omegaconf, jre_headless, antlr4-python3-runtime }: buildPythonPackage rec { pname = "hydra"; - version = "0.11.3"; + version = "1.1.1"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "facebookresearch"; repo = pname; - rev = version; - sha256 = "0plbls65qfrvvigza3qvy0pwjzgkz8ylpgb1im14k3b125ny41ad"; + rev = "v${version}"; + sha256 = "sha256:1svzysrjg47gb6lxx66fzd8wbhpbbsppprpbqssf5aqvhxgay3qk"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ omegaconf ] ++ lib.optional isPy27 pathlib2; + nativeBuildInputs = [ jre_headless ]; + checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ omegaconf antlr4-python3-runtime ] + ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - checkPhase = '' - runHook preCheck - pytest tests/ - runHook postCheck - ''; + # test environment setup broken under Nix for a few tests: + disabledTests = [ + "test_bash_completion_with_dot_in_path" + "test_install_uninstall" + ]; + disabledTestPaths = [ "tests/test_hydra.py" ]; meta = with lib; { description = "A framework for configuring complex applications"; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 72823b013fc2..13f3981955cd 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest-mock -, pytestCheckHook, pyyaml, isPy27, jre_minimal, antlr4-python3-runtime }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-mock, pytestCheckHook +, pyyaml, pythonOlder, jre_minimal, antlr4-python3-runtime }: buildPythonPackage rec { pname = "omegaconf"; version = "2.1.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "omry"; @@ -14,8 +14,12 @@ buildPythonPackage rec { sha256 = "sha256-0aDlqPXELxQ/lnw4Hd9es8ldYhUP/TacH9AIyaffwnI="; }; + postPatch = '' + substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"]' 'setup_requires=[]' + ''; + checkInputs = [ pytestCheckHook pytest-mock ]; - nativeBuildInputs = [ jre_minimal pytest-runner ]; + nativeBuildInputs = [ jre_minimal ]; propagatedBuildInputs = [ antlr4-python3-runtime pyyaml ]; disabledTestPaths = [ "tests/test_pydev_resolver_plugin.py" ]; # needs pydevd - not in Nixpkgs From 2cdea81182fcbe3da4a815808cd305c625d41016 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 00:51:19 +0000 Subject: [PATCH 030/135] astc-encoder: 3.1 -> 3.2 --- pkgs/tools/graphics/astc-encoder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 10bd5d3edf49..d5754c7baeb3 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { gccStdenv.mkDerivation rec { pname = "astc-encoder"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-WWxk8F1MtFv1tWbSs45fmu4k9VCAAOjJP8zBz80zLTo="; + sha256 = "sha256-1GVMzM4+viVqurkzJqTL3Yszld5zLmpjygT/z74HMLs="; }; nativeBuildInputs = [ cmake ]; From f8df7606683fc9fbce68c8c363d1318dab2ed199 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Aug 2021 03:00:39 +0200 Subject: [PATCH 031/135] nixos/octoprint: allow access to serial devices Printers are usually connected over USB to serial interfaces that are mounted as tty character devices owned by the dialout group. Add our octoprint service to this group at runtime to allow access to these printers. --- nixos/modules/services/misc/octoprint.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index c926d889b37a..7129ac69527f 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -122,6 +122,9 @@ in ExecStart = "${pluginsEnv}/bin/octoprint serve -b ${cfg.stateDir}"; User = cfg.user; Group = cfg.group; + SupplementaryGroups = [ + "dialout" + ]; }; }; From 0039dff71d8306ffa6f03959ea71e949dd7144e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 04:08:29 +0000 Subject: [PATCH 032/135] python38Packages.google-cloud-access-context-manager: 0.1.6 -> 0.1.7 --- .../google-cloud-access-context-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 470ec41f8365..166ad2c84e85 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.6"; + version = "0.1.7"; src = fetchPypi { inherit pname version; - sha256 = "011hbbjqjqk6fskb180hfhhsddz3i2a9gz34sf4wy1j2s4my9xy0"; + sha256 = "02adf212c8d280298ffe03a0c91743618693ec394b42cbb85b4a29f8d9544afa"; }; propagatedBuildInputs = [ google-api-core ]; From f6c8fa7da922be20d61185daa33d490f19de21f9 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Tue, 24 Aug 2021 09:20:36 +0200 Subject: [PATCH 033/135] trilium: 0.47.5 -> 0.47.7 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index a1be66c56f12..3cf7fd1eaebd 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.47.5"; + version = "0.47.7"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "16sm93vzlsqmrykbzdvgwszbhq79brd74zp9n9q5wrf4s44xizzv"; + sha256 = "1fcrc01wr8ln1i77q9h89i90wwyijpfp58fa717wbdvyly4860sh"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "0jk9pf3ljzfdv7d91wxda8z9qz653qas58wsrx42gnf7zxn1l648"; + sha256 = "0qp37y3xgbhl6vj2bkwz1lfylkn82kx7n0lcfr58wxwkn00149ry"; }; in { From 435a9dc3e4981ae86e303d9e52aaafe57a05a33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 22:28:55 +0200 Subject: [PATCH 034/135] python39Packages.google-cloud-access-context-manager: fix depedency pin --- .../google-cloud-access-context-manager/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 470ec41f8365..7b33ee56caf4 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -9,6 +9,11 @@ buildPythonPackage rec { sha256 = "011hbbjqjqk6fskb180hfhhsddz3i2a9gz34sf4wy1j2s4my9xy0"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "google-api-core[grpc] >= 1.26.0, < 2.0.0dev" "google-api-core[grpc] >= 1.26.0, < 2.0.1" + ''; + propagatedBuildInputs = [ google-api-core ]; # No tests in repo From 0d51339e962e3304460e87ad700436e3cb23215f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 23:29:11 +0200 Subject: [PATCH 035/135] python39Packages.google-cloud-bigquery: disable tests which require credentials --- .../python-modules/google-cloud-bigquery/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index f30fa659720c..21d356f7f7c9 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -53,6 +53,12 @@ buildPythonPackage rec { # requires credentials "test_bigquery_magic" "TestBigQuery" + "test_query_retry_539" + "test_query_retry_539" + "test_list_rows_empty_table" + "test_list_rows_page_size" + "test_list_rows_scalars" + "test_list_rows_scalars_extreme" # Mocking of _ensure_bqstorage_client fails "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" # requires network From e24194df1c346684cee39821c6a399f01a6dc1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 10:16:33 +0200 Subject: [PATCH 036/135] python39Packages.google-cloud-firestore: 2.2.0 -> 2.3.0 --- .../python-modules/google-cloud-firestore/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 87bd997ae88f..8c4b964b2b83 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QMwvMPebC2a09XmKQKYFPwVIbZlnUEaXxTh8hlnS9Js="; + sha256 = "sha256-gc68S+utdcO2OSCRAxyTCjnXBfUxWN/D7PfNg3cUzQ8="; }; propagatedBuildInputs = [ @@ -43,6 +43,8 @@ buildPythonPackage rec { # Tests are broken "tests/system/test_system.py" "tests/system/test_system_async.py" + # requires credentials + "tests/unit/v1/test_bulk_writer.py" ]; disabledTests = [ From 3f5f2abadef89ff4dae6c61b99c48bfdec7d5dc2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Aug 2021 12:19:56 +0200 Subject: [PATCH 037/135] esphome: 2021.8.0 -> 2021.8.1 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 112841c0260b..5c04cd8018ad 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.8.0"; + version = "2021.8.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-yVqma5WRQTt5Vq7poqHexASc59xthYaNcz/kkefC7qI="; + sha256 = "sha256-1eWM2MuIQ1ewbx53MmxmKi1Q92hzBqGboV3LbmMrw8g="; }; patches = [ From 317f4af37e89531fcfd7dc69cc32e49d3739e9e6 Mon Sep 17 00:00:00 2001 From: Roberto Di Remigio Date: Tue, 24 Aug 2021 12:28:04 +0200 Subject: [PATCH 038/135] spotify-tui: 0.24.0 -> 0.25.0 --- pkgs/applications/audio/spotify-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 783c15674a29..7395ca85d9f6 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "1vi6b22ygi6nwydjwqirph9k18akbw81m3bci134nrbnrb30glla"; + sha256 = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI="; }; - cargoSha256 = "1l91xcgr3hcjaphns1hs0i8w1ynxqwx7rbgpl0i5xnyrkw0gn9lj"; + cargoSha256 = "sha256-iucI4/iMF+uXRlnMttobu4xo3IQXq7tGiSSN8eCrLM0="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ]; buildInputs = [ ] From 5dacb8308526107f031fc04a7981b5b3de68e916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 12:58:47 +0200 Subject: [PATCH 039/135] python39Packages.google-cloud-audit-log: init at 0.1.0 --- .../google-cloud-audit-log/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/google-cloud-audit-log/default.nix diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix new file mode 100644 index 000000000000..7d101c32284e --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, googleapis-common-protos, protobuf }: + +buildPythonPackage rec { + pname = "google-cloud-audit-log"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "5bf5a53c641b13828154ab21fb209669be69d71cd462f5d6456bf87722fc0eeb"; + }; + + propagatedBuildInputs = [ googleapis-common-protos protobuf ]; + + # tests are a bit wonky to setup and are not very deep either + doCheck = false; + + pythonImportsCheck = [ "google.cloud.audit" ]; + + meta = with lib; { + description = "Google Cloud Audit Protos"; + homepage = "https://github.com/googleapis/python-audit-log"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 428913333280..bc0389c3fcd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2995,6 +2995,8 @@ in { google-cloud-asset = callPackage ../development/python-modules/google-cloud-asset { }; + google-cloud-audit-log = callPackage ../development/python-modules/google-cloud-audit-log { }; + google-cloud-automl = callPackage ../development/python-modules/google-cloud-automl { }; google-cloud-bigquery = callPackage ../development/python-modules/google-cloud-bigquery { }; From 57988a92b3cf676a97b2b8943ca4c76cecc091ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 12:59:37 +0200 Subject: [PATCH 040/135] python39Packages.google-cloud-logging: fix missing imports --- .../python-modules/google-cloud-logging/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 00abd8160690..f9017eb33fa4 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -4,6 +4,8 @@ , django , flask , google-api-core +, google-cloud-appengine-logging +, google-cloud-audit-log , google-cloud-core , google-cloud-testutils , mock @@ -22,7 +24,13 @@ buildPythonPackage rec { sha256 = "sha256-SZ7tXxPKuAXIeAsNFKDZMan/HWXvzN2eaHctQOfa1MU="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-appengine-logging + google-cloud-audit-log + google-cloud-core + proto-plus + ]; checkInputs = [ django From 983577f6116c4bc25b793d08fad22e3c818727c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 12:54:46 +0000 Subject: [PATCH 041/135] quill: 0.2.1 -> 0.2.4 --- pkgs/tools/security/quill/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/quill/default.nix b/pkgs/tools/security/quill/default.nix index 74c7996a8964..9440823f4292 100644 --- a/pkgs/tools/security/quill/default.nix +++ b/pkgs/tools/security/quill/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "quill"; - version = "0.2.1"; + version = "0.2.4"; src = fetchFromGitHub { owner = "dfinity"; repo = "quill"; rev = "v${version}"; - sha256 = "02ga2xkdxs36mfr4lv43cy6wkf27c28bdkzfkp3az5jvyk17mkfr"; + sha256 = "sha256-rR5VgdlJy6TQBmCHuKc7nPjznbeLjCmQdUJKjY0GsNI="; }; ic = fetchFromGitHub { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { export OPENSSL_LIB_DIR=${openssl.out}/lib ''; - cargoSha256 = "142pzhyi73ljlqas5vbhjhn4vmp9w9ps1mv8q7s3kzg0h7jcvm1k"; + cargoSha256 = "sha256-nLNuOqShOq01gVWoRCbsvfAd7B9VClUA8Hu8/UQNILg="; nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ openssl ] From 5dda093d86a99fd32cf410052296aaf88c120569 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 14:39:51 +0000 Subject: [PATCH 042/135] python38Packages.pex: 2.1.45 -> 2.1.46 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index ea10276ae407..5145bec925a9 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.45"; + version = "2.1.46"; src = fetchPypi { inherit pname version; - sha256 = "e5b0de7b23e1f578f93559a08a01630481b0af3dc9fb3e130b14b99baa83491b"; + sha256 = "28958292ab6a149ef7dd7998939a6e899b2f1ba811407ea1edac9d2d84417dfd"; }; nativeBuildInputs = [ setuptools ]; From 9444cf6b8d24be0f72d2c0ce4ec8940218f3bcf6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 16:46:02 +0000 Subject: [PATCH 043/135] vultr-cli: 2.7.0 -> 2.8.0 --- pkgs/development/tools/vultr-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index b953feea2211..3b9cebb6439a 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3q0in41/ZGuZcMiu+5qT8AGttro2it89xp741RCxAYY="; + sha256 = "sha256-BPeOud10cTsZ2flWRMf6F/i9JwnPPDFje3OZIAUa0O8="; }; vendorSha256 = null; From 9084979fc34c662707086469c4be6f820dce93a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 21:39:11 +0200 Subject: [PATCH 044/135] python39Packages.tensorflow-tensorboard: 2.4.0 -> 2.6.0 --- .../tensorflow-tensorboard/default.nix | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 031254205066..123c339fea48 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder , numpy , wheel , werkzeug @@ -7,6 +10,8 @@ , markdown , absl-py , google-auth-oauthlib +, setuptools +, tensorboard-data-server , tensorboard-plugin-wit , tensorboard-plugin-profile }: @@ -17,27 +22,44 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "2.4.0"; + version = "2.6.0"; format = "wheel"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "tensorboard"; inherit version format; + dist = "py3"; python = "py3"; - sha256 = "0f17h6i398n8maam0r3rssqvdqnqbwjyf96nnhf482anm1iwdq6d"; + sha256 = "sha256-99rEzftS0UyeP3RYXOKq+OYgNiCoZOUfr4SYiwn3u9s="; }; + postPatch = '' + chmod u+rwx -R ./dist + pushd dist + wheel unpack --dest unpacked ./*.whl + pushd unpacked/tensorboard-${version} + + substituteInPlace tensorboard-${version}.dist-info/METADATA \ + --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" + + popd + wheel pack ./unpacked/tensorboard-${version} + popd + ''; + propagatedBuildInputs = [ - numpy - werkzeug - protobuf - markdown - grpcio absl-py + grpcio google-auth-oauthlib + markdown + numpy + protobuf + setuptools + tensorboard-data-server tensorboard-plugin-profile tensorboard-plugin-wit + werkzeug # not declared in install_requires, but used at runtime # https://github.com/NixOS/nixpkgs/issues/73840 wheel @@ -60,7 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "TensorFlow's Visualization Toolkit"; - homepage = "http://tensorflow.org"; + homepage = "https://www.tensorflow.org/"; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; }; From b919ded180a5c72b26a523197c5d9444b25db4f7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 24 Aug 2021 21:15:51 +0100 Subject: [PATCH 045/135] haproxy: 2.3.10 -> 2.3.13 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index bb79ad956a67..32fa2af818bf 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.10"; + version = "2.3.13"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-mUbgz8g/KQcrNDHjckYiHPnUqdKKFYwHVxTTRSZvTzU="; + sha256 = "0mz2vga8wwhqa8n4psphbqfd5q33n4m8ar7ac9chhn0i397s8lf6"; }; buildInputs = [ openssl zlib ] From d9500ee0b058e875e501a437a34d40bcf052c076 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 23:14:44 +0200 Subject: [PATCH 046/135] python3Packages.hap-python: 4.0.0 -> 4.1.0 --- pkgs/development/python-modules/hap-python/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index e48826eae9fc..39d7429e8106 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.0.0"; + version = "4.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "1k4gq23j4f7yppxf8rzrrayn6clj48cdzixjdsmv5awhzsf9n6w4"; + sha256 = "sha256-vUbcsG6mKPgH+IF5i/BYSIkfIizSZzMWz0Kq0yfuKxE="; }; propagatedBuildInputs = [ @@ -42,8 +42,8 @@ buildPythonPackage rec { pytestCheckHook ]; - # Disable tests requiring network access disabledTestPaths = [ + # Disable tests requiring network access "tests/test_accessory_driver.py" "tests/test_hap_handler.py" "tests/test_hap_protocol.py" @@ -56,8 +56,11 @@ buildPythonPackage rec { "test_we_can_start_stop" "test_push_event" "test_bridge_run_stop" + "test_migration_to_include_client_properties" ]; + pythonImportsCheck = [ "pyhap" ]; + meta = with lib; { homepage = "https://github.com/ikalchev/HAP-python"; description = "HomeKit Accessory Protocol implementation in python"; From f62080e77bd36ddc3bbd94fc3e7d7bbdc4949d7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 23:20:01 +0200 Subject: [PATCH 047/135] python3Packages.plugwise: 0.12.0 -> 0.13.1 --- pkgs/development/python-modules/plugwise/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index ec6d9c41a0d8..ececea7d7ddc 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; - rev = version; - sha256 = "sha256-fZ0mhsM7LroJgIyBO4eRzZaz2OQxa4Hhj1rNufHXvHI="; + rev = "v${version}"; + sha256 = "1sv421aa6ip74ajxa5imnh188hyx9dq3vwkb6aifi14h2wpr9lh3"; }; propagatedBuildInputs = [ From b1b57ec04e82b0979be474047b5187d5afcc6c8a Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 25 Aug 2021 09:52:07 +1000 Subject: [PATCH 048/135] fastp: 0.20.1 -> 0.22.0 --- pkgs/applications/science/biology/fastp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/applications/science/biology/fastp/default.nix index e396c8597d24..c4cae59d1c4e 100644 --- a/pkgs/applications/science/biology/fastp/default.nix +++ b/pkgs/applications/science/biology/fastp/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fastp"; - version = "0.20.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; rev = "v${version}"; - sha256 = "sha256-pANwppkO9pfV9vctB7HmNCzYRtf+Xt+5HMKzvFuvyFM="; + sha256 = "sha256-XR76hNz7iGXQYSBbBandHZ+oU3wyTf1AKlu9Xeq/GyE="; }; buildInputs = [ zlib ]; From ed6c628f3427a2ef308ba13e0446f98cf066ec2c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 00:36:04 +0000 Subject: [PATCH 049/135] adwaita-qt: 1.3.1 -> 1.4.0 --- pkgs/data/themes/adwaita-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index fa69afe50c5e..3e72d8a74b8a 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "adwaita-qt"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "sha256-3uHa7veLzaSIm9WSR/Z0X+aSdXziO1TnI/CQgccrKYg="; + sha256 = "sha256-KkqLUhS0JMwJsgu8fv5iGozH3Xv+cXumxx5IewZTTPc="; }; nativeBuildInputs = [ From 0cc67d775fba1af56eea9420c81e524f94376564 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 25 Aug 2021 02:02:32 +0100 Subject: [PATCH 050/135] ccache: 4.3 -> 4.4 (#135527) Added `test.trim_dir` to exclude list on Darwin as reported by @r-burns. --- .../development/tools/misc/ccache/default.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 909a160c7eea..3b1b54e6547a 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,10 +1,9 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , substituteAll , binutils -, asciidoc +, asciidoctor , cmake , perl , zstd @@ -15,13 +14,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ZBxDTMUZiZJLIYbvACTFwvlss+IZiMjiL0khfM5hFCM="; + hash = "sha256-ZewR1srksfKCxehhAg3i8m+0OvmOSF+24njbtcc1GQY="; }; outputs = [ "out" "man" ]; @@ -35,16 +34,17 @@ let ccache = stdenv.mkDerivation rec { src = ./force-objdump-on-darwin.patch; objdump = "${binutils.bintools}/bin/objdump"; }) - # Fix clang C++ modules test (remove in next release) - (fetchpatch { - url = "https://github.com/ccache/ccache/commit/8b0c783ffc77d29a3e3520345b776a5c496fd892.patch"; - sha256 = "13qllx0qhfrdila6bdij9lk74fhkm3vdj01zgq1ri6ffrv9lqrla"; - }) ]; - nativeBuildInputs = [ asciidoc cmake perl ]; + nativeBuildInputs = [ asciidoctor cmake perl ]; buildInputs = [ zstd ]; + cmakeFlags = [ + # Build system does not autodetect redis library presence. + # Requires explicit flag. + "-DREDIS_STORAGE_BACKEND=OFF" + ]; + doCheck = true; checkInputs = [ # test/run requires the compgen function which is available in @@ -56,7 +56,7 @@ let ccache = stdenv.mkDerivation rec { runHook preCheck export HOME=$(mktemp -d) ctest --output-on-failure ${lib.optionalString stdenv.isDarwin '' - -E '^(test.nocpp2|test.basedir|test.multi_arch)$' + -E '^(test.nocpp2|test.basedir|test.multi_arch|test.trim_dir)$' ''} runHook postCheck ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a47c944b747d..982122bf59ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13438,9 +13438,7 @@ with pkgs; cc-tool = callPackage ../development/embedded/cc-tool { }; - ccache = callPackage ../development/tools/misc/ccache { - asciidoc = asciidoc-full; - }; + ccache = callPackage ../development/tools/misc/ccache { }; # Wrapper that works as gcc or g++ # It can be used by setting in nixpkgs config like this, for example: From 0d34c193f381946f177e4b19d576e6b9e5715c42 Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Tue, 24 Aug 2021 20:16:00 -0700 Subject: [PATCH 051/135] openexr_3: 3.0.5 -> 3.1.1 --- pkgs/development/libraries/openexr/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index 03539076e6f2..ee5e849f2eae 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.0.5"; + version = "3.1.1"; outputs = [ "bin" "dev" "out" "doc" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - sha256 = "0inmpby1syyxxzr0sazqvpb8j63vpj09vpkp4xi7m2qd4rxynkph"; + sha256 = "1p0l07vfpb25fx6jcgk1747v8x9xgpifx4cvvgi3g2473wlx6pyb"; }; nativeBuildInputs = [ cmake ]; From 6f9c7b1f0cf559fda0933b68cde432b61f29dc5c Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Tue, 24 Aug 2021 20:51:11 -0700 Subject: [PATCH 052/135] dateutils: 0.4.8 -> 0.4.9 --- pkgs/tools/misc/dateutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index e6793813b2be..a43f07c0a2d9 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }: stdenv.mkDerivation rec { - version = "0.4.8"; + version = "0.4.9"; pname = "dateutils"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz"; - sha256 = "0061f36axskm7yq9cp64x5a5phil8d3zgcd668nfmqzk9ji58w1z"; + sha256 = "1hy96h9imxdbg9y7305mgv4grr6x4qic9xy3vhgh15lvjkcmc0kr"; }; nativeBuildInputs = [ autoreconfHook ]; From 52370c03e92e1953770b86523efc12af6f4e6702 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 03:57:11 +0000 Subject: [PATCH 053/135] fioctl: 0.19.1 -> 0.20 --- pkgs/tools/admin/fioctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index e271b2d15490..6e20a32cf21b 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fioctl"; - version = "0.19.1"; + version = "0.20"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-s6L/B01TaSCDMyRjZxNBDdhR46H7kDeXvVVP7b1e9Iw="; + sha256 = "sha256-vc+V69cyJZSJa6GXUUNYeXdKvmUrVIQhsBykptcl85s="; }; vendorSha256 = "sha256-SuUY4xwinky5QO+GxyotrFiYX1LnWQNjwWXIUpfVHUE="; From 9de4dc9e48028bbcc63ce409d8c015f4e9617c5e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 14:14:34 +0000 Subject: [PATCH 054/135] python38Packages.pyfronius: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/pyfronius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix index 5ad12130fa45..682ae2ff620b 100644 --- a/pkgs/development/python-modules/pyfronius/default.nix +++ b/pkgs/development/python-modules/pyfronius/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyfronius"; - version = "0.6.2"; + version = "0.6.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nielstron"; repo = pname; rev = "release-${version}"; - sha256 = "03szfgf2g0hs4r92p8jb8alzl7byzrirxsa25630zygmkadzgrz2"; + sha256 = "19cgr0y4zfyghpw9hwl9immh5c464dlasnfd8q570k9f0q682249"; }; propagatedBuildInputs = [ From 68658a5b0e620e033e34baabc986ea90d818d8d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 06:27:24 +0000 Subject: [PATCH 055/135] python38Packages.pythondialog: 3.5.1 -> 3.5.2 --- pkgs/development/python-modules/pythondialog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/pkgs/development/python-modules/pythondialog/default.nix index 6f8b6a2bbec3..fbd37155cdb7 100644 --- a/pkgs/development/python-modules/pythondialog/default.nix +++ b/pkgs/development/python-modules/pythondialog/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pythondialog"; - version = "3.5.1"; + version = "3.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8"; + sha256 = "4fc11e95540d1d5dbe0a60cd3fb7787354df85ee4b5da21f708ea46cb47bf6d6"; }; patchPhase = '' From ad338549c519b4703f6122b426193483dda3b313 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 02:39:49 +0000 Subject: [PATCH 056/135] python38Packages.azure-mgmt-servicebus: 6.0.0 -> 7.0.0 --- .../python-modules/azure-mgmt-servicebus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index 2deaf2b91dd7..5dd689b976e4 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-servicebus"; - version = "6.0.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; + sha256 = "ee859efec2ec9fc8d059811967b1cb17836f4f5786e7406494a42f51f0667822"; }; propagatedBuildInputs = [ From 85a2af3c76af1d7cad3336423cd63b32d36c5c56 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Tue, 24 Aug 2021 20:15:46 -0700 Subject: [PATCH 057/135] python3Packages.awslambdaric: 1.2.0 -> 1.2.2 --- pkgs/development/python-modules/awslambdaric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index f5d282ac0ee1..1826291da502 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "awslambdaric"; - version = "1.2.0"; + version = "1.2.2"; disabled = isPy27; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; rev = version; - sha256 = "120qar8iaxj6dmnhjw1c40n2w06f1nyxy57dwh06xdiany698fg4"; + sha256 = "1r4b4w5xhf6p4vs7yx89kighlqim9f96v2ryknmrnmblgr4kg0h1"; }; postPatch = '' From e4d8156bf7d2af30459cebcfd792a536bf35e3c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 06:20:11 +0000 Subject: [PATCH 058/135] iotop-c: 1.17 -> 1.18 --- pkgs/os-specific/linux/iotop-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/os-specific/linux/iotop-c/default.nix index 47cfa57fe817..ca0eddac6664 100644 --- a/pkgs/os-specific/linux/iotop-c/default.nix +++ b/pkgs/os-specific/linux/iotop-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.17"; + version = "1.18"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "0hjy30155c3nijx3jgyn5kpj293632p0j6f3lf5acdfax1ynav86"; + sha256 = "sha256-5RbxryvRKWJvjuJJwDK6GYnwdtHGfW7XEc75q4omxIA="; }; nativeBuildInputs = [ pkg-config ]; From 772bbb4019633b0dad5550084f0a2184dac31528 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:37:57 +0200 Subject: [PATCH 059/135] python3Packages.smbprotocol: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/smbprotocol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index b182667cfcbf..93f158508eb6 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.6.1"; + version = "1.6.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "0pyjnmrkiqcd0r1s6zl8w91zy0605k7cyy5n4cvv52079gy0axhd"; + sha256 = "sha256-nSWZfhZD++I5hM2ijqft2U95kyEe3h/nrSfiT3sQiKE="; }; propagatedBuildInputs = [ From f36b5da8bac044f1962ab086b91c663a9f3f3a01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:44:44 +0200 Subject: [PATCH 060/135] python3Packages.censys: 2.0.5 -> 2.0.6 --- pkgs/development/python-modules/censys/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 47f61242d63f..06e619676a67 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.0.5"; + version = "2.0.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-/vMDNHNUY3mpK9jSDPVhuA050rwZF8O6IjTCLqQZIWc="; + sha256 = "sha256-Lbd2Pm79n0cFoGHC2rucxgZijzcVYVJJsq1yzqB9QLk="; }; nativeBuildInputs = [ @@ -51,8 +51,8 @@ buildPythonPackage rec { --replace 'backoff = "^1.11.1"' 'backoff = "*"' \ --replace 'requests = ">=2.26.0"' 'requests = "*"' \ --replace 'rich = "^10.6.0"' 'rich = "*"' - substituteInPlace pytest.ini --replace \ - " --cov -rs -p no:warnings" "" + substituteInPlace pytest.ini \ + --replace "--cov" "" ''; # The tests want to write a configuration file From 6575c9012cf97145d0a895d3a4c33fbb76954b45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:17 +0200 Subject: [PATCH 061/135] python3Packages.archinfo: 9.0.9506 -> 9.0.9572 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 46938694850c..5c8f04f4b948 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9506"; + version = "9.0.9572"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jGXJpwiP2/O2aJhAP15VGqrekiiB0eiIFCjkzNMbqxw="; + sha256 = "sha256-OzgLGjEVOVRnQvWVcci8EGn6gtO8D8QoDnC9dfXGHZU="; }; checkInputs = [ From a9ac94752c7b71dec005d4a0feaae0948270a4f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:20 +0200 Subject: [PATCH 062/135] python3Packages.ailment: 9.0.9506 -> 9.0.9572 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 6cf817f813fb..c9412428a9c4 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ikIO6AhoBkmz4+8BLOC55Yh6HbzHJOjlktSDMiC0I38="; + sha256 = "sha256-cjVKIlvGu1SCiVkegJ36GevZ9bihYF7n3P/xNqtAapw="; }; propagatedBuildInputs = [ pyvex ]; From 9bff900ef80b7339f505c395caaccf8199afbef1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:22 +0200 Subject: [PATCH 063/135] python3Packages.pyvex: 9.0.9506 -> 9.0.9572 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index fee0653d5ec5..2b8bdb171560 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9506"; + version = "9.0.9572"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DseMX41dXmmt44SPVHSIFRIJL1u9yZ3kq8pv8TzC/OQ="; + sha256 = "sha256-ish37nO+r1VJY9XS83K8tu60Snhd547n965TFqdBgzs="; }; postPatch = lib.optionalString stdenv.isDarwin '' From 2e7186a71c476b47b96b5701fe41dd7709e8aff7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:25 +0200 Subject: [PATCH 064/135] python3Packages.claripy: 9.0.9506 -> 9.0.9572 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index f85a9919a3f2..26aa06466600 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wczwKTtOJ4VC3UZvd1KT6GfGUk5AS90ggLi2lFjhD+Q="; + sha256 = "sha256-YC605gIM+l9Tnx6lu0ayrnYPE6Xx+aTgDXPziFY/lDA="; }; # Use upstream z3 implementation From 2aacbf42690b2950fa786ce0d6a38df16654eda1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:28 +0200 Subject: [PATCH 065/135] python3Packages.cle: 9.0.9506 -> 9.0.9572 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 37a2294934fa..e2f0a7feed07 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9506"; + version = "9.0.9572"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jTVccnCRqsp3EBl/RSKWVekAOsGhRvdIJxRyYV2gI4Q="; + sha256 = "sha256-b1LMHeaQqz0fNleRlME0kgSYZGGXBhFKCp0iRr/2A7c="; }; propagatedBuildInputs = [ From cf32a8e5fa94513db7cfb26525417a116686d696 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:31 +0200 Subject: [PATCH 066/135] python3Packages.angr: 9.0.9506 -> 9.0.9572 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index db2ee2c13d1e..20c658909bec 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-2bKsLmZeFs7N4YUYxIktDoOn/H8waaOaOJOzyVumuf8="; + sha256 = "sha256-ZA2PKyJVXrSs2IvpjMyHGrtAPUpUZFhUzlKURLEWm5o="; }; propagatedBuildInputs = [ From 0bd9ae367fb276083a8768d242289a65091057c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:34 +0200 Subject: [PATCH 067/135] python3Packages.angrop: 9.0.9506 -> 9.0.9572 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 5af743b93fb9..f0e0f4e1658b 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dTaTtiMzIm9PfVkjAED9x9zae+vdRcl1kDMtqUWvpkA="; + sha256 = "sha256-R4i7hQGwc74/szehcWBjkC6b9DsblluHKWxEk0iSFRI="; }; propagatedBuildInputs = [ From 8349ef5050b888c6b6a4fc6e21a9128a26d0c173 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 24 Aug 2021 11:11:20 +0200 Subject: [PATCH 068/135] python39packages.mpldatacursor: init at 0.7.1 --- .../python-modules/mpldatacursor/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/mpldatacursor/default.nix diff --git a/pkgs/development/python-modules/mpldatacursor/default.nix b/pkgs/development/python-modules/mpldatacursor/default.nix new file mode 100644 index 000000000000..b14470ca215a --- /dev/null +++ b/pkgs/development/python-modules/mpldatacursor/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +}: + +buildPythonPackage rec { + pname = "mpldatacursor"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "joferkington"; + repo = pname; + rev = "v${version}"; + sha256 = "0i1lwl6x6hgjq4xwsc138i4v5895lmnpfqwpzpnj5mlck6fy6rda"; + }; + + propagatedBuildInputs = [ matplotlib ]; + + # No tests included in archive + doCheck = false; + + pythonImportsCheck = [ "mpldatacursor" ]; + + meta = with lib; { + homepage = "https://github.com/joferkington/mpldatacursor"; + description = "Interactive data cursors for matplotlib"; + license = licenses.mit; + maintainers = with maintainers; [ bzizou ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8736b7182a5..67db1490780f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4640,6 +4640,8 @@ in { mpi4py = callPackage ../development/python-modules/mpi4py { }; + mpldatacursor = callPackage ../development/python-modules/mpldatacursor { }; + mplfinance = callPackage ../development/python-modules/mplfinance { }; mplleaflet = callPackage ../development/python-modules/mplleaflet { }; From bcd4ec4f48fc251cc7818c6be28e683723bfca2a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 07:00:16 +0000 Subject: [PATCH 069/135] kotlin: 1.5.21 -> 1.5.30 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 7e46e4bf2eaf..a1de91f2d396 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.5.21"; + version = "1.5.30"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-8zE6/dar8bjHXGKS9OQfLbr+/I9scnYse6mz2u712lk="; + sha256 = "sha256-Je69ubsuFl5LqO+/j/lDxF1Pw52//CwcqgWejdgTZ18="; }; propagatedBuildInputs = [ jre ] ; From 90a707e52593e63d8112141f6c58be50c5394745 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 09:03:01 +0200 Subject: [PATCH 070/135] python3Packages.bitarray: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 97dded095624..ad97a5f04c8b 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QgPNtE136zCnReZXbIK34zaB8TSzOBBSVvd+cdvTMN0="; + sha256 = "sha256-S+47qRZLZs72TxCZ6aO4jpndzQyUOAfplENhPhhLSLQ="; }; checkPhase = '' From 6e4f17b5e65dbfa95a5245259f64ce46156261ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 09:13:31 +0200 Subject: [PATCH 071/135] python3Packages.codecov: 2.1.11 -> 2.1.12 --- .../python-modules/codecov/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 2e8cbf29220c..3b7ca324fd2c 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -1,17 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, coverage +, unittest2 +}: buildPythonPackage rec { pname = "codecov"; - version = "2.1.11"; + version = "2.1.12"; src = fetchPypi { inherit pname version; - sha256 = "6cde272454009d27355f9434f4e49f238c0273b216beda8472a65dc4957f473b"; + sha256 = "sha256-oNpGu1AlQm2ola+Qk43vjuEtN/y8u7wVttxkz368UcE="; }; - checkInputs = [ unittest2 ]; # Tests only + propagatedBuildInputs = [ + requests + coverage + ]; - propagatedBuildInputs = [ requests coverage ]; + checkInputs = [ unittest2 ]; postPatch = '' sed -i 's/, "argparse"//' setup.py @@ -24,5 +33,6 @@ buildPythonPackage rec { description = "Python report uploader for Codecov"; homepage = "https://codecov.io/"; license = licenses.asl20; + maintainers = with maintainers; [ fab ]; }; } From 6ee577f99468870dd467d69ca1589ba0757e4ea4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 07:22:14 +0000 Subject: [PATCH 072/135] kustomize: 4.2.0 -> 4.3.0 --- pkgs/development/tools/kustomize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index c2453c8ff163..cae13140b04f 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "4.2.0"; + version = "4.3.0"; # rev is the commit of the tag, mainly for kustomize version command output rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245"; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "sha256-mFF0Yc+j292oajY1i9SApnWaQnVoHxvkGCIurKC0t4o="; + sha256 = "sha256-Oo29/H1rWKOMNBIa8N/ih2Bfmclsn/kqv3il6c2muoQ="; }; # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged. @@ -26,7 +26,7 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "sha256-VMvXDIrg/BkuxZVDHvpfHY/hgwQGz2kw1/hu5lhcYEE="; + vendorSha256 = "sha256-oX+6cc5EO2RqK2O212iaW/6CMFCNdYzTpAaqDTFqX1A="; meta = with lib; { description = "Customization of kubernetes YAML configurations"; From 5a877797cac56da66cb828ad444ecb788e43cbd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 09:24:59 +0200 Subject: [PATCH 073/135] python3Packages.codecov: enable tests --- .../python-modules/codecov/default.nix | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 3b7ca324fd2c..20c80872fd0f 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -1,18 +1,22 @@ { lib , buildPythonPackage -, fetchPypi -, requests , coverage -, unittest2 +, ddt +, fetchFromGitHub +, mock +, pytestCheckHook +, requests }: buildPythonPackage rec { pname = "codecov"; version = "2.1.12"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-oNpGu1AlQm2ola+Qk43vjuEtN/y8u7wVttxkz368UcE="; + src = fetchFromGitHub { + owner = "codecov"; + repo = "codecov-python"; + rev = "v${version}"; + sha256 = "0bdk1cp3hxydpx9knqfv88ywwzw7yqhywi0inxjd6x53qh75prqy"; }; propagatedBuildInputs = [ @@ -20,14 +24,22 @@ buildPythonPackage rec { coverage ]; - checkInputs = [ unittest2 ]; + checkInputs = [ + ddt + mock + pytestCheckHook + ]; - postPatch = '' - sed -i 's/, "argparse"//' setup.py - ''; + pytestFlagsArray = [ "tests/test.py" ]; - # No tests in archive - doCheck = false; + disabledTests = [ + # No git repo available and network + "test_bowerrc_none" + "test_prefix" + "test_send" + ]; + + pythonImportsCheck = [ "codecov" ]; meta = with lib; { description = "Python report uploader for Codecov"; From a0c7a3a6cae3a4ed97098edeea9bc375f76f7cd6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 07:32:11 +0000 Subject: [PATCH 074/135] lib3mf: 2.1.1 -> 2.2.0 --- pkgs/development/libraries/lib3mf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix index b75b1b833d73..b301ac13c2d8 100644 --- a/pkgs/development/libraries/lib3mf/default.nix +++ b/pkgs/development/libraries/lib3mf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "lib3mf"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "3MFConsortium"; repo = pname; rev = "v${version}"; - sha256 = "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3"; + sha256 = "sha256-WMTTYYgpCIM86a6Jw8iah/YVXN9T5youzEieWL/d+Bc="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; From 86fbb46d43faafc2a7215da920113f523df50092 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 09:56:39 +0200 Subject: [PATCH 075/135] python3Packages.phonenumbers: 8.12.30 -> 8.12.31 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 6d6a624b1423..c04ccbd5281e 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.30"; + version = "8.12.31"; src = fetchPypi { inherit pname version; - sha256 = "9ca65c36f437881a8f7dac979a5733ae8fb5a0a436aecd47bd2c06494bdf0a20"; + sha256 = "sha256-CR7SsxWFZ/EsmfcZVwocys4AF585tE8ea4lfWdk9rcg="; }; checkInputs = [ From 1ae7ba3faeb6e48e22208b0b006b9e3f667c30b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 10:07:22 +0200 Subject: [PATCH 076/135] python3Packages.parse-type: 0.5.2 -> 0.5.6 --- .../python-modules/parse-type/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index 709b257e3375..b5458cd7eb5e 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,21 +1,30 @@ -{ lib, fetchPypi +{ lib, fetchFromGitHub , buildPythonPackage, pythonOlder , pytest, pytest-runner , parse, six, enum34 }: buildPythonPackage rec { - pname = "parse_type"; - version = "0.5.2"; + pname = "parse-type"; + version = "0.5.6"; - src = fetchPypi { - inherit pname version; - sha256 = "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz"; + src = fetchFromGitHub { + owner = "jenisys"; + repo = "parse_type"; + rev = "v${version}"; + sha256 = "sha256-CJroqJIi5DpmR8i1lr8OJ+234615PhpVUsqK91XOT3E="; }; - checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34; + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--metadata PACKAGE_UNDER_TEST parse_type" "" \ + --replace "--metadata PACKAGE_VERSION 0.5.6" "" \ + --replace "--html=build/testing/report.html --self-contained-html" "" \ + --replace "--junit-xml=build/testing/report.xml" "" + ''; + checkPhase = '' py.test tests ''; From f31fafc3840e1afbdb25115dcfbad1baf54b90d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 10:34:15 +0200 Subject: [PATCH 077/135] python3Packages.pyrad: 2.3 -> 2.4 --- pkgs/development/python-modules/pyrad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 31cbf77d94e0..331fc3783728 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyrad"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "pyradius"; repo = pname; rev = version; - sha256 = "0hy7999av47s8100afbhxfjb8phbmrqcv530xlvskndby4a8w94k"; + sha256 = "sha256-oqgkE0xG/8cmLeRZdGoHkaHbjtByeJwzBJwEdxH8oNY="; }; propagatedBuildInputs = [ netaddr six ]; From 288b36f84cb7b81af0541e6e5706460978ad70a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 11:10:27 +0200 Subject: [PATCH 078/135] yt-dlp: 2021.08.02 -> 2021.08.10 --- pkgs/tools/misc/yt-dlp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 8f5e14a24039..17d75fa4935d 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage +{ lib, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc , fetchFromGitHub , websockets, mutagen @@ -13,13 +13,13 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.08.02"; + version = "2021.08.10"; src = fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; rev = version; - sha256 = "QEJKOZGVQNXLU8GfTbwBx2Zv3KO++ozTJcXLWxXA4hI="; + sha256 = "sha256-8mOjIvbC3AFHCXKV5G66cFy7SM7sULzM8czXcqQKbms="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 74e51f889cf6c12b1f8a52e2ada2715c3e34620b Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Wed, 25 Aug 2021 09:37:27 +0100 Subject: [PATCH 079/135] snippetpixie: 1.5.2 -> 1.5.3 --- 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 6cd6bdda0d9d..301831d1a830 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.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "173fm9h7lnhhbg5qbjz40g0fy60dwd2l55mdcc1j8dh73vz96pfr"; + sha256 = "0gs3d9hdywg4vcfbp4qfcagfjqalfgw9xpvywg4pw1cm3rzbdqmz"; }; nativeBuildInputs = [ From 816fd297403c10f7d57dd30654ad20d95bf9ddf6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 10:37:34 +0200 Subject: [PATCH 080/135] python3Packages.pyrad: add pythonImportsCheck and update license --- pkgs/development/python-modules/pyrad/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 331fc3783728..67841cab7d9f 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -18,10 +18,12 @@ buildPythonPackage rec { nosetests -e testBind ''; + pythonImportsCheck = [ "pyrad" ]; + meta = with lib; { description = "Python RADIUS Implementation"; homepage = "https://bitbucket.org/zzzeek/sqlsoup"; - license = licenses.mit; + license = licenses.bsd3; maintainers = [ maintainers.globin ]; }; } From 49ab8cc8e8f68923a4e303c84cefb4c84e120097 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 10:47:59 +0200 Subject: [PATCH 081/135] python3Packages.rapidfuzz: 1.4.1 -> 1.5.0 --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 8743e5014e04..6b78252de651 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.4.1"; + version = "1.5.0"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "RapidFuzz"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-uZdD25ATJgRrDAHYSQNp7NvEmW7p3LD9vNmxAbf5Mwk="; + sha256 = "sha256-Omo9ActReimYDK9dARG0s32Qq61neDELRechbnwRfwU="; }; checkInputs = [ From af0205cac7c34149c472f2a1e78232f599ddeed0 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 25 Aug 2021 16:15:55 +0800 Subject: [PATCH 082/135] perlPackages.ExtUtilsCChecker: 0.10 -> 0.11 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6728030822eb..1b38a64a868f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7509,10 +7509,10 @@ let ExtUtilsCChecker = buildPerlModule { pname = "ExtUtils-CChecker"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.10.tar.gz"; - sha256 = "50bfe76870fc1510f56bae4fa2dce0165d9ac4af4e7320d6b8fda14dfea4be0b"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.11.tar.gz"; + sha256 = "1x8vafpff5nma18svxp1h3mp069fjmzlsdvnbcgn3z1pgrkkcxqi"; }; buildInputs = [ TestFatal ]; meta = { From b102c5f715ff3e92552a3a26ef4840546b49a88e Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 16 Aug 2021 21:51:08 +0200 Subject: [PATCH 083/135] collectd: add dependencies for plugins notify_email, openldap, openipmi, xencpu --- pkgs/tools/system/collectd/plugins.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index dd578cd6393b..edda0e8fadfb 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -6,6 +6,7 @@ , jdk , libatasmart , libdbi +, libesmtp , libgcrypt , libmemcached, cyrus_sasl , libmodbus @@ -19,12 +20,14 @@ , libvirt , libxml2 , libapparmor, libcap_ng, numactl -, lvm2 , lua +, lvm2 , lm_sensors , mongoc , mosquitto , net-snmp +, openldap +, openipmi , perl , postgresql , protobufc @@ -35,6 +38,7 @@ , rrdtool , udev , varnish +, xen , yajl # Defaults to `null` for all supported plugins, # list of plugin names for a custom build @@ -122,7 +126,9 @@ let intel_rdt = {}; interface = {}; ipc = {}; - ipmi = {}; + ipmi = { + buildInputs = [ openipmi ]; + }; iptables = { buildInputs = [ libpcap @@ -200,6 +206,12 @@ let openldap = {}; openvpn = {}; oracle = {}; + notify_email = { + buildInputs = [ libesmtp ]; + }; + openldap = { + buildInputs = [ openldap ]; + }; ovs_events = { buildInputs = [ yajl ]; }; @@ -318,6 +330,9 @@ let zfs_arc = {}; zone = {}; zookeeper = {}; + xencpu = { + buildInputs = [ xen ]; + }; }; configureFlags = From a064c4d533f8490ab5ab99388e154ff3ce0be10b Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 16 Aug 2021 21:52:03 +0200 Subject: [PATCH 084/135] collectd: remove virt plugin dependencies that are no longer used --- pkgs/tools/system/collectd/plugins.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index edda0e8fadfb..ecafa587eddc 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -292,11 +292,7 @@ let }; virt = { buildInputs = [ libvirt libxml2 yajl ] ++ - lib.optionals stdenv.isLinux [ lvm2 udev - # those might be no longer required when https://github.com/NixOS/nixpkgs/pull/51767 - # is merged - libapparmor numactl libcap_ng - ]; + lib.optionals stdenv.isLinux [ lvm2 udev ]; }; vmem = {}; vserver = {}; From 39adcbca307cf8f0c7bedf457676d629d3a60754 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 16 Aug 2021 21:54:05 +0200 Subject: [PATCH 085/135] collectd: reduce plugin configuration by configuring --disable-all-plugins --- pkgs/tools/system/collectd/plugins.nix | 131 ++----------------------- 1 file changed, 7 insertions(+), 124 deletions(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index ecafa587eddc..3ed2ff70998c 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -47,10 +47,9 @@ }: let - # All plugins and their dependencies. - # Please help complete this! + # Plugins that have dependencies. + # Please help to extend these! plugins = { - aggregation = {}; amqp = { buildInputs = [ yajl ] ++ lib.optionals stdenv.isLinux [ rabbitmq-c ]; @@ -58,13 +57,9 @@ let apache = { buildInputs = [ curl ]; }; - apcups = {}; - apple_sensors = {}; - aquaero = {}; ascent = { buildInputs = [ curl libxml2 ]; }; - barometer = {}; battery = { buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit @@ -76,14 +71,6 @@ let ceph = { buildInputs = [ yajl ]; }; - cgroups = {}; - chrony = {}; - conntrack = {}; - contextswitch = {}; - cpu = {}; - cpufreq = {}; - cpusleep = {}; - csv = {}; curl = { buildInputs = [ curl ]; }; @@ -96,7 +83,6 @@ let dbi = { buildInputs = [ libdbi ]; }; - df = {}; disk = { buildInputs = lib.optionals stdenv.isLinux [ udev @@ -107,25 +93,6 @@ let dns = { buildInputs = [ libpcap ]; }; - dpdkevents = {}; - dpdkstat = {}; - drbd = {}; - email = {}; - entropy = {}; - ethstat = {}; - exec = {}; - fhcount = {}; - filecount = {}; - fscache = {}; - gmond = {}; - gps = {}; - grpc = {}; - hddtemp = {}; - hugepages = {}; - intel_pmu = {}; - intel_rdt = {}; - interface = {}; - ipc = {}; ipmi = { buildInputs = [ openipmi ]; }; @@ -136,49 +103,29 @@ let iptables libmnl ]; }; - ipvs = {}; - irq = {}; java = { buildInputs = [ jdk libgcrypt libxml2 ]; }; - load = {}; - logfile = {}; log_logstash = { buildInputs = [ yajl ]; }; - lpar = {}; lua = { buildInputs = [ lua ]; }; - lvm = {}; - madwifi = {}; - match_empty_counter = {}; - match_hashed = {}; - match_regex = {}; - match_timediff = {}; - match_value = {}; - mbmon = {}; - mcelog = {}; - md = {}; memcachec = { buildInputs = [ libmemcached cyrus_sasl ]; }; - memcached = {}; - memory = {}; - mic = {}; modbus = { buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; }; mqtt = { buildInputs = [ mosquitto ]; }; - multimeter = {}; mysql = { buildInputs = lib.optionals (libmysqlclient != null) [ libmysqlclient ]; }; - netapp = {}; netlink = { buildInputs = [ libpcap @@ -189,23 +136,12 @@ let network = { buildInputs = [ libgcrypt ]; }; - nfs = {}; nginx = { buildInputs = [ curl ]; }; notify_desktop = { buildInputs = [ libnotify gdk-pixbuf ]; }; - notify_email = {}; - notify_nagios = {}; - ntpd = {}; - numa = {}; - nut = {}; - olsrd = {}; - onewire = {}; - openldap = {}; - openvpn = {}; - oracle = {}; notify_email = { buildInputs = [ libesmtp ]; }; @@ -221,7 +157,6 @@ let perl = { buildInputs = [ perl ]; }; - pf = {}; pinba = { buildInputs = [ protobufc ]; }; @@ -231,16 +166,12 @@ let postgresql = { buildInputs = [ postgresql ]; }; - powerdns = {}; - processes = {}; - protocols = {}; python = { buildInputs = [ python ]; }; redis = { buildInputs = [ hiredis ]; }; - routeros = {}; rrdcached = { buildInputs = [ rrdtool libxml2 ]; }; @@ -250,7 +181,6 @@ let sensors = { buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; }; - serial = {}; sigrok = { buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; }; @@ -263,30 +193,6 @@ let snmp_agent = { buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; }; - statsd = {}; - swap = {}; - synproxy = {}; - syslog = {}; - table = {}; - tail_csv = {}; - tail = {}; - tape = {}; - target_notification = {}; - target_replace = {}; - target_scale = {}; - target_set = {}; - target_v5upgrade = {}; - tcpconns = {}; - teamspeak2 = {}; - ted = {}; - thermal = {}; - threshold = {}; - tokyotyrant = {}; - turbostat = {}; - unixsock = {}; - uptime = {}; - users = {}; - uuid = {}; varnish = { buildInputs = [ curl varnish ]; }; @@ -294,10 +200,6 @@ let buildInputs = [ libvirt libxml2 yajl ] ++ lib.optionals stdenv.isLinux [ lvm2 udev ]; }; - vmem = {}; - vserver = {}; - wireless = {}; - write_graphite = {}; write_http = { buildInputs = [ curl yajl ]; }; @@ -319,37 +221,18 @@ let write_riemann = { buildInputs = [ protobufc riemann_c_client ]; }; - write_sensu = {}; - write_tsdb = {}; - xencpu = {}; - xmms = {}; - zfs_arc = {}; - zone = {}; - zookeeper = {}; xencpu = { buildInputs = [ xen ]; }; }; - configureFlags = - if enabledPlugins == null - then [] - else (map (plugin: "--enable-${plugin}") enabledPlugins) ++ - (map (plugin: "--disable-${plugin}") - (builtins.filter (plugin: ! builtins.elem plugin enabledPlugins) - (builtins.attrNames plugins)) - ); + configureFlags = lib.optionals (enabledPlugins != null) ( + [ "--disable-all-plugins" ] + ++ (map (plugin: "--enable-${plugin}") enabledPlugins)); pluginBuildInputs = plugin: - if ! builtins.hasAttr plugin plugins - then throw "Unknown collectd plugin: ${plugin}" - else - let - pluginAttrs = builtins.getAttr plugin plugins; - in - if pluginAttrs ? "buildInputs" - then pluginAttrs.buildInputs - else []; + lib.optionals (plugins ? ${plugin} && plugins.${plugin} ? buildInputs) + plugins.${plugin}.buildInputs; buildInputs = if enabledPlugins == null From 11a144c6f3ae206cabba6cf6d875eeccdf2d25f4 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 16 Aug 2021 21:58:21 +0200 Subject: [PATCH 086/135] collectd: shorten plugins buildInputs definition --- pkgs/tools/system/collectd/plugins.nix | 248 ++++++++----------------- 1 file changed, 74 insertions(+), 174 deletions(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 3ed2ff70998c..df99c60c3ef0 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -47,183 +47,83 @@ }: let + inherit (darwin.apple_sdk.frameworks) IOKit; + # Plugins that have dependencies. # Please help to extend these! plugins = { - amqp = { - buildInputs = [ yajl ] ++ - lib.optionals stdenv.isLinux [ rabbitmq-c ]; - }; - apache = { - buildInputs = [ curl ]; - }; - ascent = { - buildInputs = [ curl libxml2 ]; - }; - battery = { - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; - }; - bind = { - buildInputs = [ curl libxml2 ]; - }; - ceph = { - buildInputs = [ yajl ]; - }; - curl = { - buildInputs = [ curl ]; - }; - curl_json = { - buildInputs = [ curl yajl ]; - }; - curl_xml = { - buildInputs = [ curl libxml2 ]; - }; - dbi = { - buildInputs = [ libdbi ]; - }; - disk = { - buildInputs = lib.optionals stdenv.isLinux [ - udev - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; - }; - dns = { - buildInputs = [ libpcap ]; - }; - ipmi = { - buildInputs = [ openipmi ]; - }; - iptables = { - buildInputs = [ - libpcap - ] ++ lib.optionals stdenv.isLinux [ - iptables libmnl - ]; - }; - java = { - buildInputs = [ jdk libgcrypt libxml2 ]; - }; - log_logstash = { - buildInputs = [ yajl ]; - }; - lua = { - buildInputs = [ lua ]; - }; - memcachec = { - buildInputs = [ libmemcached cyrus_sasl ]; - }; - modbus = { - buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; - }; - mqtt = { - buildInputs = [ mosquitto ]; - }; - mysql = { - buildInputs = lib.optionals (libmysqlclient != null) [ - libmysqlclient - ]; - }; - netlink = { - buildInputs = [ - libpcap - ] ++ lib.optionals stdenv.isLinux [ - libmnl - ]; - }; - network = { - buildInputs = [ libgcrypt ]; - }; - nginx = { - buildInputs = [ curl ]; - }; - notify_desktop = { - buildInputs = [ libnotify gdk-pixbuf ]; - }; - notify_email = { - buildInputs = [ libesmtp ]; - }; - openldap = { - buildInputs = [ openldap ]; - }; - ovs_events = { - buildInputs = [ yajl ]; - }; - ovs_stats = { - buildInputs = [ yajl ]; - }; - perl = { - buildInputs = [ perl ]; - }; - pinba = { - buildInputs = [ protobufc ]; - }; - ping = { - buildInputs = [ liboping ]; - }; - postgresql = { - buildInputs = [ postgresql ]; - }; - python = { - buildInputs = [ python ]; - }; - redis = { - buildInputs = [ hiredis ]; - }; - rrdcached = { - buildInputs = [ rrdtool libxml2 ]; - }; - rrdtool = { - buildInputs = [ rrdtool libxml2 ]; - }; - sensors = { - buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; - }; - sigrok = { - buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; - }; - smart = { - buildInputs = lib.optionals stdenv.isLinux [ libatasmart udev ]; - }; - snmp = { - buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; - }; - snmp_agent = { - buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; - }; - varnish = { - buildInputs = [ curl varnish ]; - }; - virt = { - buildInputs = [ libvirt libxml2 yajl ] ++ - lib.optionals stdenv.isLinux [ lvm2 udev ]; - }; - write_http = { - buildInputs = [ curl yajl ]; - }; - write_kafka = { - buildInputs = [ yajl rdkafka ]; - }; - write_log = { - buildInputs = [ yajl ]; - }; - write_mongodb = { - buildInputs = [ mongoc ]; - }; - write_prometheus = { - buildInputs = [ protobufc libmicrohttpd ]; - }; - write_redis = { - buildInputs = [ hiredis ]; - }; - write_riemann = { - buildInputs = [ protobufc riemann_c_client ]; - }; - xencpu = { - buildInputs = [ xen ]; - }; + amqp.buildInputs = [ + yajl + ] ++ lib.optionals stdenv.isLinux [ rabbitmq-c ]; + apache.buildInputs = [ curl ]; + ascent.buildInputs = [ curl libxml2 ]; + battery.buildInputs = lib.optionals stdenv.isDarwin [ + IOKit + ]; + bind.buildInputs = [ curl libxml2 ]; + ceph.buildInputs = [ yajl ]; + curl.buildInputs = [ curl ]; + curl_json.buildInputs = [ curl yajl ]; + curl_xml.buildInputs = [ curl libxml2 ]; + dbi.buildInputs = [ libdbi ]; + disk.buildInputs = lib.optionals stdenv.isLinux [ + udev + ] ++ lib.optionals stdenv.isDarwin [ + IOKit + ]; + dns.buildInputs = [ libpcap ]; + ipmi.buildInputs = [ openipmi ]; + iptables.buildInputs = [ + libpcap + ] ++ lib.optionals stdenv.isLinux [ + iptables libmnl + ]; + java.buildInputs = [ jdk libgcrypt libxml2 ]; + log_logstash.buildInputs = [ yajl ]; + lua.buildInputs = [ lua ]; + memcachec.buildInputs = [ libmemcached cyrus_sasl ]; + modbus.buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; + mqtt.buildInputs = [ mosquitto ]; + mysql.buildInputs = lib.optionals (libmysqlclient != null) [ + libmysqlclient + ]; + netlink.buildInputs = [ + libpcap + ] ++ lib.optionals stdenv.isLinux [ + libmnl + ]; + network.buildInputs = [ libgcrypt ]; + nginx.buildInputs = [ curl ]; + notify_desktop.buildInputs = [ libnotify gdk-pixbuf ]; + notify_email.buildInputs = [ libesmtp ]; + openldap.buildInputs = [ openldap ]; + ovs_events.buildInputs = [ yajl ]; + ovs_stats.buildInputs = [ yajl ]; + perl.buildInputs = [ perl ]; + pinba.buildInputs = [ protobufc ]; + ping.buildInputs = [ liboping ]; + postgresql.buildInputs = [ postgresql ]; + python.buildInputs = [ python ]; + redis.buildInputs = [ hiredis ]; + rrdcached.buildInputs = [ rrdtool libxml2 ]; + rrdtool.buildInputs = [ rrdtool libxml2 ]; + sensors.buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; + sigrok.buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; + smart.buildInputs = lib.optionals stdenv.isLinux [ libatasmart udev ]; + snmp.buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; + snmp_agent.buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; + varnish.buildInputs = [ curl varnish ]; + virt.buildInputs = [ + libvirt libxml2 yajl + ] ++ lib.optionals stdenv.isLinux [ lvm2 udev ]; + write_http.buildInputs = [ curl yajl ]; + write_kafka.buildInputs = [ yajl rdkafka ]; + write_log.buildInputs = [ yajl ]; + write_mongodb.buildInputs = [ mongoc ]; + write_prometheus.buildInputs = [ protobufc libmicrohttpd ]; + write_redis.buildInputs = [ hiredis ]; + write_riemann.buildInputs = [ protobufc riemann_c_client ]; + xencpu.buildInputs = [ xen ]; }; configureFlags = lib.optionals (enabledPlugins != null) ( From 4dacd7461fa6f5bd0f4cb15e1f996e79e8379f42 Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 21 Aug 2021 01:40:32 +0200 Subject: [PATCH 087/135] collectd: move IOKit input to all-packages.nix --- pkgs/tools/system/collectd/plugins.nix | 3 +-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index df99c60c3ef0..6438a545a485 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -40,6 +40,7 @@ , varnish , xen , yajl +, IOKit # Defaults to `null` for all supported plugins, # list of plugin names for a custom build , enabledPlugins ? null @@ -47,8 +48,6 @@ }: let - inherit (darwin.apple_sdk.frameworks) IOKit; - # Plugins that have dependencies. # Please help to extend these! plugins = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 982122bf59ed..0f5dc92affed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3788,6 +3788,7 @@ with pkgs; collectd = callPackage ../tools/system/collectd { libsigrok = libsigrok_0_3; # not compatible with >= 0.4.0 yet jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + inherit (darwin.apple_sdk.frameworks) IOKit; }; collectd-data = callPackage ../tools/system/collectd/data.nix { }; From 5a4ed9410ee95d901bd0e2da743a50b9a83fb831 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 10:17:08 +0000 Subject: [PATCH 088/135] openxr-loader: 1.0.18 -> 1.0.19 --- pkgs/development/libraries/openxr-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 44d9c01ded17..b4a2634867bc 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.18"; + version = "1.0.19"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-Ek4gFL10/aRciCoJBNaaSX/Hdbap4X/K4k+KeAfpKDg="; + sha256 = "sha256-LEXxqzHzTadgK2PV9Wiud9MzblDHdF4L5T4fVydRJW8="; }; nativeBuildInputs = [ cmake python3 ]; From f13997ff312505bfab4e42fe687fd42d97fa3c36 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Aug 2021 12:30:11 +0200 Subject: [PATCH 089/135] jiq: 0.7.1 -> 0.7.2 ChangeLog: https://github.com/fiatjaf/jiq/releases/tag/v0.7.2 --- pkgs/development/tools/misc/jiq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/development/tools/misc/jiq/default.nix index c52a9ae4c030..61477a4c7de0 100644 --- a/pkgs/development/tools/misc/jiq/default.nix +++ b/pkgs/development/tools/misc/jiq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jiq"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "fiatjaf"; repo = pname; - rev = version; - sha256 = "sha256-EPhnfgmn0AufuxwcwRrEEQk+RD97akFJSzngkTl4LmY="; + rev = "v${version}"; + sha256 = "sha256-txhttYngN+dofA3Yp3gZUZPRRZWGug9ysXq1Q0RP7ig="; }; vendorSha256 = "sha256-ZUmOhPGy+24AuxdeRVF0Vnu8zDGFrHoUlYiDdfIV5lc="; From 3b7677852aab327a56b4e050915ddefbbe262a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 21:39:57 +0200 Subject: [PATCH 090/135] python39Packages.tesnorboard-data-server: init at 0.6.1 --- .../tensorboard-data-server/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/tensorboard-data-server/default.nix diff --git a/pkgs/development/python-modules/tensorboard-data-server/default.nix b/pkgs/development/python-modules/tensorboard-data-server/default.nix new file mode 100644 index 000000000000..74f53d7c6763 --- /dev/null +++ b/pkgs/development/python-modules/tensorboard-data-server/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "tensorboard-data-server"; + version = "0.6.1"; + format = "wheel"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "tensorboard_data_server"; + inherit version format; + dist = "py3"; + python = "py3"; + sha256 = "sha256-gJ/piHaC01wffR9U8PQPmLsfdxsUJltFPKBR4s5Y/Kc="; + }; + + pythonImportsCheck = [ "tensorboard_data_server" ]; + + meta = with lib; { + description = "Fast data loading for TensorBoard"; + homepage = "https://github.com/tensorflow/tensorboard/tree/master/tensorboard/data/server"; + license = licenses.asl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc0389c3fcd4..05044196bf10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8635,6 +8635,8 @@ in { tenacity = callPackage ../development/python-modules/tenacity { }; + tensorboard-data-server = callPackage ../development/python-modules/tensorboard-data-server { }; + tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { }; tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit {}; From 85a639637bdf7543ca930c137a8f34197d335cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 23:03:32 +0200 Subject: [PATCH 091/135] python39Packages.cirq-google: fix google-api-core version constraint --- pkgs/development/python-modules/cirq-google/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index 8692aef4b678..900189dc2edb 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -16,7 +16,9 @@ buildPythonPackage rec { sourceRoot = "source/${pname}"; postPatch = '' - substituteInPlace requirements.txt --replace "protobuf~=3.13.0" "protobuf" + substituteInPlace requirements.txt \ + --replace "protobuf~=3.13.0" "protobuf" \ + --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" ''; propagatedBuildInputs = [ From 22ca563072bb2e6c387f44f42b6c66e516e99a40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 13:53:19 +0200 Subject: [PATCH 092/135] python3Packages.pyflume: remove obsolete patch sections --- .../python-modules/pyflume/default.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix index 075297794b21..ff4e7189c527 100644 --- a/pkgs/development/python-modules/pyflume/default.nix +++ b/pkgs/development/python-modules/pyflume/default.nix @@ -22,13 +22,6 @@ buildPythonPackage rec { sha256 = "129sz33a270v120bzl9l98nmvdzn7ns4cf9w2v18lmzlldbyz2vn"; }; - prePatch = '' - substituteInPlace setup.py --replace 'pyjwt==2.0.1' 'pyjwt>=2.0.1' - substituteInPlace setup.py --replace 'ratelimit==2.2.1' 'ratelimit>=2.2.1' - substituteInPlace setup.py --replace 'pytz==2019.2' 'pytz>=2019.2' - substituteInPlace setup.py --replace 'requests==2.24.0' 'requests>=2.24.0' - ''; - propagatedBuildInputs = [ pyjwt ratelimit @@ -41,15 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/ChrisMandich/PyFlume/issues/18 - substituteInPlace setup.py \ - --replace "pyjwt==2.0.1" "pyjwt>=2.0.1" \ - --replace "ratelimit==2.2.1" "ratelimit>=2.2.1" \ - --replace "pytz==2019.2" "pytz>=2019.2" \ - --replace "requests==2.24.0" "requests>=2.24.0" - ''; - pythonImportsCheck = [ "pyflume" ]; meta = with lib; { From d0abc6e50b0a672c7f0fec4a3fd5226ebda73305 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 13:59:03 +0200 Subject: [PATCH 093/135] python3Packages.parse-type: cleanup --- .../python-modules/parse-type/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index b5458cd7eb5e..8faff81880cf 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,7 +1,10 @@ -{ lib, fetchFromGitHub -, buildPythonPackage, pythonOlder -, pytest, pytest-runner -, parse, six, enum34 +{ lib +, buildPythonPackage +, fetchFromGitHub +, parse +, pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { @@ -14,8 +17,15 @@ buildPythonPackage rec { rev = "v${version}"; sha256 = "sha256-CJroqJIi5DpmR8i1lr8OJ+234615PhpVUsqK91XOT3E="; }; - checkInputs = [ pytest pytest-runner ]; - propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34; + + propagatedBuildInputs = [ + parse + six + ]; + + checkInputs = [ + pytestCheckHook + ]; postPatch = '' substituteInPlace pytest.ini \ @@ -25,13 +35,11 @@ buildPythonPackage rec { --replace "--junit-xml=build/testing/report.xml" "" ''; - checkPhase = '' - py.test tests - ''; + pythonImportsCheck = [ "parse_type" ]; meta = with lib; { - homepage = "https://github.com/jenisys/parse_type"; description = "Simplifies to build parse types based on the parse module"; + homepage = "https://github.com/jenisys/parse_type"; license = licenses.bsd3; maintainers = with maintainers; [ alunduil ]; }; From 83514ae7a9f25023c2bc7bec323e661b7302d61d Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 13 Aug 2021 16:31:14 -0300 Subject: [PATCH 094/135] lib.formats.yaml: use well known YAML format The way `(lib.formats.yaml {}).generate` generates YAML is compliant because on YAML 1.2 spec JSON is a subset of YAML but it bugs people's minds and can lead to problems with software that is not compatible with YAML 1.2. This commit also changes the test of the generation function. Data validation/typing remains the same. See #133802. Signed-off-by: lucasew --- .../from_md/release-notes/rl-2111.section.xml | 7 +++++ .../manual/release-notes/rl-2111.section.md | 2 ++ pkgs/pkgs-lib/formats.nix | 29 +++++++++++++++---- pkgs/pkgs-lib/tests/formats.nix | 26 +++++++---------- 4 files changed, 43 insertions(+), 21 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 6d02f71ac989..39a7965a7ed4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1058,6 +1058,13 @@ Superuser created successfully. sign OCSP responses and server certificates. + + + lib.formats.yaml’s + generate will not generate JSON anymore, + but instead use more of the YAML-specific syntax. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index a337a72b7166..0203215f11e8 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -302,3 +302,5 @@ To be able to access the web UI this port needs to be opened in the firewall. - Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs. - Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates. + +- `lib.formats.yaml`'s `generate` will not generate JSON anymore, but instead use more of the YAML-specific syntax. diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 44c8f9135439..5e17519d4ce1 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -48,14 +48,31 @@ rec { }; - # YAML has been a strict superset of JSON since 1.2 - yaml = {}: - let jsonSet = json {}; - in jsonSet // { - type = jsonSet.type // { + yaml = {}: { + + generate = name: value: pkgs.runCommand name { + nativeBuildInputs = [ pkgs.remarshal ]; + value = builtins.toJSON value; + passAsFile = [ "value" ]; + } '' + json2yaml "$valuePath" "$out" + ''; + + type = with lib.types; let + valueType = nullOr (oneOf [ + bool + int + float + str + path + (attrsOf valueType) + (listOf valueType) + ]) // { description = "YAML value"; }; - }; + in valueType; + + }; ini = { # Represents lists as duplicate keys diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index af19f6100eef..14cc85eff31d 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -72,21 +72,17 @@ in runBuildTests { path = ./formats.nix; }; expected = '' - { - "attrs": { - "foo": null - }, - "false": false, - "float": 3.141, - "list": [ - null, - null - ], - "null": null, - "path": "${./formats.nix}", - "str": "foo", - "true": true - } + attrs: + foo: null + 'false': false + float: 3.141 + list: + - null + - null + 'null': null + path: ${./formats.nix} + str: foo + 'true': true ''; }; From edca4b029f4f869d77642f3c8d9e8d27ac8473a0 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 25 Aug 2021 20:06:04 +0800 Subject: [PATCH 095/135] perlPackages.Filelchown: fix build on Darwin --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6728030822eb..dcb6c70b94f4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8081,7 +8081,7 @@ let sha256 = "a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec"; }; buildInputs = [ ExtUtilsCChecker ]; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Modify attributes of symlinks without dereferencing them"; license = with lib.licenses; [ artistic1 gpl1Plus ]; From 7c9d049653684aaaf4169bfc702851d0f06d9309 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 25 Aug 2021 14:17:36 +0200 Subject: [PATCH 096/135] esphome: 2021.8.1 -> 2021.8.2 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 5c04cd8018ad..4c58632e0df6 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.8.1"; + version = "2021.8.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-1eWM2MuIQ1ewbx53MmxmKi1Q92hzBqGboV3LbmMrw8g="; + sha256 = "sha256-R+5eefPUZc6y/B8cZbxsLVrVwvBbVISZQAb1KwiYdFg="; }; patches = [ From d16075b4c53270573eca08bbf41117513d9e44cd Mon Sep 17 00:00:00 2001 From: Thomas Sean Dominic Kelly Date: Wed, 25 Aug 2021 13:10:51 +0100 Subject: [PATCH 097/135] perlPackages.Graph: 0.9712 -> 0.9722 --- pkgs/top-level/perl-packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6728030822eb..1ba507322aee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9101,12 +9101,15 @@ let Graph = buildPerlPackage { pname = "Graph"; - version = "0.9712"; + version = "0.9722"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9712.tar.gz"; - sha256 = "1as4ngbqxrjv9f31hm3wg8pyiyrz5fbbvlpfsrm68k1yskwkgkcg"; + url = "mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9722.tar.gz"; + sha256 = "c113633833f3a1bef8fa8eb96680be36d00e41ef404bddd7fc0bb98703e28d4d"; + }; + propagatedBuildInputs = [ HeapFibonacci SetObject ]; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ HeapFibonacci ]; }; GraphicsTIFF = buildPerlPackage { From 9c8b5a8b7fcc5db3d9e50c9451ebd44aac124ce9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 06:09:43 +0000 Subject: [PATCH 098/135] headscale: 0.6.1 -> 0.7.0 --- pkgs/servers/headscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 01abc596517d..755a538f58d9 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "headscale"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-pzsbCxJ3N30XpjF//02SV6URhA6f6Wz8a6HvGxsK7M4="; + sha256 = "sha256-N1WjfsiLuroXsmD67HeWw/2lLJ8r3iWYwGac9DbbFsQ="; }; vendorSha256 = "sha256-ususDOF/LznhK4EInHE7J/ItMjziGfP9Gn8/Q5wd78g="; From b35a0c79f5217abbe6044e03167a22dd4ab1aa89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Tarbouriech?= <78071629+noe-tarbouriech@users.noreply.github.com> Date: Wed, 25 Aug 2021 15:14:45 +0200 Subject: [PATCH 099/135] StarUML: 2.8.1 -> 4.0.1 (#135599) Co-authored-by: Sandro --- pkgs/tools/misc/staruml/default.nix | 49 +++++++++++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 847e8bb84282..ab28b8777f44 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -1,23 +1,33 @@ { stdenv, lib, fetchurl, makeWrapper , dpkg, patchelf -, gtk2, glib, gdk-pixbuf, alsa-lib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd -, libXdamage, expat }: +, gtk3, glib, systemd +, xorg, nss, nspr +, atk, at-spi2-atk, dbus +, gdk-pixbuf, pango, cairo +, expat, libdrm, mesa +, alsa-lib, at-spi2-core, cups }: let - LD_LIBRARY_PATH = lib.makeLibraryPath - [ glib gtk2 gdk-pixbuf alsa-lib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; + LD_LIBRARY_PATH = lib.makeLibraryPath [ + glib gtk3 xorg.libXdamage + xorg.libX11 xorg.libxcb xorg.libXcomposite + xorg.libXcursor xorg.libXext xorg.libXfixes + xorg.libXi xorg.libXrender xorg.libXtst + nss nspr atk at-spi2-atk dbus + gdk-pixbuf pango cairo + xorg.libXrandr expat libdrm + mesa alsa-lib at-spi2-core + cups + ]; in stdenv.mkDerivation rec { - version = "2.8.1"; + version = "4.0.1"; pname = "staruml"; src = - if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-32-bit.deb"; - sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n"; - } else fetchurl { - url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-64-bit.deb"; - sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0"; + fetchurl { + url = "https://staruml.io/download/releases-v4/StarUML_${version}_amd64.deb"; + sha256 = "0vxrs5y4a17bnc27fd2k2qc0vi81v677mi55znylwf3a41fjfcir"; }; nativeBuildInputs = [ makeWrapper dpkg ]; @@ -30,25 +40,24 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - mv opt/staruml $out/bin + mv opt/StarUML $out/bin mkdir -p $out/lib ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 - for binary in StarUML Brackets-node; do - ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/$binary - wrapProgram $out/bin/$binary \ - --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} - done + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/staruml + wrapProgram $out/bin/staruml \ + --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} ''; meta = with lib; { description = "A sophisticated software modeler"; homepage = "https://staruml.io/"; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f5dc92affed..afae38acb69b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9285,7 +9285,7 @@ with pkgs; stricat = callPackage ../tools/security/stricat { }; - staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; + staruml = callPackage ../tools/misc/staruml { }; stone-phaser = callPackage ../applications/audio/stone-phaser { }; From 14b61efa8736771a7ab549ede5b92bbbbaa5bef7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 25 Aug 2021 15:22:50 +0200 Subject: [PATCH 100/135] dockerTools.usrBinEnv: add This provides a /usr/bin/env, for shell scripts using the "/usr/bin/env executable" shebang. --- pkgs/build-support/docker/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 832d2949a1aa..9e4709dd9bf8 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -759,6 +759,13 @@ rec { ]; }; + # This provides a /usr/bin/env, for shell scripts using the + # "#!/usr/bin/env executable" shebang. + usrBinEnv = runCommand "usr-bin-env" { } '' + mkdir -p $out/usr/bin + ln -s ${pkgs.coreutils}/bin/env $out/usr/bin + ''; + # This provides /bin/sh, pointing to bashInteractive. binSh = runCommand "bin-sh" { } '' mkdir -p $out/bin From 277682bdaef1c40620fa4b9cac8d74eb6c2790b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 25 Aug 2021 11:31:52 -0300 Subject: [PATCH 101/135] marwaita-peppermint: 0.6 -> 10.3 --- pkgs/data/themes/marwaita-peppermint/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/marwaita-peppermint/default.nix b/pkgs/data/themes/marwaita-peppermint/default.nix index 70e7bdef2d4e..6873cd31f8dd 100644 --- a/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/pkgs/data/themes/marwaita-peppermint/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "0.6"; + version = "10.3"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0mhkkx2qa66z4b2h5iynhy63flwdf6b2phd21r1j8kp4m08dynms"; + sha256 = "09lqp82aymj3silpwmjkkf4mgv3b1xw7181ck89lz2nxb98sr9im"; }; buildInputs = [ @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Marwaita GTK theme with Peppermint Os Linux style"; homepage = "https://www.pling.com/p/1399569/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; From 076f6e2d948259e18ddac8e562c62b5b53de9fe6 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 25 Aug 2021 09:38:37 -0400 Subject: [PATCH 102/135] nixos/make-zfs-image: init This is a private interface for internal NixOS use. It is similar to `make-disk-image` except it is much more opinionated about what kind of disk image it'll make. Specifically, it will always create *two* disks: 1. a `boot` disk formatted with FAT in a hybrid GPT mode. 2. a `root` disk which is completely owned by a single zpool. The partitioning and FAT decisions should make the resulting images bootable under EFI or BIOS, with systemd-boot or grub. The root disk's zpools options are highly customizable, including fully customizable datasets and their options. Because the boot disk and partition are highly opinionated, it is expected that the `boot` disk will be mounted at `/boot`. It is always labeled ESP even on BIOS boot systems. In order for the datasets to be mounted properly, the `datasets` passed in to `make-zfs-image` are turned in to NixOS configuration stored at /etc/nixos/configuration.nix inside the VM. NOTE: The function accepts a system configuration in the `config` argument. The *caller* must manually configure the system in `config` to have each specified `dataset` be represented by a corresponding `fileSystems` entry. One way to test the resulting images is with qemu: ```sh boot=$(find ./result/ -name '*.boot.*'); root=$(find ./result/ -name '*.root.*'); echo '`Ctrl-a h` to get help on the monitor'; echo '`Ctrl-a x` to exit'; qemu-kvm \ -nographic \ -cpu max \ -m 16G \ -drive file=$boot,snapshot=on,index=0,media=disk \ -drive file=$root,snapshot=on,index=1,media=disk \ -boot c \ -net user \ -net nic \ -msg timestamp=on ``` --- nixos/lib/make-zfs-image.nix | 333 +++++++++++++++++++++++++++++++++++ 1 file changed, 333 insertions(+) create mode 100644 nixos/lib/make-zfs-image.nix diff --git a/nixos/lib/make-zfs-image.nix b/nixos/lib/make-zfs-image.nix new file mode 100644 index 000000000000..40648ca24d4d --- /dev/null +++ b/nixos/lib/make-zfs-image.nix @@ -0,0 +1,333 @@ +# Note: This is a private API, internal to NixOS. Its interface is subject +# to change without notice. +# +# The result of this builder is two disk images: +# +# * `boot` - a small disk formatted with FAT to be used for /boot. FAT is +# chosen to support EFI. +# * `root` - a larger disk with a zpool taking the entire disk. +# +# This two-disk approach is taken to satisfy ZFS's requirements for +# autoexpand. +# +# # Why doesn't autoexpand work with ZFS in a partition? +# +# When ZFS owns the whole disk doesn’t really use a partition: it has +# a marker partition at the start and a marker partition at the end of +# the disk. +# +# If ZFS is constrained to a partition, ZFS leaves expanding the partition +# up to the user. Obviously, the user may not choose to do so. +# +# Once the user expands the partition, calling zpool online -e expands the +# vdev to use the whole partition. It doesn’t happen automatically +# presumably because zed doesn’t get an event saying it’s partition grew, +# whereas it can and does get an event saying the whole disk it is on is +# now larger. +{ lib +, pkgs +, # The NixOS configuration to be installed onto the disk image. + config + +, # size of the FAT boot disk, in megabytes. + bootSize ? 1024 + +, # The size of the root disk, in megabytes. + rootSize ? 2048 + +, # The name of the ZFS pool + rootPoolName ? "tank" + +, # zpool properties + rootPoolProperties ? { + autoexpand = "on"; + } +, # pool-wide filesystem properties + rootPoolFilesystemProperties ? { + acltype = "posixacl"; + atime = "off"; + compression = "on"; + mountpoint = "legacy"; + xattr = "sa"; + } + +, # datasets, with per-attribute options: + # mount: (optional) mount point in the VM + # properties: (optional) ZFS properties on the dataset, like filesystemProperties + # Notes: + # 1. datasets will be created from shorter to longer names as a simple topo-sort + # 2. you should define a root's dataset's mount for `/` + datasets ? { } + +, # The files and directories to be placed in the target file system. + # This is a list of attribute sets {source, target} where `source' + # is the file system object (regular file or directory) to be + # grafted in the file system at path `target'. + contents ? [] + +, # The initial NixOS configuration file to be copied to + # /etc/nixos/configuration.nix. This configuration will be embedded + # inside a configuration which includes the described ZFS fileSystems. + configFile ? null + +, # Shell code executed after the VM has finished. + postVM ? "" + +, name ? "nixos-disk-image" + +, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw. + format ? "raw" + +, # Include a copy of Nixpkgs in the disk image + includeChannel ? true +}: +let + formatOpt = if format == "qcow2-compressed" then "qcow2" else format; + + compress = lib.optionalString (format == "qcow2-compressed") "-c"; + + filenameSuffix = "." + { + qcow2 = "qcow2"; + vdi = "vdi"; + vpc = "vhd"; + raw = "img"; + }.${formatOpt} or formatOpt; + bootFilename = "nixos.boot${filenameSuffix}"; + rootFilename = "nixos.root${filenameSuffix}"; + + # FIXME: merge with channel.nix / make-channel.nix. + channelSources = + let + nixpkgs = lib.cleanSource pkgs.path; + in + pkgs.runCommand "nixos-${config.system.nixos.version}" {} '' + mkdir -p $out + cp -prd ${nixpkgs.outPath} $out/nixos + chmod -R u+w $out/nixos + if [ ! -e $out/nixos/nixpkgs ]; then + ln -s . $out/nixos/nixpkgs + fi + rm -rf $out/nixos/.git + echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix + ''; + + closureInfo = pkgs.closureInfo { + rootPaths = [ config.system.build.toplevel ] + ++ (lib.optional includeChannel channelSources); + }; + + modulesTree = pkgs.aggregateModules + (with config.boot.kernelPackages; [ kernel zfs ]); + + tools = lib.makeBinPath ( + with pkgs; [ + config.system.build.nixos-enter + config.system.build.nixos-install + dosfstools + e2fsprogs + gptfdisk + nix + parted + utillinux + zfs + ] + ); + + hasDefinedMount = disk: ((disk.mount or null) != null); + + stringifyProperties = prefix: properties: lib.concatStringsSep " \\\n" ( + lib.mapAttrsToList + ( + property: value: "${prefix} ${lib.escapeShellArg property}=${lib.escapeShellArg value}" + ) + properties + ); + + featuresToProperties = features: + lib.listToAttrs + (builtins.map (feature: { + name = "feature@${feature}"; + value = "enabled"; + }) features); + + createDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + sorted = lib.sort (left: right: (lib.stringLength left.name) < (lib.stringLength right.name)) datasetlist; + cmd = { name, value }: + let + properties = stringifyProperties "-o" (value.properties or {}); + in + "zfs create -p ${properties} ${name}"; + in + lib.concatMapStringsSep "\n" cmd sorted; + + mountDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist; + sorted = lib.sort (left: right: (lib.stringLength left.value.mount) < (lib.stringLength right.value.mount)) mounts; + cmd = { name, value }: + '' + mkdir -p /mnt${lib.escapeShellArg value.mount} + mount -t zfs ${name} /mnt${lib.escapeShellArg value.mount} + ''; + in + lib.concatMapStringsSep "\n" cmd sorted; + + unmountDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist; + sorted = lib.sort (left: right: (lib.stringLength left.value.mount) > (lib.stringLength right.value.mount)) mounts; + cmd = { name, value }: + '' + umount /mnt${lib.escapeShellArg value.mount} + ''; + in + lib.concatMapStringsSep "\n" cmd sorted; + + + fileSystemsCfgFile = + let + mountable = lib.filterAttrs (_: value: hasDefinedMount value) datasets; + in + pkgs.runCommand "filesystem-config.nix" { + buildInputs = with pkgs; [ jq nixpkgs-fmt ]; + filesystems = builtins.toJSON { + fileSystems = lib.mapAttrs' + ( + dataset: attrs: + { + name = attrs.mount; + value = { + fsType = "zfs"; + device = "${dataset}"; + }; + } + ) + mountable; + }; + passAsFile = [ "filesystems" ]; + } '' + ( + echo "builtins.fromJSON '''" + jq . < "$filesystemsPath" + echo "'''" + ) > $out + + nixpkgs-fmt $out + ''; + + mergedConfig = + if configFile == null + then fileSystemsCfgFile + else + pkgs.runCommand "configuration.nix" { + buildInputs = with pkgs; [ nixpkgs-fmt ]; + } + '' + ( + echo '{ imports = [' + printf "(%s)\n" "$(cat ${fileSystemsCfgFile})"; + printf "(%s)\n" "$(cat ${configFile})"; + echo ']; }' + ) > $out + + nixpkgs-fmt $out + ''; + + image = ( + pkgs.vmTools.override { + rootModules = + [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++ + (pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos"); + kernel = modulesTree; + } + ).runInLinuxVM ( + pkgs.runCommand name + { + QEMU_OPTS = "-drive file=$bootDiskImage,if=virtio,cache=unsafe,werror=report" + + " -drive file=$rootDiskImage,if=virtio,cache=unsafe,werror=report"; + preVM = '' + PATH=$PATH:${pkgs.qemu_kvm}/bin + mkdir $out + bootDiskImage=boot.raw + qemu-img create -f raw $bootDiskImage ${toString bootSize}M + + rootDiskImage=root.raw + qemu-img create -f raw $rootDiskImage ${toString rootSize}M + ''; + + postVM = '' + ${if formatOpt == "raw" then '' + mv $bootDiskImage $out/${bootFilename} + mv $rootDiskImage $out/${rootFilename} + '' else '' + ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $bootDiskImage $out/${bootFilename} + ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename} + ''} + bootDiskImage=$out/${bootFilename} + rootDiskImage=$out/${rootFilename} + set -x + ${postVM} + ''; + } '' + export PATH=${tools}:$PATH + set -x + + cp -sv /dev/vda /dev/sda + cp -sv /dev/vda /dev/xvda + + parted --script /dev/vda -- \ + mklabel gpt \ + mkpart no-fs 1MiB 2MiB \ + set 1 bios_grub on \ + align-check optimal 1 \ + mkpart ESP fat32 2MiB -1MiB \ + align-check optimal 2 \ + print + + sfdisk --dump /dev/vda + + + zpool create \ + ${stringifyProperties " -o" rootPoolProperties} \ + ${stringifyProperties " -O" rootPoolFilesystemProperties} \ + ${rootPoolName} /dev/vdb + parted --script /dev/vdb -- print + + ${createDatasets} + ${mountDatasets} + + mkdir -p /mnt/boot + mkfs.vfat -n ESP /dev/vda2 + mount /dev/vda2 /mnt/boot + + mount + + # Install a configuration.nix + mkdir -p /mnt/etc/nixos + # `cat` so it is mutable on the fs + cat ${mergedConfig} > /mnt/etc/nixos/configuration.nix + + export NIX_STATE_DIR=$TMPDIR/state + nix-store --load-db < ${closureInfo}/registration + + nixos-install \ + --root /mnt \ + --no-root-passwd \ + --system ${config.system.build.toplevel} \ + --substituters "" \ + ${lib.optionalString includeChannel ''--channel ${channelSources}''} + + df -h + + umount /mnt/boot + ${unmountDatasets} + + zpool export ${rootPoolName} + '' + ); +in +image From bd38b059eae05871579b2dfd51cd41d058b6a1ec Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 25 Aug 2021 09:38:46 -0400 Subject: [PATCH 103/135] NixOS/amazonImageZfs: init Introduce an AWS EC2 AMI which supports aarch64 and x86_64 with a ZFS root. This uses `make-zfs-image` which implies two EBS volumes are needed inside EC2, one for boot, one for root. It should not matter which is identified `xvda` and which is `xvdb`, though I have always uploaded `boot` as `xvda`. --- .../scripts/ec2/amazon-image-zfs.nix | 12 ++ .../maintainers/scripts/ec2/amazon-image.nix | 103 +++++++++++++----- nixos/modules/virtualisation/amazon-image.nix | 10 +- .../modules/virtualisation/amazon-options.nix | 54 ++++++++- nixos/release.nix | 14 +++ 5 files changed, 165 insertions(+), 28 deletions(-) create mode 100644 nixos/maintainers/scripts/ec2/amazon-image-zfs.nix diff --git a/nixos/maintainers/scripts/ec2/amazon-image-zfs.nix b/nixos/maintainers/scripts/ec2/amazon-image-zfs.nix new file mode 100644 index 000000000000..32dd96a7cb7e --- /dev/null +++ b/nixos/maintainers/scripts/ec2/amazon-image-zfs.nix @@ -0,0 +1,12 @@ +{ + imports = [ ./amazon-image.nix ]; + ec2.zfs = { + enable = true; + datasets = { + "tank/system/root".mount = "/"; + "tank/system/var".mount = "/var"; + "tank/local/nix".mount = "/nix"; + "tank/user/home".mount = "/home"; + }; + }; +} diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 677aff4421e0..cb9fbfd86039 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.amazonImage; + in { imports = [ ../../../modules/virtualisation/amazon-image.nix ]; @@ -53,15 +54,7 @@ in { }; }; - config.system.build.amazonImage = import ../../../lib/make-disk-image.nix { - inherit lib config; - inherit (cfg) contents format name; - pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - partitionTableType = if config.ec2.efi then "efi" - else if config.ec2.hvm then "legacy+gpt" - else "none"; - diskSize = cfg.sizeMB; - fsType = "ext4"; + config.system.build.amazonImage = let configFile = pkgs.writeText "configuration.nix" '' { modulesPath, ... }: { @@ -72,24 +65,84 @@ in { ${optionalString config.ec2.efi '' ec2.efi = true; ''} + ${optionalString config.ec2.zfs.enable '' + ec2.zfs.enable = true; + networking.hostId = "${config.networking.hostId}"; + ''} } ''; - postVM = '' - extension=''${diskImage##*.} - friendlyName=$out/${cfg.name}.$extension - mv "$diskImage" "$friendlyName" - diskImage=$friendlyName - mkdir -p $out/nix-support - echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products + zfsBuilder = import ../../../lib/make-zfs-image.nix { + inherit lib config configFile; + inherit (cfg) contents format name; + pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - ${pkgs.jq}/bin/jq -n \ - --arg label ${lib.escapeShellArg config.system.nixos.label} \ - --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg file "$diskImage" \ - '$ARGS.named' \ - > $out/nix-support/image-info.json - ''; - }; + includeChannel = true; + + bootSize = 1000; # 1G is the minimum EBS volume + + rootSize = cfg.sizeMB; + rootPoolProperties = { + ashift = 12; + autoexpand = "on"; + }; + + datasets = config.ec2.zfs.datasets; + + postVM = '' + extension=''${rootDiskImage##*.} + friendlyName=$out/${cfg.name} + rootDisk="$friendlyName.root.$extension" + bootDisk="$friendlyName.boot.$extension" + mv "$rootDiskImage" "$rootDisk" + mv "$bootDiskImage" "$bootDisk" + + mkdir -p $out/nix-support + echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products + echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products + + ${pkgs.jq}/bin/jq -n \ + --arg label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg root "$rootDisk" \ + --arg boot "$bootDisk" \ + '$ARGS.named' \ + > $out/nix-support/image-info.json + ''; + }; + + extBuilder = import ../../../lib/make-disk-image.nix { + inherit lib config configFile; + + inherit (cfg) contents format name; + pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package + + fsType = "ext4"; + partitionTableType = if config.ec2.efi then "efi" + else if config.ec2.hvm then "legacy+gpt" + else "none"; + + diskSize = cfg.sizeMB; + + postVM = '' + extension=''${diskImage##*.} + friendlyName=$out/${cfg.name}.$extension + mv "$diskImage" "$friendlyName" + diskImage=$friendlyName + + mkdir -p $out/nix-support + echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products + + ${pkgs.jq}/bin/jq -n \ + --arg label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg file "$diskImage" \ + '$ARGS.named' \ + > $out/nix-support/image-info.json + ''; + }; + in if config.ec2.zfs.enable then zfsBuilder else extBuilder; } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index bf5c04543a70..fe248a94488b 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -41,17 +41,23 @@ in boot.growPartition = cfg.hvm; - fileSystems."/" = { + fileSystems."/" = mkIf (!cfg.zfs.enable) { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; autoResize = true; }; - fileSystems."/boot" = mkIf cfg.efi { + fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) { + # The ZFS image uses a partition labeled ESP whether or not we're + # booting with EFI. device = "/dev/disk/by-label/ESP"; fsType = "vfat"; }; + services.zfs.expandOnBoot = mkIf cfg.zfs.enable "all"; + + boot.zfs.devNodes = mkIf cfg.zfs.enable "/dev/"; + boot.extraModulePackages = [ config.boot.kernelPackages.ena ]; diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 2e807131e938..698edcd835a6 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -1,7 +1,46 @@ { config, lib, pkgs, ... }: -{ +let + inherit (lib) types; +in { options = { ec2 = { + zfs = { + enable = lib.mkOption { + default = false; + internal = true; + description = '' + Whether the EC2 instance uses a ZFS root. + ''; + }; + + datasets = lib.mkOption { + description = '' + Datasets to create under the `tank` and `boot` zpools. + + **NOTE:** This option is used only at image creation time, and + does not attempt to declaratively create or manage datasets + on an existing system. + ''; + + default = {}; + + type = types.attrsOf (types.submodule { + options = { + mount = lib.mkOption { + description = "Where to mount this dataset."; + type = types.nullOr types.string; + default = null; + }; + + properties = lib.mkOption { + description = "Properties to set on this dataset."; + type = types.attrsOf types.string; + default = {}; + }; + }; + }); + }; + }; hvm = lib.mkOption { default = lib.versionAtLeast config.system.stateVersion "17.03"; internal = true; @@ -18,4 +57,17 @@ }; }; }; + + config = lib.mkIf config.ec2.zfs.enable { + networking.hostId = lib.mkDefault "00000000"; + + fileSystems = let + mountable = lib.filterAttrs (_: value: ((value.mount or null) != null)) config.ec2.zfs.datasets; + in lib.mapAttrs' + (dataset: opts: lib.nameValuePair opts.mount { + device = dataset; + fsType = "zfs"; + }) + mountable; + }; } diff --git a/nixos/release.nix b/nixos/release.nix index 2367e79e4ad0..264d82bacc8a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -217,6 +217,20 @@ in rec { }).config.system.build.amazonImage) ); + amazonImageZfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ configuration + versionModule + ./maintainers/scripts/ec2/amazon-image-zfs.nix + ]; + }).config.system.build.amazonImage) + + ); # Test job for https://github.com/NixOS/nixpkgs/issues/121354 to test From 71b3d18181974523ef7264106a4bf213a3103439 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 25 Aug 2021 09:38:55 -0400 Subject: [PATCH 104/135] amazon images: extend the image-info.json to have a disks object Having a disks object with a dictionary of all the disks and their properties makes it easier to process multi-disk images. Note the rename of `label` to `system_label` is because `$label`i is something of a special token to jq. --- .../maintainers/scripts/ec2/amazon-image.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index cb9fbfd86039..6942b58f236e 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -102,14 +102,20 @@ in { echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products ${pkgs.jq}/bin/jq -n \ - --arg label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg root "$rootDisk" \ --arg boot "$bootDisk" \ - '$ARGS.named' \ - > $out/nix-support/image-info.json + '{} + | .label = $system_label + | .system = $system + | .disks.boot.logical_bytes = $boot_logical_bytes + | .disks.boot.file = $boot + | .disks.root.logical_bytes = $root_logical_bytes + | .disks.root.file = $root + ' > $out/nix-support/image-info.json ''; }; @@ -136,12 +142,18 @@ in { echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products ${pkgs.jq}/bin/jq -n \ - --arg label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg file "$diskImage" \ - '$ARGS.named' \ - > $out/nix-support/image-info.json + '{} + | .label = $system_label + | .system = $system + | .logical_bytes = $logical_bytes + | .file = $file + | .disks.root.logical_bytes = $logical_bytes + | .disks.root.file = $file + ' > $out/nix-support/image-info.json ''; }; in if config.ec2.zfs.enable then zfsBuilder else extBuilder; From ca4678e6b3a97b76407580fea31144439eb52d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 25 Aug 2021 12:04:40 -0300 Subject: [PATCH 105/135] fbmenugen: 0.85 -> 0.86 --- .../misc/fbmenugen/0001-Fix-paths.patch | 29 +++++++------------ pkgs/applications/misc/fbmenugen/default.nix | 6 ++-- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch b/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch index b52aeafb5f36..1db7aeb738bb 100644 --- a/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch +++ b/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch @@ -1,14 +1,14 @@ -From 76c25147328d71960c70bbdd5a9396aac4a362a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Wed, 20 May 2020 14:19:07 -0300 +From b65921873585616c86a591eee9efbc68f84eb3d3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo?= +Date: Wed, 25 Aug 2021 12:03:09 -0300 Subject: [PATCH] Fix paths --- - fbmenugen | 14 ++++++-------- - 1 file changed, 6 insertions(+), 8 deletions(-) + fbmenugen | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fbmenugen b/fbmenugen -index 46a18dc..0c8eb08 100755 +index 241be16..5fc9aea 100755 --- a/fbmenugen +++ b/fbmenugen @@ -214,9 +214,7 @@ my %CONFIG = ( @@ -22,15 +22,6 @@ index 46a18dc..0c8eb08 100755 "$home_dir/.local/share/applications", ], #>>> -@@ -232,7 +230,7 @@ my %CONFIG = ( - force_icon_size => 0, - generic_fallback => 0, - locale_support => 1, -- use_gtk3 => 0, -+ use_gtk3 => 1, - - VERSION => $version, - ); @@ -252,7 +250,7 @@ if (not -e $config_file) { } @@ -40,7 +31,7 @@ index 46a18dc..0c8eb08 100755 require File::Copy; File::Copy::copy($etc_schema_file, $schema_file) or warn "$0: can't copy file `$etc_schema_file' to `$schema_file': $!\n"; -@@ -570,7 +568,7 @@ EXIT +@@ -588,7 +586,7 @@ EXIT $generated_menu .= begin_category(@{$schema->{fluxbox}}) . <<"FOOTER"; [config] (Configure) [submenu] (System Styles) {Choose a style...} @@ -49,7 +40,7 @@ index 46a18dc..0c8eb08 100755 [end] [submenu] (User Styles) {Choose a style...} [stylesdir] (~/.fluxbox/styles) -@@ -580,12 +578,12 @@ EXIT +@@ -598,12 +596,13 @@ EXIT [exec] (Screenshot - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg} [exec] (Screenshot - PNG) {import screenshot.png && display -resize 50% screenshot.png} [exec] (Run) {fbrun} @@ -59,11 +50,11 @@ index 46a18dc..0c8eb08 100755 [commanddialog] (Fluxbox Command) [reconfig] (Reload config) [restart] (Restart) -- [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) | xmessage -file - -center} + [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) | xmessage -file - -center} + [exec] (About) {(@fluxbox@/bin/fluxbox -v; @fluxbox@/bin/fluxbox -info | @gnused@/bin/sed 1d) | @xmessage@/bin/xmessage -file - -center} [separator] [exit] (Exit) [end] -- -2.26.2 +2.32.0 diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix index 36629179ab58..06d7453ede66 100644 --- a/pkgs/applications/misc/fbmenugen/default.nix +++ b/pkgs/applications/misc/fbmenugen/default.nix @@ -11,13 +11,13 @@ perlPackages.buildPerlPackage rec { pname = "fbmenugen"; - version = "0.85"; + version = "0.86"; src = fetchFromGitHub { owner = "trizen"; repo = pname; rev = version; - sha256 = "1pmms3wzkm8h41a8zrkpn6gq9m9yy5wr5rrzmb84lbacprqq6q7q"; + sha256 = "0ya7s8b5xbaplz365bnr580szxxsngrs2n7smj8vz8a7kwi0319q"; }; patches = [ @@ -68,7 +68,7 @@ perlPackages.buildPerlPackage rec { meta = with lib; { homepage = "https://github.com/trizen/fbmenugen"; description = "Simple menu generator for the Fluxbox Window Manager"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; From a29c3f3f86b12e83b83c65bdac91daca5b08197c Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Wed, 25 Aug 2021 11:30:07 -0400 Subject: [PATCH 106/135] cloudflared: 2021.8.2 -> 2021.8.3 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index c036890aad9a..ebc1144e1576 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.8.2"; + version = "2021.8.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-5PMKVWBOWkUhmCSttbhu7UdS3dLqr0epJpQL1jfS31c="; + sha256 = "sha256-gipLjABvJ1QK98uX7Gl6feHXUei95yHlSNkqlQ7pVg4="; }; vendorSha256 = null; From 4ffe91a29d5713c3d4b1f6faf1afe56431ee66c5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Aug 2021 20:42:00 -0700 Subject: [PATCH 107/135] qtile: restore derivation name --- pkgs/applications/window-managers/qtile/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index cd7b5a159e2a..ae62cdbbba14 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -10,7 +10,7 @@ let pythonPackages = python.pkgs; unwrapped = pythonPackages.buildPythonPackage rec { - name = "qtile-${version}"; + pname = "qtile"; version = "0.18.0"; src = fetchFromGitHub { @@ -61,6 +61,8 @@ let }; in (python.withPackages (ps: [ unwrapped ])).overrideAttrs (_: { + # otherwise will be exported as "env", this restores `nix search` behavior + name = "${unwrapped.pname}-${unwrapped.version}"; # export underlying qtile package passthru = { inherit unwrapped; }; }) From 4b8c79896c80031892b9a49a4c6af9c1883bdea8 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 25 Aug 2021 04:56:02 +0800 Subject: [PATCH 108/135] rust-analyzer: enable check by default --- .../tools/rust/rust-analyzer/default.nix | 10 ++++++++-- .../ignore-git-and-rustfmt-tests.patch | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 9df4d9075aa6..394b743ec806 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -1,8 +1,7 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake , libiconv , useMimalloc ? false -# FIXME: Test doesn't pass under rustc 1.52.1 due to different escaping of `'` in string. -, doCheck ? false +, doCheck ? true }: rustPlatform.buildRustPackage rec { @@ -17,9 +16,16 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6Tbgy77Essi3Hyd5kdJ7JJbx7RuFZQWURfRrpScvPPQ="; }; + patches = [ + # Code format and git history check require more dependencies but don't really matter for packaging. + # So just ignore them. + ./ignore-git-and-rustfmt-tests.patch + ]; + buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; + cargoTestFlags = lib.optional useMimalloc "--features=mimalloc"; nativeBuildInputs = lib.optional useMimalloc cmake; diff --git a/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch b/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch new file mode 100644 index 000000000000..1247e4804684 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch @@ -0,0 +1,18 @@ +--- a/crates/rust-analyzer/tests/slow-tests/tidy.rs ++++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs +@@ -6,6 +6,7 @@ use std::{ + use xshell::{cmd, pushd, pushenv, read_file}; + + #[test] ++#[ignore] + fn check_code_formatting() { + let _dir = pushd(sourcegen::project_root()).unwrap(); + let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); +@@ -138,6 +139,7 @@ fn check_cargo_toml(path: &Path, text: String) -> () { + } + + #[test] ++#[ignore] + fn check_merge_commits() { + let stdout = cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19..") + .read() From 3f2c99d8a1c668991f4d92bc1815741e72c34ec4 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Wed, 25 Aug 2021 14:42:21 +0300 Subject: [PATCH 109/135] tvheadend: use ffmpeg_4 instead of ffmpeg_3 --- pkgs/servers/tvheadend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 98a40766d7e7..6c853b1ccc8b 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config -, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_3, libiconv, openssl, python +, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python , v4l-utils, which, zlib }: let @@ -29,7 +29,7 @@ in stdenv.mkDerivation { }; buildInputs = [ - avahi dbus gettext git gnutar gzip bzip2 ffmpeg_3 libiconv openssl python + avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python which zlib ]; From cccfa0e1d9b2e368913984c494dd3604ab5501ea Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Wed, 25 Aug 2021 15:01:52 -0400 Subject: [PATCH 110/135] pantalaimon: 0.9.2 -> 0.10.2 --- .../instant-messengers/pantalaimon/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 7cfa889d2803..153819fc8417 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, - setuptools, fetchpatch, installShellFiles, + setuptools, installShellFiles, pytest, faker, pytest-aiohttp, aioresponses, @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.9.2"; + version = "0.10.2"; disabled = pythonOlder "3.6"; @@ -19,17 +19,9 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "11dfv5b2slqybisq6npmrqxrzslh4bjs4093vrc05s94046d9d9n"; + sha256 = "sha256-sjaJomKMKSZqLlKWTG7Oa87dXa5SnGQlVnrdS707A1w="; }; - patches = [ - # accept newer matrix-nio versions - (fetchpatch { - url = "https://github.com/matrix-org/pantalaimon/commit/73f68c76fb05037bd7fe71688ce39eb1f526a385.patch"; - sha256 = "0wvqcfan8yp67p6khsqkynbkifksp2422b9jy511mvhpy51sqykl"; - }) - ]; - propagatedBuildInputs = [ aiohttp appdirs From 34fc789a948c6f677c8542566212674622a53a43 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 25 Aug 2021 14:42:10 -0300 Subject: [PATCH 111/135] k3s: 1.21.3+k3s1 -> 1.21.4+k3s1 --- pkgs/applications/networking/cluster/k3s/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 4340543b7773..4b60ec6ea2dd 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -7,7 +7,6 @@ , bridge-utils , conntrack-tools , buildGoPackage -, git , runc , kmod , libseccomp @@ -44,8 +43,8 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.21.3+k3s1"; # k3s git tag - k3sCommit = "1d1f220fbee9cdeb5416b76b707dde8c231121f2"; # k3s git commit at the above version + k3sVersion = "1.21.4+k3s1"; # k3s git tag + k3sCommit = "3e250fdbab72d88f7e6aae57446023a0567ffc97"; # k3s git commit at the above version traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION @@ -102,7 +101,7 @@ let k3sRepo = fetchgit { url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; - sha256 = "sha256-K4HVXFp5cpByEO4dUwmpzOuhsGh1k7X6k5aShCorTjg="; + sha256 = "1w7drvk0bmlmqrxh1y6dxjy7dk6bdrl72pkd25lc1ir6wbzb05h9"; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. From 304ed7c4218f8e5bdf68d4de4fef58d2338ffbe9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Jun 2021 01:14:53 +0200 Subject: [PATCH 112/135] doc/python: explain bulk package set updates --- doc/languages-frameworks/python.section.md | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 53df328f8d48..987ea1af9daa 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1602,3 +1602,33 @@ The following rules are desired to be respected: If necessary, `pname` has to be given a different value within `fetchPypi`. * Attribute names in `python-packages.nix` should be sorted alphanumerically to avoid merge conflicts and ease locating attributes. + +## Package set maintenance + +The whole Python package set has a lot of packages that do not see regular +updates, because they either are a very fragile component in the Python +ecosystem, like for example the `hypothesis` package, or packages that have +no maintainer, so maintenance falls back to the package set maintainers. + +### Updating packages in bulk + +There is a tool to update alot of python libraries in bulk, it exists at +`maintainers/scripts/update-python-libraries` with this repository. + +It can quickly update minor or major versions for all packages selected +and create update commits, and supports the `fetchPypi`, `fetchurl` and +`fetchFromGitHub` fetchers. When updating lots of packages that are +hosted on GitHub, exporting a `GITHUB_API_TOKEN` is highly recommended. + +Updating packages in bulk leads to lots of breakages, which is why a +stabilization period on the `python-unstable` branch is required. + +Once the branch is sufficiently stable it should normally be merged +into the `staging` branch. + +An exemplary call to update all python libraries between minor versions +would be: + +```ShellSession +$ maintainers/scripts/update-python-libraries --target minor --commit --use-pkgs-prefix pkgs/development/python-modules/**/default.nix +``` From 6a37c6b945d2a5cd57d54050e7e90a8b19acdffe Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 25 Aug 2021 22:38:35 +0300 Subject: [PATCH 113/135] earthly: remove extldflags fixes #135693 --- pkgs/development/tools/earthly/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 1d66e059a72d..aa1de8acd583 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -18,7 +18,6 @@ buildGoModule rec { -s -w -X main.Version=v${version} -X main.DefaultBuildkitdImage=earthly/buildkitd:v${version} - -extldflags -static ''; BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork"; From a99529335810a30cd8c9bc5b5fe376600f5ac62e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 25 Aug 2021 17:04:17 +0200 Subject: [PATCH 114/135] beam_nox: actually disable wxSupport --- 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 afae38acb69b..0a7c1f3e17eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12605,7 +12605,7 @@ with pkgs; }; beam = callPackage ./beam-packages.nix { }; - beam_nox = callPackage ./beam-packages.nix { wxSupport = false; }; + beam_nox = callPackage ./beam-packages.nix { beam = beam_nox; wxSupport = false; }; inherit (beam.interpreters) erlang erlangR24 erlangR23 erlangR22 erlangR21 From 326209f03708f07545c13f5970cc3ae8a42053e1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 25 Aug 2021 19:28:56 +0100 Subject: [PATCH 115/135] mc: 4.8.26 -> 4.8.27 --- pkgs/tools/misc/mc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index cb577ee333d5..b9ff4ad33d2c 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.26"; + version = "4.8.27"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc="; + sha256 = "sha256-Mb5ZIl/6mSCBbpqLO+CrIloW0Z5Pr0aJDyW9/6AqT/Q="; }; nativeBuildInputs = [ pkg-config autoreconfHook unzip ] From 104c63a5ab0bd9f5b3a6072ab95ed878d1d9bf25 Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Wed, 25 Aug 2021 09:46:49 -0400 Subject: [PATCH 116/135] weechatScripts.url_hint: init at 0.8 --- .../irc/weechat/scripts/default.nix | 2 ++ .../irc/weechat/scripts/url_hint/default.nix | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/networking/irc/weechat/scripts/url_hint/default.nix diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 4b5d9e83334d..ccbf78ec4c7c 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -7,6 +7,8 @@ inherit (perlPackages) PodParser; }; + url_hint = callPackage ./url_hint { }; + weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { inherit (luaPackages) cjson luaffi; }; diff --git a/pkgs/applications/networking/irc/weechat/scripts/url_hint/default.nix b/pkgs/applications/networking/irc/weechat/scripts/url_hint/default.nix new file mode 100644 index 000000000000..90c98b8fe769 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/url_hint/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchurl, weechat }: + +stdenv.mkDerivation { + pname = "url_hint"; + version = "0.8"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/weechat/scripts/10671d785ea3f9619d0afd0d7a1158bfa4ee3938/python/url_hint.py"; + sha256 = "0aw59kq74yqh0qbdkldfl6l83d0bz833232xr2w4741szck43kss"; + }; + + dontUnpack = true; + + passthru.scripts = [ "url_hint.py" ]; + + installPhase = '' + runHook preInstall + install -D $src $out/share/url_hint.py + runHook postInstall + ''; + + meta = with lib; { + inherit (weechat.meta) platforms; + description = "url_hint.py is a URL opening script."; + license = licenses.mit; + maintainers = with maintainers; [ eraserhd ]; + }; +} From 05e11f840b29a23598e2499d747cdd9b98276370 Mon Sep 17 00:00:00 2001 From: laikq <55911173+laikq@users.noreply.github.com> Date: Tue, 24 Aug 2021 10:16:04 +0200 Subject: [PATCH 117/135] joplin-desktop: 2.1.9 -> 2.3.5 --- pkgs/applications/misc/joplin-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index a5a9c3e45f42..02e3596e05ee 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.1.9"; + version = "2.3.5"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "1s7zydi90yzafii42m3aaf3niqlmdy2m494j2b3yrz2j26njj4q9"; - x86_64-darwin = "1pvl08yhcrnrvdybfmkigaidhfrrg42bb6rzv96zyq9w4k0l0lm8"; + x86_64-linux = "sha256-Qy/CpIEfAZ9735mwcNaJIw+qVmYXVwQ7gJuUj2lpQc4="; + x86_64-darwin = "sha256-7I+fhcFFW/WihuUkSE5Pc8RhKszSgByP58H3sKSJbrc="; }.${system} or throwSystem; }; From 745f6a9f879f2eeaa49f2d4ba7f62b8dd5a4783a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 22:42:46 +0200 Subject: [PATCH 118/135] terrascan: 1.9.0 -> 1.10.0 --- pkgs/tools/security/terrascan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 106012bd7a36..eb5320d250fc 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DTwA8nHWKOXeha0TBoEGJuoUedxJVev0R0GnHuaHEMc="; + sha256 = "sha256-IF5BDe6XnOR7F/ajYBbMuFpIxUawgd/Oo2AthL5aeWE="; }; - vendorSha256 = "sha256-gDhEaJ444d7fITVaEkH5RXMykmZyXjC+mPfaa2vkpIk="; + vendorSha256 = "sha256-PZM8OWvjj8681/CWVE896f3vRHnkNeJj2w/aoOFZ9P0="; # Tests want to download a vulnerable Terraform project doCheck = false; From 64129db6c70a117e964a2e27553da2e2946faff4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 08:13:41 +0000 Subject: [PATCH 119/135] jenkins-job-builder: 3.9.0 -> 3.10.0 --- .../python-modules/jenkins-job-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 3ae6bf84ae4f..5b3f68272fa2 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "4a53e146843d567c375c2e61e70a840d75a412402fd78c1dd3da5642a6aaa375"; + sha256 = "sha256-8MP8YHIkxDqjPsUYv6ROmuRwcGMzPpsVCRwxga3XdYU="; }; postPatch = '' From 5bb4a67959cebbe8b24021c0a583a614245a2e20 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 25 Aug 2021 22:49:01 +0200 Subject: [PATCH 120/135] chromiumDev: 94.0.4606.12 -> 94.0.4606.20 --- .../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 00731c0c399d..9404851247b5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "94.0.4606.12", - "sha256": "1yv34wahg1f0l35kvlm3x17wvqdg8yyzmjj6naz2lnl5qai89zr8", - "sha256bin64": "19z9yzj6ig5ym8f9zzs8b4yixkspc0x62sz526r39803pbgs7s7i", + "version": "94.0.4606.20", + "sha256": "0wp9fdw7jkrzhaz8dils7k1ssd6v7kkiz4y9l81s37xxi3xj1drg", + "sha256bin64": "059rn0jj2cajrxx57gmr0ndkgixgfqazb73rxbprqj4857w4d5da", "deps": { "gn": { "version": "2021-08-11", From 27893ad1011bd5d31ccad042e7be16f05f3ecd59 Mon Sep 17 00:00:00 2001 From: Maas Lalani Date: Wed, 25 Aug 2021 16:31:26 -0400 Subject: [PATCH 121/135] slides: 0.4.1 -> 0.5.0 --- pkgs/applications/misc/slides/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index 491e889f242d..c69971919ee9 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "slides"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "1cywqrqj199hmx532h4vn0j17ypswq2zkmv8qpxpayvjwimx4pwk"; + sha256 = "175g823n253d3xg8hxycw3gm1hhqb0vz8zs7xxcbdw5rlpd2hjii"; }; checkInputs = [ @@ -18,7 +18,7 @@ buildGoModule rec { ruby ]; - vendorSha256 = "0y6fz9rw702mji571k0gp4kpfx7xbv7rvlnmpfjygy6lmp7wga6f"; + vendorSha256 = "13kx47amwvzyzc251iijsbwa52s8bpld4xllb4y85qkwllfnmq2g"; ldflags = [ "-s" "-w" From 6ea5813ff09dcad9a903a3941f167ab38c29cd40 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 25 Aug 2021 17:12:29 -0400 Subject: [PATCH 122/135] runiq: init at 1.2.1 --- pkgs/tools/text/runiq/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/text/runiq/default.nix diff --git a/pkgs/tools/text/runiq/default.nix b/pkgs/tools/text/runiq/default.nix new file mode 100644 index 000000000000..6d7bb5e7eb0b --- /dev/null +++ b/pkgs/tools/text/runiq/default.nix @@ -0,0 +1,20 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "runiq"; + version = "1.2.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "0xhd1z8mykxg9kiq8nw5agy1jxfk414czq62xm1s13ssig3h7jqj"; + }; + + cargoSha256 = "1g4yfz5xq9lqwh0ggyn8kn8bnzrqfmh7kx455md5ranrqqh0x5db"; + + meta = with lib; { + description = "An efficient way to filter duplicate lines from input, à la uniq"; + homepage = "https://github.com/whitfin/runiq"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afae38acb69b..56d7c4bc1cab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32020,6 +32020,8 @@ with pkgs; run-scaled = callPackage ../tools/X11/run-scaled { }; + runiq = callPackage ../tools/text/runiq { }; + runit = callPackage ../tools/system/runit { }; refind = callPackage ../tools/bootloaders/refind { }; From 2163af5167d15c2238d3fe47d69f6803359d455f Mon Sep 17 00:00:00 2001 From: Leo Maroni Date: Tue, 24 Aug 2021 14:59:58 +0200 Subject: [PATCH 123/135] nixos/grafana: start systemd service after database --- nixos/modules/services/monitoring/grafana.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index e0b2624b6cac..fb67bbfb8420 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -6,6 +6,8 @@ let cfg = config.services.grafana; opt = options.services.grafana; declarativePlugins = pkgs.linkFarm "grafana-plugins" (builtins.map (pkg: { name = pkg.pname; path = pkg; }) cfg.declarativePlugins); + useMysql = cfg.database.type == "mysql"; + usePostgresql = cfg.database.type == "postgres"; envOptions = { PATHS_DATA = cfg.dataDir; @@ -635,7 +637,7 @@ in { systemd.services.grafana = { description = "Grafana Service Daemon"; wantedBy = ["multi-user.target"]; - after = ["networking.target"]; + after = ["networking.target"] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service"; environment = { QT_QPA_PLATFORM = "offscreen"; } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; From 3b81e5c7c4d7251aabd5b829a95feeed5cb6b227 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 25 Aug 2021 18:05:40 -0400 Subject: [PATCH 124/135] dutree: init at 0.2.18 --- pkgs/tools/misc/dutree/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/dutree/default.nix diff --git a/pkgs/tools/misc/dutree/default.nix b/pkgs/tools/misc/dutree/default.nix new file mode 100644 index 000000000000..99ba711b0cd6 --- /dev/null +++ b/pkgs/tools/misc/dutree/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "dutree"; + version = "0.2.18"; + + src = fetchFromGitHub { + owner = "nachoparker"; + repo = pname; + rev = "v${version}"; + sha256 = "1720295nxwr6r5yr6zhk2cw5y2l4w862f5wm9v7jjmf3a840yl8p"; + }; + + cargoSha256 = "0gg1w0xx36aswfm0y53nqwwz7zds25ysmklbrc8v2r91j74bhkzw"; + + meta = with lib; { + description = "A tool to analyze file system usage written in Rust"; + homepage = "https://github.com/nachoparker/dutree"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afae38acb69b..1be534a03afc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24000,6 +24000,8 @@ with pkgs; du-dust = callPackage ../tools/misc/dust { }; + dutree = callPackage ../tools/misc/dutree { }; + devede = callPackage ../applications/video/devede { }; denemo = callPackage ../applications/audio/denemo { }; From fce59fbdc474316a266ff1440441bd5ec02532b8 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 26 Aug 2021 07:10:33 +0900 Subject: [PATCH 125/135] vscode-extensions.lokalise.i18n-ally: init at "2.7.1" --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 84e727907f3e..94f9f5b6903f 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -917,6 +917,18 @@ let }; }; + lokalise.i18n-ally = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "i18n-ally"; + publisher = "Lokalise"; + version = "2.7.1"; + sha256 = "sha256-nHBYRSiPQ5ucWPr9VCUgMrosloLnVj40Fh+CEBvWONE="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + mads-hartmann.bash-ide-vscode = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "mads-hartmann"; From f74b8acfac29c2bff5c8435622ed5b4fae39da20 Mon Sep 17 00:00:00 2001 From: luhuaei <46041665+luhuaei@users.noreply.github.com> Date: Thu, 26 Aug 2021 06:16:41 +0800 Subject: [PATCH 126/135] pymupdf: 1.18.16 -> 1.18.17 (#135661) --- .../python-modules/pymupdf/default.nix | 11 ++--------- .../python-modules/pymupdf/nix-support.patch | 17 ----------------- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/python-modules/pymupdf/nix-support.patch diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index e749c467ab19..0b147c971b02 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -13,21 +13,14 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.18.16"; + version = "1.18.17"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "b21e39098fbbe0fdf269fdb2d1dd25a3847bbf22785ee8903d3a5637c2d0b9d7"; + sha256 = "fa39ee5e91eae77818e07b6bb7e0cb0b402ad88e39a74b08626ce1c2150c5414"; }; - patchFlags = [ "--binary" "--ignore-whitespace" ]; - patches = [ - # Add NIX environment support. - # Should be removed next pyMuPDF release. - ./nix-support.patch - ]; - postPatch = '' substituteInPlace setup.py \ --replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf diff --git a/pkgs/development/python-modules/pymupdf/nix-support.patch b/pkgs/development/python-modules/pymupdf/nix-support.patch deleted file mode 100644 index e0a14337a8d9..000000000000 --- a/pkgs/development/python-modules/pymupdf/nix-support.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -36,10 +36,14 @@ LIBRARIES = { - "opensuse": OPENSUSE, - "fedora": FEDORA, - "alpine": ALPINE, -+ "nix": FEDORA, - } - - - def load_libraries(): -+ if os.getenv("NIX_STORE"): -+ return LIBRARIES["nix"] -+ - try: - import distro - From df7d41ecb5a679f784e574f3f3ddbf0cb3569d56 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 26 Aug 2021 00:17:41 +0200 Subject: [PATCH 127/135] cosign: 1.0.1 -> 1.1.0 https://github.com/sigstore/cosign/releases/tag/v1.1.0 --- pkgs/tools/security/cosign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index f5f60f3da2a7..0f81fb4a3d18 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j1C4OGyVY41bG+rRr6chbii94H4yeRCum52A8XcnP6g="; + sha256 = "sha256-FG6LAaz6n2l77Wr7SYmwzL10G5gyHPCPG05hQlsOQBI="; }; buildInputs = @@ -17,7 +17,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "sha256-9/KrgokCqSWqC4nOgA1e9H0sOx6O/ZFGFEPxiPEKoNI="; + vendorSha256 = "sha256-OKQVgF/pg4cigMkckX/dclieHCoD39ltR+DegaUfSDk="; excludedPackages = "\\(copasetic\\)"; From 9aa05d18b77b20ecea5046fac4987a5130d9dfef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 26 Aug 2021 00:19:25 +0200 Subject: [PATCH 128/135] flexoptix-app: 5.9.0 -> 5.11.0 and fixes This update is required because the autoupdater prevents the app from running without being updated (which is not possible because it is a store path). So this updates the app and patches out the updater (essentially it never thinks it needs to update, even though it prints on the command line that it should). Also fix the desktop item. --- pkgs/tools/misc/flexoptix-app/default.nix | 29 ++++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 40f30bd7ad90..507fbb7dcc71 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,12 +1,12 @@ -{ lib, appimageTools, fetchurl }: let +{ lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.9.0"; + version = "5.11.0"; name = "${pname}-${version}"; src = fetchurl { name = "${name}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - sha256 = "0gbqaj9b11mxx0knmmh2d5863kaslbb3r6c4h8rjhg8qy4cws7hj"; + sha256 = "sha256:1hzdb2fbkwpsf0d3ws4z32blk6549jwhf1lrlqmcxhzqfvkr4gin"; }; udevRules = fetchurl { @@ -14,12 +14,20 @@ sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr"; }; - appimageContents = appimageTools.extractType2 { - inherit name src; - }; + appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: { + buildCommand = '' + ${oA.buildCommand} -in appimageTools.wrapType2 { - inherit name src; + # Get rid of the autoupdater + ${nodePackages.asar}/bin/asar extract $out/resources/app.asar app + sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js + ${nodePackages.asar}/bin/asar pack app $out/resources/app.asar + ''; + }); + +in appimageTools.wrapAppImage { + inherit name; + src = appimageContents; multiPkgs = null; # no 32bit needed extraPkgs = { pkgs, ... }@args: [ @@ -27,11 +35,14 @@ in appimageTools.wrapType2 { ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; extraInstallCommands = '' + # Add desktop convencience stuff mv $out/bin/{${name},${pname}} install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps substituteInPlace $out/share/applications/flexoptix-app.desktop \ - --replace 'Exec=AppRun' "Exec=$out/bin/${pname}" + --replace 'Exec=AppRun' "Exec=$out/bin/${pname} --" + + # Add udev rules mkdir -p $out/lib/udev/rules.d ln -s ${udevRules} $out/lib/udev/rules.d/99-tprogrammer.rules ''; From 799908d71c4b74c7d0e753c3860f4686790eddc8 Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Sun, 22 Aug 2021 20:19:47 +0100 Subject: [PATCH 129/135] micromamba: 0.14.1 -> 0.15.0 --- .../package-management/micromamba/default.nix | 41 ++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index a7e563ce67e5..ad325cd4f41a 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -1,23 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake , cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc }: let libsolv' = libsolv.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ - "-DENABLE_CONDA=true" # Maybe enable this in the original libsolv package? No idea about the implications. + "-DENABLE_CONDA=true" ]; + + patches = [ + # Patch added by the mamba team + (fetchpatch { + url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/add_strict_repo_prio_rule.patch"; + sha256 = "19c47i5cpyy88nxskf7k6q6r43i55w61jvnz7fc2r84hpjkcrv7r"; + }) + # Patch added by the mamba team + (fetchpatch { + url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/conda_variant_priorization.patch"; + sha256 = "1iic0yx7h8s662hi2jqx68w5kpyrab4fr017vxd4wyxb6wyk35dd"; + }) + # Patch added by the mamba team + (fetchpatch { + url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/memcpy_to_memmove.patch"; + sha256 = "1c9ir40l6crcxllj5zwhzbrbgibwqaizyykd0vip61gywlfzss64"; + }) + ]; + }); + + # fails linking with yaml-cpp 0.7.x + libyamlcpp' = libyamlcpp.overrideAttrs (oldAttrs: rec { + + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "jbeder"; + repo = "yaml-cpp"; + rev = "yaml-cpp-${version}"; + sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s"; + }; }); in stdenv.mkDerivation rec { pname = "micromamba"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = version; - sha256 = "0a5kmwk44ll4d8b2akjc0vm6ap9jfxclcw4fclvjxr2in3am9256"; + sha256 = "1zksp4zqj4wn9p9jb1qx1acajaz20k9xnm80yi7bab2d37y18hcw"; }; nativeBuildInputs = [ cmake ]; @@ -27,7 +58,7 @@ stdenv.mkDerivation rec { nlohmann_json curl libarchive - libyamlcpp + libyamlcpp' libsolv' reproc # python3Packages.pybind11 # Would be necessary if someone wants to build with bindings I guess. From 1a5b80085f86992bc2af984570a8fd75ada7b2d1 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 24 Aug 2021 11:26:52 +0900 Subject: [PATCH 130/135] bash: update-patch-set script fixes - make the script runnable from any directory - add missing nix dependency to run nix-hash - make padding non implicit - small shellcheck fixes (variable quoting...) --- pkgs/shells/bash/update-patch-set.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/shells/bash/update-patch-set.sh b/pkgs/shells/bash/update-patch-set.sh index cb4f372f5433..03b00228822d 100755 --- a/pkgs/shells/bash/update-patch-set.sh +++ b/pkgs/shells/bash/update-patch-set.sh @@ -1,11 +1,11 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure -i bash -p wget -p gnupg -p cacert +#!nix-shell --pure -i bash -p wget -p gnupg -p cacert -p nix # Update patch set for GNU Bash or Readline. if [ $# -ne 2 ] then - echo "Usage: $(basename $0) PROJECT VERSION" + echo "Usage: $(basename "$0") PROJECT VERSION" echo "" echo "Update the patch set for PROJECT (one of \`bash' or \`readline') for" echo "the given version (e.g., \`4.0'). Produce \`PROJECT-patches.nix'." @@ -14,14 +14,12 @@ fi PROJECT="$1" VERSION="$2" -VERSION_CONDENSED="$(echo $VERSION | sed -es/\\.//g)" -PATCH_LIST="$PROJECT-$VERSION-patches.nix" +DIR=$(dirname "$0") +VERSION_CONDENSED="$(echo "$VERSION" | sed -es/\\.//g)" +PATCH_LIST="$DIR/$PROJECT-$VERSION-patches.nix" set -e -start=1 -end=100 # must be > 99 for correct padding - rm -vf "$PATCH_LIST" wget "https://tiswww.case.edu/php/chet/gpgkey.asc" @@ -35,18 +33,20 @@ rm gpgkey.asc{,.md5} echo "patch: [" ) \ >> "$PATCH_LIST" -for i in `seq -w $start $end` +for i in {001..100} do - wget ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i || break - wget ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i.sig - gpg --verify $PROJECT$VERSION_CONDENSED-$i.sig - echo "(patch \"$i\" \"$(nix-hash --flat --type sha256 --base32 $PROJECT$VERSION_CONDENSED-$i)\")" \ + wget -P "$DIR" "ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i" || break + wget -P "$DIR" "ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i.sig" + gpg --verify "$DIR/$PROJECT$VERSION_CONDENSED-$i.sig" + hash=$(nix-hash --flat --type sha256 --base32 "$DIR/$PROJECT$VERSION_CONDENSED-$i") + echo "(patch \"$i\" \"$hash\")" \ >> "$PATCH_LIST" - rm -f $PROJECT$VERSION_CONDENSED-$i{,.sig} + rm -f "$DIR/$PROJECT$VERSION_CONDENSED-$i"{,.sig} done echo "]" >> "$PATCH_LIST" -echo "Got $(expr $i - 1) patches." +# bash interprets numbers starting with 0 as octals +echo "Got $((10#$i - 1)) patches." echo "Patch list has been written to \`$PATCH_LIST'." From 5dae71ea08de782cd178fc45b002ac8fe1767813 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 24 Aug 2021 11:27:17 +0900 Subject: [PATCH 131/135] bash: update 5.1 patches --- pkgs/shells/bash/bash-5.1-patches.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/shells/bash/bash-5.1-patches.nix b/pkgs/shells/bash/bash-5.1-patches.nix index b834deda0f80..aa5ad75fbc70 100644 --- a/pkgs/shells/bash/bash-5.1-patches.nix +++ b/pkgs/shells/bash/bash-5.1-patches.nix @@ -5,4 +5,8 @@ patch: [ (patch "002" "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm") (patch "003" "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2") (patch "004" "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls") +(patch "005" "19bdyigdr81824nxvqr6a7k0cax60wq7376j6b91afbnwvlvbjyc") +(patch "006" "051x8wlwrqk0yr0zg378vh824iklfl5g9pkmcdf62qp8gn9pvqbm") +(patch "007" "0fir80pp1gmlpadmqcgkrv4y119pc7xllchjzg05fd7px73viz5c") +(patch "008" "1lfjgshk8i9vch92p5wgc9r90j3phw79aa7gbai89w183b2z6b7j") ] From c4960e2eede052699fb8547ce380ab2af882fd52 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 26 Aug 2021 00:38:12 +0200 Subject: [PATCH 132/135] hydrus: 451 -> 452 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index de952e866dc4..3a7d38f0d386 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "451"; + version = "452"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-HoaXbnhwh6kDWgRFVs+VttzIY3MaxriteFTE1fwBUYs="; + sha256 = "sha256-CSWrmjJ6lFQ6tG403Uf+VAOfvBd1oAhd2kTU/7XA3f0="; }; nativeBuildInputs = [ From 761c93e4102f9a92632789130e87ac56959a3d3d Mon Sep 17 00:00:00 2001 From: ners <50560955+ners@users.noreply.github.com> Date: Thu, 26 Aug 2021 00:59:47 +0200 Subject: [PATCH 133/135] neovim-qt: add qtsvg depedency (#135683) Co-authored-by: Christoph Neidahl --- pkgs/applications/editors/neovim/neovim-qt.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix index 0a4d17d997b5..4d53143ac85c 100644 --- a/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/pkgs/applications/editors/neovim/neovim-qt.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper -, msgpack, neovim, python3Packages, qtbase }: +, msgpack, neovim, python3Packages, qtbase, qtsvg }: mkDerivation rec { pname = "neovim-qt-unwrapped"; @@ -20,6 +20,7 @@ mkDerivation rec { buildInputs = [ neovim.unwrapped # only used to generate help tags at build time qtbase + qtsvg ] ++ (with python3Packages; [ jinja2 python msgpack ]); From d1f93e7bc68d9c059bcde6faa1e9928305d0c33f Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 24 Aug 2021 17:57:48 +0200 Subject: [PATCH 134/135] gst: init at 5.0.4 --- .../git-and-tools/gst/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/gst/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/gst/default.nix b/pkgs/applications/version-management/git-and-tools/gst/default.nix new file mode 100644 index 000000000000..a323c61bf143 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gst/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, ghq +}: + +buildGoModule rec { + pname = "gst"; + version = "5.0.4"; + + src = fetchFromGitHub { + owner = "uetchy"; + repo = "gst"; + rev = "v${version}"; + sha256 = "0fqgkmhn84402hidxv4niy9himcdwm1h80prkfk9vghwcyynrbsj"; + }; + + vendorSha256 = "0k5xl55vzpl64gwsgaff92jismpx6y7l2ia0kx7gamd1vklf0qwh"; + + doCheck = false; + + nativeBuildInputs = [ + git + ghq + ]; + + ldflags = [ + "-s" "-w" "-X=main.Version=${version}" + ]; + + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" --version)" == "${pname} version ${version}" ]]; then + export HOME=$(mktemp -d) + git config --global user.name "Test User" + git config --global user.email "test@example.com" + git config --global init.defaultBranch "main" + git config --global ghq.user "user" + ghq create test > /dev/null 2>&1 + touch $HOME/ghq/github.com/user/test/SmokeTest + $out/bin/${pname} list | grep SmokeTest > /dev/null + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; + + meta = { + description = "Supercharge your ghq workflow"; + homepage = "https://github.com/uetchy/gst"; + maintainers = with lib.maintainers; [ _0x4A6F ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5e1505ff971..0d80bc79fd51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5185,6 +5185,8 @@ with pkgs; ghq = callPackage ../applications/version-management/git-and-tools/ghq { }; + gst = callPackage ../applications/version-management/git-and-tools/gst { }; + ghr = callPackage ../applications/version-management/git-and-tools/ghr { }; gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; From c511b4e1f9611b7716d66260554489e717722f13 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 26 Aug 2021 01:57:43 +0200 Subject: [PATCH 135/135] formats: Fix yaml test Faulty test result was introduced in https://github.com/NixOS/nixpkgs/pull/133807 --- pkgs/pkgs-lib/tests/formats.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 14cc85eff31d..2bc4e407fe75 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -77,8 +77,8 @@ in runBuildTests { 'false': false float: 3.141 list: - - null - - null + - null + - null 'null': null path: ${./formats.nix} str: foo