From 966cc8e8ab744a2b9dfd0a0931c86f74a77c7740 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Nov 2020 09:12:52 +0000 Subject: [PATCH 001/246] libcec: 4.0.7 -> 6.0.2 --- pkgs/development/libraries/libcec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 792d899333e..24f497ad04d 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }: -let version = "4.0.7"; in +let version = "6.0.2"; in stdenv.mkDerivation { pname = "libcec"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw"; + sha256 = "0xrkrcgfgr5r8r0854bw3i9jbq4jmf8nzc5vrrx2sxzvlkbrc1h9"; }; nativeBuildInputs = [ pkgconfig cmake ]; From 0c8f5c0f15edf5cbe188d63d0a32e43785f527f7 Mon Sep 17 00:00:00 2001 From: kvtb <76634406+kvtb@users.noreply.github.com> Date: Thu, 31 Dec 2020 23:48:05 +0000 Subject: [PATCH 002/246] kresd.nix: fix string escaping \+ has no effect in single quoted strings --- nixos/modules/services/networking/kresd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 074830fc352..342db95b5ff 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -8,9 +8,9 @@ let # Convert systemd-style address specification to kresd config line(s). # On Nix level we don't attempt to precisely validate the address specifications. mkListen = kind: addr: let - al_v4 = builtins.match "([0-9.]\+):([0-9]\+)" addr; - al_v6 = builtins.match "\\[(.\+)]:([0-9]\+)" addr; - al_portOnly = builtins.match "()([0-9]\+)" addr; + al_v4 = builtins.match "([0-9.]+):([0-9]+)" addr; + al_v6 = builtins.match "\\[(.+)]:([0-9]+)" addr; + al_portOnly = builtins.match "()([0-9]+)" addr; al = findFirst (a: a != null) (throw "services.kresd.*: incorrect address specification '${addr}'") [ al_v4 al_v6 al_portOnly ]; From 2c7f09a78f74f1a89fb47b675680b17526b9c7ff Mon Sep 17 00:00:00 2001 From: kvtb <76634406+kvtb@users.noreply.github.com> Date: Thu, 31 Dec 2020 23:49:55 +0000 Subject: [PATCH 003/246] docuwiki.nix: fix string escaping \. has no effect in single quoted strings --- nixos/modules/services/web-apps/dokuwiki.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index d9ebb3a9880..1d7f7b496ae 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -329,7 +329,7 @@ in extraConfig = "internal;"; }; - locations."~ ^/lib.*\.(js|css|gif|png|ico|jpg|jpeg)$" = { + locations."~ ^/lib.*\\.(js|css|gif|png|ico|jpg|jpeg)$" = { extraConfig = "expires 365d;"; }; @@ -349,7 +349,7 @@ in ''; }; - locations."~ \.php$" = { + locations."~ \\.php$" = { extraConfig = '' try_files $uri $uri/ /doku.php; include ${pkgs.nginx}/conf/fastcgi_params; From 2d6926b64b433e2fdf3e1d33b493d14c53f6a602 Mon Sep 17 00:00:00 2001 From: kvtb <76634406+kvtb@users.noreply.github.com> Date: Thu, 31 Dec 2020 23:50:51 +0000 Subject: [PATCH 004/246] fpm.nix: fix string escaping \. has no effect in single quoted strings --- nixos/tests/php/fpm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 9ad515ebdde..ffca46541e2 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -10,7 +10,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { testdir = pkgs.writeTextDir "web/index.php" " Date: Thu, 31 Dec 2020 23:51:49 +0000 Subject: [PATCH 005/246] build-bazel-package: fix string escaping \@ has no effect in single quoted strings --- pkgs/build-support/build-bazel-package/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 10a331bcc9e..a6f15a26cca 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -108,8 +108,8 @@ in stdenv.mkDerivation (fBuildAttrs // { rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker} ${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""} rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker} - ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\@local_config_cc.marker}" else ""} - ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\@local_*.marker}" else ""} + ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}" else ""} + ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}" else ""} # Clear markers find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \; From 75ad3ad7c6fde5b641dd59a8549bed645af7e3cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Jan 2021 17:00:07 +0100 Subject: [PATCH 006/246] python3Packages.exrex: init at 0.10.5 --- .../python-modules/exrex/default.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/exrex/default.nix diff --git a/pkgs/development/python-modules/exrex/default.nix b/pkgs/development/python-modules/exrex/default.nix new file mode 100644 index 00000000000..8c980c8d00f --- /dev/null +++ b/pkgs/development/python-modules/exrex/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "exrex"; + version = "0.10.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wq8nyycdprxl9q9y1pfhkbca4rvysj45h1xn7waybl3v67v3f1z"; + }; + + # Projec thas no released tests + doCheck = false; + pythonImportsCheck = [ "exrex" ]; + + meta = with lib; { + description = "Irregular methods on regular expressions"; + homepage = "https://github.com/asciimoo/exrex"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} From ecf62da9407aa2687d0e0fb28c6d131f9597732c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Jan 2021 17:00:45 +0100 Subject: [PATCH 007/246] python3Packages.questionary: init at 1.9.0 --- .../python-modules/questionary/default.nix | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/questionary/default.nix diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix new file mode 100644 index 00000000000..ecb33f6adb1 --- /dev/null +++ b/pkgs/development/python-modules/questionary/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry +, prompt_toolkit +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "questionary"; + version = "1.9.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tmbo"; + repo = pname; + rev = version; + sha256 = "1x748bz7l2r48031dj6vr6jvvac28pv6vx1bina4lz60h1qac1kf"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ prompt_toolkit ]; + + checkInputs = [ + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "questionary" ]; + + meta = with lib; { + description = "Python library to build command line user prompts"; + homepage = "https://github.com/bachya/regenmaschine"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} From 7d2829c0a004e9ee27115be0bc41c2e7787675cb Mon Sep 17 00:00:00 2001 From: Matthias Treydte Date: Thu, 28 Jan 2021 13:05:53 +0100 Subject: [PATCH 008/246] nixos/nginx: fix MemoryDenyWriteExecute not being disabled when needed The expression should check if the actually used nginx package needes write+execute rights, not the default pkgs.nginx (which has no modules unless overridden in an overlay). Having MemoryDenyWriteExecute always true causes e.g. the Lua module to fail (because JIT compilation). --- nixos/modules/services/web-servers/nginx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index d6f463be9e8..e6797fecc1a 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -801,7 +801,7 @@ in ProtectControlGroups = true; RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; LockPersonality = true; - MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) pkgs.nginx.modules); + MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules); RestrictRealtime = true; RestrictSUIDSGID = true; PrivateMounts = true; From ef8a3d9f83bd8eb9e0815279dadac8b72661ed04 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Tue, 2 Feb 2021 20:45:15 -0800 Subject: [PATCH 009/246] llvmPackages_11.compiler-rt: fix build on darwin Needed to prevent faulty i686 codegen on x86_64. We're doing this already for the older llvm packages, so not sure why 11 never had this. --- pkgs/development/compilers/llvm/11/compiler-rt.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix index 091f327550b..b3e8cb9e828 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" ] ++ lib.optionals (stdenv.isDarwin) [ "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" From a9a100adf605e5e3586401a28a89d64690dace5f Mon Sep 17 00:00:00 2001 From: Leonard Pollak Date: Mon, 15 Feb 2021 14:56:26 +0100 Subject: [PATCH 010/246] nixos/ceph: fix ceph.client.extraOptions type --- nixos/modules/services/network-filesystems/ceph.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index 632c3fb1059..d833062c473 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -316,7 +316,7 @@ in client = { enable = mkEnableOption "Ceph client configuration"; extraConfig = mkOption { - type = with types; attrsOf str; + type = with types; attrsOf (attrsOf str); default = {}; example = '' { From c406d55e699ae2d4436eab3db6064aa6ce28aadc Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sat, 20 Feb 2021 19:41:06 +0000 Subject: [PATCH 011/246] vo-aacenc: init at 0.1.3 Signed-off-by: Arthur Gautier --- .../libraries/vo-aacenc/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/vo-aacenc/default.nix diff --git a/pkgs/development/libraries/vo-aacenc/default.nix b/pkgs/development/libraries/vo-aacenc/default.nix new file mode 100644 index 00000000000..fb8dd43fe03 --- /dev/null +++ b/pkgs/development/libraries/vo-aacenc/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "vo-aacenc"; + version = "0.1.3"; + + src = fetchurl { + url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; + sha256 = "sha256-5Rp0d6NZ8Y33xPgtGV2rThTnQUy9SM95zBlfxEaFDzY="; + }; + + meta = with lib; { + description = "VisualOn AAC encoder library"; + homepage = "https://sourceforge.net/projects/opencore-amr/"; + license = licenses.asl20; + maintainers = [ maintainers.baloo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d488a13b22..94c01fc3d17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8765,6 +8765,8 @@ in vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { }; + vo-aacenc = callPackage ../development/libraries/vo-aacenc { }; + vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; From f7011c70f30acf0fe5a229b77e4ad22041b8872e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 22 Feb 2021 00:04:23 +0100 Subject: [PATCH 012/246] nextcloud21: init at 21.0.0, set as default version ChangeLog: https://nextcloud.com/changelog/#latest21 * Packaged 21.0.0, test-deployed it to my personal instance and tested the most basic functionality (`davfs2`-mount, {card,cal}dav sync, file management). * Bumped the default version for unstable/21.05 to `nextcloud21`. Since `nextcloud20` was added after the release of 20.09 (and thus the default on 20.09 is still `nextcloud19`), it's now needed to upgrade across two majors. This is not a problem though since it's possible to upgrade to v20 on 20.09 already and if not, the module will guard the administrator through the upgrade with eval warnings as it's the case since 20.03. * Dropped `nextcloud17` attribute and marked `nextcloud18` as EOL. --- nixos/doc/manual/release-notes/rl-2105.xml | 8 +++++--- nixos/modules/services/web-apps/nextcloud.nix | 11 +++++----- nixos/modules/services/web-apps/nextcloud.xml | 2 +- pkgs/servers/nextcloud/default.nix | 20 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index ca4b468e355..092068c3d3b 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -552,14 +552,16 @@ self: super: - The default-version of nextcloud is nextcloud20. + The default-version of nextcloud is nextcloud21. Please note that it's not possible to upgrade nextcloud across multiple major versions! This means that it's e.g. not possible to upgrade - from nextcloud18 to nextcloud20 in a single deploy. + from nextcloud18 to nextcloud20 in a single deploy and + most 20.09 users will have to upgrade to nextcloud20 + first. The package can be manually upgraded by setting - to nextcloud20. + to nextcloud21. diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index de1c67235f4..413db757357 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -86,7 +86,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud18" "nextcloud19" "nextcloud20" ]; + relatedPackages = [ "nextcloud19" "nextcloud20" "nextcloud21" ]; }; maxUploadSize = mkOption { @@ -348,7 +348,7 @@ in { ]; warnings = let - latest = 20; + latest = 21; upgradeWarning = major: nixos: '' A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. @@ -366,9 +366,9 @@ in { Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release. Please migrate your configuration to config.services.nextcloud.poolSettings. '') - ++ (optional (versionOlder cfg.package.version "18") (upgradeWarning 17 "20.03")) ++ (optional (versionOlder cfg.package.version "19") (upgradeWarning 18 "20.09")) - ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05")); + ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05")) + ++ (optional (versionOlder cfg.package.version "21") (upgradeWarning 20 "21.05")); services.nextcloud.package = with pkgs; mkDefault ( @@ -378,14 +378,13 @@ in { nextcloud defined in an overlay, please set `services.nextcloud.package` to `pkgs.nextcloud`. '' - else if versionOlder stateVersion "20.03" then nextcloud17 else if versionOlder stateVersion "20.09" then nextcloud18 # 21.03 will not be an official release - it was instead 21.05. # This versionOlder statement remains set to 21.03 for backwards compatibility. # See https://github.com/NixOS/nixpkgs/pull/108899 and # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md. else if versionOlder stateVersion "21.03" then nextcloud19 - else nextcloud20 + else nextcloud21 ); } diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 6cbfda118c4..83a6f68edcb 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -11,7 +11,7 @@ desktop client is packaged at pkgs.nextcloud-client. - The current default by NixOS is nextcloud20 which is also the latest + The current default by NixOS is nextcloud21 which is also the latest major version available.
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a40dd71fafd..53625941b61 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -31,24 +31,19 @@ let }; }; in { - nextcloud17 = throw '' - Nextcloud v17 has been removed from `nixpkgs` as the support for it will be dropped - by upstream within the lifetime of NixOS 20.09[1]. Please upgrade to Nextcloud v18 by + nextcloud18 = throw '' + Nextcloud v18 has been removed from `nixpkgs` as the support for it was dropped + by upstream in 2021-01. Please upgrade to at least Nextcloud v19 by declaring - services.nextcloud.package = pkgs.nextcloud18; + services.nextcloud.package = pkgs.nextcloud19; in your NixOS config. [1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html ''; - nextcloud18 = generic { - version = "18.0.10"; - sha256 = "0kv9mdn36shr98kh27969b8xs7pgczbyjklrfskxy9mph7bbzir6"; - eol = true; - }; - + # FIXME(@Ma27) remove on 2021-06 nextcloud19 = generic { version = "19.0.6"; sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg="; @@ -61,4 +56,9 @@ in { version = "20.0.7"; sha256 = "sha256-jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys="; }; + + nextcloud21 = generic { + version = "21.0.0"; + sha256 = "sha256-zq2u72doWhGvxbI7Coa6PHvQp7E41dHswFJiODZV8fA="; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8403e1a925b..adcac4d6a44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6544,7 +6544,7 @@ in grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud17 nextcloud18 nextcloud19 nextcloud20; + nextcloud18 nextcloud19 nextcloud20 nextcloud21; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; From 25b39e3fc7dab3a3da33e3c3e04cefb12b718178 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 1 Feb 2021 19:26:57 +0000 Subject: [PATCH 013/246] blflash: init at 0.3.2 --- pkgs/tools/misc/blflash/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/blflash/default.nix diff --git a/pkgs/tools/misc/blflash/default.nix b/pkgs/tools/misc/blflash/default.nix new file mode 100644 index 00000000000..bf09fc8d0a7 --- /dev/null +++ b/pkgs/tools/misc/blflash/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "blflash"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "spacemeowx2"; + repo = "blflash"; + rev = "v${version}"; + sha256 = "sha256-+2ncK1ibtQwlBREw4Yiqj4vFvAcZqjkoTBtBdAAUoRg="; + }; + + cargoSha256 = "sha256-tt9jfcoEw/HQ0/qU4lhbqKtIw/lthDTcyf/3HYQNPEY="; + + meta = with lib; { + description = "An bl602 serial flasher written in Rust"; + homepage = "https://github.com/spacemeowx2/blflash"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 375fa0bdf6e..3035c2ab6ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21188,6 +21188,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; + blflash = callPackage ../tools/misc/blflash { }; + blogc = callPackage ../applications/misc/blogc { }; bluefish = callPackage ../applications/editors/bluefish { From 76b4a48399a7c6fbb6c6298d1c0c4255bba882b5 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Mon, 28 Dec 2020 19:45:28 +0000 Subject: [PATCH 014/246] nemo-qml-plugin-dbus: init at 2.1.23 --- .../nemo-qml-plugin-dbus/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix diff --git a/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix b/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix new file mode 100644 index 00000000000..5a680b9da9a --- /dev/null +++ b/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qmake, qtbase }: + +mkDerivation rec { + pname = "nemo-qml-plugin-dbus"; + version = "2.1.23"; + + src = fetchFromGitLab { + domain = "git.sailfishos.org"; + owner = "mer-core"; + repo = "nemo-qml-plugin-dbus"; + rev = version; + sha256 = "0ww478ds7a6h4naa7vslj6ckn9cpsgcml0q7qardkzmdmxsrv1ag"; + }; + + nativeBuildInputs = [ qmake ]; + + postPatch = '' + substituteInPlace dbus.pro --replace ' tests' "" + substituteInPlace src/nemo-dbus/nemo-dbus.pro \ + --replace /usr $out \ + --replace '$$[QT_INSTALL_LIBS]' $out'/lib' + substituteInPlace src/plugin/plugin.pro \ + --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}' + ''; + + meta = with lib; { + description = "Nemo DBus plugin for qml"; + homepage = "https://git.sailfishos.org/mer-core/nemo-qml-plugin-dbus/"; + license = licenses.lgpl2Only; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 750af7e772f..a604ddc4358 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16004,6 +16004,8 @@ in ndpi = callPackage ../development/libraries/ndpi { }; + nemo-qml-plugin-dbus = libsForQt5.callPackage ../development/libraries/nemo-qml-plugin-dbus { }; + nifticlib = callPackage ../development/libraries/science/biology/nifticlib { }; notify-sharp = callPackage ../development/libraries/notify-sharp { }; From e9fe70c13ed5da5adebc3c09207499cd85d10c80 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Mon, 28 Dec 2020 19:46:48 +0000 Subject: [PATCH 015/246] mapbox-gl-native: init at 2020.06.07 --- .../libraries/mapbox-gl-native/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/mapbox-gl-native/default.nix diff --git a/pkgs/development/libraries/mapbox-gl-native/default.nix b/pkgs/development/libraries/mapbox-gl-native/default.nix new file mode 100644 index 00000000000..e98903e3a83 --- /dev/null +++ b/pkgs/development/libraries/mapbox-gl-native/default.nix @@ -0,0 +1,33 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config +, qtbase, curl, libuv, glfw3 }: + +mkDerivation rec { + pname = "mapbox-gl-native"; + version = "2020.06.07"; + + src = fetchFromGitHub { + owner = "mapbox"; + repo = "mapbox-gl-native"; + rev = "e18467d755f470b26f61f6893eddd76ecf0816e6"; + sha256 = "1x271gg9h81jpi70pv63i6lsa1zg6bzja9mbz7bsa4s02fpqy7wh"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl libuv glfw3 qtbase ]; + + cmakeFlags = [ + "-DMBGL_WITH_QT=ON" + "-DMBGL_WITH_QT_LIB_ONLY=ON" + "-DMBGL_WITH_QT_HEADLESS=OFF" + ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=type-limits"; + + meta = with lib; { + description = "Interactive, thoroughly customizable maps in native Android, iOS, macOS, Node.js, and Qt applications, powered by vector tiles and OpenGL"; + homepage = "https://mapbox.com/mobile"; + license = licenses.bsd2; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a604ddc4358..ce4a27b500d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15857,6 +15857,8 @@ in opencl-clang = callPackage ../development/libraries/opencl-clang { }; + mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; + mapnik = callPackage ../development/libraries/mapnik { }; marisa = callPackage ../development/libraries/marisa {}; From fccc5ba324647a13d5a172498ca440809ea27ddd Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Mon, 28 Dec 2020 19:48:24 +0000 Subject: [PATCH 016/246] mapbox-gl-qml: init at 1.7.5 --- .../libraries/mapbox-gl-qml/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/mapbox-gl-qml/default.nix diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix new file mode 100644 index 00000000000..1740b9ae580 --- /dev/null +++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -0,0 +1,32 @@ +{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtlocation, mapbox-gl-native }: + +mkDerivation rec { + pname = "mapbox-gl-qml"; + version = "1.7.5"; + + src = fetchFromGitHub { + owner = "rinigus"; + repo = "mapbox-gl-qml"; + rev = version; + sha256 = "1izwkfqn8jl83vihcxl2b159sqmkn1amxf92zw0h6psls2g9xhwx"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtlocation mapbox-gl-native ]; + + postPatch = '' + substituteInPlace mapbox-gl-qml.pro \ + --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}' + ''; + + # Package expects qt5 subdirectory of mapbox-gl-native to be in the include path + NIX_CFLAGS_COMPILE = "-I${mapbox-gl-native}/include/qt5"; + + meta = with lib; { + description = "Unofficial Mapbox GL Native bindings for Qt QML"; + homepage = "https://github.com/rinigus/mapbox-gl-qml"; + license = licenses.lgpl3Only; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce4a27b500d..d6327ed33d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15859,6 +15859,8 @@ in mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; + mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; + mapnik = callPackage ../development/libraries/mapnik { }; marisa = callPackage ../development/libraries/marisa {}; From e31f16ec8546ba10ccf79b4535443fa4a4421249 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Mon, 28 Dec 2020 19:53:52 +0000 Subject: [PATCH 017/246] s2geometry: init at 0.9.0 --- .../libraries/s2geometry/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/s2geometry/default.nix diff --git a/pkgs/development/libraries/s2geometry/default.nix b/pkgs/development/libraries/s2geometry/default.nix new file mode 100644 index 00000000000..afd5ffa0a0a --- /dev/null +++ b/pkgs/development/libraries/s2geometry/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, openssl, gtest }: + +stdenv.mkDerivation rec { + pname = "s2geometry"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "s2geometry"; + rev = "v${version}"; + sha256 = "1mx61bnn2f6bd281qlhn667q6yfg1pxzd2js88l5wpkqlfzzhfaz"; + }; + + patches = [ + # Fix build https://github.com/google/s2geometry/issues/165 + (fetchpatch { + url = "https://github.com/google/s2geometry/commit/a4dddf40647c68cd0104eafc31e9c8fb247a6308.patch"; + sha256 = "0fp3w4bg7pgf5vv4vacp9g06rbqzhxc2fg6i5appp93q6phiinvi"; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ openssl gtest ]; + + meta = with lib; { + description = "Computational geometry and spatial indexing on the sphere"; + homepage = "http://s2geometry.io/"; + license = licenses.asl20; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6327ed33d4..b97c08e3a87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16657,6 +16657,8 @@ in rubberband = callPackage ../development/libraries/rubberband { }; + s2geometry = callPackage ../development/libraries/s2geometry { }; + /* This package references ghc844, which we no longer have. Unfortunately, I have been unable to mark it as "broken" in a way that the ofBorg bot recognizes. Since I don't want to merge code into master that generates From 74bec372931c5ad12e9bac9a0a77841d2452c92d Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 12 Nov 2020 23:55:18 +0100 Subject: [PATCH 018/246] plik,plikd: init at 1.3.1 The client and the servers are separated so that a simple user just gets the necessary binary. Currently the server frontend has a very old build, I could not build this asset myself, so for the moment I simply extracted it from the binary release of the project. Once this build procedure will have been updated I will transition to a full build --- pkgs/servers/plik/default.nix | 25 ++++++++++++++++++++ pkgs/servers/plik/programs.nix | 42 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 3 files changed, 70 insertions(+) create mode 100644 pkgs/servers/plik/default.nix create mode 100644 pkgs/servers/plik/programs.nix diff --git a/pkgs/servers/plik/default.nix b/pkgs/servers/plik/default.nix new file mode 100644 index 00000000000..b66ca14e415 --- /dev/null +++ b/pkgs/servers/plik/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchurl, makeWrapper, runCommand, callPackage }: + +let + version = "1.3.1"; + + programs = callPackage ./programs.nix {}; + + webapp = fetchurl { + url = "https://github.com/root-gg/plik/releases/download/${version}/plik-${version}-linux-amd64.tar.gz"; + sha256 = "KN6cp29KKdGamYnfL3jYltx0EDx6syDPfV0jShOk7Zw="; + }; + +in { + + inherit (programs) plik plikd-unwrapped; + + plikd = runCommand "plikd-${version}" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/libexec/plikd/{bin,webapp} $out/bin + tar xf ${webapp} plik-${version}-linux-amd64/webapp/dist/ + mv plik-*/webapp/dist $out/libexec/plikd/webapp + cp ${programs.plikd-unwrapped}/bin/plikd $out/libexec/plikd/bin/plikd + makeWrapper $out/libexec/plikd/bin/plikd $out/bin/plikd \ + --run "cd $out/libexec/plikd/bin" + ''; +} diff --git a/pkgs/servers/plik/programs.nix b/pkgs/servers/plik/programs.nix new file mode 100644 index 00000000000..ff83ec5ff68 --- /dev/null +++ b/pkgs/servers/plik/programs.nix @@ -0,0 +1,42 @@ +{ lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }: + +let + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "root-gg"; + repo = "plik"; + rev = version; + sha256 = "C/1Uwjsqd9n3WSXlnlq9K3EJHkLOSavS9cPqF2UqmGo="; + }; + + vendorSha256 = "klmWXC3tkoOcQHhiQZjR2C5jqaRJqMQOLtVxZ0cFq/Y="; + + meta = with lib; { + homepage = "https://plik.root.gg/"; + description = "Scalable & friendly temporary file upload system"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.mit; + }; +in { + + plik = buildGoModule { + pname = "plik"; + inherit version meta src vendorSha256; + + subPackages = [ "client" ]; + postInstall = '' + mv $out/bin/client $out/bin/plik + ''; + }; + + plikd-unwrapped = buildGoModule { + pname = "plikd-unwrapped"; + inherit version src vendorSha256; + + subPackages = [ "server" ]; + postFixup = '' + mv $out/bin/server $out/bin/plikd + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d6fe1396d9..1de7b360812 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7176,6 +7176,9 @@ in plujain-ramp = callPackage ../applications/audio/plujain-ramp { }; + inherit (callPackage ../servers/plik { }) + plik plikd; + plex = callPackage ../servers/plex { }; plexRaw = callPackage ../servers/plex/raw.nix { }; From fc2ae7d79e31aade4bbbabc66ba57a456851b4df Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 10:07:16 +0100 Subject: [PATCH 019/246] nixos/plikd: Add new service module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/plikd.nix | 82 +++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 nixos/modules/services/misc/plikd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f831e302b16..37e918cd0a1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -509,6 +509,7 @@ ./services/misc/paperless.nix ./services/misc/parsoid.nix ./services/misc/plex.nix + ./services/misc/plikd.nix ./services/misc/tautulli.nix ./services/misc/pinnwand.nix ./services/misc/pykms.nix diff --git a/nixos/modules/services/misc/plikd.nix b/nixos/modules/services/misc/plikd.nix new file mode 100644 index 00000000000..a62dbef1d2a --- /dev/null +++ b/nixos/modules/services/misc/plikd.nix @@ -0,0 +1,82 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.plikd; + + format = pkgs.formats.toml {}; + plikdCfg = format.generate "plikd.cfg" cfg.settings; +in +{ + options = { + services.plikd = { + enable = mkEnableOption "the plikd server"; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for the plikd."; + }; + + settings = mkOption { + type = format.type; + default = {}; + description = '' + Configuration for plikd, see + for supported values. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.plikd.settings = mapAttrs (name: mkDefault) { + ListenPort = 8080; + ListenAddress = "localhost"; + DataBackend = "file"; + DataBackendConfig = { + Directory = "/var/lib/plikd"; + }; + MetadataBackendConfig = { + Driver = "sqlite3"; + ConnectionString = "/var/lib/plikd/plik.db"; + }; + }; + + systemd.services.plikd = { + description = "Plikd file sharing server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.plikd}/bin/plikd --config ${plikdCfg}"; + Restart = "on-failure"; + StateDirectory = "plikd"; + LogsDirectory = "plikd"; + DynamicUser = true; + + # Basic hardening + NoNewPrivileges = "yes"; + PrivateTmp = "yes"; + PrivateDevices = "yes"; + DevicePolicy = "closed"; + ProtectSystem = "strict"; + ProtectHome = "read-only"; + ProtectControlGroups = "yes"; + ProtectKernelModules = "yes"; + ProtectKernelTunables = "yes"; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK"; + RestrictNamespaces = "yes"; + RestrictRealtime = "yes"; + RestrictSUIDSGID = "yes"; + MemoryDenyWriteExecute = "yes"; + LockPersonality = "yes"; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.settings.ListenPort ]; + }; + }; +} From 10fa80fd300ce9cd081b578621861332ddf3e411 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 15:00:34 +0100 Subject: [PATCH 020/246] nixos/tests: new test for plikd --- nixos/tests/all-tests.nix | 1 + nixos/tests/plikd.nix | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 nixos/tests/plikd.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 541e0bc0a5c..ab8d79981fb 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -306,6 +306,7 @@ in pinnwand = handleTest ./pinnwand.nix {}; plasma5 = handleTest ./plasma5.nix {}; pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {}; + plikd = handleTest ./plikd.nix {}; plotinus = handleTest ./plotinus.nix {}; podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; postfix = handleTest ./postfix.nix {}; diff --git a/nixos/tests/plikd.nix b/nixos/tests/plikd.nix new file mode 100644 index 00000000000..8fec93c01f6 --- /dev/null +++ b/nixos/tests/plikd.nix @@ -0,0 +1,27 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "plikd"; + meta = with lib.maintainers; { + maintainers = [ freezeboy ]; + }; + + machine = { pkgs, ... }: let + in { + services.plikd.enable = true; + environment.systemPackages = [ pkgs.plik ]; + }; + + testScript = '' + # Service basic test + machine.wait_for_unit("plikd") + + # Network test + machine.wait_for_open_port("8080") + machine.succeed("curl --fail -v http://localhost:8080") + + # Application test + machine.execute("echo test > /tmp/data.txt") + machine.succeed("plik --server http://localhost:8080 /tmp/data.txt | grep curl") + + machine.succeed("diff data.txt /tmp/data.txt") + ''; +}) From a3c72e4d7de5c168c5c29af19488e79b02fdaca4 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Mon, 28 Dec 2020 20:04:09 +0000 Subject: [PATCH 021/246] pure-maps: init at 2.6.0 --- pkgs/applications/misc/pure-maps/default.nix | 46 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/misc/pure-maps/default.nix diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix new file mode 100644 index 00000000000..3ee87d58c08 --- /dev/null +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -0,0 +1,46 @@ +{ lib, mkDerivation, fetchFromGitHub, wrapQtAppsHook +, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors +, nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry +, python3, pyotherside, python3Packages +}: + +mkDerivation rec { + pname = "pure-maps"; + version = "2.6.0"; + + src = fetchFromGitHub { + owner = "rinigus"; + repo = "pure-maps"; + rev = version; + sha256 = "1nviq2pavyxwh9k4kyzqpbzmx1wybwdax4pyd017izh9h6gqnjhs"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ qmake python3 qttools wrapQtAppsHook ]; + buildInputs = [ + kirigami2 qtquickcontrols2 qtlocation qtsensors + nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry + ]; + propagatedBuildInputs = with python3Packages; [ gpxpy pyxdg ]; + + postPatch = '' + substituteInPlace pure-maps.pro \ + --replace '$$[QT_HOST_BINS]/lconvert' 'lconvert' + ''; + + qmakeFlags = [ "FLAVOR=kirigami" ]; + + dontWrapQtApps = true; + postInstall = '' + wrapQtApp $out/bin/pure-maps \ + --prefix PYTHONPATH : "$out/share" + ''; + + meta = with lib; { + description = "Display vector and raster maps, places, routes, and provide navigation instructions with a flexible selection of data and service providers"; + homepage = "https://github.com/rinigus/pure-maps"; + license = licenses.gpl3Only; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b97c08e3a87..eed66e815c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24603,6 +24603,8 @@ in puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; + pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { }; + pwdsafety = callPackage ../tools/security/pwdsafety { }; pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; From 41405995d6dc893a105845ed4890663ccb9cd65a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Feb 2021 11:42:30 +0100 Subject: [PATCH 022/246] python3Packages.django-mailman3: 1.3.4 -> 1.3.5 --- .../python-modules/django-mailman3/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 11939b9b773..fbac0a82a17 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.4"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "7e37b68bb47e9ae196ca19018f576e2c8c90189c5bd82d4e549d0c2f2f3f35fb"; + sha256 = "sha256-NoWVs8JiPt6spb7qXxKIdCTDhO3W9wUs9EJEMHUIQxM="; }; propagatedBuildInputs = [ @@ -21,10 +21,12 @@ buildPythonPackage rec { PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test ''; + pythonImportsCheck = [ "django_mailman3" ]; + meta = with lib; { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ globin peti ]; }; } From 8a20e93b5036a275462de883bb2a8d9032993b22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Feb 2021 11:50:07 +0100 Subject: [PATCH 023/246] python3Packages.postorius: 1.3.3 -> 1.3.4 --- pkgs/servers/mail/mailman/postorius.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 9330de3a8f3..fc9f6217d93 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "postorius"; - version = "1.3.3"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "08jn23gblbkfl09qlykbpsmp39mmach3sl69h1j5cd5kkx839rwa"; + sha256 = "sha256-L2ApUGQNvR0UVvodVM+wMzjYLZkegI4fT4yUiU/cibU="; }; propagatedBuildInputs = [ django-mailman3 readme_renderer ]; @@ -17,10 +17,10 @@ buildPythonPackage rec { # Tries to connect to database. doCheck = false; - meta = { - homepage = "https://www.gnu.org/software/mailman/"; + meta = with lib; { + homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ globin peti ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ globin peti ]; }; } From 96997fc0b4d48f480dd2758ac5fbc893b2ad0fda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Feb 2021 11:29:40 +0100 Subject: [PATCH 024/246] python3Packages.readme_renderer: 28.0 -> 29.0 python3Packages.readme_renderer: update Python release --- pkgs/development/python-modules/readme_renderer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 57a84e69d20..3a54251886d 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -9,15 +9,17 @@ , future , pygments , six +, pythonOlder }: buildPythonPackage rec { pname = "readme_renderer"; - version = "28.0"; + version = "29.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6b7e5aa59210a40de72eb79931491eaf46fefca2952b9181268bd7c7c65c260a"; + sha256 = "sha256-kv1awr+Gd/MQ8zA6pLzludX58glKuYwp8TeR17gFo9s="; }; checkInputs = [ pytest mock ]; From 62a76604dcedd879fcb2d2f54031f5b558dd17ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Feb 2021 11:31:26 +0100 Subject: [PATCH 025/246] python3Packages.readme_renderer: update check part --- .../readme_renderer/default.nix | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 3a54251886d..0d22a0c56c9 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -1,14 +1,13 @@ { lib -, buildPythonPackage -, fetchPypi -, pytest -, mock -, cmarkgfm , bleach +, buildPythonPackage +, cmarkgfm , docutils +, fetchPypi , future +, mock , pygments -, six +, pytestCheckHook , pythonOlder }: @@ -22,21 +21,25 @@ buildPythonPackage rec { sha256 = "sha256-kv1awr+Gd/MQ8zA6pLzludX58glKuYwp8TeR17gFo9s="; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ - bleach cmarkgfm docutils future pygments six + bleach + cmarkgfm + docutils + future + pygments ]; - checkPhase = '' - # disable one failing test case - # fixtures test is failing for incorrect class name - py.test -k "not test_invalid_link and not fixtures" - ''; + checkInputs = [ + mock + pytestCheckHook + ]; - meta = { - description = "readme_renderer is a library for rendering readme descriptions for Warehouse"; + pythonImportsCheck = [ "readme_renderer" ]; + + meta = with lib; { + description = "Python library for rendering readme descriptions"; homepage = "https://github.com/pypa/readme_renderer"; - license = lib.licenses.asl20; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; }; } From b1f65920c357b5cdde7123fabdc7a2af4d07f93e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 24 Feb 2021 22:27:39 +0100 Subject: [PATCH 026/246] nixos/nextcloud: add `defaultPhoneRegion` option for v21 --- nixos/modules/services/web-apps/nextcloud.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 413db757357..5090d424c08 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -280,6 +280,24 @@ in { may be served via HTTPS. ''; }; + + defaultPhoneRegion = mkOption { + default = null; + type = types.nullOr types.str; + example = "DE"; + description = '' + + This option exists since Nextcloud 21! If older versions are used, + this will throw an eval-error! + + + ISO 3611-1 + country codes for automatic phone-number detection without a country code. + + With e.g. DE set, the +49 can be omitted for + phone-numbers. + ''; + }; }; caching = { @@ -345,6 +363,9 @@ in { && !(acfg.adminpass != null && acfg.adminpassFile != null)); message = "Please specify exactly one of adminpass or adminpassFile"; } + { assertion = versionOlder cfg.package.version "21" -> cfg.config.defaultPhoneRegion == null; + message = "The `defaultPhoneRegion'-setting is only supported for Nextcloud >=21!"; + } ]; warnings = let @@ -442,6 +463,7 @@ in { 'dbtype' => '${c.dbtype}', 'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)}, 'trusted_proxies' => ${writePhpArrary (c.trustedProxies)}, + ${optionalString (c.defaultPhoneRegion != null) "'default_phone_region' => '${c.defaultPhoneRegion}',"} ]; ''; occInstallCmd = let From 797721423ca052dda400c0e1b1889c15f1972f29 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 24 Feb 2021 23:01:14 +0100 Subject: [PATCH 027/246] nixos/nextcloud: update nginx config Please note that I didn't use the current nginx config from the administration manual as this would've broken ACME challenges[1]. Also added a fix for Microsoft clients. [1] https://github.com/nextcloud/documentation/pull/5825#issuecomment-783977761 --- nixos/modules/services/web-apps/nextcloud.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 5090d424c08..6497a259dba 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -612,6 +612,14 @@ in { access_log off; ''; }; + "= /" = { + priority = 100; + extraConfig = '' + if ( $http_user_agent ~ ^DavClnt ) { + return 302 /remote.php/webdav/$is_args$args; + } + ''; + }; "/" = { priority = 900; extraConfig = "rewrite ^ /index.php;"; @@ -630,6 +638,9 @@ in { location = /.well-known/caldav { return 301 /remote.php/dav; } + location ~ ^/\.well-known/(?!acme-challenge|pki-validation) { + return 301 /index.php$request_uri; + } try_files $uri $uri/ =404; ''; }; From 5c51cf3559408ac39a4d6dda50b5d7de2a1f092a Mon Sep 17 00:00:00 2001 From: Ales Huzik Date: Fri, 19 Feb 2021 21:22:52 +1100 Subject: [PATCH 028/246] nxpmicro-mfgtools: add udev rules --- pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index a35cc57b825..8b603fbc5ce 100644 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { preConfigure = "echo ${version} > .tarball-version"; + postInstall = '' + # rules printed by the following invocation are static, + # they come from hardcoded configs in libuuu/config.cpp:48 + $out/bin/uuu -udev > udev-rules 2>stderr.txt + rules_file="$(cat stderr.txt|grep '1: put above udev run into'|sed 's|^.*/||')" + install -D udev-rules "$out/lib/udev/rules.d/$rules_file" + ''; + meta = with lib; { description = "Freescale/NXP I.MX chip image deploy tools"; longDescription = '' From fabe4e78acf687ecdb91a936711a88a9811a842c Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Sat, 10 Oct 2020 19:21:20 -0700 Subject: [PATCH 029/246] dirdiff: init at 2.1 --- pkgs/tools/text/dirdiff/default.nix | 59 +++++++++++++++++++ .../tools/text/dirdiff/dirdiff-2.1-vars.patch | 32 ++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 3 files changed, 96 insertions(+) create mode 100644 pkgs/tools/text/dirdiff/default.nix create mode 100644 pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch diff --git a/pkgs/tools/text/dirdiff/default.nix b/pkgs/tools/text/dirdiff/default.nix new file mode 100644 index 00000000000..b49df59b29e --- /dev/null +++ b/pkgs/tools/text/dirdiff/default.nix @@ -0,0 +1,59 @@ +{ copyDesktopItems, fetchurl, lib, makeDesktopItem, stdenv, tcl, tk }: + +stdenv.mkDerivation rec { + pname = "dirdiff"; + version = "2.1"; + + src = fetchurl { + url = "https://www.samba.org/ftp/paulus/${pname}-${version}.tar.gz"; + sha256 = "0lljd8av68j70733yshzzhxjr1lm0vgmbqsm8f02g03qsma3cdyb"; + }; + + nativeBuildInputs = [ copyDesktopItems ]; + buildInputs = [ tcl tk ]; + + # Some light path patching. + patches = [ ./dirdiff-2.1-vars.patch ]; + postPatch = '' + for file in dirdiff Makefile; do + substituteInPlace "$file" \ + --subst-var out \ + --subst-var-by tcl ${tcl} \ + --subst-var-by tk ${tk} + done + ''; + + # If we don't create the directories ourselves, then 'make install' creates + # files named 'bin' and 'lib'. + preInstall = '' + mkdir -p $out/bin $out/lib + ''; + + installFlags = [ + "BINDIR=${placeholder "out"}/bin" + "LIBDIR=${placeholder "out"}/lib" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "dirdiff"; + exec = "dirdiff"; + desktopName = "Dirdiff"; + genericName = "Directory Diff Viewer"; + comment = "Diff and merge directory trees"; + categories = "Development;"; + }) + ]; + + meta = with lib; { + description = "Graphical directory tree diff and merge tool"; + longDescription = '' + Dirdiff is a graphical tool for displaying the differences between + directory trees and for merging changes from one tree into another. + ''; + homepage = "https://www.samba.org/ftp/paulus/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ khumba ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch b/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch new file mode 100644 index 00000000000..4e7aa025754 --- /dev/null +++ b/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch @@ -0,0 +1,32 @@ +diff '--color=auto' -ru dirdiff-2.1/dirdiff dirdiff-2.1-patched/dirdiff +--- dirdiff-2.1/dirdiff 2005-04-20 03:09:53.000000000 -0700 ++++ dirdiff-2.1-patched/dirdiff 2021-02-14 22:54:09.837692023 -0800 +@@ -1,6 +1,6 @@ + #!/bin/sh + # Tcl ignores the next line \ +-exec wish "$0" -- "${1+$@}" ++exec @tk@/bin/wish "$0" -- "${1+$@}" + + # Copyright (C) 1999-2004 Paul Mackerras. All rights reserved. + # This program is free software; it may be used, copied, modified +@@ -17,7 +17,7 @@ + set TclExe [info nameofexecutable] + set compound_ok [expr {$tcl_version >= 8.4}] + +-set nofilecmp [catch {load libfilecmp.so.0.0}] ++set nofilecmp [catch {load @out@/lib/libfilecmp.so.0.0}] + set rcsflag {} + set diffbflag {} + set diffBflag {} +diff '--color=auto' -ru dirdiff-2.1/Makefile dirdiff-2.1-patched/Makefile +--- dirdiff-2.1/Makefile 2005-04-19 03:22:01.000000000 -0700 ++++ dirdiff-2.1-patched/Makefile 2021-02-14 22:54:58.575400923 -0800 +@@ -7,7 +7,7 @@ + INSTALL=install + + # You may need to change the -I arguments depending on your system +-CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl ++CFLAGS=-O3 -I@tcl@/include + + all: libfilecmp.so.0.0 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09700ec4a41..9f4ef2e2136 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3604,6 +3604,11 @@ in inherit (pythonPackages) mutagen python wrapPython; }; + dirdiff = callPackage ../tools/text/dirdiff { + tcl = tcl-8_5; + tk = tk-8_5; + }; + picotts = callPackage ../tools/audio/picotts { }; wgetpaste = callPackage ../tools/text/wgetpaste { }; From fd96e5ae460d872a9537db6cf123c32de3737535 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 26 Feb 2021 11:03:54 -0500 Subject: [PATCH 030/246] yabridge, yabridgectl: 3.0.0 -> 3.0.1 Also replaces hashes with SRI hashes --- pkgs/tools/audio/yabridge/default.nix | 12 ++++++------ pkgs/tools/audio/yabridgectl/default.nix | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 56f6cddb61e..034e73207e3 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -17,7 +17,7 @@ let owner = "fraillt"; repo = "bitsery"; rev = "v${version}"; - sha256 = "132b0n0xlpcv97l6bhk9n57hg95pkhwqzvr9jkv57nmggn76s5q7"; + hash = "sha256-Bxdtjn2v2lP2lCnvjzmct6QHT7FpwmXoSZtd2oEFS4w="; }; }; @@ -28,7 +28,7 @@ let owner = "Naios"; repo = "function2"; rev = version; - sha256 = "0abrz2as62725g212qswi35nsdlf5wrhcz78hm2qidbgqr9rkir5"; + hash = "sha256-JceZU8ZvtYhFheh8BjMvjjZty4hcYxHEK+IIo5X4eSk="; }; }; @@ -39,7 +39,7 @@ let owner = "marzer"; repo = "tomlplusplus"; rev = "v${version}"; - sha256 = "0fspinnpyk1c9ay0h3wl8d4bbm6aswlypnrw2c7pk2i4mh981b4b"; + hash = "sha256-i6yAEqwkinkPEzzb6ynXytS1SEOUDwi8SixMf62NVzs="; }; }; @@ -51,19 +51,19 @@ let repo = "vst3sdk"; rev = version; fetchSubmodules = true; - sha256 = "1fqpylkbljifwdw2z75agc0yxnhmv4b09fxs3rvlw1qmm5mwx0p2"; + sha256 = "sha256-4oLOa6kVB053Hrq7BBbZFdruAXuqnC944y5Kuib1F7s="; }; }; in stdenv.mkDerivation rec { pname = "yabridge"; - version = "3.0.0"; + version = "3.0.1"; # NOTE: Also update yabridgectl's cargoSha256 when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - sha256 = "0ha7jhnkd2i49q5rz2hp7sq6hv19bir99x51hs6nvvcf16hlf2bp"; + hash = "sha256-BT8Qj8WvyRlBwSuIIlfWVhlG3RSv2sFnSskCcjPF/N0="; }; # Unpack subproject sources diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index 6fa85cd89e8..6a77b502aee 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -6,9 +6,12 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoSha256 = "1sjhani8h7ap42yqlnj05sx59jyz2h12qlm1ibv8ldxcpwps0bwy"; + cargoHash = "sha256-YSK1DWv9kb6kFUJ4UEhh6psKsVqwpFJjvjJgj2e4BAc="; patches = [ + # By default, yabridgectl locates libyabridge.so by using + # hard-coded distro-specific lib paths. This patch replaces those + # hard coded paths with lib paths from NIX_PROFILE. ./libyabridge-from-nix-profiles.patch ]; From 52eba2efb9818a238bee6eea274a54db9c2dafc4 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sat, 20 Feb 2021 19:41:48 +0000 Subject: [PATCH 031/246] gst_all_1.gst-plugins-bad: adds voaacenc support Signed-off-by: Arthur Gautier --- pkgs/development/libraries/gstreamer/bad/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 313a063cae8..89011b9230f 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,10 +1,8 @@ { lib, stdenv , fetchurl -, fetchpatch , meson , ninja , gettext -, config , pkg-config , python3 , gst-plugins-base @@ -81,6 +79,7 @@ , x265 , libxml2 , srt +, vo-aacenc }: assert faacSupport -> faac != null; @@ -99,6 +98,7 @@ in stdenv.mkDerivation rec { }; patches = [ + # Use pkgconfig to inject the includedirs ./fix_pkgconfig_includedir.patch ]; @@ -117,6 +117,8 @@ in stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc + # gobject-introspection has to be in both nativeBuildInputs and + # buildInputs. The build tries to link against libgirepository-1.0.so gobject-introspection faad2 libass @@ -163,6 +165,7 @@ in stdenv.mkDerivation rec { libxml2 libintl srt + vo-aacenc ] ++ optionals enableZbar [ zbar ] ++ optionals faacSupport [ @@ -241,7 +244,6 @@ in stdenv.mkDerivation rec { "-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing "-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing "-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing - "-Dvoaacenc=disabled" # required `vo-aacenc` library not packaged in nixpkgs as of writing "-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing "-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support From 96dd54fc9e8cf75fbc2baf16c806965a5217736e Mon Sep 17 00:00:00 2001 From: Kevin Mullins Date: Fri, 26 Feb 2021 13:02:28 -0800 Subject: [PATCH 032/246] maintainers: add pnotequalnp --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 075d87b403f..2b07c6a9c18 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7455,6 +7455,16 @@ githubId = 11365056; name = "Kevin Liu"; }; + pnotequalnp = { + email = "kevin@pnotequalnp.com"; + github = "pnotequalnp"; + githubId = 46154511; + name = "Kevin Mullins"; + keys = [{ + longkeyid = "rsa4096/361820A45DB41E9A"; + fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A"; + }]; + }; polyrod = { email = "dc1mdp@gmail.com"; github = "polyrod"; From dcd95747df6e6528273186b1903b7178aa6ba584 Mon Sep 17 00:00:00 2001 From: Kevin Mullins Date: Fri, 26 Feb 2021 13:04:12 -0800 Subject: [PATCH 033/246] libjwt: init at 1.12.1 --- pkgs/development/libraries/libjwt/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/libjwt/default.nix diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/development/libraries/libjwt/default.nix new file mode 100644 index 00000000000..9c7d624e7f6 --- /dev/null +++ b/pkgs/development/libraries/libjwt/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, jansson, openssl }: + +stdenv.mkDerivation rec { + pname = "libjwt"; + version = "1.12.1"; + + src = fetchFromGitHub { + owner = "benmcollins"; + repo = "libjwt"; + rev = "v${version}"; + sha256 = "1c69slf9k56gh0xcg6269v712ysm6wckracms4grdsc72xg6x7h2"; + }; + + buildInputs = [ jansson openssl ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + meta = with lib; { + homepage = "https://github.com/benmcollins/libjwt"; + description = "JWT C Library"; + license = licenses.mpl20; + maintainers = with maintainers; [ pnotequalnp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 384b575f614..aa6eec616f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15310,6 +15310,8 @@ in libmicrohttpd = libmicrohttpd_0_9_72; }; + libjwt = callPackage ../development/libraries/libjwt { }; + libkate = callPackage ../development/libraries/libkate { }; libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; From 1a92826cdc5b6225983ffc13f544451759093775 Mon Sep 17 00:00:00 2001 From: "Wilson E. Husin" Date: Wed, 24 Feb 2021 23:02:19 -0800 Subject: [PATCH 034/246] obsidian: refactor to build using app.asar --- pkgs/applications/misc/obsidian/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 76009b96a33..3f898a13247 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -34,23 +34,20 @@ in stdenv.mkDerivation rec { src = fetchurl { url = - "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "AkPx7X00kEds7B1syXJPSV1+TJlqQ7NnR6w9wSG2BRw="; + "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; + sha256 = "1acy0dny04c8rdxqvsq70aa7vd8rgyjarcrf57mhh26ai5wiw81s"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; - unpackPhase = '' - gzip -dc $src > obsidian.asar - ''; - installPhase = '' mkdir -p $out/bin makeWrapper ${electron}/bin/electron $out/bin/obsidian \ - --add-flags $out/share/electron/obsidian.asar + --add-flags $out/share/obsidian/app.asar - install -m 444 -D obsidian.asar $out/share/electron/obsidian.asar + install -m 444 -D resources/app.asar $out/share/obsidian/app.asar + install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar install -m 444 -D "${desktopItem}/share/applications/"* \ -t $out/share/applications/ From c7a8f9fbffdcc43cb2113c36506ef9d9e808cc12 Mon Sep 17 00:00:00 2001 From: zseri Date: Fri, 26 Feb 2021 23:54:13 +0100 Subject: [PATCH 035/246] maintainers: add zseri --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2d122346fca..d8bc07fb912 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10756,6 +10756,16 @@ github = "pulsation"; githubId = 1838397; }; + zseri = { + name = "zseri"; + email = "zseri.devel@ytrizja.de"; + github = "zseri"; + githubId = 1618343; + keys = [{ + longkeyid = "rsa4096/0x229E63AE5644A96D"; + fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D"; + }]; + }; zupo = { name = "Nejc Zupan"; email = "nejczupan+nix@gmail.com"; From d39fa1f503caecdf1997f5bafd3e027dcc4b3dae Mon Sep 17 00:00:00 2001 From: zseri Date: Sat, 27 Feb 2021 00:04:28 +0100 Subject: [PATCH 036/246] libowlevelzs: init at 0.1.1 --- .../libraries/libowlevelzs/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libowlevelzs/default.nix diff --git a/pkgs/development/libraries/libowlevelzs/default.nix b/pkgs/development/libraries/libowlevelzs/default.nix new file mode 100644 index 00000000000..e024874eabe --- /dev/null +++ b/pkgs/development/libraries/libowlevelzs/default.nix @@ -0,0 +1,27 @@ +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "libowlevelzs"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "zseri"; + repo = "libowlevelzs"; + rev = "v${version}"; + sha256 = "y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Zscheile Lowlevel (utility) library"; + homepage = "https://github.com/zseri/libowlevelzs"; + license = licenses.mit; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88edafd49fa..4ecbff496e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23423,6 +23423,8 @@ in libowfat = callPackage ../development/libraries/libowfat { }; + libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; + librecad = libsForQt514.callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still; From 113e2761b7873e110bb54b11310adfeb2cf1cb49 Mon Sep 17 00:00:00 2001 From: zseri Date: Sat, 27 Feb 2021 00:04:37 +0100 Subject: [PATCH 037/246] zs-apc-spdu-ctl: init at 0.0.2 --- .../networking/zs-apc-spdu-ctl/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/networking/zs-apc-spdu-ctl/default.nix diff --git a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix new file mode 100644 index 00000000000..275cc88e597 --- /dev/null +++ b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix @@ -0,0 +1,36 @@ +{ cmake +, fetchFromGitHub +, fping +, lib +, libowlevelzs +, net-snmp +, stdenv +}: + +# TODO: add a services entry for the /etc/zs-apc-spdu.conf file +stdenv.mkDerivation rec { + pname = "zs-apc-spdu-ctl"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "zseri"; + repo = "zs-apc-spdu-ctl"; + rev = "v${version}"; + sha256 = "TMV9ETWBVeXq6tZ2e0CrvHBXoyKfOLCQurjBdf/iw/M="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ fping libowlevelzs net-snmp ]; + + postPatch = '' + substituteInPlace src/confent.cxx \ + --replace /usr/sbin/fping "${lib.makeBinPath [fping]}/fping" + ''; + + meta = with lib; { + description = "APC SPDU control utility"; + license = licenses.mit; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ecbff496e0..98c5e4bfa9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9352,6 +9352,8 @@ in zinit = callPackage ../shells/zsh/zinit {} ; + zs-apc-spdu-ctl = callPackage ../tools/networking/zs-apc-spdu-ctl { }; + zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; zsh-autopair = callPackage ../shells/zsh/zsh-autopair { }; From 33f54b0ecaa1d627ac4500119f16d2e52562db0d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 26 Feb 2021 17:30:32 +0200 Subject: [PATCH 038/246] libayatana-appindicator: Make multi output - Before this PR: `/nix/store/05k80dpnfgz73awks4nrvgl64396dxpi-libayatana-appindicator-gtk3-0.5.5 931.9M` - After this PR `/nix/store/31nijqx29pwiv8vjj4n8n8lmppmgdy00-libayatana-appindicator-gtk3-0.5.5 303.7M` --- pkgs/development/libraries/libayatana-appindicator/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index ef9823130f4..cbfbb593f1c 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { pname = "libayatana-appindicator-gtk${gtkVersion}"; version = "0.5.5"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-appindicator"; From 3081bd0ca972974f343abaedd13cfe0014379a6b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 27 Feb 2021 17:53:44 -0300 Subject: [PATCH 039/246] mons: add thiagokokada as maintainer --- pkgs/tools/misc/mons/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/mons/default.nix b/pkgs/tools/misc/mons/default.nix index 71a12c88796..a24e4869829 100644 --- a/pkgs/tools/misc/mons/default.nix +++ b/pkgs/tools/misc/mons/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "POSIX Shell script to quickly manage 2-monitors display"; homepage = "https://github.com/Ventto/mons.git"; license = licenses.mit; - maintainers = [ maintainers.mschneider ]; + maintainers = with maintainers; [ mschneider thiagokokada ]; }; } From ed8a3061c5fb5d1fd9f4a75b498d426c3c63d005 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 27 Feb 2021 18:25:04 +0800 Subject: [PATCH 040/246] exa: 0.9.0 -> unstable-2021-01-14 --- pkgs/tools/misc/exa/default.nix | 37 +++++++++++++-------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index f275d254677..a9d2a7b122f 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,43 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib +{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pandoc, perl, pkg-config, zlib , Security, libiconv, installShellFiles }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "exa"; - version = "0.9.0"; + version = "unstable-2021-01-14"; - cargoSha256 = "0nl106jlbr8gnnlbi20mrc6zyww7vxgmw6w34ibndxqh9ggxwfvr"; + cargoSha256 = "1lmjh0grpnx20y6raxnxgjkr92h395r6jk8mm2ypc4cxpxczdqvl"; src = fetchFromGitHub { owner = "ogham"; - repo = "exa"; - rev = "v${version}"; - sha256 = "14qlm9zb9v22hxbbi833xaq2b7qsxnmh15s317200vz5f1305hhw"; + repo = pname; + rev = "13b91cced4cab012413b25c9d3e30c63548639d0"; + sha256 = "18y4v1s102lh3gvgjwdd66qlsr75wpwpcj8zsk5y5r95a405dkfm"; }; - patches = [ - (fetchpatch { - # https://github.com/ogham/exa/pull/584 - name = "fix-panic-on-broken-symlink-in-git-repository.patch"; - url = "https://github.com/ogham/exa/pull/584/commits/a7a8e99cf3a15992afb2383435da0231917ffb54.patch"; - sha256 = "0n5q483sz300jkp0sbb350hdinmkw7s6bmigdyr6ypz3fvygd9hx"; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; + nativeBuildInputs = [ cmake pkg-config perl installShellFiles pandoc ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; outputs = [ "out" "man" ]; postInstall = '' - installManPage contrib/man/exa.1 + pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1 + pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5 + installManPage man/exa.1 man/exa_colors.5 installShellCompletion \ - --name exa contrib/completions.bash \ - --name exa.fish contrib/completions.fish \ - --name _exa contrib/completions.zsh + --name exa completions/completions.bash \ + --name exa.fish completions/completions.fish \ + --name _exa completions/completions.zsh ''; # Some tests fail, but Travis ensures a proper build From 4fc83dc5f56e0596e5a9dbb156cd9c3b459cfe75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Feb 2021 13:04:42 +0100 Subject: [PATCH 041/246] python3Packages.myjwt: init at 1.4.0 --- .../python-modules/myjwt/default.nix | 58 +++++++++++++++++++ .../python-modules/myjwt/pinning.patch | 21 +++++++ pkgs/top-level/python-packages.nix | 6 ++ 3 files changed, 85 insertions(+) create mode 100644 pkgs/development/python-modules/myjwt/default.nix create mode 100644 pkgs/development/python-modules/myjwt/pinning.patch diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix new file mode 100644 index 00000000000..d80e66e07bf --- /dev/null +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, click +, colorama +, cryptography +, exrex +, pyopenssl +, pyperclip +, questionary +, requests +, pytestCheckHook +, pytest-mock +, requests-mock +}: + +buildPythonPackage rec { + pname = "myjwt"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "mBouamama"; + repo = "MyJWT"; + rev = version; + sha256 = "1n3lvdrzp6wbbcygjwa7xar2jnhjnrz7a9khmn2phhkkngxm5rc4"; + }; + + patches = [ ./pinning.patch ]; + + propagatedBuildInputs = [ + click + colorama + cryptography + exrex + pyopenssl + pyperclip + questionary + requests + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + requests-mock + ]; + + pythonImportsCheck = [ "myjwt" ]; + + meta = with lib; { + description = "CLI tool for testing vulnerabilities on Json Web Token(JWT)"; + homepage = "https://github.com/mBouamama/MyJWT"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + # Build failures + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/myjwt/pinning.patch b/pkgs/development/python-modules/myjwt/pinning.patch new file mode 100644 index 00000000000..abae9d0e2ec --- /dev/null +++ b/pkgs/development/python-modules/myjwt/pinning.patch @@ -0,0 +1,21 @@ +diff --git a/requirements.txt b/requirements.txt +index 3017e02..2b465db 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,8 +1,8 @@ +-click==7.1.2 +-colorama==0.4.4 +-cryptography==3.3.1 +-exrex==0.10.5 +-pyOpenSSL==20.0.1 +-pyperclip==1.8.1 +-questionary==1.9.0 +-requests==2.25.1 ++click ++colorama ++cryptography ++exrex ++pyOpenSSL ++pyperclip ++questionary ++requests diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 754e0d75310..acbb2bec394 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2076,6 +2076,8 @@ in { exifread = callPackage ../development/python-modules/exifread { }; + exrex = callPackage ../development/python-modules/exrex { }; + extras = callPackage ../development/python-modules/extras { }; eyeD3 = callPackage ../development/python-modules/eyed3 { }; @@ -4175,6 +4177,8 @@ in { mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + myjwt = callPackage ../development/python-modules/myjwt { }; + mypy = callPackage ../development/python-modules/mypy { }; mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; @@ -6503,6 +6507,8 @@ in { querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + questionary = callPackage ../development/python-modules/questionary { }; + queuelib = callPackage ../development/python-modules/queuelib { }; r2pipe = callPackage ../development/python-modules/r2pipe { }; From 428ff5779ae6b4335f2c1edfb1a7969d013f9700 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 27 Feb 2021 12:32:51 -0800 Subject: [PATCH 042/246] erlangR23: 23.1.4 -> 23.2.6 --- pkgs/development/interpreters/erlang/R23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 53d1b49c375..23a68b7ee85 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,8 +3,8 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.1.4"; - sha256 = "16ssxmrgjgvzg06aa1l4wz9rrdjfy39k22amgabxwb5if1g8bg8z"; + version = "23.2.6"; + sha256 = "sha256-G930sNbr8h5ryI/IE+J6OKhR5ij68ZhGo1YIEjSOwGU="; prePatch = '' substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" From 025f1c4c874aec7546a6044c4ebaac0ee83ce906 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 27 Feb 2021 12:34:38 -0800 Subject: [PATCH 043/246] erlangR22: 22.3 -> 22.3.4.16 --- pkgs/development/interpreters/erlang/R22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 7596ad9e2f1..59bd5a5d3f7 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -3,8 +3,8 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "22.3"; - sha256 = "0srbyncgnr1kp0rrviq14ia3h795b3gk0iws5ishv6rphcq1rs27"; + version = "22.3.4.16"; + sha256 = "sha256-V0RwEPfjnHtEzShNh6Q49yGC5fbt2mNR4xy6f6iWvck="; prePatch = '' substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" From 7993fc70af9e8e1b8b91ec93aecf3e98377d1e8a Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 27 Feb 2021 12:34:56 -0800 Subject: [PATCH 044/246] erlangR21: 21.3.8.3 -> 21.3.8.21 --- pkgs/development/interpreters/erlang/R21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index fdd034fc607..2fe58a76b03 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation { - version = "21.3.8.3"; - sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; + version = "21.3.8.21"; + sha256 = "sha256-zQCs2hOA66jxAaxl/B42EKCejAktIav2rpVQCNyKCh4="; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" From a026ea9856021e8afb7dac044c010bb4af8b871f Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 27 Feb 2021 12:26:17 -0800 Subject: [PATCH 045/246] erlang: add missing AGL framework for aarch64-darwin Preventing this: ``` LD ../priv/aarch64-apple-darwin20.3.0/wxe_driver.so ld: file not found: /System/Library/Frameworks/AGL.framework/Versions/A/AGL for architecture arm64 clang-11: error: linker command failed with exit code 1 (use -v to see invocation) make[3]: *** [Makefile:176: ../priv/aarch64-apple-darwin20.3.0/wxe_driver.so] Error 1 ``` --- pkgs/development/interpreters/erlang/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 110a93a3ba5..ee9e173e829 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation ({ ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages ++ optional withSystemd systemd - ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ Carbon Cocoa ]); + ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa ]); debugInfo = enableDebugInfo; From d85965dcf50d5ef5f2681a0ca93ac2f8fec2f51c Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 27 Feb 2021 15:09:52 -0800 Subject: [PATCH 046/246] llvmPackages_11.libcxx: backport block.h fix from llvm12 As a concrete example, this fixes graphviz compilation: * https://gitlab.com/graphviz/graphviz/-/issues/1785 --- pkgs/development/compilers/llvm/11/libc++/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix index 0bb1ae33acd..6adb824f539 100644 --- a/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version +{ lib, stdenv, fetch, fetchpatch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -15,7 +15,14 @@ stdenv.mkDerivation { mv llvm-* llvm ''; - patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + patches = [ + (fetchpatch { + # Backported from LLVM 12, avoids clashes with commonly used "block.h" header. + url = "https://github.com/llvm/llvm-project/commit/19bc9ea480b60b607a3e303f20c7a3a2ea553369.patch"; + sha256 = "sha256-aWa66ogmPkG0xHzSfcpD0qZyZQcNKwLV44js4eiun78="; + stripLen = 1; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py From e96c9b30fa11aba581a1ec7f8f739ed6bcd8b96a Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sun, 28 Feb 2021 11:58:22 -0800 Subject: [PATCH 047/246] erlang: add missing WebKit framework on darwin Fixing the following error: ``` LD ../priv/x86_64-apple-darwin20.3.0/wxe_driver.so ld: file not found: /System/Library/Frameworks/WebKit.framework/Versions/A/WebKit for architecture x86_64 clang-7: error: linker command failed with exit code 1 (use -v to see invocation) ``` --- pkgs/development/interpreters/erlang/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index ee9e173e829..632eb9c541a 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation ({ ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages ++ optional withSystemd systemd - ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa ]); + ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]); debugInfo = enableDebugInfo; From d79c466e99a0159cd7c6d62320c41f3e6957a73e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 27 Feb 2021 18:21:04 -0300 Subject: [PATCH 048/246] mons: declare xrandr explicitly instead of using it from PATH mons tries to detect if xrandr is installed in the PATH, failing otherwise. However, this is not the way that packages are generally packaged in nixpkgs. This commit changes it to hardcode the path of xrandr explicitly instead of depending of xrandr being declared in PATH. --- pkgs/tools/misc/mons/default.nix | 10 ++++++++++ pkgs/tools/misc/mons/xrandr.patch | 14 ++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/mons/xrandr.patch diff --git a/pkgs/tools/misc/mons/default.nix b/pkgs/tools/misc/mons/default.nix index a24e4869829..920cab1763b 100644 --- a/pkgs/tools/misc/mons/default.nix +++ b/pkgs/tools/misc/mons/default.nix @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Substitute xrandr path with @xrandr@ so we can replace it with + # real path in substituteInPlace + ./xrandr.patch + ]; + + postPatch = '' + substituteInPlace mons.sh --replace '@xrandr@' '${xrandr}/bin/xrandr' + ''; + nativeBuildInputs = [ help2man ]; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/tools/misc/mons/xrandr.patch b/pkgs/tools/misc/mons/xrandr.patch new file mode 100644 index 00000000000..6cbcdf9d514 --- /dev/null +++ b/pkgs/tools/misc/mons/xrandr.patch @@ -0,0 +1,14 @@ +diff --git a/mons.sh b/mons.sh +index b86ce5c..feb0f33 100755 +--- a/mons.sh ++++ b/mons.sh +@@ -151,8 +151,7 @@ main() { + # ============================= + + [ -z "$DISPLAY" ] && { echo 'DISPLAY: no variable set.'; exit 1; } +- command -vp xrandr >/dev/null 2>&1 || { echo 'xrandr: command not found.'; exit 1; } +- XRANDR="$(command -pv xrandr)" ++ XRANDR="@xrandr@" + + # ============================= + # Argument Checking From 4d6fe8fb1701c24a613dcd8eb8da857fc10c215d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 1 Mar 2021 04:20:00 +0000 Subject: [PATCH 049/246] caf: 0.17.6 -> 0.18.0 https://github.com/actor-framework/actor-framework/releases/tag/0.18.0 --- pkgs/development/libraries/caf/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index fdc06df948d..944b5276c5a 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.17.6"; + version = "0.18.0"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "03pi2jcdvdxncvv3hmzlamask0db1fc5l79k9rgq9agl0swd0mnz"; + sha256 = "1c3spd6vm1h9qhlk5c4fdwi6nbqx5vwz2zvv6qp0rj1hx6xpq3cx"; }; nativeBuildInputs = [ cmake ]; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; cmakeFlags = [ - "-DCAF_NO_EXAMPLES:BOOL=TRUE" + "-DCAF_ENABLE_EXAMPLES:BOOL=OFF" ]; doCheck = true; checkTarget = "test"; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib + export LD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io + export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io ''; meta = with lib; { From e6b86a37eb2e56e5c8c0662a4c43e6956a70f437 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Wed, 19 Feb 2020 16:40:00 +0100 Subject: [PATCH 050/246] umr: init at unstable-2021-02-18 --- pkgs/development/misc/umr/default.nix | 37 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/misc/umr/default.nix diff --git a/pkgs/development/misc/umr/default.nix b/pkgs/development/misc/umr/default.nix new file mode 100644 index 00000000000..158cef2eed1 --- /dev/null +++ b/pkgs/development/misc/umr/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchgit, bash-completion, cmake, pkg-config +, libdrm, libpciaccess, llvmPackages, ncurses +}: + +stdenv.mkDerivation rec { + pname = "umr"; + version = "unstable-2021-02-18"; + + src = fetchgit { + url = "https://gitlab.freedesktop.org/tomstdenis/umr"; + rev = "79e17f8f2807ed707fc1be369d0aad536f6dbc97"; + sha256 = "IwTkHEuJ82hngPjFVIihU2rSolLBqHxQTNsP8puYPaY="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + bash-completion + libdrm + libpciaccess + llvmPackages.llvm + ncurses + ]; + + # Remove static libraries (there are no dynamic libraries in there) + postInstall = '' + rm -r $out/lib + ''; + + meta = with lib; { + description = "A userspace debugging and diagnostic tool for AMD GPUs"; + homepage = "https://gitlab.freedesktop.org/tomstdenis/umr"; + license = licenses.mit; + maintainers = with maintainers; [ Flakebi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdc4262a486..447f9ed0ecf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11731,6 +11731,10 @@ in pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64; pharo-launcher = callPackage ../development/pharo/launcher { }; + umr = callPackage ../development/misc/umr { + llvmPackages = llvmPackages_latest; + }; + srandrd = callPackage ../tools/X11/srandrd { }; srecord = callPackage ../development/tools/misc/srecord { }; From 70ef3914bc728c6f72c8e1101b2c35bca0c93d8e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 28 Feb 2021 22:52:44 -0300 Subject: [PATCH 051/246] luakit: 2.2.1 -> 2.3 --- .../networking/browsers/luakit/default.nix | 54 +++++++++++++------ 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 917da034c30..8656b4aaa27 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -1,34 +1,56 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook -, help2man, luafilesystem, luajit, sqlite -, webkitgtk, gtk3, gst_all_1, glib-networking +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, wrapGAppsHook +, help2man +, glib-networking +, gst_all_1 +, gtk3 +, luafilesystem +, luajit +, sqlite +, webkitgtk }: stdenv.mkDerivation rec { pname = "luakit"; - version = "2.2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "luakit"; repo = pname; rev = version; - sha256 = "sha256-78B8vXkWsFMJIHA72Qrk2SWubrY6YuArqcM0UAPjpzc="; + hash = "sha256-5YeJkbWk1wHxWXqWOvhEDeScWPU/aRVhuOWRHLSHVZM="; }; nativeBuildInputs = [ - pkg-config help2man wrapGAppsHook + pkg-config + help2man + wrapGAppsHook ]; - buildInputs = [ - webkitgtk luafilesystem luajit sqlite gtk3 + gtk3 glib-networking # TLS support - ] ++ ( with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly gst-libav ]); + luafilesystem + luajit + sqlite + webkitgtk + ] ++ ( with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + ]); + + # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found + # TODO: why is not this the default? The test runner adds + # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils + # scripts don't add an equivalent preBuild = '' - # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found - # TODO: why is not this the default? The test runner adds - # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils - # scripts don't add an equivalent export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua" ''; @@ -52,6 +74,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://luakit.github.io/"; description = "Fast, small, webkit-based browser framework extensible in Lua"; longDescription = '' Luakit is a highly configurable browser framework based on the WebKit web @@ -60,9 +83,8 @@ stdenv.mkDerivation rec { power users, developers and anyone who wants to have fine-grained control over their web browser’s behaviour and interface. ''; - homepage = "https://luakit.github.io/"; license = licenses.gpl3Only; - platforms = platforms.unix; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; }; } From 13be7fd7b770974edce7542bcb208aacdedb5d72 Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Mon, 1 Mar 2021 17:31:30 -0700 Subject: [PATCH 052/246] minikube: 1.17.1 -> 1.18.0 --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 81ca2283d20..66ff583e8c9 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.17.1"; + version = "1.18.0"; - vendorSha256 = "1flny2f7n3vqhl9vkwsqxvzl8q3fv8v0h1p0d0qaqp9lgn02q3bh"; + vendorSha256 = "0fy9x9zlmwpncyj55scvriv4vr4kjvqss85b0a1zs2srvlnf8gz2"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1m4kw77j4swwg3vqwmwrys7cq790w4g6y4gvdg33z9n1y9xzqys3"; + sha256 = "1yjcaq0lg5a7ip2qxjmnzq3pa1gjhdfdq9a4xk2zxyqcam4dh6v2"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; From ad9faced84b57884f336e7aa1320b6a58f8862a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Mar 2021 06:34:57 +0000 Subject: [PATCH 053/246] python37Packages.google-cloud-bigquery: 2.9.0 -> 2.10.0 --- .../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 644c7ef9185..228f3b68b61 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "33fcbdf5567bdb7657fb3485f061e7f1b45361f65fdafc168ab9172117fd9a5a"; + sha256 = "fac9adb1394d948e259fba1df4e86a6c34cfccaf19af7bdbdf9640cf6e313a71"; }; propagatedBuildInputs = [ From 704a0ab8c37b9dc3ab2cebde1feb8e70adb1f091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20L=C3=B8we=20Jacobsen?= Date: Tue, 2 Mar 2021 11:58:45 +0100 Subject: [PATCH 054/246] elasticsearch: Fix broken unfree version The current unfree versions are broken because makeWrapper is not a part of nativeBuildInputs. The bug was introduced in #112276. --- pkgs/servers/search/elasticsearch/6.x.nix | 2 +- pkgs/servers/search/elasticsearch/7.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index b3ad305687a..3558fd5935e 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (rec { }; } // optionalAttrs enableUnfree { dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; runtimeDependencies = [ zlib ]; postFixup = '' for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index ffe8a75412b..f808b6985b4 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (rec { }; } // optionalAttrs enableUnfree { dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; runtimeDependencies = [ zlib ]; postFixup = '' for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do From 81a2e8a8cc7bfaaf147b14101a154f4d9cb190fd Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Tue, 2 Mar 2021 14:51:51 +0300 Subject: [PATCH 055/246] gops: 0.3.15 -> 0.3.16 --- pkgs/development/tools/gops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix index 35d7cf50a7e..0f0230049cf 100644 --- a/pkgs/development/tools/gops/default.nix +++ b/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.15"; + version = "0.3.16"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "091idnsgbwabmm5s9zhm474fbxvjvpkvwg68snbypfll7wdr3phy"; + sha256 = "1ksypkja5smxvrhgcjk0w18ws97crx6bx5sj20sh8352xx0nm6mp"; }; vendorSha256 = null; From 3f93abd4ea47942b0b88f8a9eba28dbdb29f117b Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Tue, 2 Mar 2021 18:59:53 +0800 Subject: [PATCH 056/246] flavours: 0.3.5 -> 0.3.6 --- pkgs/applications/misc/flavours/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index 6ee546fa7c5..0e072aa649c 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "flavours"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "Misterio77"; repo = pname; rev = "v${version}"; - sha256 = "1lvbq026ap02f22mv45s904a0f81dr2f07j6bq0wnwl5wd5w0wpj"; + sha256 = "0nys1sh4qwda1ql6aq07bhyvhjp5zf0qm98kr4kf2fmr87ddc12q"; }; - cargoSha256 = "0wgi65k180mq1q6j4nma0wpfdvl67im5v5gmhzv1ap6xg3bicdg1"; + cargoSha256 = "0bmmxiv8bd09kgxmhmynslfscsx2aml1m1glvid3inaipylcq45h"; meta = with lib; { description = "An easy to use base16 scheme manager/builder that integrates with any workflow"; From fb815e88c3358cfe8fd9058ccbd41834b9b2f864 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 2 Mar 2021 13:03:35 +0100 Subject: [PATCH 057/246] apostrophe: 2.2.0.3 -> 2.3 --- .../applications/editors/apostrophe/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 4265e0ef104..a2030dfb9fd 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -2,23 +2,26 @@ , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive -, shared-mime-info, haskellPackages}: +, shared-mime-info, haskellPackages, libhandy +}: let - pythonEnv = pythonPackages.python.withPackages(p: with p; - [ regex setuptools python-Levenshtein pyenchant pygobject3 pycairo pypandoc ]); + pythonEnv = pythonPackages.python.withPackages(p: with p; [ + regex setuptools python-Levenshtein pyenchant + pygobject3 pycairo pypandoc chardet + ]); texliveDist = texlive.combined.scheme-medium; in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.2.0.3"; + version = "2.3"; src = fetchFromGitLab { owner = "somas"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879"; + sha256 = "1ggrbbnhbnf6p3hs72dww3c9m1rvr4znggmvwcpj6i8v1a3kycnb"; }; nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils @@ -26,13 +29,11 @@ in stdenv.mkDerivation rec { buildInputs = [ glib pythonEnv gobject-introspection gtk3 gnome3.adwaita-icon-theme webkitgtk gspell texliveDist - glib-networking ]; + glib-networking libhandy ]; postPatch = '' patchShebangs --build build-aux/meson_post_install.py - substituteInPlace ${pname}/config.py --replace "/usr/share/${pname}" "$out/share/${pname}" - # get rid of unused distributed dependencies rm -r ${pname}/pylocales ''; From e8a1548009ff632ec0f190c6705dd35cfabb420a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 2 Mar 2021 13:04:52 +0100 Subject: [PATCH 058/246] apostrophe: make texlive overrideable more easily Now you can just build apostrophe.override { texlive = yourTexliveDist; } which makes using a custom texlive distribution possible. --- pkgs/applications/editors/apostrophe/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index a2030dfb9fd..dd8757d0c17 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -10,7 +10,6 @@ let regex setuptools python-Levenshtein pyenchant pygobject3 pycairo pypandoc chardet ]); - texliveDist = texlive.combined.scheme-medium; in stdenv.mkDerivation rec { pname = "apostrophe"; @@ -28,7 +27,7 @@ in stdenv.mkDerivation rec { appstream-glib wrapGAppsHook ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 - gnome3.adwaita-icon-theme webkitgtk gspell texliveDist + gnome3.adwaita-icon-theme webkitgtk gspell texlive glib-networking libhandy ]; postPatch = '' @@ -41,7 +40,7 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/" - --prefix PATH : "${texliveDist}/bin" + --prefix PATH : "${texlive}/bin" --prefix PATH : "${haskellPackages.pandoc-citeproc}/bin" --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7316c3cc11a..e88c645adf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21297,6 +21297,7 @@ in apostrophe = callPackage ../applications/editors/apostrophe { pythonPackages = python3Packages; + texlive = texlive.combined.scheme-medium; }; aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; From c2a89d5bcad09a052016e4f7a64f8f82259959ab Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 2 Mar 2021 15:30:20 +0100 Subject: [PATCH 059/246] development/interpreters/lua-5: remove unused files These nix expressions from the lua-5 directory are imported nowhere and can be removed safely. --- .../interpreters/lua-5/filesystem.nix | 26 ------------------- .../interpreters/lua-5/sockets.nix | 25 ------------------ 2 files changed, 51 deletions(-) delete mode 100644 pkgs/development/interpreters/lua-5/filesystem.nix delete mode 100644 pkgs/development/interpreters/lua-5/sockets.nix diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix deleted file mode 100644 index d4e68b5cb76..00000000000 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, lua5 }: - -stdenv.mkDerivation { - version = "1.6.2"; - pname = "lua-filesystem"; - isLibrary = true; - src = fetchurl { - url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; - sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz"; - }; - - buildInputs = [ lua5 ]; - - preBuild = '' - makeFlagsArray=( - PREFIX=$out - LUA_LIBDIR="$out/lib/lua/${lua5.luaversion}" - LUA_INC="-I${lua5}/include"); - ''; - - meta = { - homepage = "https://github.com/keplerproject/luafilesystem"; - hydraPlatforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix deleted file mode 100644 index d16f068883a..00000000000 --- a/pkgs/development/interpreters/lua-5/sockets.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, lua5 }: - -stdenv.mkDerivation rec { - pname = "lua-sockets"; - version = "2.0.2"; - src = fetchurl { - url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz"; - sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag"; - }; - - luaver = lua5.luaversion; - patchPhase = '' - sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua5.luaversion}," \ - -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua5.luaversion}," \ - -i config - ''; - - buildInputs = [ lua5 ]; - - meta = { - homepage = "http://w3.impa.br/~diego/software/luasocket/"; - hydraPlatforms = lib.platforms.linux; - maintainers = [ ]; - }; -} From 17cc2e7543946262fc33929dc85feac3b66b46d0 Mon Sep 17 00:00:00 2001 From: kvtb <76634406+kvtb@users.noreply.github.com> Date: Thu, 31 Dec 2020 23:52:35 +0000 Subject: [PATCH 060/246] libcutl: fix string escaping \. has no effect in single quoted strings --- pkgs/development/libraries/libcutl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index b13805aa37a..b3effb4ab1e 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { description = "C++ utility library from Code Synthesis"; longDescription = '' libcutl is a C++ utility library. - It contains a collection of generic and independent components such as + It contains a collection of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks, etc. ''; homepage = "https://codesynthesis.com/projects/libcutl/"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { license = licenses.mit; }; - majmin = builtins.head ( builtins.match "([[:digit:]]\.[[:digit:]]+)\.*" "${version}" ); + majmin = builtins.head ( builtins.match "([[:digit:]]\\.[[:digit:]]+).*" "${version}" ); src = fetchurl { url = "https://codesynthesis.com/download/${pname}/${majmin}/${pname}-${version}.tar.bz2"; sha256 = "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j"; From 44164e9cd480e8d8fc3752e250c7965b3c265d36 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 26 Feb 2021 10:33:00 -0500 Subject: [PATCH 061/246] sbt: Remove installCheck The check is very fragile. We cannot replace it with different logic as that would require network access. ` --- pkgs/development/tools/build-managers/sbt/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index c9518d685b5..7ea10ac90ab 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-wqdZ/kCjwhoWtaiNAM1m869vByHk6mG2OULfuDotVP0="; }; - patchPhase = '' + postPatch = '' echo -java-home ${jre.home} >>conf/sbtopts ''; @@ -25,17 +25,16 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isLinux [ zlib ]; installPhase = '' + runHook preInstall + mkdir -p $out/share/sbt $out/bin cp -ra . $out/share/sbt ln -sT ../share/sbt/bin/sbt $out/bin/sbt ln -sT ../share/sbt/bin/sbtn-x86_64-${ if (stdenv.isDarwin) then "apple-darwin" else "pc-linux" } $out/bin/sbtn - ''; - doInstallCheck = true; - installCheckPhase = '' - ($out/bin/sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${version} (this may take some time)' + runHook postInstall ''; meta = with lib; { From e1f38da2c768e59cbcee5e10f836ce8f0050f021 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Mar 2021 20:00:40 +0000 Subject: [PATCH 062/246] cargo-expand: 1.0.4 -> 1.0.5 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 09650e8a386..7cb366c5502 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "09jdqf1f8kl2c3k4cp8j3qqb96gclhncvfdwg2l3bmh5r10id9b3"; + sha256 = "sha256-FWXSEGjTr2DewZ8NidzPdc6jhfNAUdV9qKyR7ZciWio="; }; - cargoSha256 = "0mx01h2zv7mpyi8s1545b7hjxn9aslzpbngrq4ii9rfqznz3r8k9"; + cargoSha256 = "sha256-uvTxOZPMTCd+3WQJeVfSC5mlJ487hJKs/0Dd2C8cpcM="; meta = with lib; { description = From 1577d16fb8725d50a52f3269ca071d01a45f2f26 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 1 Mar 2021 20:04:38 -0300 Subject: [PATCH 063/246] vms-empire: 1.15 -> 1.16 --- pkgs/games/vms-empire/default.nix | 51 ++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix index fcfc89667af..b3e89617ef3 100644 --- a/pkgs/games/vms-empire/default.nix +++ b/pkgs/games/vms-empire/default.nix @@ -1,26 +1,50 @@ -{ lib, stdenv, fetchurl, ncurses, xmlto }: +{ lib +, stdenv +, fetchurl +, ncurses +, xmlto +, docbook_xml_dtd_44 +, docbook_xsl +, installShellFiles +}: stdenv.mkDerivation rec { pname = "vms-empire"; - version = "1.15"; + version = "1.16"; src = fetchurl{ - url = "http://www.catb.org/~esr/vms-empire/${pname}-${version}.tar.gz"; - sha256 = "1vcpglkimcljb8s1dp6lzr5a0vbfxmh6xf37cmb8rf9wc3pghgn3"; + url = "http://www.catb.org/~esr/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-XETIbt/qVU+TpamPc2WQynqqUuZqkTUnItBprjg+gPk="; }; - buildInputs = - [ ncurses xmlto ]; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ + ncurses + xmlto + docbook_xml_dtd_44 + docbook_xsl + ]; - patchPhase = '' - sed -i -e 's|^install: empire\.6 uninstall|install: empire.6|' -e 's|usr/||g' Makefile + postBuild = '' + xmlto man vms-empire.xml + xmlto html-nochunks vms-empire.xml + ''; + + installPhase = '' + runHook preInstall + install -D vms-empire -t ${placeholder "out"}/bin/ + install -D vms-empire.html -t ${placeholder "out"}/share/doc/${pname}/ + install -D vms-empire.desktop -t ${placeholder "out"}/share/applications/ + install -D vms-empire.png -t ${placeholder "out"}/share/icons/hicolor/48x48/apps/ + install -D vms-empire.xml -t ${placeholder "out"}/share/appdata/ + installManPage empire.6 + runHook postInstall ''; hardeningDisable = [ "format" ]; - makeFlags = [ "DESTDIR=$(out)" ]; - meta = with lib; { + homepage = "http://catb.org/~esr/vms-empire/"; description = "The ancestor of all expand/explore/exploit/exterminate games"; longDescription = '' Empire is a simulation of a full-scale war between two emperors, the @@ -30,11 +54,8 @@ stdenv.mkDerivation rec { expand/explore/exploit/exterminate games, including Civilization and Master of Orion. ''; - homepage = "http://catb.org/~esr/vms-empire/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } - - From af5ce367fd16d56aa993f95dc3b2a69db6f325ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Mar 2021 22:21:13 +0000 Subject: [PATCH 064/246] ft2-clone: 1.43 -> 1.44_fix --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index d9d2570d0a8..2ebff030b4e 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.43"; + version = "1.44_fix"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-OIQk7ngg1wsB6DFcxhrviPGlhzdaAWBi9C2roSNg1eI="; + sha256 = "sha256-2HhG2cDzAvpSm655M1KQnjbfVvqqOZDz2ty7xnttskA="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) From 5c7461478b3b0fcfa315876fd3ec915242d68566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 2 Mar 2021 23:54:53 +0100 Subject: [PATCH 065/246] pythonPackages.datadog: fix tests --- .../python-modules/datadog/default.nix | 48 +++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index a8917c3965f..4a1bddfe369 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,6 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, decorator, requests, simplejson, pillow, typing -, nose, mock, pytest, freezegun }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, decorator +, requests +, typing +, configparser +, click +, freezegun +, mock +, pytestCheckHook +, pytest-vcr +, python-dateutil +, vcrpy +}: buildPythonPackage rec { pname = "datadog"; @@ -15,13 +28,30 @@ buildPythonPackage rec { find . -name '*.pyc' -exec rm {} \; ''; - propagatedBuildInputs = [ decorator requests simplejson pillow ] - ++ lib.optionals (pythonOlder "3.5") [ typing ]; + propagatedBuildInputs = [ decorator requests ] + ++ lib.optional (pythonOlder "3.5") typing + ++ lib.optional (pythonOlder "3.0") configparser; - checkInputs = [ nose mock pytest freezegun ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ + click + freezegun + mock + pytestCheckHook + pytest-vcr + python-dateutil + vcrpy + ]; + + disabledTestPaths = [ + "tests/unit/dogstatsd/test_statsd.py" # does not work in sandbox + ]; + + disabledTests = [ + "test_default_settings_set" + "test_threadstats_thread_safety" + ]; + + pythonImportsCheck = [ "datadog" ]; meta = with lib; { description = "The Datadog Python library"; From d1c569ff8da86032510d3cb091fc5b0207f41026 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Mar 2021 00:05:17 +0100 Subject: [PATCH 066/246] python3Packages.pillow: 8.1.0 -> 8.1.1 https://pillow.readthedocs.io/en/stable/releasenotes/8.1.1.html Fixes: CVE-2021-25289, CVE-2021-25290, CVE-2021-25291, CVE-2021-25292, CVE-2021-25293 --- pkgs/development/python-modules/pillow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 5597f459219..60af19347fa 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -5,13 +5,13 @@ import ./generic.nix (rec { pname = "Pillow"; - version = "8.1.0"; + version = "8.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1fnvc07m15fv59bdlkds1q7rl9jrr3cbbn69sfqvzvdpjbknhxl8"; + sha256 = "1fnvc07m15fv59bdlkds1q7rl9jrr3cbbn69sfqvzvdpjbknhxl9"; }; meta = with lib; { From 55a6de83dd95d79804ce5e952513967751270aaf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 3 Mar 2021 00:05:41 +0100 Subject: [PATCH 067/246] citrix_workspace: remove myself from maintainer list The customer project where this was needed is now over and I don't expect another project with this requirement anytime soon. Since there's no way to test new versions now, it doesn't make any sense to be a maintainer here for now. --- .../applications/networking/remote/citrix-workspace/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 0437a108d89..fcd8a80cff4 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -202,7 +202,7 @@ stdenv.mkDerivation rec { license = licenses.unfree; description = "Citrix Workspace"; platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; inherit homepage; }; } From e1bd676313083ffe14a54ed3d3e6942c2ae55d20 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Mar 2021 00:16:46 +0000 Subject: [PATCH 068/246] keycloak: 12.0.3 -> 12.0.4 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index aaa2a2f2b5c..3726facd583 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "12.0.3"; + version = "12.0.4"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-YUeSX02iLhrGzItnbUbK8ib7IfWG3+2k154cTPAt8Wc="; + sha256 = "sha256-7DKKpuKPoSKIpfvhCvLzuyepbmixgq0+o+83FKi6Dwc="; }; nativeBuildInputs = [ makeWrapper ]; From 6667c07db00d953bf3afb8b5c9cce363641ffad2 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 2 Mar 2021 20:23:37 -0500 Subject: [PATCH 069/246] kodi: fix build for wayland and gbm --- pkgs/applications/video/kodi/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 2de5899aa3e..0137a916ac4 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -231,7 +231,6 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DAPP_RENDER_SYSTEM=${if useGbm then "gles" else "gl"}" - "-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}" "-Dlibdvdcss_URL=${libdvdcss.src}" "-Dlibdvdnav_URL=${libdvdnav.src}" "-Dlibdvdread_URL=${libdvdread.src}" @@ -251,9 +250,11 @@ in stdenv.mkDerivation { # I'm guessing there is a thing waiting to time out doCheck = false; - # Need these tools on the build system when cross compiling, - # hacky, but have found no other way. - preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preConfigure = '' + cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}") + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # Need these tools on the build system when cross compiling, + # hacky, but have found no other way. CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin" From fa8551634e0018c8b6b253152da6e03935c1eb49 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Mar 2021 02:49:10 +0100 Subject: [PATCH 070/246] openjfx15: python2 -> python3, ffmpeg_3 -> ffmpeg --- pkgs/development/compilers/openjdk/openjfx/15.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index f9059ae2fc4..655b29f6535 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib -, ffmpeg_3, python, ruby }: +, ffmpeg, python3, ruby }: let major = "15"; @@ -21,8 +21,8 @@ let sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; From 06352b165d300f14f65ea8acbe12f579007dc2b0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Mar 2021 03:28:44 +0100 Subject: [PATCH 071/246] gixy: use python3 --- pkgs/tools/admin/gixy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 118457d4080..06656a9e033 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -1,11 +1,11 @@ -{ lib, fetchFromGitHub, python }: +{ lib, fetchFromGitHub, python3 }: -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "gixy"; version = "0.1.20"; # package is only compatible with python 2.7 and 3.5+ - disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27); + disabled = with python3.pkgs; !(pythonAtLeast "3.5" || isPy27); # fetching from GitHub because the PyPi source is missing the tests src = fetchFromGitHub { @@ -19,7 +19,7 @@ python.pkgs.buildPythonApplication rec { sed -ie '/argparse/d' setup.py ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ cached-property ConfigArgParse pyparsing From 8efa14a5cb19843bc07c8785e9d62baaaa093a2f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Feb 2021 08:21:18 +0100 Subject: [PATCH 072/246] =?UTF-8?q?ocamlPackages.digestif:=200.9.0=20?= =?UTF-8?q?=E2=86=92=201.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/digestif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index dd8a0f57164..e2501c60f5a 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "digestif"; - version = "0.9.0"; + version = "1.0.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz"; - sha256 = "0vk9prgjp46xs8qizq7szkj6mqjj2ymncs2016bc8zswcdc1a3q4"; + sha256 = "11188ya6ksb0p0zvs6saz3qxv4a8pyy8m3sq35f3qfxrxhghqi99"; }; propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; From 7393cb9fe4f03c55174708cad56c7ce9d623b040 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 26 Jan 2021 20:32:48 +0100 Subject: [PATCH 073/246] unrtf: 0.21.9 -> 0.21.10 --- pkgs/tools/text/unrtf/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index 57ffe95988d..3357404a7d3 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -1,22 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }: +{ lib, stdenv, fetchurl, autoconf, automake, libiconv }: stdenv.mkDerivation rec { pname = "unrtf"; - version = "0.21.9"; + version = "0.21.10"; src = fetchurl { - url = "https://www.gnu.org/software/unrtf/${pname}-${version}.tar.gz"; - sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2"; + url = "https://ftp.gnu.org/gnu/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1bil6z4niydz9gqm2j861dkxmqnpc8m7hvidsjbzz7x63whj17xl"; }; - patches = [ - (fetchpatch { - name = "CVE-2016-10091-0001-convert.c-Use-safe-buffer-size-and-snprintf.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849705;filename=0001-convert.c-Use-safe-buffer-size-and-snprintf.patch;msg=20"; - sha256 = "0s0fjvm3zdm9967sijlipfrwjs0h23n2n8fa6f40xxp8y5qq5a0b"; - }) - ]; - nativeBuildInputs = [ autoconf automake ]; buildInputs = [ libiconv ]; From 2517018ac2586c74cba2ef4e7bf1fd7fbc2e4ef1 Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Mon, 22 Feb 2021 14:16:22 -0500 Subject: [PATCH 074/246] ocamlPackages.directories: init at 0.2 --- .../ocaml-modules/directories/default.nix | 33 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/ocaml-modules/directories/default.nix diff --git a/pkgs/development/ocaml-modules/directories/default.nix b/pkgs/development/ocaml-modules/directories/default.nix new file mode 100644 index 00000000000..eae11953113 --- /dev/null +++ b/pkgs/development/ocaml-modules/directories/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, buildDunePackage }: + +buildDunePackage rec { + pname = "directories"; + version = "0.2"; + useDune2 = true; + + minimumOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "ocamlpro"; + repo = pname; + rev = version; + sha256 = "0s7ginh0g0fhw8xf9v58cx99a8q9jqsf4i0p134m5qzf84qpjwff"; + }; + + meta = { + homepage = "https://github.com/ocamlpro/directories"; + description = "An OCaml library that provides configuration, cache and data paths (and more!) following the suitable conventions on Linux, macOS and Windows"; + longDescription = '' + directories is an OCaml library that provides configuration, cache and + data paths (and more!) following the suitable conventions on Linux, macOS + and Windows. It is inspired by similar libraries for other languages such + as directories-jvm. + + The following conventions are used: XDG Base Directory Specification and + xdg-user-dirs on Linux, Known Folders on Windows, Standard Directories on + macOS. + ''; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ bcc32 ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0b2c548c1e0..51dd6c257b2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -242,6 +242,8 @@ let digestif = callPackage ../development/ocaml-modules/digestif { }; + directories = callPackage ../development/ocaml-modules/directories { }; + dispatch = callPackage ../development/ocaml-modules/dispatch { }; dns = callPackage ../development/ocaml-modules/dns { }; From d81d591d13df3d609b8fa05695882edce3a91244 Mon Sep 17 00:00:00 2001 From: Andreas Schmid Date: Sun, 28 Feb 2021 08:30:34 +0100 Subject: [PATCH 075/246] nix-direnv: fix NIX_BIN_PREFIX substitution in built direnvrc * Reason: statically set `${NIX_BIN_PREFIX}` within generated `direnvrc`. * Before it only replaced the `-z ${NIX_BIN_PREFIX:-}` check which therefore never was `true`. So, also `NIX_BIN_PREFIX` never got set such that its usage later always failed execution with `NIX_BIN_PREFIX: unbound variable`. With the fix, the line containing the check will no longer be replaced. * Solves https://github.com/nix-community/nix-direnv/issues/70 * See also discussion on #114622 Signed-off-by: Andreas Schmid --- pkgs/tools/misc/nix-direnv/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 833f8313f61..3fe8e3f3870 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, nix }: +{ lib, stdenv, fetchFromGitHub, gnugrep, nix, nixFlakes }: stdenv.mkDerivation rec { pname = "nix-direnv"; @@ -14,9 +14,8 @@ stdenv.mkDerivation rec { # Substitute instead of wrapping because the resulting file is # getting sourced, not executed: postPatch = '' - substituteInPlace direnvrc \ - --replace "\''${NIX_BIN_PREFIX:-}" "\''${NIX_BIN_PREFIX:-${nix}/bin/}" \ - --replace "grep" "${gnugrep}/bin/grep" + sed -i "1a NIX_BIN_PREFIX=${nixFlakes}/bin/" direnvrc + substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep" ''; installPhase = '' From 694721374b47b881c816fd5cb870c36c26102bf5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 3 Mar 2021 16:25:16 +1000 Subject: [PATCH 076/246] youtube-dl: 2021.03.02 -> 2021.03.03 https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.03 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 4879bd9b042..96a4b8e7fee 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl 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.03.02"; + version = "2021.03.03"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0g3fmbxbixi92vbjjy5dabz538yvfzdp649kafs09n55iw29s3f8"; + sha256 = "11z2v8mdii0bl13850mc6hgz80d0kgzb4hdxyikc3wa4jqfwrq7f"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From e2f5dca46afbfbe3a75cf76b5fe20a825b526303 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Wed, 3 Mar 2021 09:12:09 +0200 Subject: [PATCH 077/246] pijul: 1.0.0-alpha.38 -> 1.0.0-alpha.46 --- pkgs/applications/version-management/pijul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index eaad772f734..776a794d649 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.38"; + version = "1.0.0-alpha.46"; src = fetchCrate { inherit version pname; - sha256 = "0f14jkr1yswwyqz0l47b0287vpyz0g1qmksr3hkskhbmwlkf1q2b"; + sha256 = "0x095g26qdch1m3izkn8ynwk1xg1qyz9ia8di23j61k7z2rqk0j5"; }; - cargoSha256 = "08p2dq48d1islk02xz1j39402fqxfh4isf8qi219aivl0yciwjn3"; + cargoSha256 = "0cw1y4vmhn70a94512mppk0kfh9xdfm0v4rp3zm00y06jzq1a1fp"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; From 71a28ca2c15ce6f1f8e782f0c6034e67a9ae26d4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 3 Mar 2021 18:06:10 +1000 Subject: [PATCH 078/246] crun: 0.17 -> 0.18 https://github.com/containers/crun/releases/tag/0.18 --- pkgs/applications/virtualization/crun/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 59e07530fbc..15ca7c9667f 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -12,6 +12,7 @@ , nixosTests , criu , system +, fetchpatch }: let @@ -37,16 +38,24 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-OdB7UXLG99ErbfSCvq87LxBy5EYkUvTfyQNG70RFbl4="; + sha256 = "sha256-VjMpfj2qUQdhqdnLpZsYigfo2sM7gNl0GrE4nitp13g="; fetchSubmodules = true; }; + patches = [ + # For 0.18 some tests switched to static builds, this was reverted after 0.18 was released + (fetchpatch { + url = "https://github.com/containers/crun/commit/d26579bfe56aa36dd522745d47a661ce8c70d4e7.patch"; + sha256 = "1xmc0wj0j2xcg0915vxn0pplc4s94rpmw0s5g8cyf8dshfl283f9"; + }) + ]; + nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; buildInputs = [ libcap libseccomp systemd yajl ] From 1897d5421999a8839c7f96397dd0c56d037ba966 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 30 Jan 2021 17:40:49 +0000 Subject: [PATCH 079/246] musescore: 3.6 -> 3.6.1 --- pkgs/applications/audio/musescore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 0c1ad144a4a..6a5dbebeca0 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "musescore"; - version = "3.6"; + version = "3.6.1"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "sha256-0M+idYnrgXyH6WLp+2jIYRnFzTB93v+dG1XHmSNyPjE="; + sha256 = "sha256-21ZI5rsc05ZWEyM0LeFr+212YViLYveZZBvVpskh8iA="; }; patches = [ From f689b8a65fce60fbfd5e1da9623fd075250c1348 Mon Sep 17 00:00:00 2001 From: Isaac van Bakel Date: Wed, 27 Jan 2021 15:14:57 +0000 Subject: [PATCH 080/246] Add notifier configs to grafana provisioning Similar to dashboards and datasources, notifiers in Grafana can also be provisioned. This adds them to the Grafana service definition. --- nixos/modules/services/monitoring/grafana.nix | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index c8515c4b898..deb0c6c79ab 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -65,10 +65,18 @@ let dashboardFile = pkgs.writeText "dashboard.yaml" (builtins.toJSON dashboardConfiguration); + notifierConfiguration = { + apiVersion = 1; + notifiers = cfg.provision.notifiers; + }; + + notifierFile = pkgs.writeText "notifier.yaml" (builtins.toJSON notifierConfiguration); + provisionConfDir = pkgs.runCommand "grafana-provisioning" { } '' mkdir -p $out/{datasources,dashboards} ln -sf ${datasourceFile} $out/datasources/datasource.yaml ln -sf ${dashboardFile} $out/dashboards/dashboard.yaml + ln -sf ${notifierFile} $out/notifiers/notifier.yaml ''; # Get a submodule without any embedded metadata: @@ -203,6 +211,64 @@ let }; }; }; + + grafanaTypes.notifierConfig = types.submodule { + options = { + name = mkOption { + type = types.str; + default = "default"; + description = "Notifier name"; + }; + type = mkOption { + type = types.enum ["dingding" "discord" "email" "googlechat" "hipchat" "kafka" "line" "teams" "opsgenie" "pagerduty" "prometheus-alertmanager" "pushover" "sensu" "sensugo" "slack" "telegram" "threema" "victorops" "webhook"]; + description = "Notifier type"; + }; + uid = mkOption { + type = types.str; + description = "Unique notifier identifier"; + }; + org_id = mkOption { + type = types.int; + default = 1; + description = "Organization ID"; + }; + org_name = mkOption { + type = types.str; + default = "Main Org."; + description = "Organization name"; + }; + is_default = mkOption { + type = types.bool; + description = "Is the default notifier"; + default = false; + }; + send_reminder = mkOption { + type = types.bool; + default = true; + description = "Should the notifier be sent reminder notifications while alerts continue to fire"; + }; + frequency = mkOption { + type = types.str; + default = "5m"; + description = "How frequently should the notifier be sent reminders"; + }; + disable_resolve_message = mkOption { + type = types.bool; + default = false; + description = "Turn off the message that sends when an alert returns to OK"; + }; + settings = mkOption { + type = types.nullOr types.attrs; + default = null; + description = "Settings for the notifier type"; + }; + secure_settings = mkOption { + type = types.nullOr types.attrs; + default = null; + description = "Secure settings for the notifier type"; + }; + }; + }; in { options.services.grafana = { enable = mkEnableOption "grafana"; @@ -348,6 +414,12 @@ in { type = types.listOf grafanaTypes.dashboardConfig; apply = x: map _filter x; }; + notifiers = mkOption { + description = "Grafana notifier configuration"; + default = []; + type = types.listOf grafanaTypes.notifierConfig; + apply = x: map _filter x; + }; }; security = { @@ -496,6 +568,9 @@ in { (optional ( any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) cfg.provision.datasources ) "Datasource passwords will be stored as plaintext in the Nix store!") + (optional ( + any (x: x.secure_settings != null) cfg.provision.notifiers + ) "Notifier secure settings will be stored as plaintext in the Nix store!") ]; environment.systemPackages = [ cfg.package ]; From 3e4499519da3a3826efcd2c378f5fc9392a5befb Mon Sep 17 00:00:00 2001 From: Isaac van Bakel Date: Thu, 28 Jan 2021 14:17:13 +0000 Subject: [PATCH 081/246] Add trailing periods to all Grafana option descriptions --- nixos/modules/services/monitoring/grafana.nix | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index deb0c6c79ab..036bf668bc1 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -87,80 +87,80 @@ let options = { name = mkOption { type = types.str; - description = "Name of the datasource. Required"; + description = "Name of the datasource. Required."; }; type = mkOption { type = types.enum ["graphite" "prometheus" "cloudwatch" "elasticsearch" "influxdb" "opentsdb" "mysql" "mssql" "postgres" "loki"]; - description = "Datasource type. Required"; + description = "Datasource type. Required."; }; access = mkOption { type = types.enum ["proxy" "direct"]; default = "proxy"; - description = "Access mode. proxy or direct (Server or Browser in the UI). Required"; + description = "Access mode. proxy or direct (Server or Browser in the UI). Required."; }; orgId = mkOption { type = types.int; default = 1; - description = "Org id. will default to orgId 1 if not specified"; + description = "Org id. will default to orgId 1 if not specified."; }; url = mkOption { type = types.str; - description = "Url of the datasource"; + description = "Url of the datasource."; }; password = mkOption { type = types.nullOr types.str; default = null; - description = "Database password, if used"; + description = "Database password, if used."; }; user = mkOption { type = types.nullOr types.str; default = null; - description = "Database user, if used"; + description = "Database user, if used."; }; database = mkOption { type = types.nullOr types.str; default = null; - description = "Database name, if used"; + description = "Database name, if used."; }; basicAuth = mkOption { type = types.nullOr types.bool; default = null; - description = "Enable/disable basic auth"; + description = "Enable/disable basic auth."; }; basicAuthUser = mkOption { type = types.nullOr types.str; default = null; - description = "Basic auth username"; + description = "Basic auth username."; }; basicAuthPassword = mkOption { type = types.nullOr types.str; default = null; - description = "Basic auth password"; + description = "Basic auth password."; }; withCredentials = mkOption { type = types.bool; default = false; - description = "Enable/disable with credentials headers"; + description = "Enable/disable with credentials headers."; }; isDefault = mkOption { type = types.bool; default = false; - description = "Mark as default datasource. Max one per org"; + description = "Mark as default datasource. Max one per org."; }; jsonData = mkOption { type = types.nullOr types.attrs; default = null; - description = "Datasource specific configuration"; + description = "Datasource specific configuration."; }; secureJsonData = mkOption { type = types.nullOr types.attrs; default = null; - description = "Datasource specific secure configuration"; + description = "Datasource specific secure configuration."; }; version = mkOption { type = types.int; default = 1; - description = "Version"; + description = "Version."; }; editable = mkOption { type = types.bool; @@ -176,37 +176,37 @@ let name = mkOption { type = types.str; default = "default"; - description = "Provider name"; + description = "Provider name."; }; orgId = mkOption { type = types.int; default = 1; - description = "Organization ID"; + description = "Organization ID."; }; folder = mkOption { type = types.str; default = ""; - description = "Add dashboards to the specified folder"; + description = "Add dashboards to the specified folder."; }; type = mkOption { type = types.str; default = "file"; - description = "Dashboard provider type"; + description = "Dashboard provider type."; }; disableDeletion = mkOption { type = types.bool; default = false; - description = "Disable deletion when JSON file is removed"; + description = "Disable deletion when JSON file is removed."; }; updateIntervalSeconds = mkOption { type = types.int; default = 10; - description = "How often Grafana will scan for changed dashboards"; + description = "How often Grafana will scan for changed dashboards."; }; options = { path = mkOption { type = types.path; - description = "Path grafana will watch for dashboards"; + description = "Path grafana will watch for dashboards."; }; }; }; @@ -217,55 +217,55 @@ let name = mkOption { type = types.str; default = "default"; - description = "Notifier name"; + description = "Notifier name."; }; type = mkOption { type = types.enum ["dingding" "discord" "email" "googlechat" "hipchat" "kafka" "line" "teams" "opsgenie" "pagerduty" "prometheus-alertmanager" "pushover" "sensu" "sensugo" "slack" "telegram" "threema" "victorops" "webhook"]; - description = "Notifier type"; + description = "Notifier type."; }; uid = mkOption { type = types.str; - description = "Unique notifier identifier"; + description = "Unique notifier identifier."; }; org_id = mkOption { type = types.int; default = 1; - description = "Organization ID"; + description = "Organization ID."; }; org_name = mkOption { type = types.str; default = "Main Org."; - description = "Organization name"; + description = "Organization name."; }; is_default = mkOption { type = types.bool; - description = "Is the default notifier"; + description = "Is the default notifier."; default = false; }; send_reminder = mkOption { type = types.bool; default = true; - description = "Should the notifier be sent reminder notifications while alerts continue to fire"; + description = "Should the notifier be sent reminder notifications while alerts continue to fire."; }; frequency = mkOption { type = types.str; default = "5m"; - description = "How frequently should the notifier be sent reminders"; + description = "How frequently should the notifier be sent reminders."; }; disable_resolve_message = mkOption { type = types.bool; default = false; - description = "Turn off the message that sends when an alert returns to OK"; + description = "Turn off the message that sends when an alert returns to OK."; }; settings = mkOption { type = types.nullOr types.attrs; default = null; - description = "Settings for the notifier type"; + description = "Settings for the notifier type."; }; secure_settings = mkOption { type = types.nullOr types.attrs; default = null; - description = "Secure settings for the notifier type"; + description = "Secure settings for the notifier type."; }; }; }; @@ -403,19 +403,19 @@ in { provision = { enable = mkEnableOption "provision"; datasources = mkOption { - description = "Grafana datasources configuration"; + description = "Grafana datasources configuration."; default = []; type = types.listOf grafanaTypes.datasourceConfig; apply = x: map _filter x; }; dashboards = mkOption { - description = "Grafana dashboard configuration"; + description = "Grafana dashboard configuration."; default = []; type = types.listOf grafanaTypes.dashboardConfig; apply = x: map _filter x; }; notifiers = mkOption { - description = "Grafana notifier configuration"; + description = "Grafana notifier configuration."; default = []; type = types.listOf grafanaTypes.notifierConfig; apply = x: map _filter x; @@ -463,12 +463,12 @@ in { smtp = { enable = mkEnableOption "smtp"; host = mkOption { - description = "Host to connect to"; + description = "Host to connect to."; default = "localhost:25"; type = types.str; }; user = mkOption { - description = "User used for authentication"; + description = "User used for authentication."; default = ""; type = types.str; }; @@ -489,7 +489,7 @@ in { type = types.nullOr types.path; }; fromAddress = mkOption { - description = "Email address used for sending"; + description = "Email address used for sending."; default = "admin@grafana.localhost"; type = types.str; }; @@ -497,7 +497,7 @@ in { users = { allowSignUp = mkOption { - description = "Disable user signup / registration"; + description = "Disable user signup / registration."; default = false; type = types.bool; }; @@ -523,17 +523,17 @@ in { auth.anonymous = { enable = mkOption { - description = "Whether to allow anonymous access"; + description = "Whether to allow anonymous access."; default = false; type = types.bool; }; org_name = mkOption { - description = "Which organization to allow anonymous access to"; + description = "Which organization to allow anonymous access to."; default = "Main Org."; type = types.str; }; org_role = mkOption { - description = "Which role anonymous users have in the organization"; + description = "Which role anonymous users have in the organization."; default = "Viewer"; type = types.str; }; @@ -542,7 +542,7 @@ in { analytics.reporting = { enable = mkOption { - description = "Whether to allow anonymous usage reporting to stats.grafana.net"; + description = "Whether to allow anonymous usage reporting to stats.grafana.net."; default = true; type = types.bool; }; From 08cfe50ff7a2b73a03051dc6d2d6b996af6186b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 05:38:10 +0000 Subject: [PATCH 082/246] libinstpatch: 1.1.5 -> 1.1.6 --- pkgs/development/libraries/audio/libinstpatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix index 29781446c8f..670dee26b2b 100644 --- a/pkgs/development/libraries/audio/libinstpatch/default.nix +++ b/pkgs/development/libraries/audio/libinstpatch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libinstpatch"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "swami"; repo = pname; rev = "v${version}"; - sha256 = "0psx4hc5yksfd3k2xqsc7c8lbz2d4yybikyddyd9hlkhq979cmjb"; + sha256 = "sha256-OU6/slrPDgzn9tvXZJKSWbcFbpS/EAsOi52FtjeYdvA="; }; nativeBuildInputs = [ cmake pkg-config ]; From 6f204e9c42d10011be7fcad106d408b66c3e0a50 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 3 Mar 2021 08:25:06 +0100 Subject: [PATCH 083/246] ocamlPackages.integers: use Dune 2 --- pkgs/development/ocaml-modules/integers/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index ad6f1f9f813..97443bf5706 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -1,9 +1,11 @@ -{ lib, fetchzip, buildDunePackage }: +{ lib, fetchzip, buildDunePackage, ocaml }: buildDunePackage rec { pname = "integers"; version = "0.4.0"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; + src = fetchzip { url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; From b3120021cf9d2d1f821f80839f89d9ead8433df4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 05:46:20 +0000 Subject: [PATCH 084/246] libmysofa: 1.1 -> 1.2 --- pkgs/development/libraries/audio/libmysofa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 9c636e0205d..821a9ea9226 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "12jzap5fh0a1fmfy4z8z4kjjlwi0qzdb9z59ijdlyqdzwxnzkccx"; + sha256 = "sha256-f+1CIVSxyScyNF92cPIiZwfnnCVrWfCZlbrIXtduIdY="; }; nativeBuildInputs = [ cmake ]; From c6cc73ca9dddd4c9fe380d5415d2dd6f58407bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Wed, 3 Mar 2021 11:08:11 +0100 Subject: [PATCH 085/246] zsh-autosuggestions: update comment --- pkgs/shells/zsh/zsh-autosuggestions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix index 3f5cadfccb1..f9502152277 100644 --- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, zsh }: -# To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option +# To make use of this derivation, use the `programs.zsh.autosuggestions.enable` option stdenv.mkDerivation rec { pname = "zsh-autosuggestions"; From e7363192ef2d0e226b71ddb18e0db4881b5cf345 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 1 Mar 2021 13:03:41 +0800 Subject: [PATCH 086/246] polkit-qt-1: 0.112 -> 0.113 and drop the old qt4 version --- .../libraries/polkit-qt-1/default.nix | 37 +++++++++++++++++++ .../libraries/polkit-qt-1/qt-4.nix | 34 ----------------- .../libraries/polkit-qt-1/qt-5.nix | 32 ---------------- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/qt5-packages.nix | 2 +- 5 files changed, 38 insertions(+), 69 deletions(-) create mode 100644 pkgs/development/libraries/polkit-qt-1/default.nix delete mode 100644 pkgs/development/libraries/polkit-qt-1/qt-4.nix delete mode 100644 pkgs/development/libraries/polkit-qt-1/qt-5.nix diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix new file mode 100644 index 00000000000..86ef2af96e7 --- /dev/null +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, mkDerivation +, fetchurl +, cmake +, pkg-config +, polkit +, glib +, pcre +, libselinux +, libsepol +, util-linux +}: + +mkDerivation rec { + pname = "polkit-qt-1"; + version = "0.113.0"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "sha256-W4ZqKVTvEP+2YVbi/orQMhtVKKjfLkqRsC9QQc5VY6c="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + glib + pcre + polkit + ] ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ]; + + meta = with lib; { + description = "A Qt wrapper around PolKit"; + maintainers = with maintainers; [ ttuegel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix deleted file mode 100644 index 0da6e15eb27..00000000000 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }: - -with lib; - -stdenv.mkDerivation { - name = "polkit-qt-1-qt4-0.112.0"; - - src = fetchurl { - url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; - sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake pkg-config automoc4 ]; - - propagatedBuildInputs = [ polkit glib qt4 ]; - - postFixup = - '' - for i in $dev/lib/cmake/*/*.cmake; do - echo "fixing $i" - substituteInPlace $i \ - --replace "\''${PACKAGE_PREFIX_DIR}/lib" $out/lib - done - ''; - - meta = with lib; { - description = "A Qt wrapper around PolKit"; - maintainers = [ maintainers.ttuegel ]; - platforms = platforms.linux; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix deleted file mode 100644 index c4918d9d8e9..00000000000 --- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }: - -with lib; - -stdenv.mkDerivation { - name = "polkit-qt-1-qt5-0.112.0"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; - sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - propagatedBuildInputs = [ polkit glib qtbase ]; - - dontWrapQtApps = true; - - postFixup = '' - # Fix library location in CMake module - sed -i "$dev/lib/cmake/PolkitQt5-1/PolkitQt5-1Config.cmake" \ - -e "s,\\(set_and_check.POLKITQT-1_LIB_DIR\\).*$,\\1 \"''${!outputLib}/lib\")," - ''; - - meta = { - description = "A Qt wrapper around PolKit"; - maintainers = with lib.maintainers; [ ttuegel ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36e77b1bc5f..fcc22399b69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16374,8 +16374,6 @@ in polkit = callPackage ../development/libraries/polkit { }; - polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; - poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 223132217a5..336f58adf11 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -127,7 +127,7 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { }; - polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; + polkit-qt = callPackage ../development/libraries/polkit-qt-1 { }; poppler = callPackage ../development/libraries/poppler { lcms = pkgs.lcms2; From c16de94bd9abead5459fafde0a249f434f8b6b04 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 30 Jan 2021 11:06:40 +0000 Subject: [PATCH 087/246] kwalletcli: 3.02 -> 3.03 --- pkgs/tools/security/kwalletcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index c1849bdca39..d18d5c1ef8b 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "kwalletcli"; - version = "3.02"; + version = "3.03"; src = fetchFromGitHub { owner = "MirBSD"; repo = pname; rev = "${pname}-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1gq45afb5nmmjfqxglv7wvcxcjd9822pc7nysq0350jmmmqwb474"; + sha256 = "sha256-DUtaQITzHhQrqA9QJd0U/5EDjH0IzY9/kal/7SYQ/Ck="; }; postPatch = '' From 52041b5d0232c35738968708a495436f8927ed17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 3 Mar 2021 10:50:26 +0000 Subject: [PATCH 088/246] remove myself from a bunch of software I no longer use/maintain --- pkgs/applications/graphics/shotwell/default.nix | 2 +- pkgs/applications/misc/calibre/default.nix | 2 +- pkgs/applications/networking/ike/default.nix | 2 +- .../applications/networking/instant-messengers/utox/default.nix | 2 +- pkgs/applications/networking/mailreaders/mailpile/default.nix | 2 +- pkgs/applications/networking/p2p/retroshare/default.nix | 2 +- pkgs/applications/video/kodi/default.nix | 2 +- pkgs/os-specific/linux/dpdk/default.nix | 2 +- pkgs/os-specific/linux/numad/default.nix | 2 +- pkgs/os-specific/linux/v4l2loopback/default.nix | 2 +- pkgs/servers/monitoring/munin/default.nix | 2 +- pkgs/servers/search/solr/default.nix | 2 +- pkgs/tools/audio/beets/default.nix | 2 +- pkgs/tools/backup/bacula/default.nix | 2 +- pkgs/tools/misc/ldapvi/default.nix | 2 +- pkgs/tools/networking/aircrack-ng/default.nix | 2 +- pkgs/tools/networking/getmail/default.nix | 2 +- pkgs/tools/networking/snabb/default.nix | 2 +- pkgs/tools/package-management/nixops/default.nix | 2 +- pkgs/tools/package-management/python2nix/default.nix | 2 +- pkgs/tools/text/poedit/default.nix | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index bd9ad301d34..204d87a59c4 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { description = "Popular photo organizer for the GNOME desktop"; homepage = "https://wiki.gnome.org/Apps/Shotwell"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [domenkozar]; + maintainers = with maintainers; []; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1471af254f1..16541eaaa21 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -179,7 +179,7 @@ mkDerivation rec { free and open source and great for both casual users and computer experts. ''; license = with licenses; if unrarSupport then unfreeRedistributable else gpl3Plus; - maintainers = with maintainers; [ domenkozar pSub AndersonTorres ]; + maintainers = with maintainers; [ pSub AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 7a8c3d395f6..5ed87334c47 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://www.shrew.net/software"; description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems"; platforms = platforms.unix; - maintainers = [ maintainers.domenkozar ]; + maintainers = [ ]; license = licenses.sleepycat; }; } diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 668e614c474..e5a2c201d87 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "Lightweight Tox client"; homepage = "https://github.com/uTox/uTox"; license = licenses.gpl3; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 1d1dc030c31..cab43750a56 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -44,7 +44,7 @@ python2Packages.buildPythonApplication rec { homepage = "https://www.mailpile.is/"; license = [ licenses.asl20 licenses.agpl3 ]; platforms = platforms.linux; - maintainers = [ maintainers.domenkozar ]; + maintainers = [ ]; knownVulnerabilities = [ "Numerous and uncounted, upstream has requested we not package it. See more: https://github.com/NixOS/nixpkgs/pull/23058#issuecomment-283515104" ]; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 85a5217ff69..a39b4aab837 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { homepage = "http://retroshare.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.domenkozar ]; + maintainers = [ ]; broken = true; # broken by libupnp: 1.6.21 -> 1.8.3 (#41684) }; } diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 2de5899aa3e..ced9c9d8b1c 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -293,6 +293,6 @@ in stdenv.mkDerivation { homepage = "https://kodi.tv/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ]; + maintainers = with maintainers; [ titanous edwtjo peterhoeg sephalon ]; }; } diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index ab183936895..e71da643bb4 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -70,6 +70,6 @@ in stdenv.mkDerivation rec { homepage = "http://dpdk.org/"; license = with licenses; [ lgpl21 gpl2 bsd2 ]; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar magenbluten orivej ]; + maintainers = with maintainers; [ magenbluten orivej ]; }; } diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index cab5fe15e66..21d5a871f4e 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://fedoraproject.org/wiki/Features/numad"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 5e0125da00a..73b2f589511 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "A kernel module to create V4L2 loopback devices"; homepage = "https://github.com/umlaeute/v4l2loopback"; license = licenses.gpl2; - maintainers = [ maintainers.domenkozar ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 5168f2e7e9d..64ee8752f1f 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://munin-monitoring.org/"; license = licenses.gpl2; - maintainers = [ maintainers.domenkozar maintainers.bjornfor ]; + maintainers = [ maintainers.bjornfor ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 2b22c38143c..479a7616ae1 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ domenkozar aanderse ]; + maintainers = with maintainers; [ aanderse ]; }; } diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 5f22ffa9602..56d3268ae2d 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -297,7 +297,7 @@ in pythonPackages.buildPythonApplication rec { description = "Music tagger and library organizer"; homepage = "http://beets.io"; license = licenses.mit; - maintainers = with maintainers; [ aszlig domenkozar doronbehar lovesegfault pjones ]; + maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index f35c7a44b58..c2ed7882331 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Enterprise ready, Network Backup Tool"; homepage = "http://bacula.org/"; license = with licenses; [ agpl3Only bsd2 ]; - maintainers = with maintainers; [ domenkozar lovek323 eleanor ]; + maintainers = with maintainers; [ lovek323 eleanor ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 9b57a295de0..759e8608090 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; homepage = "http://www.lichteblau.com/ldapvi/"; license = licenses.gpl2; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index eda64978c63..33a90636659 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wireless encryption cracking tools"; homepage = "http://www.aircrack-ng.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 4e20cbe7441..44481802cc0 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "A program for retrieving mail"; - maintainers = [ lib.maintainers.raskin lib.maintainers.domenkozar ]; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; homepage = "http://pyropus.ca/software/getmail/"; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 9ee01439653..d65f4fae30e 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { ''; platforms = [ "x86_64-linux" ]; license = licenses.asl20; - maintainers = [ maintainers.lukego maintainers.domenkozar ]; + maintainers = [ maintainers.lukego ]; }; } diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 0dcbeb8abfe..16ecc7f11de 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -63,7 +63,7 @@ in python2Packages.buildPythonApplication { meta = { homepage = "https://github.com/NixOS/nixops"; description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; + maintainers = with lib.maintainers; [ aminechikhaoui eelco rob ]; platforms = lib.platforms.unix; license = lib.licenses.lgpl3; }; diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index b6ffe9abc02..c36a488647a 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication { propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ]; meta = with lib; { - maintainers = [ maintainers.domenkozar ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 63d0c05e543..185b2a41c46 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://www.poedit.net/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; }; } From 9f38162b3033a57f114e7601df95f257e94eb002 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 3 Mar 2021 12:21:46 +0100 Subject: [PATCH 089/246] chromium: 88.0.4324.182 -> 89.0.4389.72 https://chromereleases.googleblog.com/2021/03/stable-channel-update-for-desktop.html This update includes 47 security fixes. Google is aware of reports that an exploit for CVE-2021-21166 exists in the wild. CVEs: CVE-2021-21159 CVE-2021-21160 CVE-2021-21161 CVE-2021-21162 CVE-2021-21163 CVE-2021-21164 CVE-2021-21165 CVE-2021-21166 CVE-2021-21167 CVE-2021-21168 CVE-2021-21169 CVE-2021-21170 CVE-2021-21171 CVE-2021-21172 CVE-2021-21173 CVE-2021-21174 CVE-2021-21175 CVE-2021-21176 CVE-2021-21177 CVE-2021-21178 CVE-2021-21179 CVE-2021-21180 CVE-2020-27844 CVE-2021-21181 CVE-2021-21182 CVE-2021-21183 CVE-2021-21184 CVE-2021-21185 CVE-2021-21186 CVE-2021-21187 CVE-2021-21188 CVE-2021-21189 CVE-2021-21190 --- .../browsers/chromium/upstream-info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 89647f47757..7573e08313b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,20 +1,20 @@ { "stable": { - "version": "88.0.4324.182", - "sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h", - "sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b", + "version": "89.0.4389.72", + "sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll", + "sha256bin64": "1h2dxgr660xy1rv52ck8ps6av0l5jdhj2k29lvs190ccpxaycglb", "deps": { "gn": { - "version": "2020-11-05", + "version": "2021-01-07", "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" + "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140", + "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" } }, "chromedriver": { - "version": "88.0.4324.96", - "sha256_linux": "0hhy3c50hlnic6kz19565s8wv2yn7k45hxnkxbvb46zhcc5s2z41", - "sha256_darwin": "11mzcmp6dr8wzyv7v2jic7l44lr77phi4y3z1ghszhfdz5dil5xp" + "version": "89.0.4389.23", + "sha256_linux": "169inx1xl7750mdd1g7yji72m33kvpk7h1dy4hyj0qignrifdm0r", + "sha256_darwin": "1a84nn4rnd215h4sjghmw03mdr49wyab8j4vlnv3xp516yn07gr3" } }, "beta": { From 61e3bd3fda52ff091ea9b1309f998b5a0edf7f0b Mon Sep 17 00:00:00 2001 From: rychale Date: Wed, 3 Mar 2021 14:25:46 +0300 Subject: [PATCH 090/246] spdlog 1.8.1 -> 1.8.2 --- pkgs/development/libraries/spdlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 7b6c98bebe8..0fe1ce442fd 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -49,8 +49,8 @@ let in { spdlog_1 = generic { - version = "1.8.1"; - sha256 = "sha256-EyZhYgcdtZC+vsOUKShheY57L0tpXltduHWwaoy6G9k="; + version = "1.8.2"; + sha256 = "sha256-vYled5Z9fmxuO9193lefpFzIHAiSgvYn2iOfneLidQ8="; }; spdlog_0 = generic { From 19959cb7efc9700b6a65cd45226048178091231d Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 3 Mar 2021 03:50:25 +0000 Subject: [PATCH 091/246] linux-rt_5_6: remove --- .../os-specific/linux/kernel/linux-rt-5.6.nix | 41 ------------------- pkgs/top-level/all-packages.nix | 8 ---- 2 files changed, 49 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-rt-5.6.nix diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix deleted file mode 100644 index 7c77454040d..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, buildLinux, fetchurl -, kernelPatches ? [ ] -, structuredExtraConfig ? {} -, extraMeta ? {} -, argsOverride ? {} -, ... } @ args: - -let - version = "5.6.19-rt12"; # updated by ./update-rt.sh - branch = lib.versions.majorMinor version; - kversion = builtins.elemAt (lib.splitString "-" version) 0; -in buildLinux (args // { - inherit version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2"; - }; - - kernelPatches = let rt-patch = { - name = "rt"; - patch = fetchurl { - url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0ia8rx0615x0z2s4ppw1244crg7c5ak07c9n3wbnz7y8bk8hyxws"; - }; - }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; - - structuredExtraConfig = with lib.kernel; { - PREEMPT_RT = yes; - # Fix error: unused option: PREEMPT_RT. - EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) - # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). - PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. - # Fix error: unused option: RT_GROUP_SCHED. - RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. - } // structuredExtraConfig; - - extraMeta = extraMeta // { - inherit branch; - }; -} // argsOverride) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcc22399b69..6c773a69f33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19284,13 +19284,6 @@ in ]; }; - linux-rt_5_6 = callPackage ../os-specific/linux/kernel/linux-rt-5.6.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -19568,7 +19561,6 @@ in # Realtime kernel packages. linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; - linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6; linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10; linuxPackages-rt = linuxPackages-rt_5_4; linuxPackages-rt_latest = linuxPackages-rt_5_10; From 5da47b15cfb68f57865f28839c2325c8a43bca2c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 3 Mar 2021 03:51:44 +0000 Subject: [PATCH 092/246] linux-rt_5_11: init at 5.11.2-rt9 --- .../linux/kernel/linux-rt-5.11.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-rt-5.11.nix diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix new file mode 100644 index 00000000000..e56d2319a96 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix @@ -0,0 +1,45 @@ +{ lib, buildLinux, fetchurl +, kernelPatches ? [ ] +, structuredExtraConfig ? {} +, extraMeta ? {} +, argsOverride ? {} +, ... } @ args: + +let + version = "5.11.2-rt9"; # updated by ./update-rt.sh + branch = lib.versions.majorMinor version; + kversion = builtins.elemAt (lib.splitString "-" version) 0; +in buildLinux (args // { + inherit version; + + # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. + modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version + else lib.replaceStrings ["-"] [".0-"] version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; + sha256 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh"; + }; + + kernelPatches = let rt-patch = { + name = "rt"; + patch = fetchurl { + url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; + sha256 = "0707rjai04x12llvs004800pkb0axf0d1sssahf3xhgrbalg94y1"; + }; + }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; + + structuredExtraConfig = with lib.kernel; { + PREEMPT_RT = yes; + # Fix error: unused option: PREEMPT_RT. + EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) + # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). + PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. + # Fix error: unused option: RT_GROUP_SCHED. + RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. + } // structuredExtraConfig; + + extraMeta = extraMeta // { + inherit branch; + }; +} // argsOverride) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c773a69f33..1cb6bd2a981 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19306,6 +19306,14 @@ in ]; }; + linux-rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export-rt-sched-migrate + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -19562,8 +19570,9 @@ in # Realtime kernel packages. linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10; + linuxPackages-rt_5_11 = linuxPackagesFor pkgs.linux-rt_5_11; linuxPackages-rt = linuxPackages-rt_5_4; - linuxPackages-rt_latest = linuxPackages-rt_5_10; + linuxPackages-rt_latest = linuxPackages-rt_5_11; linux-rt = linuxPackages-rt.kernel; linux-rt_latest = linuxPackages-rt_latest.kernel; From 8a61e45f52ab4f8ce94b0cd8b4333b13e549efe1 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Wed, 3 Mar 2021 12:51:59 +0100 Subject: [PATCH 093/246] squashfsTools: enable LZO compression --- pkgs/tools/filesystems/squashfs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 7e55bcf6e0e..3c38341554a 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, zlib, xz , lz4 +, lzo , zstd }: @@ -25,13 +26,13 @@ stdenv.mkDerivation { ./0001-Mksquashfs-add-no-hardlinks-option.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; - buildInputs = [ zlib xz zstd lz4 ]; + buildInputs = [ zlib xz zstd lz4 lzo ]; preBuild = "cd squashfs-tools"; installFlags = [ "INSTALL_DIR=\${out}/bin" ]; - makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" ]; + makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" "LZO_SUPPORT=1"]; meta = { homepage = "http://squashfs.sourceforge.net/"; From 816a4517267861984ca514fde344ceb47c34d318 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 18:36:02 +0700 Subject: [PATCH 094/246] QuadProgpp: fix darwin build --- pkgs/development/libraries/science/math/QuadProgpp/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix index 254ce08dc60..703a7f2e344 100644 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ ]; meta = with lib; { homepage = "https://github.com/liuq/QuadProgpp"; @@ -22,6 +21,6 @@ stdenv.mkDerivation rec { Goldfarb-Idnani active-set dual method. ''; maintainers = with maintainers; [ ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } From 5a8065a15e7abcdaf6abc0268b8de5e15847a10a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 18:36:49 +0700 Subject: [PATCH 095/246] 0x0: add meta.platforms --- pkgs/tools/misc/0x0/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index 39cfcefaee8..0b9c6f7c3bb 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { homepage = "https://gitlab.com/somasis/scripts/"; maintainers = [ maintainers.ar1a ]; license = licenses.unlicense; + platforms = platforms.unix; }; } From 94691d61a6bde7f3604eef3957222201991c9fff Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 18:38:43 +0700 Subject: [PATCH 096/246] 4th: fix darwin build --- pkgs/development/compilers/4th/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix index 7205a979e27..a8923879c06 100644 --- a/pkgs/development/compilers/4th/default.nix +++ b/pkgs/development/compilers/4th/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "-C sources" - "CC=${stdenv.cc}/bin/cc" + "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "A portable Forth compiler"; homepage = "https://thebeez.home.xs4all.nl/4tH/index.html"; license = licenses.lgpl3; - platforms = platforms.linux; + platforms = platforms.all; }; } From 2b94b2a0c5ca89c36b84fcdc02aa10412e4e54b8 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 18:42:17 +0700 Subject: [PATCH 097/246] arachne: expand platforms to unix --- pkgs/development/compilers/arachne-pnr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 030da03add8..f537eb14d34 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cseed/arachne-pnr"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ shell thoughtpolice ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From c403e5747bd37b8d512694f7e089ce9e5099eff0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 18:45:09 +0700 Subject: [PATCH 098/246] gprolog: expand platforms to unix --- pkgs/development/compilers/gprolog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 59f33db68cb..87bf767f5bd 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ lib.maintainers.peti ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; + platforms = lib.platforms.unix; }; } From deaae6b7470a3a84c33e225bf3307602e9a8e2e8 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 18:45:49 +0700 Subject: [PATCH 099/246] miranda: add meta.platforms --- pkgs/development/compilers/miranda/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix index ab34f833d75..5de16633ed7 100644 --- a/pkgs/development/compilers/miranda/default.nix +++ b/pkgs/development/compilers/miranda/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/"; license = licenses.bsd2; maintainers = with maintainers; [ siraben ]; + platforms = platforms.all; }; } From a0061df00535d3a90063378ede80cfc8ba44c909 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 18:48:05 +0700 Subject: [PATCH 100/246] muon: fix darwin build --- pkgs/development/compilers/muon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/muon/default.nix b/pkgs/development/compilers/muon/default.nix index 2e178f775b6..aef02bca970 100644 --- a/pkgs/development/compilers/muon/default.nix +++ b/pkgs/development/compilers/muon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p $out/bin $out/share/mu cp -r lib $out/share/mu - gcc -O3 -o $out/bin/mu-unwrapped bootstrap/mu64.c + ${stdenv.cc.targetPrefix}cc -o $out/bin/mu-unwrapped bootstrap/mu64.c ''; installPhase = '' @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nickmqb/muon"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; }; } From 9ef6fe63be0d3baa269d534b622667bf4ea66515 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 18:51:40 +0700 Subject: [PATCH 101/246] rasm: fix darwin build --- pkgs/development/compilers/rasm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix index c2415899f6b..0feaabc92e6 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/development/compilers/rasm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildPhase = '' # according to official documentation - cc rasm_v*.c -O2 -lm -lrt -o rasm + ${stdenv.cc.targetPrefix}cc rasm_v*.c -O2 -lm -o rasm ''; installPhase = '' @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { # use -n option to display all licenses license = licenses.mit; # expat version maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From 65f8db5ff98579a529210644b33af80113521f8d Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 2 Mar 2021 23:39:48 +0100 Subject: [PATCH 102/246] nix-output-monitor: Add nom-build script --- pkgs/tools/nix/nix-output-monitor/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index f3b080938eb..2a9935793cf 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -1,15 +1,16 @@ { mkDerivation, ansi-terminal, async, attoparsec, base, containers , cassava, directory, HUnit, mtl, nix-derivation, process, relude, lib , stm, terminal-size, text, time, unix, wcwidth, fetchFromGitHub +, expect, runtimeShell }: -mkDerivation { +mkDerivation rec { pname = "nix-output-monitor"; version = "1.0.1.1"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; sha256 = "1wi1gsl5q1sy7k6k5wxhwpwzki7rghhbsyzm84hnw6h93w6401ax"; - rev = "v1.0.1.1"; + rev = "v${version}"; }; isLibrary = true; isExecutable = true; @@ -25,6 +26,13 @@ mkDerivation { ansi-terminal async attoparsec base containers directory HUnit mtl nix-derivation process relude stm text time unix ]; + postInstall = '' + cat > $out/bin/nom-build << EOF + #!${runtimeShell} + ${expect}/bin/unbuffer nix-build "\$@" 2>&1 | exec $out/bin/nom + EOF + chmod a+x $out/bin/nom-build + ''; homepage = "https://github.com/maralorn/nix-output-monitor"; description = "Parses output of nix-build to show additional information"; license = lib.licenses.agpl3Plus; From 6f2fbf5f0b811c2d38bb140db5f26b225ab6a2e5 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 24 Feb 2021 23:24:51 +0100 Subject: [PATCH 103/246] treewide: add missing lib inputs This fixes hopefully all remaining missing lib inputs, likely introduced as a regression by our recent treewide switch from stdenv.lib to lib. These instances are all I could find using nix-instantiate --parse using the following command: find "$NIXPKGS" -name '*.nix' \ -and ! -path "$NIXPKGS/pkgs/development/interpreters/python/cpython/docs/template.nix" \ -and ! -path '$NIXPKGS/.git/**' \ -print0 | xargs -0 nix-instantiate --parse >/dev/null --- .../audio/magnetophonDSP/CharacterCompressor/default.nix | 2 +- pkgs/applications/audio/magnetophonDSP/CompBus/default.nix | 2 +- .../audio/magnetophonDSP/ConstantDetuneChorus/default.nix | 2 +- pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix | 2 +- pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix | 2 +- pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix | 2 +- pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix | 2 +- .../audio/magnetophonDSP/faustCompressors/default.nix | 2 +- pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix | 2 +- .../audio/magnetophonDSP/shelfMultiBand/default.nix | 2 +- pkgs/applications/misc/robomongo/default.nix | 2 +- pkgs/applications/science/logic/sad/default.nix | 2 +- pkgs/development/compilers/chicken/4/egg2nix.nix | 2 +- pkgs/development/libraries/libelf-freebsd/default.nix | 2 +- .../tools/continuous-integration/buildkite-agent/generic.nix | 2 +- pkgs/tools/audio/beets/plugins/alternatives.nix | 2 +- pkgs/tools/audio/beets/plugins/copyartifacts.nix | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index d7f0a7fb20e..400f268d439 100644 --- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "CharacterCompressor"; version = "0.3.3"; diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 7a917d79c57..0b80aef170a 100644 --- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "CompBus"; version = "1.1.1"; diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index 5ac71172325..56534309733 100644 --- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "constant-detune-chorus"; version = "0.1.3"; diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 277b186fd4a..4b1157de0b0 100644 --- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "LazyLimiter"; version = "0.3.2"; diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index de7e573cbee..f951486e3fa 100644 --- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "MBdistortion"; version = "1.1.1"; diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index 80c5bb89eee..fff4292cd76 100644 --- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "RhythmDelay"; version = "2.1"; diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 9bd4076f130..6bc8cff2261 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: +{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: stdenv.mkDerivation rec { pname = "VoiceOfFaust"; version = "1.1.4"; diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index a90492f4235..7ea5fa753c8 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "faustCompressors-v${version}"; version = "1.2"; diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index 414e350caa0..fd807dd4245 100644 --- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "pluginUtils"; version = "1.1"; diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index 7dcdf985c82..07d4402578c 100644 --- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "shelfMultiBand"; version = "0.6.1"; diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index e8bba1f7a34..af5285909c6 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, +{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 8e4d19973ef..fe0ca1b3017 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, haskell, spass }: +{ lib, stdenv, fetchurl, haskell, spass }: stdenv.mkDerivation { name = "system-for-automated-deduction-2.3.25"; diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix index d2f2805ed7f..422053ea9d8 100644 --- a/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -1,4 +1,4 @@ -{ eggDerivation, fetchurl, chickenEggs }: +{ lib, eggDerivation, fetchurl, chickenEggs }: # Note: This mostly reimplements the default.nix already contained in # the tarball. Is there a nicer way than duplicating code? diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix index c3a4986c832..19c537b5115 100644 --- a/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -1,4 +1,4 @@ -{ fetchsvn, stdenv, gnum4, tet }: +{ lib, fetchsvn, stdenv, gnum4, tet }: stdenv.mkDerivation (rec { version = "3258"; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 64ca730d7dc..3b9de427bde 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep +{ lib, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep , src, version, hasBootstrapScript, postPatch ? "" , ... }: let diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix index 793611699ec..797aab16c1a 100644 --- a/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, beets, pythonPackages }: +{ lib, fetchFromGitHub, beets, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "beets-alternatives"; diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix index 5af52066caa..b8a17a7d13e 100644 --- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, beets, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, beets, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication { name = "beets-copyartifacts"; From b4ce3151b2f9aef49e5d04f9fa3e8bc02368c86c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 26 Feb 2021 11:32:04 +0100 Subject: [PATCH 104/246] magnetophonDSP: recurseIntoAttrs This makes nix tooling pick up on the magnetophonDSP attribute set in all-packages.nix which prevented eval errors from being detected by ofborg in the past for example. --- 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 1cb6bd2a981..c9a43e63d35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23602,7 +23602,7 @@ in mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; - magnetophonDSP = { + magnetophonDSP = lib.recurseIntoAttrs { CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { }; ConstantDetuneChorus = callPackage ../applications/audio/magnetophonDSP/ConstantDetuneChorus { }; From 39379808503b9793b4481a3a42c2e0c5e9f1be3d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 26 Feb 2021 11:38:08 +0100 Subject: [PATCH 105/246] chickenPackages_{4,5}: recurseIntoAttrs This prevents further evaluation regression for chickenPackages if they are deprecated again. Since chickenPackages_4 and chickenPackages_5 are extremely tiny package set, the cost of building one additional set on hydra is probably fine. --- pkgs/development/compilers/chicken/4/default.nix | 4 ++-- pkgs/development/compilers/chicken/5/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/chicken/4/default.nix b/pkgs/development/compilers/chicken/4/default.nix index 8d29c7c9a2b..5445469b776 100644 --- a/pkgs/development/compilers/chicken/4/default.nix +++ b/pkgs/development/compilers/chicken/4/default.nix @@ -1,4 +1,4 @@ -{ newScope } : +{ lib, newScope } : let callPackage = newScope self; @@ -18,4 +18,4 @@ let egg2nix = callPackage ./egg2nix.nix { }; }; -in self +in lib.recurseIntoAttrs self diff --git a/pkgs/development/compilers/chicken/5/default.nix b/pkgs/development/compilers/chicken/5/default.nix index 8d29c7c9a2b..5445469b776 100644 --- a/pkgs/development/compilers/chicken/5/default.nix +++ b/pkgs/development/compilers/chicken/5/default.nix @@ -1,4 +1,4 @@ -{ newScope } : +{ lib, newScope } : let callPackage = newScope self; @@ -18,4 +18,4 @@ let egg2nix = callPackage ./egg2nix.nix { }; }; -in self +in lib.recurseIntoAttrs self From c7e2333f494e680cc508ef90068a42bbe2c1f986 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 2 Mar 2021 17:10:43 +0100 Subject: [PATCH 106/246] libelf-freebsd: add source hash Built libelf-freebsd's src attribute on NixOS to verify. --- pkgs/development/libraries/libelf-freebsd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix index 19c537b5115..d4a8b8f6f21 100644 --- a/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation (rec { url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk"; rev = (lib.strings.toInt version); name = "elftoolchain-${version}"; + sha256 = "1rcmddjanlsik0b055x8k914r9rxs8yjsvslia2nh1bhzf1lxmqz"; }; buildInputs = [ gnum4 tet ]; From d774b4234a559d112088399e7a37ff9b64e99549 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 3 Mar 2021 13:44:26 +0100 Subject: [PATCH 107/246] [needs new maintainer] gitRepo: Remove myself as maintainer (#114835) Co-authored-by: Sandro --- pkgs/applications/version-management/git-repo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index f0d4ef664c0..72f6d67c2f1 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://android.googlesource.com/tools/repo"; license = licenses.asl20; - maintainers = [ maintainers.primeos ]; + maintainers = [ ]; platforms = platforms.unix; }; } From 62ea910ef36306905ef562f646745aade3f7c2d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Tue, 2 Mar 2021 17:26:38 +0100 Subject: [PATCH 108/246] pothos: init at 0.7.1 --- pkgs/applications/radio/pothos/default.nix | 74 +++++++++++++++ pkgs/applications/radio/pothos/spuce.patch | 101 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 177 insertions(+) create mode 100644 pkgs/applications/radio/pothos/default.nix create mode 100644 pkgs/applications/radio/pothos/spuce.patch diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix new file mode 100644 index 00000000000..64f5093c4b9 --- /dev/null +++ b/pkgs/applications/radio/pothos/default.nix @@ -0,0 +1,74 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, doxygen +, wrapQtAppsHook +, pcre +, poco +, qtbase +, qtsvg +, libsForQt5 +, nlohmann_json +, soapysdr-with-plugins +, portaudio +, alsaLib +, muparserx +, python3 +}: + +mkDerivation rec { + pname = "pothos"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "PothosCore"; + rev = "pothos-${version}"; + sha256 = "038c3ipvf4sgj0zhm3vcj07ymsva4ds6v89y43f5d3p4n8zc2rsg"; + fetchSubmodules = true; + }; + + patches = [ + # spuce's CMakeLists.txt uses QT5_USE_Modules, which does not seem to work on Nix + ./spuce.patch + ]; + + nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ]; + + buildInputs = [ + pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json + soapysdr-with-plugins portaudio alsaLib muparserx python3 + ]; + + postInstall = '' + install -Dm644 $out/share/Pothos/Desktop/pothos-flow.desktop $out/share/applications/pothos-flow.desktop + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-16.png $out/share/icons/hicolor/16x16/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-22.png $out/share/icons/hicolor/22x22/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-32.png $out/share/icons/hicolor/32x32/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-48.png $out/share/icons/hicolor/48x48/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-64.png $out/share/icons/hicolor/64x64/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-128.png $out/share/icons/hicolor/128x128/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow.xml $out/share/mime/application/pothos-flow.xml + rm -r $out/share/Pothos/Desktop + ''; + + dontWrapQtApps = true; + preFixup = '' + # PothosUtil does not need to be wrapped + wrapQtApp $out/bin/PothosFlow + wrapQtApp $out/bin/spuce_fir_plot + wrapQtApp $out/bin/spuce_iir_plot + wrapQtApp $out/bin/spuce_other_plot + wrapQtApp $out/bin/spuce_window_plot + ''; + + meta = with lib; { + description = "The Pothos data-flow framework"; + homepage = "https://github.com/pothosware/PothosCore/wiki"; + license = licenses.boost; + platforms = platforms.linux; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/pkgs/applications/radio/pothos/spuce.patch b/pkgs/applications/radio/pothos/spuce.patch new file mode 100644 index 00000000000..ed0377540a8 --- /dev/null +++ b/pkgs/applications/radio/pothos/spuce.patch @@ -0,0 +1,101 @@ +diff --git a/spuce/qt_fir/CMakeLists.txt b/spuce/qt_fir/CMakeLists.txt +index fa2e580..e32113c 100644 +--- a/spuce/qt_fir/CMakeLists.txt ++++ b/spuce/qt_fir/CMakeLists.txt +@@ -6,7 +6,7 @@ Message("Project spuce fir_plot") + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + +-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) ++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) + + set(SOURCES + make_filter.cpp +@@ -27,11 +27,7 @@ set_property(TARGET spuce_fir PROPERTY POSITION_INDEPENDENT_CODE TRUE) + set_property(TARGET spuce_fir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) + set_property(TARGET spuce_fir_plot PROPERTY CXX_STANDARD 11) + +-TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce) +-QT5_USE_Modules(spuce_fir_plot Gui) +-QT5_USE_Modules(spuce_fir_plot Core) +-QT5_USE_Modules(spuce_fir_plot Widgets) +-QT5_USE_Modules(spuce_fir_plot PrintSupport) ++TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) + + INSTALL(TARGETS spuce_fir_plot DESTINATION bin) + +diff --git a/spuce/qt_iir/CMakeLists.txt b/spuce/qt_iir/CMakeLists.txt +index 4717226..debb5f9 100644 +--- a/spuce/qt_iir/CMakeLists.txt ++++ b/spuce/qt_iir/CMakeLists.txt +@@ -6,7 +6,7 @@ Message("Project spuce iir_plot") + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + +-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) ++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) + + set(SOURCES + make_filter.cpp +@@ -27,10 +27,6 @@ set_property(TARGET spuce_iir PROPERTY POSITION_INDEPENDENT_CODE TRUE) + set_property(TARGET spuce_iir_plot PROPERTY CXX_STANDARD 11) + set_property(TARGET spuce_iir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) + +-TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce) +-QT5_USE_Modules(spuce_iir_plot Gui) +-QT5_USE_Modules(spuce_iir_plot Core) +-QT5_USE_Modules(spuce_iir_plot Widgets) +-QT5_USE_Modules(spuce_iir_plot PrintSupport) ++TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) + + INSTALL(TARGETS spuce_iir_plot DESTINATION bin) +diff --git a/spuce/qt_other/CMakeLists.txt b/spuce/qt_other/CMakeLists.txt +index 29c270d..e1ed778 100644 +--- a/spuce/qt_other/CMakeLists.txt ++++ b/spuce/qt_other/CMakeLists.txt +@@ -6,7 +6,7 @@ Message("Project spuce window_plot") + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + +-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) ++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) + + set(SOURCES make_filter.cpp) + ADD_LIBRARY(spuce_other STATIC ${SOURCES}) +@@ -23,10 +23,6 @@ ADD_EXECUTABLE(spuce_other_plot ${other_plot_SOURCES} ${other_plot_HEADERS_MOC}) + set_property(TARGET spuce_other_plot PROPERTY CXX_STANDARD 11) + set_property(TARGET spuce_other_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) + +-TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce) +-QT5_USE_Modules(spuce_other_plot Gui) +-QT5_USE_Modules(spuce_other_plot Core) +-QT5_USE_Modules(spuce_other_plot Widgets) +-QT5_USE_Modules(spuce_other_plot PrintSupport) ++TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) + + INSTALL(TARGETS spuce_other_plot DESTINATION bin) +diff --git a/spuce/qt_window/CMakeLists.txt b/spuce/qt_window/CMakeLists.txt +index e95c85b..4a77ab8 100644 +--- a/spuce/qt_window/CMakeLists.txt ++++ b/spuce/qt_window/CMakeLists.txt +@@ -6,7 +6,7 @@ Message("Project spuce window_plot") + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + +-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) ++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) + + set(SOURCES make_filter.cpp) + +@@ -25,10 +25,6 @@ set_property(TARGET spuce_window_plot PROPERTY CXX_STANDARD 11) + set_property(TARGET spuce_win PROPERTY POSITION_INDEPENDENT_CODE TRUE) + set_property(TARGET spuce_window_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) + +-TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce) +-QT5_USE_Modules(spuce_window_plot Gui) +-QT5_USE_Modules(spuce_window_plot Core) +-QT5_USE_Modules(spuce_window_plot Widgets) +-QT5_USE_Modules(spuce_window_plot PrintSupport) ++TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) + + INSTALL(TARGETS spuce_window_plot DESTINATION bin) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1849edcb4..97272222cbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24589,6 +24589,8 @@ in ponymix = callPackage ../applications/audio/ponymix { }; + pothos = libsForQt5.callPackage ../applications/radio/pothos { }; + potrace = callPackage ../applications/graphics/potrace {}; posterazor = callPackage ../applications/misc/posterazor { }; From 89aba1d889f7e5007fa3157893fc913febb48809 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 3 Mar 2021 00:12:37 +0100 Subject: [PATCH 109/246] grafana-loki: add buildinfo Otherwise, no version output is shown with `--version` or during log messages. --- pkgs/servers/monitoring/loki/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 99f83e1bfbd..370006a591e 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -26,6 +26,10 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) loki; }; + buildFlagsArray = let t = "github.com/grafana/loki/pkg/build"; in '' + -ldflags=-s -w -X ${t}.Version=${version} -X ${t}.BuildUser=nix@nixpkgs -X ${t}.BuildDate=unknown -X ${t}.Branch=unknown -X ${t}.Revision=unknown + ''; + doCheck = true; meta = with lib; { From d4821a48929dc885fc44a91879189e211bcb702e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 3 Mar 2021 14:39:27 +0100 Subject: [PATCH 110/246] vorta: 0.7.4 -> 0.7.5 ChangeLog: https://github.com/borgbase/vorta/releases/tag/v0.7.5 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 1809777ed54..c37bf0f20f7 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-+WQ3p2ddyQpJqCLc1HqFZlKK85VkX2Iv2eXEcVkBs6g="; + sha256 = "sha256-qPO8qmXYDDFwV+8hAUyfF4Ins0vkwEJbw4JPguUSYOw="; }; postPatch = '' From 979a6b25901bd73f2dbc15cc51760227fb208045 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 3 Mar 2021 15:09:10 +0100 Subject: [PATCH 111/246] beets-check: fix patch path The path to the used patch was broken, making the derivation fail evaluation. However the patch needs to be updated as some new test failure has cropped up. --- pkgs/tools/audio/beets/plugins/check.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/audio/beets/plugins/check.nix b/pkgs/tools/audio/beets/plugins/check.nix index 441dcfe579f..259b62a23b0 100644 --- a/pkgs/tools/audio/beets/plugins/check.nix +++ b/pkgs/tools/audio/beets/plugins/check.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ flac liboggz mp3val ]; # patch out broken tests - patches = [ ./beet-check-tests.patch ]; + patches = [ ./check-tests.patch ]; # patch out futures dependency, it is only needed for Python2 which we don't # support. From bce37e7542986dc823242bf04829c06901eb9676 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 3 Mar 2021 15:16:31 +0100 Subject: [PATCH 112/246] beets: refactor external plugins into top-level package set Instead of managing external plugins in the beets derivation, we introduce a new top-level package set beetsExternalPlugins which the beets derivation receives as an input. This change doesn't affect how the beets derivation is built or overridden, so the change won't be noticed by users, but it makes hydra evaluate and build external plugins which should benefit users of those plugins and prevent future regressions as we have experienced (currently on master beets-alternatives fails to evaluate, but this wasn't picked up by ofborg nor hydra). --- pkgs/tools/audio/beets/default.nix | 24 ++++++++---------------- pkgs/top-level/all-packages.nix | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 56d3268ae2d..7fea4bd28d4 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -3,8 +3,8 @@ , runtimeShell , unstableGitUpdater -# Attributes needed for tests of the external plugins -, callPackage, beets +# external plugins package set +, beetsExternalPlugins , enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null , enableAcousticbrainz ? true @@ -116,15 +116,6 @@ let doInstallCheck = false; }); - pluginArgs = externalTestArgs // { inherit pythonPackages; }; - - plugins = { - alternatives = callPackage ./plugins/alternatives.nix pluginArgs; - check = callPackage ./plugins/check.nix pluginArgs; - copyartifacts = callPackage ./plugins/copyartifacts.nix pluginArgs; - extrafiles = callPackage ./plugins/extrafiles.nix pluginArgs; - }; - in pythonPackages.buildPythonApplication rec { pname = "beets"; # While there is a stable version, 1.4.9, it is more than 1000 commits behind @@ -169,7 +160,7 @@ in pythonPackages.buildPythonApplication rec { || enableSubsonicupdate || enableAcousticbrainz) pythonPackages.requests - ++ optional enableCheck plugins.check + ++ optional enableCheck beetsExternalPlugins.check ++ optional enableConvert ffmpeg ++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableGmusic pythonPackages.gmusicapi @@ -179,9 +170,9 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableSonosUpdate pythonPackages.soco ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask - ++ optional enableAlternatives plugins.alternatives - ++ optional enableCopyArtifacts plugins.copyartifacts - ++ optional enableExtraFiles plugins.extrafiles + ++ optional enableAlternatives beetsExternalPlugins.alternatives + ++ optional enableCopyArtifacts beetsExternalPlugins.copyartifacts + ++ optional enableExtraFiles beetsExternalPlugins.extrafiles ; buildInputs = [ @@ -289,7 +280,8 @@ in pythonPackages.buildPythonApplication rec { makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ]; passthru = { - externalPlugins = plugins; + # FIXME: remove in favor of pkgs.beetsExternalPlugins + externalPlugins = beetsExternalPlugins; updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9a43e63d35..becd662ad21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3009,6 +3009,26 @@ in pythonPackages = python3Packages; }; + beetsExternalPlugins = + let + pluginArgs = { + # This is a stripped down beets for testing of the external plugins. + beets = (beets.override { + enableAlternatives = false; + enableCopyArtifacts = false; + enableExtraFiles = false; + }).overrideAttrs (lib.const { + doInstallCheck = false; + }); + pythonPackages = python3Packages; + }; + in lib.recurseIntoAttrs { + alternatives = callPackage ../tools/audio/beets/plugins/alternatives.nix pluginArgs; + check = callPackage ../tools/audio/beets/plugins/check.nix pluginArgs; + copyartifacts = callPackage ../tools/audio/beets/plugins/copyartifacts.nix pluginArgs; + extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs; + }; + bento4 = callPackage ../tools/video/bento4 { }; bepasty = callPackage ../tools/misc/bepasty { }; From 22cc7b494d874e4f0b158595c936036d431257f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Mar 2021 15:35:11 +0100 Subject: [PATCH 113/246] python3Packages.aiomultiprocess: 0.8.0 -> 0.9.0 --- .../python-modules/aiomultiprocess/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix index 9b648d59537..7b84996a1c9 100644 --- a/pkgs/development/python-modules/aiomultiprocess/default.nix +++ b/pkgs/development/python-modules/aiomultiprocess/default.nix @@ -1,20 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aiomultiprocess"; - version = "0.8.0"; + version = "0.9.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "omnilib"; repo = pname; rev = "v${version}"; - sha256 = "0vkj1vgvlv828pi3sn0hjzdy9f0j63gljs2ylibbsaixa7mbkpvy"; + sha256 = "sha256-yOP69FXDb2Grmtszx7oa6uiJGUar8su3KwqQPI+xjrw="; }; + nativeBuildInputs = [ flit-core ]; + checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "aiomultiprocess/tests/*.py" ]; From a35841420fe24dc416cf39c390e4f31a90716dcb Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Tue, 2 Mar 2021 18:29:09 -0500 Subject: [PATCH 114/246] pythonPackages.rfcat: init at 1.9.5 --- .../python-modules/rfcat/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/rfcat/default.nix diff --git a/pkgs/development/python-modules/rfcat/default.nix b/pkgs/development/python-modules/rfcat/default.nix new file mode 100644 index 00000000000..7bb390e79a2 --- /dev/null +++ b/pkgs/development/python-modules/rfcat/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, future +, ipython +, numpy +, pyserial +, pyusb +, hostPlatform +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "rfcat"; + version = "1.9.5"; + + src = fetchFromGitHub { + owner = "atlas0fd00m"; + repo = "rfcat"; + rev = "v${version}"; + sha256 = "1mmr7g7ma70sk6vl851430nqnd7zxsk7yb0xngwrdx9z7fbz2ck0"; + }; + + propagatedBuildInputs = [ + future + ipython + numpy + pyserial + pyusb + ]; + + postInstall = lib.optionalString hostPlatform.isLinux '' + mkdir -p $out/etc/udev/rules.d + cp etc/udev/rules.d/20-rfcat.rules $out/etc/udev/rules.d + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "rflib" ]; + + meta = with lib; { + description = "Swiss Army knife of sub-GHz ISM band radio"; + homepage = "https://github.com/atlas0fd00m/rfcat"; + license = licenses.bsd3; + maintainers = with maintainers; [ trepetti ]; + changelog = "https://github.com/atlas0fd00m/rfcat/releases/tag/v${version}"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b92a8a9f343..97ec1ea1c22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6726,6 +6726,8 @@ in { rfc7464 = callPackage ../development/python-modules/rfc7464 { }; + rfcat = callPackage ../development/python-modules/rfcat { }; + rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { }); rich = callPackage ../development/python-modules/rich { }; From 18c6f9ca9438474f1e4d36e6313527f6bffa0bd3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 17 Feb 2021 10:22:01 -0500 Subject: [PATCH 115/246] luaformatter: init at 1.3.4 --- .../tools/luaformatter/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/luaformatter/default.nix diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix new file mode 100644 index 00000000000..991f1a37717 --- /dev/null +++ b/pkgs/development/tools/luaformatter/default.nix @@ -0,0 +1,30 @@ +{ cmake, fetchFromGitHub, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "luaformatter"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "koihik"; + repo = "luaformatter"; + rev = version; + sha256 = "163190g37r6npg5k5mhdwckdhv9nwy2gnfp5jjk8p0s6cyvydqjw"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp lua-format $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Code formatter for lua"; + homepage = "https://github.com/koihik/luaformatter"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2a484db32d..509fcfbdbc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12608,6 +12608,8 @@ in lttv = callPackage ../development/tools/misc/lttv { }; + luaformatter = callPackage ../development/tools/luaformatter { }; + massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; From 76784820fcf58f1bfb2149f43c8c8c290cacd71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 16:20:33 +0100 Subject: [PATCH 116/246] senv: init at 0.5.0 --- pkgs/applications/misc/senv/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/senv/default.nix diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/applications/misc/senv/default.nix new file mode 100644 index 00000000000..6df8dc781e7 --- /dev/null +++ b/pkgs/applications/misc/senv/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "senv"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "SpectralOps"; + repo = pname; + rev = "v${version}"; + sha256 = "014422sdks2xlpsgvynwibz25jg1fj5s8dcf8b1j6djgq5glhfaf"; + }; + + vendorSha256 = "05n55yf75r7i9kl56kw9x6hgmyf5bva5dzp9ni2ws0lb1389grfc"; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Friends don't let friends leak secrets on their terminal window"; + homepage = "https://github.com/SpectralOps/senv"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 750af7e772f..ce925f27346 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29427,6 +29427,8 @@ in sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix (config.sane or {}); + senv = callPackage ../applications/misc/senv { }; + brlaser = callPackage ../misc/cups/drivers/brlaser { }; fxlinuxprint = callPackage ../misc/cups/drivers/fxlinuxprint { }; From e1da8ae536f606aac84cec772a13ec6a52eef22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:53:19 +0100 Subject: [PATCH 117/246] cloud-init: remove unused input, cleanup --- pkgs/tools/virtualization/cloud-init/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 24ecb7f99c3..dfd3321b6b6 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -8,7 +8,6 @@ , requests , jsonschema , jsonpatch -, pytest , httpretty , dmidecode , pytestCheckHook @@ -17,11 +16,9 @@ , openssh }: -let version = "20.3"; - -in buildPythonApplication { +buildPythonApplication rec { pname = "cloud-init"; - inherit version; + version = "20.3"; namePrefix = ""; src = fetchFromGitHub { @@ -81,10 +78,10 @@ in buildPythonApplication { export TMPDIR=/tmp ''; - meta = { + meta = with lib; { homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; - maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ]; - platforms = lib.platforms.all; + maintainers = with maintainers; [ madjar phile314 ]; + platforms = platforms.all; }; } From 25aa76bb6bdc5f9fc2500618d2e924cb2ff12a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:54:02 +0100 Subject: [PATCH 118/246] cloud-utils: remove unused inputs --- pkgs/tools/misc/cloud-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index b10259f24fc..32ef248ca85 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper , gawk, gnused, util-linux, file -, wget, python3, qemu-utils, euca2ools +, wget, python3, qemu-utils , e2fsprogs, cdrkit , gptfdisk }: From 993fb95e7832e62e8de93735ffcd2006bc693fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:56:43 +0100 Subject: [PATCH 119/246] qemu: remove not require enableParallelBuild --- pkgs/applications/virtualization/qemu/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b4b16e21689..4124b8e111f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation rec { ++ optionals libiscsiSupport [ libiscsi ] ++ optionals smbdSupport [ samba ]; - enableParallelBuilding = true; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build outputs = [ "out" "ga" ]; From 238ce01f85af26ffa020647198f6275a115f06bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:56:53 +0100 Subject: [PATCH 120/246] qtemu: remove unused input --- pkgs/applications/virtualization/qtemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix index 3a5f26bfcc8..9568a0bb695 100644 --- a/pkgs/applications/virtualization/qtemu/default.nix +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }: +{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu }: mkDerivation rec { pname = "qtemu"; From 56c756d851f52af33f305b28a2c9f113fa50f597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:57:01 +0100 Subject: [PATCH 121/246] pythonPackages.cot: remove unused inputs --- pkgs/development/python-modules/cot/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index a6de8321dc0..607057b73f2 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k -, argcomplete, colorlog, pyvmomi, requests, verboselogs +, colorlog, pyvmomi, requests, verboselogs , psutil, pyopenssl, setuptools -, mock, pytest, pytest-mock, pytestCheckHook, qemu +, mock, pytest-mock, pytestCheckHook, qemu }: buildPythonPackage rec { pname = "cot"; version = "2.2.1"; - disabled = !isPy3k; src = fetchPypi { From c1edda834257fa659ae794f7b9ca1f4543e08235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:57:24 +0100 Subject: [PATCH 122/246] vagrant: remove unused input --- pkgs/development/tools/vagrant/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 701b973ad4f..34662498f23 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive -, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux, fetchpatch +, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux }: let From 0f78e1772fbc2a97f6620381b222541ab97ed0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:59:28 +0100 Subject: [PATCH 123/246] aqemu: mark broken --- pkgs/applications/virtualization/aqemu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix index 2d865f41818..13b27c7d6cc 100644 --- a/pkgs/applications/virtualization/aqemu/default.nix +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -22,5 +22,6 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; + broken = true; }; } From bbc7926c372a09f6afcf9dbd6415fa293854b676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 23:50:44 +0100 Subject: [PATCH 124/246] crystal2nix: remove unused input --- pkgs/development/compilers/crystal2nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/crystal2nix/default.nix b/pkgs/development/compilers/crystal2nix/default.nix index 25cbbd4d01a..0f4909f5e15 100644 --- a/pkgs/development/compilers/crystal2nix/default.nix +++ b/pkgs/development/compilers/crystal2nix/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchgit, crystal, makeWrapper, nix-prefetch-git }: +{ lib, fetchFromGitHub, crystal, makeWrapper, nix-prefetch-git }: crystal.buildCrystalPackage rec { pname = "crystal2nix"; From a59de3b3f4eae272fff6036997e016f16aaf1c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 01:56:27 +0100 Subject: [PATCH 125/246] libnixxml: cleanup --- .../libraries/libnixxml/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index abbffcf0f94..40459dbca22 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -1,25 +1,31 @@ { fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: stdenv.mkDerivation { - name = "libnixxml"; + pname = "libnixxml"; + version = "unstable-2020-06-25"; + src = fetchFromGitHub { owner = "svanderburg"; repo = "libnixxml"; rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a"; sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; }; - configureFlags = [ "--with-gd" "--with-glib" ]; - CFLAGS = "-Wall"; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ]; - doCheck = false; - postPatch = '' + + preConfigure = '' ./bootstrap ''; + configureFlags = [ "--with-gd" "--with-glib" ]; + CFLAGS = "-Wall"; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ]; + + doCheck = false; + meta = with lib; { description = "XML-based Nix-friendly data integration library"; - homepage = https://github.com/svanderburg/libnixxml; + homepage = "https://github.com/svanderburg/libnixxml"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; platforms = platforms.unix; From e14161d3b7904222754aeca4dd65a455885cb7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 01:56:33 +0100 Subject: [PATCH 126/246] pythonPackages.gradient_statsd: remove unused input --- pkgs/development/python-modules/gradient_statsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix index ada005d14f8..180e20c9f56 100644 --- a/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/pkgs/development/python-modules/gradient_statsd/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, boto3, requests, datadog, configparser, python +, requests, datadog, configparser, python }: buildPythonPackage rec { From e3dbed8e382b5eb13f72151898c1b4995471a6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 01:56:40 +0100 Subject: [PATCH 127/246] pythonPackages.pysvn: mark broken on darwin, use https for download --- pkgs/development/python-modules/pysvn/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 9e994860709..37e3490a54c 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { format = "other"; src = fetchurl { - url = "http://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; + url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q="; }; @@ -79,5 +79,7 @@ buildPythonPackage rec { description = "Python bindings for Subversion"; homepage = "http://pysvn.tigris.org/"; license = licenses.asl20; + # g++: command not found + broken = stdenv.isDarwin; }; } From c2d20af5e5ca8d4ee6256a69fd2899f9a851ebdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 02:01:44 +0100 Subject: [PATCH 128/246] serf: switch to pname + version --- pkgs/development/libraries/serf/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 092ab62ed7c..5b603e6a0c7 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -2,10 +2,11 @@ , pkg-config, libiconv }: stdenv.mkDerivation rec { - name = "serf-1.3.9"; + pname = "serf"; + version = "1.3.9"; src = fetchurl { - url = "https://www.apache.org/dist/serf/${name}.tar.bz2"; + url = "https://www.apache.org/dist/serf/${pname}-${version}.tar.bz2"; sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; From bc4afe3260ebdbebe69c7707c582bc97cfe2f4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 04:58:40 +0100 Subject: [PATCH 129/246] calligra: remove unused input --- pkgs/applications/office/calligra/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index a8ca37df36a..e54a3cbad4c 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,15 +1,14 @@ -{ - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, - boost, qtwebkit, qtx11extras, shared-mime-info, - breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, - kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, - kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross, - knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons, - kwindowsystem, kxmlgui, sonnet, threadweaver, - kcontacts, akonadi, akonadi-calendar, akonadi-contacts, - eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen, - librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon, - poppler, pstoedit, qca-qt5, vc +{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools +, boost, qtwebkit, qtx11extras, shared-mime-info +, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets +, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n +, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross +, knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons +, kwindowsystem, kxmlgui, sonnet, threadweaver +, kcontacts, akonadi, akonadi-calendar, akonadi-contacts +, eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen +, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon +, poppler, pstoedit, qca-qt5, vc # TODO: package Spnav, m2mml LibEtonyek, Libqgit2 }: From e19f06147670c7bd5538ad0b32eb64a63a9518bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 04:59:48 +0100 Subject: [PATCH 130/246] calamares: remove enableParallelBuilding, remove unused input --- pkgs/tools/misc/calamares/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index e79774da917..90abc765920 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore , kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase -, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, glibc, tzdata +, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata , ckbcomp, xkeyboard_config, mkDerivation }: @@ -21,8 +21,6 @@ mkDerivation rec { qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; - enableParallelBuilding = false; - cmakeFlags = [ "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so" "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" From b1e42ebb1fe07fa47af0b9fa7d0ba5afbf55b437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 13:50:04 +0100 Subject: [PATCH 131/246] noto-fonts: remove unused input --- pkgs/data/fonts/noto-fonts/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index d93e5885401..530cfca7424 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , fetchurl , fetchzip -, optipng , cairo , python3 , pkg-config From c4d6162d67620d126174d9ebdac3cfb1bb8200b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 13:50:11 +0100 Subject: [PATCH 132/246] noto-fonts: remove unused input --- pkgs/data/fonts/noto-fonts/tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index f5bd6335dfb..c43ff3a313f 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, buildPythonPackage, pythonOlder , afdko, appdirs, attrs, black, booleanoperations, brotlipy, click -, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml +, defcon, fontmath, fontparts, fontpens, fonttools, lxml , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli , pillow, six, bash, setuptools_scm }: From c47331a6c0b1c31d0e2a1f3ae1a24c20b428b358 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 18:56:53 +0700 Subject: [PATCH 133/246] serpent: fix darwin build --- pkgs/development/compilers/serpent/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index 775a78a9734..fbcbf4485a4 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation { sha256 = "1bns9wgn5i1ahj19qx7v1wwdy8ca3q3pigxwznm5nywsw7s7lqxs"; }; + postPatch = '' + substituteInPlace Makefile --replace 'g++' '${stdenv.cc.targetPrefix}c++' + ''; + installPhase = '' mkdir -p $out/bin mv serpent $out/bin @@ -33,6 +37,6 @@ stdenv.mkDerivation { homepage = "https://github.com/ethereum/wiki/wiki/Serpent"; license = with licenses; [ wtfpl ]; maintainers = with maintainers; [ chris-martin ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } From cff8ee22e3f3cc99f1c06121f0366411f9f7acf1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 18:59:33 +0700 Subject: [PATCH 134/246] yaml-merge: expand platforms to unix --- pkgs/tools/text/yaml-merge/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix index d36522edb87..7c4ecc49df5 100644 --- a/pkgs/tools/text/yaml-merge/default.nix +++ b/pkgs/tools/text/yaml-merge/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Merge YAML data files"; homepage = "https://github.com/abbradar/yaml-merge"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; } From d6a4596c488f9ba47acc7fe5af020d47d302f3aa Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 19:00:39 +0700 Subject: [PATCH 135/246] uni2ascii: expand platforms to all --- pkgs/tools/text/uni2ascii/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index 19c95dcec63..e2bda04d13f 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { similar ASCII characters, e.g. by stripping diacritics. ''; maintainers = with lib.maintainers; [ goibhniu ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } From db04431fcb4179c2f4443d1e5bc9cf21e9b03936 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 19:03:07 +0700 Subject: [PATCH 136/246] mpage: fix darwin build --- pkgs/tools/text/mpage/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 9bde7f388dc..99cfec97a70 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi"; }; - patchPhase = '' + postPatch = '' sed -i "Makefile" -e "s|^ *PREFIX *=.*$|PREFIX = $out|g" + substituteInPlace Makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc' ''; meta = { @@ -24,6 +25,6 @@ stdenv.mkDerivation rec { license = "liberal"; # a non-copyleft license, see `Copyright' file homepage = "http://www.mesa.nl/pub/mpage/"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } From 8ff1b8b502a6c1766b3706f3cdbf9ad448c1571c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 19:07:03 +0700 Subject: [PATCH 137/246] snooze: expand platforms to unix --- pkgs/tools/system/snooze/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/snooze/default.nix b/pkgs/tools/system/snooze/default.nix index 750a0954d3f..05c0b69c922 100644 --- a/pkgs/tools/system/snooze/default.nix +++ b/pkgs/tools/system/snooze/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "Tool for waiting until a particular time and then running a command"; maintainers = with maintainers; [ kaction ]; license = licenses.cc0; - platforms = platforms.linux; + platforms = platforms.unix; }; } From b79fb90a1c48c92e5b24c074e060b013aeccebc8 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Mar 2021 19:07:41 +0700 Subject: [PATCH 138/246] numdiff: fix darwin build --- pkgs/tools/text/numdiff/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index db27c1bfd0c..317d29003cd 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libintl }: stdenv.mkDerivation rec { @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz"; sha256 = "1vzmjh8mhwwysn4x4m2vif7q2k8i19x8azq7pzmkwwj4g48lla47"; }; + + buildInputs = [ libintl ]; + meta = with lib; { description = '' A little program that can be used to compare putatively similar files @@ -18,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/numdiff/"; license = licenses.gpl3Plus; maintainers = with maintainers; []; - platforms = platforms.gnu ++ platforms.linux; + platforms = platforms.unix; }; } From 9004162c264173beddb8308a2533fa08c8ca24ca Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 3 Mar 2021 16:55:03 +0100 Subject: [PATCH 139/246] chromium: Add my script to generate the commit messages Might not be that readable and reliable but it should get the job done. --- .../browsers/chromium/get-commit-message.py | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 pkgs/applications/networking/browsers/chromium/get-commit-message.py diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py new file mode 100755 index 00000000000..bbadb3153ee --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p python3Packages.feedparser python3Packages.requests + +# This script prints the Git commit message for stable channel updates. + +import re +import textwrap + +import feedparser +import requests + +feed = feedparser.parse('https://chromereleases.googleblog.com/feeds/posts/default') +html_tags = re.compile(r'<[^>]+>') + +for entry in feed.entries: + if entry.title != 'Stable Channel Update for Desktop': + continue + url = requests.get(entry.link).url.split('?')[0] + content = entry.content[0].value + if re.search(r'Linux', content) is None: + continue + #print(url) # For debugging purposes + version = re.search(r'\d+(\.\d+){3}', content).group(0) + fixes = re.search(r'This update includes .+ security fixes\.', content).group(0) + fixes = html_tags.sub('', fixes) + zero_days = re.search(r'Google is aware of reports that .+ in the wild\.', content) + if zero_days: + fixes += " " + zero_days.group(0) + cve_list = re.findall(r'CVE-[^: ]+', content) + cve_string = ' '.join(cve_list) + print('chromium: TODO -> ' + version + '\n') + print(url + '\n') + print('\n'.join(textwrap.wrap(fixes, width=72)) + '\n') + print("CVEs:\n" + '\n'.join(textwrap.wrap(cve_string, width=72))) + break # We only care about the most recent stable channel update From 0177ea48e2a572360291df6bcc004a4e4eaaf00d Mon Sep 17 00:00:00 2001 From: yvt Date: Thu, 4 Mar 2021 01:05:00 +0900 Subject: [PATCH 140/246] cfdyndns: fix build The custom installPhase got broken as the rust build scripts only provide $releaseDir in postInstall hooks. The default rust installPhase installs the same files, so the custom one is unnecessary. --- pkgs/applications/networking/dyndns/cfdyndns/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index dae9ad3bc33..51f62529e9c 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -17,11 +17,6 @@ buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - installPhase = '' - mkdir -p $out/bin - cp -p $releaseDir/cfdyndns $out/bin/ - ''; - meta = with lib; { description = "CloudFlare Dynamic DNS Client"; homepage = "https://github.com/colemickens/cfdyndns"; From 5c99d24d1ecc148bb9cb3bea8beb5f9e1ee4388b Mon Sep 17 00:00:00 2001 From: laikq <55911173+laikq@users.noreply.github.com> Date: Fri, 25 Dec 2020 19:38:05 +0100 Subject: [PATCH 141/246] doc: explain where pkgs comes from in writing-modules The manual mentions how "[config and pkgs] are explained later". Added a link to where they are explained, and a hint pointing to the NIX_PATH variable. --- nixos/doc/manual/configuration/config-file.xml | 7 ++++--- nixos/doc/manual/development/writing-modules.xml | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 7ccb5b3664e..19cfb57920d 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -16,9 +16,10 @@ The first line ({ config, pkgs, ... }:) denotes that this is actually a function that takes at least the two arguments config and pkgs. (These are explained - later.) The function returns a set of option definitions - ({ ... }). These definitions - have the form name = + later, in chapter ) The function returns + a set of option definitions ({ + ... }). These definitions have the form + name = value, where name is the name of an option and value is its value. For example, diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index d244356dbed..fad4637f51f 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -74,7 +74,10 @@ linkend="sec-configuration-syntax"/>, we saw the following structure This line makes the current Nix expression a function. The variable - pkgs contains Nixpkgs, while config + pkgs contains Nixpkgs (by default, it takes the + nixpkgs entry of NIX_PATH, see the Nix + manual for further details), while config contains the full system configuration. This line can be omitted if there is no reference to pkgs and config inside the module. From 5973aa563fb12af573ab4f7f47e5ae7e5ba4f7d0 Mon Sep 17 00:00:00 2001 From: Florian Beeres Date: Wed, 3 Mar 2021 17:10:02 +0100 Subject: [PATCH 142/246] maintainers: add fbrs --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d3a35283b78..57fd22646f0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3071,6 +3071,12 @@ githubId = 1276854; name = "Florian Peter"; }; + fbrs = { + email = "yuuki@protonmail.com"; + github = "cideM"; + githubId = 4246921; + name = "Florian Beeres"; + }; fdns = { email = "fdns02@gmail.com"; github = "fdns"; From b22877092700f3464c5591bcbac93c20fa074bc4 Mon Sep 17 00:00:00 2001 From: Florian Beeres Date: Wed, 3 Mar 2021 17:10:13 +0100 Subject: [PATCH 143/246] go-mockery: init at 2.5.1 --- pkgs/development/tools/go-mockery/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/go-mockery/default.nix diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix new file mode 100644 index 00000000000..db876ea09f2 --- /dev/null +++ b/pkgs/development/tools/go-mockery/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-mockery"; + version = "2.5.1"; + + src = fetchFromGitHub { + owner = "vektra"; + repo = "mockery"; + rev = "v${version}"; + sha256 = "5W5WGWqxpZzOqk1VOlLeggIqfneRb7s7ZT5faNEhDos="; + }; + + vendorSha256 = "//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA="; + + meta = with lib; { + homepage = "https://github.com/vektra/mockery"; + description = "A mock code autogenerator for Golang"; + maintainers = with maintainers; [ fbrs ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 509fcfbdbc2..a5c3ba3eaaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19895,6 +19895,8 @@ in go-migrate = callPackage ../development/tools/go-migrate { }; + go-mockery = callPackage ../development/tools/go-mockery { }; + gomacro = callPackage ../development/tools/gomacro { }; gomodifytags = callPackage ../development/tools/gomodifytags { }; From 091bd4d6225092aa64a7806b3329597d886e6bf9 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Tue, 2 Mar 2021 09:51:19 +0100 Subject: [PATCH 144/246] hyper: add required libraries to library path --- pkgs/applications/terminal-emulators/hyper/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 092d4a0e09e..7dd495f977a 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk2, cairo +{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver -, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: +, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio, at-spi2-atk }: let libPath = lib.makeLibraryPath [ - stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus + stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio + at-spi2-atk ]; in stdenv.mkDerivation rec { @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" mv opt "$out/" ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Hyper:\$ORIGIN" "$out/opt/Hyper/hyper" mv usr/* "$out/" ''; dontPatchELF = true; From 5c66c2233d954a721b585d78e79127d7390e1f65 Mon Sep 17 00:00:00 2001 From: Jens Nolte Date: Wed, 3 Mar 2021 17:25:30 +0100 Subject: [PATCH 145/246] mycrypto: Fix crash when opening FileChooser dialog --- pkgs/applications/blockchains/mycrypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index b884f044efe..17e884c5794 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -1,5 +1,5 @@ { lib, appimageTools, fetchurl, makeDesktopItem -, gsettings-desktop-schemas, gtk2 +, gsettings-desktop-schemas, gtk3 }: let @@ -30,7 +30,7 @@ in appimageTools.wrapType2 rec { inherit name src; profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk2}/share/gsettings-schemas/${gtk2.name}:$XDG_DATA_DIRS + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ''; multiPkgs = null; # no p32bit needed From e0a6314775cca8a617b791663fb76c0e108ea88e Mon Sep 17 00:00:00 2001 From: Samuel Noordhuis Date: Thu, 4 Mar 2021 03:38:09 +1100 Subject: [PATCH 146/246] terraform-docs: 0.9.1 -> 0.11.2 (#114803) The owner of the repository has changed from segmentio to terraform-docs since the last pull request. This commit also introduces the use of buildGoModule in place of buildGoPackage, so that we can avoid generating a deps.nix file for module dependencies. --- .../cluster/terraform-docs/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index a5b6e7d2f5e..804659e084a 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,24 +1,26 @@ -{ lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { pname = "terraform-docs"; - version = "0.9.1"; - - goPackagePath = "github.com/segmentio/${pname}"; + version = "0.11.2"; src = fetchFromGitHub { - owner = "segmentio"; - repo = pname; - rev = "v${version}"; - sha256 = "00sfzdqhf8g85m03r6mbzfas5vvc67iq7syb8ljcgxg8l1knxnjx"; + owner = "terraform-docs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-x2YTd4ZnimTRkFWbwFp4qz6BymD6ESVxBy6YE+QqQ6k="; }; + vendorSha256 = "sha256-drfhfY03Ao0fqleBdzbAnPsE4kVrJMcUbec0txaEIP0="; + + subPackages = [ "." ]; + preBuild = '' buildFlagsArray+=("-ldflags" "-X main.version=${version}") ''; meta = with lib; { description = "A utility to generate documentation from Terraform modules in various output formats"; - homepage = "https://github.com/segmentio/terraform-docs/"; + homepage = "https://github.com/terraform-docs/terraform-docs/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; From fc74ad444af06291f367a6d50dd70f010392cd33 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 3 Mar 2021 16:38:16 +0000 Subject: [PATCH 147/246] buildPythonPackage: Fix after #112276 Fix #114952 Before it was using the wrong `makeWrapper`, the one that expected to run on the target platform and produce packages for the "super-target". The "super target" (sliding off the end of the platforms list) is defined to be the same as the target, to cap it with a loop so there is no sliding off. However, `targetPackages.targetPackages` is *not* similarly defined. Per the bottom of `pkgs/stdenv/booter.nix` it is an almost-empty package set that just exists as a hack to help some things with exotic `depsTargetTarget`. In particular, that rump "super `targetPackages`" does not contain a `runtimeShell`, and that's the source of our eval-time error. --- pkgs/top-level/python-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4673bb8d200..7eb17fe1d78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -126,7 +126,13 @@ in { # helpers - wrapPython = callPackage ../development/interpreters/python/wrap-python.nix {inherit python; inherit (pkgs) makeSetupHook makeWrapper; }; + # We use build packages because we are making a setup hook to be used as a + # native build input. The script itself references both the build-time + # (build) and run-time (host) python from the explicitly passed in `python` + # attribute, so the `buildPackages` doesn't effect that. + wrapPython = pkgs.buildPackages.callPackage ../development/interpreters/python/wrap-python.nix { + inherit python; + }; # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions pythonPackages = self; From 3752605627e1fab4fc9298c7f1eb60b963ac8e9a Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Sat, 10 Oct 2020 17:46:58 -0400 Subject: [PATCH 148/246] vscode-exts/ms-dotnettools-csharp: Init at 1.23.2 Including PR fixes as suggested by: - Sandro --- pkgs/misc/vscode-extensions/default.nix | 2 + .../ms-dotnettools-csharp/default.nix | 143 ++++++++++++++++ .../rt-deps-bin-srcs.json | 37 +++++ .../ms-dotnettools-csharp/update-bin-srcs | 25 +++ .../update-bin-srcs-lib.sh | 154 ++++++++++++++++++ 5 files changed, 361 insertions(+) create mode 100644 pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix create mode 100644 pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json create mode 100755 pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs create mode 100755 pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index bc00f82f19b..d1bbba0b953 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -141,6 +141,8 @@ let }; }; + ms-dotnettools.csharp = callPackage ./ms-dotnettools-csharp { }; + ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-kubernetes-tools"; diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix new file mode 100644 index 00000000000..a7b0e17ecbf --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix @@ -0,0 +1,143 @@ +{ lib +, fetchurl +, vscode-utils +, unzip +, patchelf +, makeWrapper +, icu +, stdenv +, openssl +, mono6 +}: + +let + # Get as close as possible as the `package.json` required version. + # This is what drives omnisharp. + mono = mono6; + + rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json); + + rtDepsBinSrcs = builtins.mapAttrs (k: v: + let + # E.g: "OmniSharp-x86_64-linux" + kSplit = builtins.split "(-)" k; + name = builtins.elemAt kSplit 0; + arch = builtins.elemAt kSplit 2; + platform = builtins.elemAt kSplit 4; + in + { + inherit name arch platform; + installPath = v.installPath; + binaries = v.binaries; + bin-src = fetchurl { + urls = v.urls; + inherit (v) sha256; + }; + } + ) + rtDepsSrcsFromJson; + + arch = "x86_64"; + platform = "linux"; + + rtDepBinSrcByName = bSrcName: + rtDepsBinSrcs."${bSrcName}-${arch}-${platform}"; + + omnisharp = rtDepBinSrcByName "OmniSharp"; + vsdbg = rtDepBinSrcByName "Debugger"; + razor = rtDepBinSrcByName "Razor"; +in + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "csharp"; + publisher = "ms-dotnettools"; + version = "1.23.2"; + sha256 = "0ydaiy8jfd1bj50bqiaz5wbl7r6qwmbz9b29bydimq0rdjgapaar"; + }; + + nativeBuildInputs = [ + unzip + patchelf + makeWrapper + ]; + + postPatch = '' + declare ext_unique_id + # See below as to why we cannot take the whole basename. + ext_unique_id="$(basename "$out" | head -c 32)" + + # Fix 'Unable to connect to debuggerEventsPipeName .. exceeds the maximum length 107.' when + # attempting to launch a specific test in debug mode. The extension attemps to open + # a pipe in extension dir which would fail anyway. We change to target file path + # to a path in tmp dir with a short name based on the unique part of the nix store path. + # This is however a brittle patch as we're working on minified code. + # Hence the attempt to only hold on stable names. + # However, this really would better be fixed upstream. + sed -i \ + -E -e 's/(this\._pipePath=[a-zA-Z0-9_]+\.join\()([a-zA-Z0-9_]+\.getExtensionPath\(\)[^,]*,)/\1require("os").tmpdir(), "'"$ext_unique_id"'"\+/g' \ + "$PWD/dist/extension.js" + + unzip_to() { + declare src_zip="''${1?}" + declare target_dir="''${2?}" + mkdir -p "$target_dir" + if unzip "$src_zip" -d "$target_dir"; then + true + elif [[ "1" -eq "$?" ]]; then + 1>&2 echo "WARNING: unzip('$?' -> skipped files)." + else + 1>&2 echo "ERROR: unzip('$?')." + fi + } + + patchelf_add_icu_as_needed() { + declare elf="''${1?}" + declare icu_major_v="${ + with builtins; head (splitVersion (parseDrvName icu.name).version)}" + + for icu_lib in icui18n icuuc icudata; do + patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf" + done + } + + patchelf_common() { + declare elf="''${1?}" + + patchelf_add_icu_as_needed "$elf" + patchelf --add-needed "libssl.so" "$elf" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc openssl.out icu.out ]}:\$ORIGIN" \ + "$elf" + } + + declare omnisharp_dir="$PWD/${omnisharp.installPath}" + unzip_to "${omnisharp.bin-src}" "$omnisharp_dir" + rm "$omnisharp_dir/bin/mono" + ln -s -T "${mono6}/bin/mono" "$omnisharp_dir/bin/mono" + chmod a+x "$omnisharp_dir/run" + touch "$omnisharp_dir/install.Lock" + + declare vsdbg_dir="$PWD/${vsdbg.installPath}" + unzip_to "${vsdbg.bin-src}" "$vsdbg_dir" + chmod a+x "$vsdbg_dir/vsdbg-ui" + chmod a+x "$vsdbg_dir/vsdbg" + touch "$vsdbg_dir/install.complete" + touch "$vsdbg_dir/install.Lock" + patchelf_common "$vsdbg_dir/vsdbg" + patchelf_common "$vsdbg_dir/vsdbg-ui" + + declare razor_dir="$PWD/${razor.installPath}" + unzip_to "${razor.bin-src}" "$razor_dir" + chmod a+x "$razor_dir/rzls" + touch "$razor_dir/install.Lock" + patchelf_common "$razor_dir/rzls" + ''; + + meta = with lib; { + description = "C# for Visual Studio Code (powered by OmniSharp)"; + license = licenses.mit; + maintainers = [ maintainers.jraygauthier ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json new file mode 100644 index 00000000000..91ee056efc1 --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json @@ -0,0 +1,37 @@ +{ + "OmniSharp-x86_64-linux": { + "installPath": ".omnisharp/1.37.1", + "binaries": [ + "./mono.linux-x86_64", + "./run" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/46933d64-075c-4f9f-b205-da4a839e2e3c/4bba2c3f40106056b53721c164ff86fa/omnisharp-linux-x64-1.37.1.zip", + "https://roslynomnisharp.blob.core.windows.net/releases/1.37.1/omnisharp-linux-x64-1.37.1.zip" + ], + "sha256": "0yzxkbq0fyq2bv0s7qmycxl0w54lla0vykg1a5lpv9j38k062vvz" + }, + "Debugger-x86_64-linux": { + "installPath": ".debugger", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/292d2e01-fb93-455f-a6b3-76cddad4f1ef/2e9b8bc5431d8f6c56025e76eaabbdff/coreclr-debug-linux-x64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-22-2/coreclr-debug-linux-x64.zip" + ], + "sha256": "1lhyjq6g6lc1b4n4z57g0ssr5msqgsmrl8yli8j9ah5s3jq1lrda" + }, + "Razor-x86_64-linux": { + "installPath": ".razor", + "binaries": [ + "./rzls" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/757f5246-2b09-43fe-9a8d-840cfd15092b/2b6d8eee0470acf725c1c7a09f8b6475/razorlanguageserver-linux-x64-6.0.0-alpha.1.20418.9.zip", + "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-linux-x64-6.0.0-alpha.1.20418.9.zip" + ], + "sha256": "1hksxq867anb9h040497phszq64f6krg4a46w0xqrm6crj8znqr5" + } +} diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs new file mode 100755 index 00000000000..ecd7efba05d --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs @@ -0,0 +1,25 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../.. -i bash -p curl jq unzip +set -euf -o pipefail + +declare scriptDir +scriptDir=$(cd "$(dirname "$0")"; pwd) +1>&2 echo "scriptDir='$scriptDir'" + +. "$scriptDir/update-bin-srcs-lib.sh" + +declare extPublisher="ms-dotnettools" +declare extName="csharp" +declare defaultExtVersion="1.23.2" +declare extVersion="${1:-$defaultExtVersion}" + +formatExtRuntimeDeps \ + "$extPublisher" "$extName" "$extVersion" \ + | computeAndAttachExtRtDepsChecksums \ + | jqStreamToJson \ + | tee "$scriptDir/rt-deps-bin-srcs.json" \ + | jq '.' + +# TODO: Unfortunatly no simple json to nix implementation available. +# This would allow us to dump to './rt-deps-bin-srcs.nix' instead. +# jsonToNix diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh new file mode 100755 index 00000000000..ad494a37908 --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh @@ -0,0 +1,154 @@ +#!/usr/bin/env bash + +prefetchExtensionZip() { + declare publisher="${1?}" + declare name="${2?}" + declare version="${3?}" + + 1>&2 echo + 1>&2 echo "------------- Downloading extension ---------------" + + declare extZipStoreName="${publisher}-${name}.zip" + declare extUrl="https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"; + 1>&2 echo "extUrl='$extUrl'" + declare nixPrefetchArgs=( --name "$extZipStoreName" --print-path "$extUrl" ) + + 1>&2 printf "$ nix-prefetch-url" + 1>&2 printf " %q" "${nixPrefetchArgs[@]}" + 1>&2 printf " 2> /dev/null\n" + declare zipShaWStorePath + zipShaWStorePath=$(nix-prefetch-url "${nixPrefetchArgs[@]}" 2> /dev/null) + + 1>&2 echo "zipShaWStorePath='$zipShaWStorePath'" + echo "$zipShaWStorePath" +} + + +prefetchExtensionUnpacked() { + declare publisher="${1?}" + declare name="${2?}" + declare version="${3?}" + + declare zipShaWStorePath + zipShaWStorePath="$(prefetchExtensionZip "$publisher" "$name" "$version")" + + declare zipStorePath + zipStorePath="$(echo "$zipShaWStorePath" | tail -n1)" + 1>&2 echo "zipStorePath='$zipStorePath'" + + function rm_tmpdir() { + 1>&2 printf "rm -rf -- %q\n" "$tmpDir" + rm -rf -- "$tmpDir" + unset tmpDir + trap - INT TERM HUP EXIT + } + function make_trapped_tmpdir() { + tmpDir=$(mktemp -d) + trap rm_tmpdir INT TERM HUP EXIT + } + + 1>&2 echo + 1>&2 echo "------------- Unpacking extension ---------------" + + make_trapped_tmpdir + declare unzipArgs=( -q -d "$tmpDir" "$zipStorePath" ) + 1>&2 printf "$ unzip" + 1>&2 printf " %q" "${unzipArgs[@]}" + 1>&2 printf "\n" + unzip "${unzipArgs[@]}" + + declare unpackedStoreName="${publisher}-${name}" + + declare unpackedStorePath + unpackedStorePath="$(nix add-to-store -n "$unpackedStoreName" "$tmpDir")" + declare unpackedSha256 + unpackedSha256="$(nix hash-path --base32 --type sha256 "$unpackedStorePath")" + 1>&2 echo "unpackedStorePath='$unpackedStorePath'" + 1>&2 echo "unpackedSha256='$unpackedSha256'" + + rm_tmpdir + + echo "$unpackedSha256" + echo "$unpackedStorePath" +} + + +prefetchExtensionJson() { + declare publisher="${1?}" + declare name="${2?}" + declare version="${3?}" + + declare unpackedShaWStorePath + unpackedShaWStorePath="$(prefetchExtensionUnpacked "$publisher" "$name" "$version")" + + declare unpackedStorePath + unpackedStorePath="$(echo "$unpackedShaWStorePath" | tail -n1)" + 1>&2 echo "unpackedStorePath='$unpackedStorePath'" + + declare jsonShaWStorePath + jsonShaWStorePath=$(nix-prefetch-url --print-path "file://${unpackedStorePath}/extension/package.json" 2> /dev/null) + + 1>&2 echo "jsonShaWStorePath='$jsonShaWStorePath'" + echo "$jsonShaWStorePath" +} + + +formatExtRuntimeDeps() { + declare publisher="${1?}" + declare name="${2?}" + declare version="${3?}" + + declare jsonShaWStorePath + jsonShaWStorePath="$(prefetchExtensionJson "$publisher" "$name" "$version")" + + declare jsonStorePath + jsonStorePath="$(echo "$jsonShaWStorePath" | tail -n1)" + 1>&2 echo "jsonStorePath='$jsonStorePath'" + + declare jqQuery + jqQuery=$(cat <<'EOF' +.runtimeDependencies \ +| map(select(.platforms[] | in({"linux": null}))) \ +| map(select(.architectures[] | in({"x86_64": null}))) \ +| .[] | {(.id + "-" + (.architectures[0]) + "-" + (.platforms[0])): \ +{installPath, binaries, urls: [.url, .fallbackUrl]}} +EOF +) + + 1>&2 printf "$ cat %q | jq '%s'\n" "$jsonStorePath" "$jqQuery" + cat "$jsonStorePath" | jq "$jqQuery" +} + + +computeExtRtDepChecksum() { + declare rtDepJsonObject="${1?}" + declare url + url="$(echo "$rtDepJsonObject" | jq -j '.[].urls[0]')" + declare sha256 + 1>&2 printf "$ nix-prefetch-url '%s'\n" "$url" + sha256="$(nix-prefetch-url "$url")" + 1>&2 echo "$sha256" + echo "$sha256" +} + + +computeAndAttachExtRtDepsChecksums() { + while read -r rtDepJsonObject; do + declare sha256 + sha256="$(computeExtRtDepChecksum "$rtDepJsonObject")" + echo "$rtDepJsonObject" | jq --arg sha256 "$sha256" '.[].sha256 = $sha256' + done < <(cat - | jq -c '.') +} + + +jqStreamToJson() { + cat - | jq --slurp '. | add' +} + + +jsonToNix() { + # TODO: Replacing this non functional stuff with a proper json to nix + # implementation would allow us to produce a 'rt-deps-bin-srcs.nix' file instead. + false + cat - | sed -E -e 's/": /" = /g' -e 's/,$/;/g' -e 's/ }$/ };/g' -e 's/ ]$/ ];/g' +} From 1ec43e04cc00af534325f1ed342d8ab7a90b5d13 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Feb 2021 21:07:08 +0100 Subject: [PATCH 149/246] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F11.ocaml:?= =?UTF-8?q?=204.11.1=20=E2=86=92=204.11.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/4.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix index afda8592818..3e5aefc11f1 100644 --- a/pkgs/development/compilers/ocaml/4.11.nix +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "11"; - patch_version = "1"; - sha256 = "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa"; + patch_version = "2"; + sha256 = "1m3wrgkkv3f77wvcymjm0i2srxzmx62y6jln3i0a2px07ng08l9z"; } From 1d9d858989baed75a2931c3f67a959b0dfc89c33 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Mar 2021 09:06:02 -0800 Subject: [PATCH 150/246] gpxsee: 8.7 -> 8.8 (#114986) --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index e5e1995548c..cebbcfe59ba 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "8.7"; + version = "8.8"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-pBNG9lDdqvxh2hGmOcL21mkkyFD7id1mWCUSgkTG71M="; + sha256 = "sha256-eAXMmjPcfnJA5w6w/SRc6T5KHss77t0JijTB6+ctjzo="; }; patches = (substituteAll { From 7738719171b6a52d930e1ba7140ee3fdaf2df3dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 13:50:53 +0100 Subject: [PATCH 151/246] awsebcli: mark broken --- pkgs/tools/virtualization/awsebcli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 796ea36eacf..1c9e8149232 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -92,5 +92,6 @@ in with localPython.pkgs; buildPythonApplication rec { description = "A command line interface for Elastic Beanstalk"; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; + broken = true; }; } From 5d14b8fa53155430e75deae19cf94c4532c1d052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 14:24:34 +0100 Subject: [PATCH 152/246] pythonPackages.w3lib: disable broken test, switch to pytestCheckHook, cleanup --- pkgs/development/python-modules/w3lib/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index 0c80423e36a..a626bdd6ec0 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , six -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -14,7 +14,14 @@ buildPythonPackage rec { sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha"; }; - buildInputs = [ six pytest ]; + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "w3lib" ]; + + disabledTests = [ + "test_add_or_replace_parameter" + ]; meta = with lib; { description = "A library of web-related functions"; @@ -22,5 +29,4 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ drewkett ]; }; - } From 8796a2e176a871ecf993283e15ce888d1131104d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 15:05:04 +0100 Subject: [PATCH 153/246] squashfs: cleanup, update homepage --- pkgs/tools/filesystems/squashfs/default.nix | 34 +++++++++++++-------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 3c38341554a..cddb1722584 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,19 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, zlib, xz +{ lib +, stdenv +, fetchFromGitHub +, zlib +, xz , lz4 , lzo , zstd }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "squashfs"; version = "4.4"; src = fetchFromGitHub { owner = "plougher"; repo = "squashfs-tools"; + rev = version; sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw"; - # Tag "4.4" points to this commit. - rev = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"; }; patches = [ @@ -28,17 +31,24 @@ stdenv.mkDerivation { buildInputs = [ zlib xz zstd lz4 lzo ]; - preBuild = "cd squashfs-tools"; + preBuild = '' + cd squashfs-tools + '' ; - installFlags = [ "INSTALL_DIR=\${out}/bin" ]; + installFlags = [ "INSTALL_DIR=${placeholder "out"}/bin" ]; - makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" "LZO_SUPPORT=1"]; + makeFlags = [ + "XZ_SUPPORT=1" + "ZSTD_SUPPORT=1" + "LZ4_SUPPORT=1" + "LZO_SUPPORT=1" + ]; - meta = { - homepage = "http://squashfs.sourceforge.net/"; + meta = with lib; { + homepage = "https://github.com/plougher/squashfs-tools"; description = "Tool for creating and unpacking squashfs filesystems"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ruuda ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ruuda ]; }; } From 2dabf9695316706134296c390290f590b2fccb9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 16:26:24 +0100 Subject: [PATCH 154/246] lizardfs: mark broken --- pkgs/tools/filesystems/lizardfs/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 766ac1f82ea..a9e0cd12d9d 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -45,5 +46,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ rushmorem shamilton ]; + # 'fprintf' was not declared in this scope + broken = true; }; } From a2b0ea6865b2346ceb015259c76e111dcca039c5 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Wed, 3 Mar 2021 18:25:12 +0100 Subject: [PATCH 155/246] coreboot-utils: Add Felix Singer as a maintainer (#115001) Signed-off-by: Felix Singer --- pkgs/tools/misc/coreboot-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index c05d50cdbc1..39e6e6f211a 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -7,7 +7,7 @@ let description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; license = licenses.gpl2; - maintainers = [ maintainers.petabyteboy ]; + maintainers = with maintainers; [ petabyteboy felixsinger ]; platforms = platforms.linux; }; From e1bcb3cc01cfd58485a57510076e96a1e69a539d Mon Sep 17 00:00:00 2001 From: tomberek Date: Wed, 3 Mar 2021 12:57:36 -0500 Subject: [PATCH 156/246] libosmpbf: remove (#114997) * libosmpbf: remove * Update pkgs/top-level/aliases.nix Co-authored-by: Sandro --- .../libraries/libosmpbf/default.nix | 23 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/libosmpbf/default.nix diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix deleted file mode 100644 index 572b5710fa9..00000000000 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, fetchurl, protobuf}: - -stdenv.mkDerivation { - name = "libosmpbf-1.5.0"; - - src = fetchurl { - url = "https://github.com/scrosby/OSM-binary/archive/v1.5.0.tar.gz"; - sha256 = "sha256-Kr8xJnKXk3MsM4B2OZnMNl5Rv/2jaaAIITh5o82QR2w="; - }; - - buildInputs = [ protobuf ]; - - sourceRoot = "OSM-binary-1.5.0/src"; - - installFlags = [ "PREFIX=$(out)" ]; - - meta = { - homepage = "https://github.com/scrosby/OSM-binary"; - description = "C library to read and write OpenStreetMap PBF files"; - license = lib.licenses.lgpl3; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7f6990c4ffb..7963127787c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -340,6 +340,7 @@ mapAliases ({ liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 liblastfm = libsForQt5.liblastfm; # added 2020-06-14 liblrdf = lrdf; # added 2018-04-25 + libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; libqrencode = qrencode; # added 2019-01-01 librdf = lrdf; # added 2020-03-22 librecad2 = librecad; # backwards compatibility alias, added 2015-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ece4b0da17..ad8bc549b90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15494,8 +15494,6 @@ in libosmocore = callPackage ../applications/misc/libosmocore { }; - libosmpbf = callPackage ../development/libraries/libosmpbf {}; - libotr = callPackage ../development/libraries/libotr { }; libow = callPackage ../development/libraries/libow { }; From 81331f20a59b040899b8f7b9c048209b625c5b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 13:50:31 +0100 Subject: [PATCH 157/246] pythonPackages.setuptools-rust: cleanup, add pythonImportsCheck --- .../python-modules/setuptools-rust/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index ee4a3b55164..e24c771457f 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -4,14 +4,13 @@ , isPy27 , semantic-version , setuptools -, setuptools_scm +, setuptools-scm , toml }: buildPythonPackage rec { pname = "setuptools-rust"; version = "0.11.6"; - disabled = isPy27; src = fetchPypi { @@ -19,10 +18,14 @@ buildPythonPackage rec { sha256 = "a5b5954909cbc5d66b914ee6763f81fa2610916041c7266105a469f504a7c4ca"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ semantic-version setuptools toml ]; + # no tests + doCheck = false; + pythonImportsCheck = [ "setuptools_rust" ]; + meta = with lib; { description = "Setuptools plugin for Rust support"; homepage = "https://github.com/PyO3/setuptools-rust"; From 9cbdb94276a3ec924456d5c2c270d0c6b35ac730 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Mar 2021 14:46:00 +0000 Subject: [PATCH 158/246] python37Packages.azure-mgmt-resource: 15.0.0 -> 16.0.0 --- .../python-modules/azure-mgmt-resource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index bdba8949887..5cbbee77ae8 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "15.0.0"; + version = "16.0.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "80ecb69aa21152b924edf481e4b26c641f11aa264120bc322a14284811df9c14"; + sha256 = "0bdbdc9c1ed2ef975d8dff45f358d1e06dc6761eace5b6817f13993447e48a68"; }; propagatedBuildInputs = [ From 1cd06e59e05975681013af60952856d62035820c Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Wed, 3 Mar 2021 18:59:28 +0000 Subject: [PATCH 159/246] libtpms: 0.7.4 -> 0.8.0 (#114491) * libtpms: 0.7.4 -> 0.8.0 * libtpms: tpm2 support is out of experimental Since db80bd9ea16894a1902c3ab787aea9d58e7d1e85 commit, tpm2 support is not experimental anymore Signed-off-by: Arthur Gautier * libtpms: remove extraneous output Nothing was put in the $out output, remove the $lib and put everything that was in it in the $out. Signed-off-by: Arthur Gautier Co-authored-by: R. RyanTM --- pkgs/tools/security/libtpms/default.nix | 10 ++++------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 ----- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index 71966a934d6..67228be6741 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -3,18 +3,17 @@ , fetchFromGitHub , pkg-config, autoreconfHook , openssl, perl -, tpm2Support ? false }: stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-nZSBD3WshlZHVMBFmDBBdFkhBjNgtASfg6+lYOOAhZ8="; + sha256 = "sha256-/zvMXdAOb4J3YaqdVJvTUI1/JFC0OKwgiYwYgYB62Y4="; }; nativeBuildInputs = [ @@ -24,14 +23,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl ]; - outputs = [ "out" "lib" "man" "dev" ]; + outputs = [ "out" "man" "dev" ]; enableParallelBuilding = true; configureFlags = [ "--with-openssl" - ] ++ lib.optionals tpm2Support [ - "--with-tpm2" # TPM2 support is flagged experimental by upstream + "--with-tpm2" ]; meta = with lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7963127787c..84adc261adc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -681,6 +681,7 @@ mapAliases ({ surf-webkit2 = surf; # added 2017-04-02 sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 + swtpm-tpm2 = swtpm; # added 2021-02-26 system_config_printer = system-config-printer; # added 2016-01-03 systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1177645cea7..35b6e6bfa22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8254,11 +8254,6 @@ in swec = callPackage ../tools/networking/swec { }; swtpm = callPackage ../tools/security/swtpm { }; - swtpm-tpm2 = swtpm.override { - libtpms = libtpms.override { - tpm2Support = true; - }; - }; svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { git = gitSVN; From 507b66a5e55f02ed378a151ee1eabc4b7793fb68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Wed, 3 Mar 2021 20:04:32 +0100 Subject: [PATCH 160/246] nixos/grafana: create directory for notifiers provisioning --- nixos/modules/services/monitoring/grafana.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 036bf668bc1..88727e70ee3 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -73,7 +73,7 @@ let notifierFile = pkgs.writeText "notifier.yaml" (builtins.toJSON notifierConfiguration); provisionConfDir = pkgs.runCommand "grafana-provisioning" { } '' - mkdir -p $out/{datasources,dashboards} + mkdir -p $out/{datasources,dashboards,notifiers} ln -sf ${datasourceFile} $out/datasources/datasource.yaml ln -sf ${dashboardFile} $out/dashboards/dashboard.yaml ln -sf ${notifierFile} $out/notifiers/notifier.yaml From 9d74b73a0768800d0e90bf73147a1a5f8ca4a9a3 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 1 Mar 2021 11:03:31 -0800 Subject: [PATCH 161/246] lifecycled: init at 3.1.0 --- pkgs/tools/misc/lifecycled/default.nix | 31 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/lifecycled/default.nix diff --git a/pkgs/tools/misc/lifecycled/default.nix b/pkgs/tools/misc/lifecycled/default.nix new file mode 100644 index 00000000000..1c30b760a9c --- /dev/null +++ b/pkgs/tools/misc/lifecycled/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule rec { + pname = "lifecycled"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "buildkite"; + repo = "lifecycled"; + rev = "v${version}"; + sha256 = "F9eovZpwbigP0AMdjAIxULPLDC3zO6GxQmPdt5Xvpkk="; + }; + + vendorSha256 = "q5wYKSLHRzL+UGn29kr8+mUupOPR1zohTscbzjMRCS0="; + + postInstall = '' + mkdir -p $out/lib/systemd/system + substitute init/systemd/lifecycled.unit $out/lib/systemd/system/lifecycled.service \ + --replace /usr/bin/lifecycled $out/bin/lifecycled + ''; + + meta = with lib; { + description = "A daemon for responding to AWS AutoScaling Lifecycle Hooks"; + homepage = "https://github.com/buildkite/lifecycled/"; + license = licenses.mit; + maintainers = with maintainers; [ cole-h grahamc ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35b6e6bfa22..533855825a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -797,6 +797,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; }; + lifecycled = callPackage ../tools/misc/lifecycled { }; + lilyterm = callPackage ../applications/terminal-emulators/lilyterm { inherit (gnome2) vte; gtk = gtk2; From c89117997db7f583592d1f7561df53b68138a4a4 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 1 Mar 2021 11:04:01 -0800 Subject: [PATCH 162/246] nixos/lifecycled: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/lifecycled.nix | 164 +++++++++++++++++++++ 2 files changed, 165 insertions(+) create mode 100644 nixos/modules/services/misc/lifecycled.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d40edb2408f..f6fcd5a325b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -490,6 +490,7 @@ ./services/misc/logkeys.nix ./services/misc/leaps.nix ./services/misc/lidarr.nix + ./services/misc/lifecycled.nix ./services/misc/mame.nix ./services/misc/matrix-appservice-discord.nix ./services/misc/matrix-synapse.nix diff --git a/nixos/modules/services/misc/lifecycled.nix b/nixos/modules/services/misc/lifecycled.nix new file mode 100644 index 00000000000..1c8942998d6 --- /dev/null +++ b/nixos/modules/services/misc/lifecycled.nix @@ -0,0 +1,164 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.services.lifecycled; + + # TODO: Add the ability to extend this with an rfc 42-like interface. + # In the meantime, one can modify the environment (as + # long as it's not overriding anything from here) with + # systemd.services.lifecycled.serviceConfig.Environment + configFile = pkgs.writeText "lifecycled" '' + LIFECYCLED_HANDLER=${cfg.handler} + ${lib.optionalString (cfg.cloudwatchGroup != null) "LIFECYCLED_CLOUDWATCH_GROUP=${cfg.cloudwatchGroup}"} + ${lib.optionalString (cfg.cloudwatchStream != null) "LIFECYCLED_CLOUDWATCH_STREAM=${cfg.cloudwatchStream}"} + ${lib.optionalString cfg.debug "LIFECYCLED_DEBUG=${lib.boolToString cfg.debug}"} + ${lib.optionalString (cfg.instanceId != null) "LIFECYCLED_INSTANCE_ID=${cfg.instanceId}"} + ${lib.optionalString cfg.json "LIFECYCLED_JSON=${lib.boolToString cfg.json}"} + ${lib.optionalString cfg.noSpot "LIFECYCLED_NO_SPOT=${lib.boolToString cfg.noSpot}"} + ${lib.optionalString (cfg.snsTopic != null) "LIFECYCLED_SNS_TOPIC=${cfg.snsTopic}"} + ${lib.optionalString (cfg.awsRegion != null) "AWS_REGION=${cfg.awsRegion}"} + ''; +in +{ + meta.maintainers = with maintainers; [ cole-h grahamc ]; + + options = { + services.lifecycled = { + enable = mkEnableOption "lifecycled"; + + queueCleaner = { + enable = mkEnableOption "lifecycled-queue-cleaner"; + + frequency = mkOption { + type = types.str; + default = "hourly"; + description = '' + How often to trigger the queue cleaner. + + NOTE: This string should be a valid value for a systemd + timer's OnCalendar configuration. See + systemd.timer5 + for more information. + ''; + }; + + parallel = mkOption { + type = types.ints.unsigned; + default = 20; + description = '' + The number of parallel deletes to run. + ''; + }; + }; + + instanceId = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The instance ID to listen for events for. + ''; + }; + + snsTopic = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The SNS topic that receives events. + ''; + }; + + noSpot = mkOption { + type = types.bool; + default = false; + description = '' + Disable the spot termination listener. + ''; + }; + + handler = mkOption { + type = types.path; + description = '' + The script to invoke to handle events. + ''; + }; + + json = mkOption { + type = types.bool; + default = false; + description = '' + Enable JSON logging. + ''; + }; + + cloudwatchGroup = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Write logs to a specific Cloudwatch Logs group. + ''; + }; + + cloudwatchStream = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Write logs to a specific Cloudwatch Logs stream. Defaults to the instance ID. + ''; + }; + + debug = mkOption { + type = types.bool; + default = false; + description = '' + Enable debugging information. + ''; + }; + + # XXX: Can be removed if / when + # https://github.com/buildkite/lifecycled/pull/91 is merged. + awsRegion = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The region used for accessing AWS services. + ''; + }; + }; + }; + + ### Implementation ### + + config = mkMerge [ + (mkIf cfg.enable { + environment.etc."lifecycled".source = configFile; + + systemd.packages = [ pkgs.lifecycled ]; + systemd.services.lifecycled = { + wantedBy = [ "network-online.target" ]; + restartTriggers = [ configFile ]; + }; + }) + + (mkIf cfg.queueCleaner.enable { + systemd.services.lifecycled-queue-cleaner = { + description = "Lifecycle Daemon Queue Cleaner"; + environment = optionalAttrs (cfg.awsRegion != null) { AWS_REGION = cfg.awsRegion; }; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.lifecycled}/bin/lifecycled-queue-cleaner -parallel ${toString cfg.queueCleaner.parallel}"; + }; + }; + + systemd.timers.lifecycled-queue-cleaner = { + description = "Lifecycle Daemon Queue Cleaner Timer"; + wantedBy = [ "timers.target" ]; + after = [ "network-online.target" ]; + timerConfig = { + Unit = "lifecycled-queue-cleaner.service"; + OnCalendar = "${cfg.queueCleaner.frequency}"; + }; + }; + }) + ]; +} From 4abe6c75ffaed4c6456e200768bffbbc94bcd52c Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Wed, 3 Mar 2021 11:22:20 -0800 Subject: [PATCH 163/246] taskwarrior: 2.5.2 -> 2.5.3 (#113056) --- .../applications/misc/taskwarrior/default.nix | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index b3f26c87c50..ee781c75e69 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -1,19 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls }: +{ lib, stdenv, fetchurl, cmake, libuuid, gnutls, python3, bash }: stdenv.mkDerivation rec { pname = "taskwarrior"; - version = "2.5.2"; + version = "2.5.3"; - src = fetchFromGitHub { - owner = "GothenburgBitFactory"; - repo = "taskwarrior"; - rev = "v${version}"; - sha256 = "0jv5b56v75qhdqbrfsddfwizmbizcsv3mn8gp92nckwlx9hrk5id"; - fetchSubmodules = true; - }; + srcs = [ + (fetchurl { + url = " https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz"; + sha256 = "0fwnxshhlha21hlgg5z1ad01w13zm1hlmncs274y5n8i15gdfhvj"; + }) + (fetchurl { + url = "https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/tests-${version}.tar.gz"; + sha256 = "165xmf9h6rb7l6l9nlyygj0mx9bi1zyd78z0lrl3nadhmgzggv0b"; + }) + ]; + + sourceRoot = "task-${version}"; + + postUnpack = '' + mv test ${sourceRoot} + ''; nativeBuildInputs = [ cmake libuuid gnutls ]; + doCheck = true; + preCheck = '' + find test -type f -exec sed -i \ + -e "s|/usr/bin/env python3|${python3.interpreter}|" \ + -e "s|/usr/bin/env bash|${bash}/bin/bash|" \ + {} + + ''; + checkTarget = "test"; + postInstall = '' mkdir -p "$out/share/bash-completion/completions" ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash" @@ -28,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://taskwarrior.org"; license = licenses.mit; maintainers = with maintainers; [ marcweber ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } From fc970213065bcfb5d9c0ff49842874f6f8cb598d Mon Sep 17 00:00:00 2001 From: Doug Chapman Date: Wed, 3 Mar 2021 06:38:54 -0800 Subject: [PATCH 164/246] s2n: 0.10.23->1.0.0, rename package to s2n-tls --- .../libraries/aws-c-event-stream/default.nix | 4 ++-- pkgs/development/libraries/aws-c-io/default.nix | 4 ++-- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++-- .../development/libraries/{s2n => s2n-tls}/default.nix | 10 +++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) rename pkgs/development/libraries/{s2n => s2n-tls}/default.nix (74%) diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index 4cfabc77bb2..18dddee6bde 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n, libexecinfo }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n-tls, libexecinfo }: stdenv.mkDerivation rec { pname = "aws-c-event-stream"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n ] + buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n-tls ] ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo; cmakeFlags = [ diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 9c7fcf11af8..373ea66a4b6 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n, Security }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n-tls, Security }: stdenv.mkDerivation rec { pname = "aws-c-io"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common s2n] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ aws-c-cal aws-c-common s2n-tls] ++ lib.optionals stdenv.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7b10fc463dd..d6fbb97014d 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n, zlib +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib , aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ - curl openssl s2n zlib + curl openssl s2n-tls zlib aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || diff --git a/pkgs/development/libraries/s2n/default.nix b/pkgs/development/libraries/s2n-tls/default.nix similarity index 74% rename from pkgs/development/libraries/s2n/default.nix rename to pkgs/development/libraries/s2n-tls/default.nix index 3ec66ebf52d..2d3ebc6cb41 100644 --- a/pkgs/development/libraries/s2n/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, openssl }: stdenv.mkDerivation rec { - pname = "s2n"; - version = "0.10.23"; + pname = "s2n-tls"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "awslabs"; + owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "063wqpszhfcbxm7a7s6d6kinqd6b6dxij85lk9jjkrslg5fgqbki"; + sha256 = "1q6kmgwb8jxmc4ijzk9pkqzz8lsbfsv9hyzqvy944w7306zx1r5h"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C99 implementation of the TLS/SSL protocols"; - homepage = "https://github.com/awslabs/s2n"; + homepage = "https://github.com/aws/s2n-tls"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7f6990c4ffb..0615e678d2b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -602,6 +602,7 @@ mapAliases ({ urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # added 2020-02-02 urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # added 2020-02-02 urxvt_bidi = rxvt-unicode-plugins.bidi; # added 2020-02-02 + s2n = s2n-tls; # added 2021-03-03 s6Dns = s6-dns; # added 2018-07-23 s6Networking = s6-networking; # added 2018-07-23 s6LinuxUtils = s6-linux-utils; # added 2018-07-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cb6bd2a981..7c6086242bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16790,7 +16790,7 @@ in graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; - s2n = callPackage ../development/libraries/s2n { }; + s2n-tls = callPackage ../development/libraries/s2n-tls { }; simavr = callPackage ../development/tools/simavr { avrgcc = pkgsCross.avr.buildPackages.gcc; From b9bf7575034fcd618228b79673a50ba9948070b4 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 14 Dec 2020 13:03:32 +0100 Subject: [PATCH 165/246] kubernetes-helm: support plugins also introduce helm-s3, helm-diff, helm-secrets plugin. You can create a wrapped helm with these plugins via: myHelm = final.wrapHelm final.kubernetes-helm-unwrapped { plugins = with final.kubernetes-helmPlugins; [ helm-s3 helm-secrets helm-diff ]; }; Running `helm plugin list` will show you these are available. --- .../cluster/helm/plugins/default.nix | 36 ++++++++++++++ .../networking/cluster/helm/wrapper.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 3 files changed, 90 insertions(+) create mode 100644 pkgs/applications/networking/cluster/helm/plugins/default.nix create mode 100644 pkgs/applications/networking/cluster/helm/wrapper.nix diff --git a/pkgs/applications/networking/cluster/helm/plugins/default.nix b/pkgs/applications/networking/cluster/helm/plugins/default.nix new file mode 100644 index 00000000000..5c1a5a57d76 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, fetchurl, fetchzip }: +let + + buildHelmPlugin = { name, ... }@attrs: + fetchzip (attrs // { + stripRoot = false; + }); +in { + + helm-s3 = let + pname = "helm-s3"; + version = "0.10.0"; + in buildHelmPlugin rec { + name = "${pname}-${version}"; + url = "https://github.com/hypnoglow/helm-s3/releases/download/v${version}/helm-s3_${version}_linux_amd64.tar.gz"; + sha256 = "sha256-pTux7HArWB5yO1Oehfd+ZpeGUziI2+wfUart5WfkQW4="; + + extraPostFetch = '' + mkdir $out/${pname} + GLOBIGNORE="$out/${pname}" + mv $out/* -t $out/${pname} + ''; + }; + + helm-diff = buildHelmPlugin { + name = "helm-diff"; + url = "https://github.com/databus23/helm-diff/releases/download/v3.1.3/helm-diff-linux.tgz"; + sha256 = "sha256-oGmBPcCyUgq2YD4+CkGrbf6/JhzXJjmkaiqX/3a03aE="; + }; + + helm-secrets = buildHelmPlugin { + name = "helm-secrets"; + url = "https://github.com/jkroepke/helm-secrets/releases/download/v3.4.1/helm-secrets.tar.gz"; + sha256 = "sha256-HXwbs/bXJXF75FbLB/En0jirCQnz8HpU3o9LeMyV0e8="; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/wrapper.nix b/pkgs/applications/networking/cluster/helm/wrapper.nix new file mode 100644 index 00000000000..edad7fa1bc9 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/wrapper.nix @@ -0,0 +1,48 @@ +{ stdenv, symlinkJoin, lib, makeWrapper +, writeText +}: + +helm: + +let + wrapper = { + plugins ? [], + extraMakeWrapperArgs ? "" + }: + let + + initialMakeWrapperArgs = [ + "${helm}/bin/helm" "${placeholder "out"}/bin/helm" + "--argv0" "$0" "--set" "HELM_PLUGINS" "${pluginsDir}" + ]; + + pluginsDir = symlinkJoin { + name = "helm-plugins"; + paths = plugins; + }; +in + symlinkJoin { + name = "helm-${lib.getVersion helm}"; + + # Remove the symlinks created by symlinkJoin which we need to perform + # extra actions upon + postBuild = '' + rm $out/bin/helm + makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs} + ''; + paths = [ helm pluginsDir ]; + + preferLocalBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + passthru = { unwrapped = helm; }; + + meta = helm.meta // { + # To prevent builds on hydra + hydraPlatforms = []; + # prefer wrapper over the package + priority = (helm.meta.priority or 0) - 1; + }; + }; +in + lib.makeOverridable wrapper diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 533855825a0..bfea34f4748 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23401,6 +23401,12 @@ in kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; + wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { }; + + kubernetes-helm-wrapped = wrapHelm kubernetes-helm-unwrapped {}; + + kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); + kubetail = callPackage ../applications/networking/cluster/kubetail { } ; kupfer = callPackage ../applications/misc/kupfer { From 7667cf9112070d3dd8791d5e4c82a07c48bd2623 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 16 Feb 2021 23:09:39 +0100 Subject: [PATCH 166/246] Update pkgs/top-level/all-packages.nix Co-authored-by: Eric Bailey --- 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 bfea34f4748..878c28417e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23403,7 +23403,7 @@ in wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { }; - kubernetes-helm-wrapped = wrapHelm kubernetes-helm-unwrapped {}; + kubernetes-helm-wrapped = wrapHelm kubernetes-helm {}; kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); From 93ea4e0102bd979c05f038d885179e1a34c0194f Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sun, 21 Feb 2021 22:47:14 -0600 Subject: [PATCH 167/246] kubernetes-helmPlugins: build rather than download --- .../cluster/helm/plugins/default.nix | 35 +++------------ .../cluster/helm/plugins/helm-diff.nix | 35 +++++++++++++++ .../cluster/helm/plugins/helm-s3.nix | 38 ++++++++++++++++ .../cluster/helm/plugins/helm-secrets.nix | 44 +++++++++++++++++++ 4 files changed, 122 insertions(+), 30 deletions(-) create mode 100644 pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix create mode 100644 pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix create mode 100644 pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix diff --git a/pkgs/applications/networking/cluster/helm/plugins/default.nix b/pkgs/applications/networking/cluster/helm/plugins/default.nix index 5c1a5a57d76..edd19a25f9b 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/default.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -1,36 +1,11 @@ -{ stdenv, fetchFromGitHub, fetchurl, fetchzip }: -let +{ callPackage }: - buildHelmPlugin = { name, ... }@attrs: - fetchzip (attrs // { - stripRoot = false; - }); -in { +{ - helm-s3 = let - pname = "helm-s3"; - version = "0.10.0"; - in buildHelmPlugin rec { - name = "${pname}-${version}"; - url = "https://github.com/hypnoglow/helm-s3/releases/download/v${version}/helm-s3_${version}_linux_amd64.tar.gz"; - sha256 = "sha256-pTux7HArWB5yO1Oehfd+ZpeGUziI2+wfUart5WfkQW4="; + helm-diff = callPackage ./helm-diff.nix {}; - extraPostFetch = '' - mkdir $out/${pname} - GLOBIGNORE="$out/${pname}" - mv $out/* -t $out/${pname} - ''; - }; + helm-s3 = callPackage ./helm-s3.nix {}; - helm-diff = buildHelmPlugin { - name = "helm-diff"; - url = "https://github.com/databus23/helm-diff/releases/download/v3.1.3/helm-diff-linux.tgz"; - sha256 = "sha256-oGmBPcCyUgq2YD4+CkGrbf6/JhzXJjmkaiqX/3a03aE="; - }; + helm-secrets = callPackage ./helm-secrets.nix {}; - helm-secrets = buildHelmPlugin { - name = "helm-secrets"; - url = "https://github.com/jkroepke/helm-secrets/releases/download/v3.4.1/helm-secrets.tar.gz"; - sha256 = "sha256-HXwbs/bXJXF75FbLB/En0jirCQnz8HpU3o9LeMyV0e8="; - }; } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix new file mode 100644 index 00000000000..ce6491bfba4 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -0,0 +1,35 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "helm-diff"; + version = "3.1.3"; + + src = fetchFromGitHub { + owner = "databus23"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-h26EOjKNrlcrs2DAYj0NmDRgNRKozjfw5DtxUgHNTa4="; + }; + + vendorSha256 = "sha256-+n/QBuZqtdgUkaBG7iqSuBfljn+AdEzDoIo5SI8ErQA="; + + # NOTE: Remove the install and upgrade hooks. + postPatch = '' + sed -i '/^hooks:/,+2 d' plugin.yaml + ''; + + postInstall = '' + install -dm755 $out/${pname} + mv $out/bin $out/${pname}/ + mv $out/${pname}/bin/{helm-,}diff + install -m644 -Dt $out/${pname} plugin.yaml + ''; + + meta = with lib; { + description = "A Helm plugin that shows a diff"; + inherit (src.meta) homepage; + license = licenses.apsl20; + maintainers = with maintainers; [ yurrriq ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix new file mode 100644 index 00000000000..661048a0c72 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -0,0 +1,38 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "helm-s3"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "hypnoglow"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2BQ/qtoL+iFbuLvrJGUuxWFKg9u1sVDRcRm2/S0mgyc="; + }; + + vendorSha256 = "sha256-/9TiY0XdkiNxW5JYeC5WD9hqySCyYYU8lB+Ft5Vm96I="; + + # NOTE: Remove the install and upgrade hooks. + postPatch = '' + sed -i '/^hooks:/,+2 d' plugin.yaml + ''; + + checkPhase = '' + make test-unit + ''; + + postInstall = '' + install -dm755 $out/${pname} + mv $out/bin $out/${pname}/ + install -m644 -Dt $out/${pname} plugin.yaml + ''; + + meta = with lib; { + description = "A Helm plugin that shows a diff"; + inherit (src.meta) homepage; + license = licenses.apsl20; + maintainers = with maintainers; [ yurrriq ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix new file mode 100644 index 00000000000..d53abe3569c --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, findutils, getopt, gnugrep, gnused, sops, vault }: + +stdenv.mkDerivation rec { + pname = "helm-secrets"; + version = "3.4.1"; + + src = fetchFromGitHub { + owner = "jkroepke"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ getopt sops ]; + + # NOTE: helm-secrets is comprised of shell scripts. + dontBuild = true; + + # NOTE: Remove the install and upgrade hooks. + postPatch = '' + sed -i '/^hooks:/,+2 d' plugin.yaml + ''; + + installPhase = '' + runHook preInstall + + install -dm755 $out/${pname} $out/${pname}/scripts + install -m644 -Dt $out/${pname} plugin.yaml + cp -r scripts/* $out/${pname}/scripts + wrapProgram $out/${pname}/scripts/run.sh \ + --prefix PATH : ${lib.makeBinPath [ coreutils findutils getopt gnugrep gnused sops vault ]} + + runHook postInstall + ''; + + meta = with lib; { + description = "A Helm plugin that helps manage secrets"; + inherit (src.meta) homepage; + license = licenses.apsl20; + maintainers = with maintainers; [ yurrriq ]; + platforms = platforms.all; + }; +} From f7752fc99cd63ad74e2f2352ecd18d83b818c187 Mon Sep 17 00:00:00 2001 From: li <@li:maisiliym.uniks> Date: Thu, 7 Jan 2021 05:13:23 +0000 Subject: [PATCH 168/246] treesitter grammars: look for scanner.c --- pkgs/development/tools/parsing/tree-sitter/grammar.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index f92e0d79426..d9ad21dea61 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -30,7 +30,11 @@ stdenv.mkDerivation { if [ ! -f "$scanner_cc" ]; then scanner_cc="" fi - $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c $scanner_cc -lstdc++ + scanner_c="$src/src/scanner.c" + if [ ! -f "$scanner_c" ]; then + scanner_c="" + fi + $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c $scanner_cc $scanner_c -lstdc++ runHook postBuild ''; installPhase = '' From c7cf17293bf5b99afd3a0c1fdb6a766c9a2f8eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Thu, 25 Feb 2021 21:17:59 +0100 Subject: [PATCH 169/246] tree-sitter: 0.17.3 -> 0.18.2 Also updates the tree-sitter grammars --- pkgs/development/tools/parsing/tree-sitter/default.nix | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-c-sharp.json | 8 ++++---- .../tools/parsing/tree-sitter/grammars/tree-sitter-c.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-cpp.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-css.json | 8 ++++---- .../grammars/tree-sitter-embedded-template.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-java.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-javascript.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-nix.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-python.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-ql.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-rust.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-typescript.json | 8 ++++---- 13 files changed, 52 insertions(+), 52 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 78fb3b7f937..44d2a8d3c15 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -16,14 +16,14 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.17.3"; - sha256 = "sha256-uQs80r9cPX8Q46irJYv2FfvuppwonSS5HVClFujaP+U="; - cargoSha256 = "sha256-fonlxLNh9KyEwCj7G5vxa7cM/DlcHNFbQpp0SwVQ3j4="; + version = "0.18.2"; + sha256 = "1kh3bqn28nal3mmwszbih8hbq25vxy3zd45pzj904yf0ds5ql684"; + cargoSha256 = "06jbn4ai5lrxzv51vfjzjs7kgxw4nh2vbafc93gma4k14gggyygc"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter"; - rev = version; + rev = "v${version}"; inherit sha256; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 81ccf5a8472..989f7bf5367 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "aae8ab2b681082ce7a35d8d5fdf75ffcf7f994e5", - "date": "2021-01-08T13:18:05+00:00", - "path": "/nix/store/fpx44l1j2dz3drnvfb7746d8zxn37gwi-tree-sitter-c-sharp", - "sha256": "107bxz9bhyixdla3xli06ism8rnkha7pa79hi7lyx00sfnjmgcc8", + "rev": "21ec3c3deb4365085aa353fadbc6a616d7769f9f", + "date": "2021-02-18T09:41:56-08:00", + "path": "/nix/store/8172rv05dvvlyp4cfmr2b41g4a20vlcf-tree-sitter-c-sharp", + "sha256": "1cc0ss09bfv2xy77bpcmy6y2hqis7a8xby9afcaxcn5llj593ynj", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 401bea63e0a..31301d981d0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "99151b1e9293c9e025498fee7e6691e1a52e1d03", - "date": "2020-05-14T11:39:30-07:00", - "path": "/nix/store/b5xqnw967s9a58wcpyspbkgbph6jxarv-tree-sitter-c", - "sha256": "07ax01r3npw13jlv20k15q2hdhqa0rwm2km6f5j50byqvmgfc6fm", + "rev": "fa408bc9e77f4b770bd1db984ca00c901ddf95fc", + "date": "2021-02-24T11:13:22-08:00", + "path": "/nix/store/8rlr93kjsvbpc8vgfxw02vcaprlfmprq-tree-sitter-c", + "sha256": "03nb8nlnkfw8p8bi4grfyh31l6419sk7ak2hnkpnnjs0y0gqb7jm", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index a4538b1a932..d5878b65fa3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "a35a275df92e7583df38f2de2562361f2b69987e", - "date": "2020-12-13T11:27:21-08:00", - "path": "/nix/store/l0mv4q1xdxz94ym1nl73y52i1yr9zcgi-tree-sitter-cpp", - "sha256": "130vizybkm11j3lpzmf183myz0vjxq75mpy6qz48rrkidhnrlryk", + "rev": "3bfe046f3967fef92ebb33f8cd58c3ff373d5e56", + "date": "2021-02-25T11:55:19-08:00", + "path": "/nix/store/m2sd8ic8j3dayfa0zz0shc2pjaamahpf-tree-sitter-cpp", + "sha256": "052imxj6920ia002pzgwj2rg75xq3xpa80w8sjdq4mnlksy8v7g6", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index b8609c0bd17..6a4795d7405 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-css", - "rev": "23f2cb97d47860c517f67f03e1f4b621d5bd2085", - "date": "2020-05-14T14:44:30-07:00", - "path": "/nix/store/r5pkz9kly0mhgrmqzdzdsr6d1dpqavld-tree-sitter-css", - "sha256": "17svpf36p0p7spppzhm3fi833zpdl2l1scg34r6d4vcbv7dknrjy", + "rev": "e882c98b5e62d864f7f9e4d855b19b6050c897a8", + "date": "2021-02-12T10:45:27-08:00", + "path": "/nix/store/g368rqak07i91ddma16pkccp63y2s5yv-tree-sitter-css", + "sha256": "0firlbl81vxnw5dp31inabizjhqc37rnbvwf05668qpfjl9gc03z", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index f0ef7079bf6..02e4977fa33 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", - "rev": "8269c1360e5b1b9ba3e04e7896d9dd2f060de12f", - "date": "2020-07-20T12:50:27-07:00", - "path": "/nix/store/9ijnzv72vc1n56k6f1xp3kb7lc9hvlhh-tree-sitter-embedded-template", - "sha256": "03symsaxp8m128cn5h14pnm30ihpc49syb4vybpdvgcvraa408qq", + "rev": "872f037009ae700e3d4c3f83284af8f51c184dd4", + "date": "2021-02-05T09:53:39-08:00", + "path": "/nix/store/qg1lmgjrvjxg05bf7dczx5my9r83rxyb-tree-sitter-embedded-template", + "sha256": "0iffxki8pqavvi0cyndgyr4gp0f4zcdbv7gn7ar4sp17pksk5ss6", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index 260dc4d10c0..66c85944969 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-java", - "rev": "f7b62ac33d63bea56ce202ace107aaa4285e50af", - "date": "2020-10-27T13:41:02-04:00", - "path": "/nix/store/h51zjbzdrm89gczcdv7nyih54vnd2xps-tree-sitter-java", - "sha256": "0jbh79brs1dskfqw05s9ndrp46hibyc37nfvhxlvanmgj3pjwgxb", + "rev": "16c07a726c34c9925b3e28716b2d6d60e3643252", + "date": "2021-02-11T09:32:05-08:00", + "path": "/nix/store/1b64g1a3cvq1hspys9z2z1lsawg2b9m2-tree-sitter-java", + "sha256": "1rag75r71cp8cvkf4f3wj911jppypziri19zysyy3pgzhznqy4zd", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 2c563f3fbfa..8d1aa2daf53 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "3f8b62f9befd3cb3b4cb0de22f6595a0aadf76ca", - "date": "2020-12-02T10:20:20-08:00", - "path": "/nix/store/c17bf7sjq95lank5ygbglv8j48i5z9w3-tree-sitter-javascript", - "sha256": "0fjq1jzrzd8c8rfxkh2s25gnqlyc19k3a8i3r1129kakisn1288k", + "rev": "37af80d372ae9e2f5adc2c6321d5a34294dc348b", + "date": "2021-02-24T09:50:29-08:00", + "path": "/nix/store/y8jbjblicw2c65kil2y4d6vdn9r9h9w5-tree-sitter-javascript", + "sha256": "0cr75184abpg95bl6wgkqn7ay849bjsib48m9pdb5jrly1idw6n2", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index 6d055ca0ae9..8d0b5aaf0e4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,9 +1,9 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "791b5ff0e4f0da358cbb941788b78d436a2ca621", - "date": "2019-05-10T15:57:43-05:00", - "path": "/nix/store/5gcddcxf6jfr4f0p203jnbjc0zxk207d-tree-sitter-nix", - "sha256": "1y5b3wh3fcmbgq8r2i97likzfp1zp02m58zacw5a1cjqs5raqz66", + "rev": "a6bae0619126d70c756c11e404d8f4ad5108242f", + "date": "2021-02-09T00:48:18-06:00", + "path": "/nix/store/1rfsi62v549h72vw7ysciaw17vr5h9yx-tree-sitter-nix", + "sha256": "08n496k0vn7c2751gywl1v40490azlri7c92dr2wfgw5jxhjmb0d", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index ff60ff80101..ded864c8976 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "f568dfabf7c4611077467a9cd13297fa0658abb6", - "date": "2021-01-06T13:32:39-08:00", - "path": "/nix/store/5g256n8ym3ll2kp9jlmnkaxpnyf6rpk3-tree-sitter-python", - "sha256": "1lxmzrkw4k9pba4xywnbd1pk2x5s99qa4skgqvgy3imgbhy7ilkh", + "rev": "3196e288650992bca2399dda15ac703c342a22bb", + "date": "2021-01-19T11:31:59-08:00", + "path": "/nix/store/0y394nsknvjxpxnsfscab531mivnzhap-tree-sitter-python", + "sha256": "0fbkyysz0qsjqzqznwgf52wsgb10h8agc4p68zafiibwlp72gd09", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index 27042b6ef95..f799ce410c6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ql", - "rev": "a0d688d62dcb9cbc7c53f0d98343c458b3776b3d", - "date": "2020-09-16T12:56:09-07:00", - "path": "/nix/store/dfdaf6wg80dfw5fvdiir7n9nj6j30g3g-tree-sitter-ql", - "sha256": "0f6rfhrbvpg8czfa7mld45by3rp628bs6fyl47a8mn18w6x0n5g2", + "rev": "f3738c138ba753eed5da386c7321cb139d185d39", + "date": "2021-02-19T10:26:41+00:00", + "path": "/nix/store/dww93fp6psaw4lhiwyn8qajq8mvsyv5s-tree-sitter-ql", + "sha256": "15wqyf0q9arr4jh0dfjr5200rghy989wvf311cffma7706ngmgxb", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index c02d03d11d9..12d7f58aecb 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "2beedf23bedbd7b02b416518693e8eed3944d4a0", - "date": "2021-01-05T10:00:48-08:00", - "path": "/nix/store/2igv1zlnl535b86zj8s9s3ir4q85933x-tree-sitter-rust", - "sha256": "0iicwhxf1f56zqpsagbm8nr30fpssi970mi9i47az206dbs506ly", + "rev": "ab7f7962073fec96e0b64fbd1697263fe2c79281", + "date": "2021-02-16T21:17:08-08:00", + "path": "/nix/store/zy2sccixlk8lwkqamikz03j42s13ndjp-tree-sitter-rust", + "sha256": "06zmbwgsvyaz0wgja8r3ir06z67gix7i62zj0k3bbng6smdnhp9w", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index fda72fc99c6..679d7e4ed6a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "2d1c7d5c10c33cb444d1781fa76f2936810afec4", - "date": "2021-01-07T09:49:56-08:00", - "path": "/nix/store/s65bv25523lwa9yrqbj9hsh0k4ig6pbx-tree-sitter-typescript", - "sha256": "09bv44n181az5rqjd43wngj9bghwy0237gpvs6xkjf9j19kvy0yi", + "rev": "543cbe44f16189f7f1b739cf268d70f373d94b87", + "date": "2021-02-25T11:54:57-08:00", + "path": "/nix/store/liyi8hkl55dcbs1wc4w2jw4zf717bb29-tree-sitter-typescript", + "sha256": "0ljhkhi8fp38l1n6wam7l8bdqxr95d0c1mf7i6p1gb6xrjzssik0", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false From 28cb2646b5bb916c22b28d8d89cb510204c0f230 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Mar 2021 22:33:44 +0100 Subject: [PATCH 170/246] python3Packages.dulwich: 0.20.18 -> 0.20.20 --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 4cc3f34929b..a4c8cb7227f 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "0.20.18"; + version = "0.20.20"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ATE4f5uZrsxprJhlWzkx8q1D2lPTpj4FD6Om1iYKxVQ="; + sha256 = "sha256-QmlZuXBfrcxsgg5a3zKR1xpIq6CvzPdBFCLjMI8RX4c="; }; LC_ALL = "en_US.UTF-8"; From b59c89f599a8ada7a5c0b927e70de6cb18eec780 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Mar 2021 23:08:39 +0100 Subject: [PATCH 171/246] python3Packages.xknx: 0.17.0 -> 0.17.1 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 841348339a7..72a54748863 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.17.0"; + version = "0.17.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-fzLqkeCfeLNu13R9cp1XVh8fE2B3L47UDpuWOod33gU="; + sha256 = "sha256-FNI6zodwlYdJDxncCOubClG9L1U6HGkQxdEEp0LdW04="; }; propagatedBuildInputs = [ From f5637361e190a6d13f6045855b310a5a7620869b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 3 Mar 2021 22:09:22 +0000 Subject: [PATCH 172/246] nano: 5.6 -> 5.6.1 See https://lists.gnu.org/archive/html/info-gnu/2021-03/msg00000.html for release infromation --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 30d1e5b7578..b5525285566 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.6"; + version = "5.6.1"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "0ckscf3klm2k1zjvcv8mkza1yp80g7ss56n73790fk83lzj87qgw"; + sha256 = "02cbxqizbdlfwnz8dpq4fbzmdi4yk6fv0cragvpa0748w1cp03bn"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From d96071dc9c84dbbef7a6bdb70c54aed9e55961a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Mar 2021 23:12:33 +0100 Subject: [PATCH 173/246] python3Packages.subarulink: 0.3.11 -> 0.3.12 --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 5b6362b76a1..ac80be2fe0c 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "G-Two"; repo = pname; rev = "subaru-v${version}"; - sha256 = "1ink9bhph6blidnfsqwq01grhp7ghacmkd4vzgb9hnhl9l52s1jq"; + sha256 = "0mhy4np3g10k778062sp2q65cfjhp4y1fghn8yvs6qg6jmg047z6"; }; propagatedBuildInputs = [ aiohttp stdiomask ]; From 2ceba68a7b0c25188153915a02db705e1d71e487 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Mar 2021 23:17:19 +0100 Subject: [PATCH 174/246] python3Packages.pyinsteon: 1.0.8 -> 1.0.9 --- pkgs/development/python-modules/pyinsteon/default.nix | 4 ++-- pkgs/development/python-modules/pylutron/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 8596883326b..cd8c566c465 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.0.8"; + version = "1.0.9"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0d028fcqmdzxp0vsz7digx794s9l65ydsnsyvyx275z6577x7h4h"; + sha256 = "sha256-+3tA+YdpTKDt7uOSl6Z1G8jTjpBJ8S9gjiQTacQSFTc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index 90a45640812..b9ed3cc20e2 100644 --- a/pkgs/development/python-modules/pylutron/default.nix +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pylutron"; - version = "0.2.6"; + version = "0.2.7"; src = fetchPypi { inherit pname version; - sha256 = "1q8qdy26s9hvfsh75pak7xiqjwrwsgq18p4d86dwf4dwmy5s4qj1"; + sha256 = "sha256-wwVTDpoRT/TIJhoRap0T01a8gmYt+vfKc+ATRs6phB4="; }; # Project has no tests From fb920279de0e37b931b136efc31bbfc6028e6a57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Mar 2021 23:19:51 +0100 Subject: [PATCH 175/246] python3Packages.aioshelly: 0.5.4 -> 0.6.1 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index f53877e03a3..058282b4c35 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "0.5.4"; + version = "0.6.1"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-EjzWx3wcmTfB3OmN0OB37K6wYKVO3HzGEIf+uihas8k="; + sha256 = "sha256-2igN5mmkXyYpQeAoPAYzhirictuionVMbqifNigEYdw="; }; propagatedBuildInputs = [ From f3972e8a1677d3d884f3e14dfcf9545f46386ab7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Mar 2021 23:28:59 +0100 Subject: [PATCH 176/246] python3Packages.pymyq: 3.0.3 -> 3.0.4 --- pkgs/development/python-modules/pymyq/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix index e93d0b602b4..71788db45c9 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -4,17 +4,19 @@ , buildPythonPackage , fetchFromGitHub , pkce +, pythonOlder }: buildPythonPackage rec { pname = "pymyq"; - version = "3.0.3"; + version = "3.0.4"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "v${version}"; - sha256 = "1wrfnbz87ns2ginyvljna0axl35s0xfaiqwzapxm8ira40ax5wrl"; + sha256 = "sha256-jeoFlLBjD81Bt6E75rk4U1Ach53KGy23QGx+A6X2rpg="; }; propagatedBuildInputs = [ From 0536966501c52971fc0ecd799825e4cf83646440 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Mar 2021 23:51:36 +0100 Subject: [PATCH 177/246] python3Packages.bleach: 3.2.1 -> 3.3.0 --- pkgs/development/python-modules/bleach/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 1bdedde1cb4..53319466d3a 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "bleach"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "52b5919b81842b1854196eaae5ca29679a2f2e378905c346d3ca8227c2c66080"; + sha256 = "sha256-mLMXBznl6D3Z3BljPwdHJ62EjL7bYCZwjIrC07aXpDM="; }; checkInputs = [ pytest pytestrunner ]; From d890b0533d04808213ccb21123f6c03090119324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Wed, 3 Mar 2021 23:58:09 +0100 Subject: [PATCH 178/246] nodejs-10_x: build with icu67 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afba3f5a371..5bf7ec652d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5887,9 +5887,12 @@ in nodejs-slim = nodejs-slim-14_x; - nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { }; + nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { + icu = icu67; + }; nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; + icu = icu67; }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { From 9dd7348c0419b279ce8d78917718a840f801e37e Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 26 Feb 2021 01:23:09 +0800 Subject: [PATCH 179/246] boost: fix meta.badPlatforms --- pkgs/development/libraries/boost/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index abff1268bfa..422c1d7b391 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -132,7 +132,8 @@ stdenv.mkDerivation { license = licenses.boost; platforms = platforms.unix ++ platforms.windows; badPlatforms = optional (versionOlder version "1.59") "aarch64-linux" - ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"; + ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" + ++ optionals (versionOlder version "1.73") lib.platforms.riscv; maintainers = with maintainers; [ peti ]; }; From 74e20c9b27b948ff548955f0e82ba2332cba85b8 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 27 Feb 2021 11:06:21 +0800 Subject: [PATCH 180/246] boost: fix cross-compile support --- pkgs/development/libraries/boost/generic.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 422c1d7b391..6158eb87511 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -150,6 +150,9 @@ stdenv.mkDerivation { cat << EOF >> user-config.jam using gcc : cross : ${stdenv.cc.targetPrefix}c++ ; EOF + # Build b2 with buildPlatform CC/CXX. + sed '2i export CC=$CC_FOR_BUILD; export CXX=$CXX_FOR_BUILD' \ + -i ./tools/build/src/engine/build.sh ''; NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin From 10d513e633d9c618b41efd62375da336f894d275 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 3 Mar 2021 15:09:49 -0800 Subject: [PATCH 181/246] nixos/hydra: append `application_name` to HYDRA_DBI This will make it easier to track specifically where queries are being made from (assuming a `log_line_prefix` that includes `%a` in the postgres configuration). --- .../continuous-integration/hydra/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 887a0cbf9a7..2206ac522e4 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -89,6 +89,11 @@ in example = "dbi:Pg:dbname=hydra;host=postgres.example.org;user=foo;"; description = '' The DBI string for Hydra database connection. + + NOTE: Attempts to set `application_name` will be overridden by + `hydra-TYPE` (where TYPE is e.g. `evaluator`, `queue-runner`, + etc.) in all hydra services to more easily distinguish where + queries are coming from. ''; }; @@ -284,7 +289,9 @@ in { wantedBy = [ "multi-user.target" ]; requires = optional haveLocalDB "postgresql.service"; after = optional haveLocalDB "postgresql.service"; - environment = env; + environment = env // { + HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-init"; + }; preStart = '' mkdir -p ${baseDir} chown hydra.hydra ${baseDir} @@ -339,7 +346,9 @@ in { wantedBy = [ "multi-user.target" ]; requires = [ "hydra-init.service" ]; after = [ "hydra-init.service" ]; - environment = serverEnv; + environment = serverEnv // { + HYDRA_DBI = "${serverEnv.HYDRA_DBI};application_name=hydra-server"; + }; restartTriggers = [ hydraConf ]; serviceConfig = { ExecStart = @@ -361,6 +370,7 @@ in environment = env // { PGPASSFILE = "${baseDir}/pgpass-queue-runner"; # grrr IN_SYSTEMD = "1"; # to get log severity levels + HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-queue-runner"; }; serviceConfig = { ExecStart = "@${hydra-package}/bin/hydra-queue-runner hydra-queue-runner -v"; @@ -380,7 +390,9 @@ in after = [ "hydra-init.service" "network.target" ]; path = with pkgs; [ hydra-package nettools jq ]; restartTriggers = [ hydraConf ]; - environment = env; + environment = env // { + HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-evaluator"; + }; serviceConfig = { ExecStart = "@${hydra-package}/bin/hydra-evaluator hydra-evaluator"; User = "hydra"; @@ -392,7 +404,9 @@ in systemd.services.hydra-update-gc-roots = { requires = [ "hydra-init.service" ]; after = [ "hydra-init.service" ]; - environment = env; + environment = env // { + HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-update-gc-roots"; + }; serviceConfig = { ExecStart = "@${hydra-package}/bin/hydra-update-gc-roots hydra-update-gc-roots"; User = "hydra"; @@ -403,7 +417,9 @@ in systemd.services.hydra-send-stats = { wantedBy = [ "multi-user.target" ]; after = [ "hydra-init.service" ]; - environment = env; + environment = env // { + HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-send-stats"; + }; serviceConfig = { ExecStart = "@${hydra-package}/bin/hydra-send-stats hydra-send-stats"; User = "hydra"; @@ -417,6 +433,7 @@ in restartTriggers = [ hydraConf ]; environment = env // { PGPASSFILE = "${baseDir}/pgpass-queue-runner"; + HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-notify"; }; serviceConfig = { ExecStart = "@${hydra-package}/bin/hydra-notify hydra-notify"; From c2df575c6c8a0dc15d5474a197480d47a01d50b2 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 25 Feb 2021 20:51:23 -0500 Subject: [PATCH 182/246] pythonPackages.exdown: 0.7.1 -> 0.8.5 --- pkgs/development/python-modules/exdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index 17cab3fe55f..bf0a71984c5 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "exdown"; - version = "0.7.1"; + version = "0.8.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vnSso3vmPIjX7JX+NwoxguwqwPHocJACeh5H0ClPcUI="; + sha256 = "1ly67whyfn74nr0dncarf3xbd96hacvzgjihx4ibckkc4h9z46bj"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; From ed626755b21e2a20e38e1373ae65b0e3cc3bcffb Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 25 Feb 2021 21:02:38 -0500 Subject: [PATCH 183/246] pythonPackages.meshio: init at 4.3.10 --- .../python-modules/meshio/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/meshio/default.nix diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix new file mode 100644 index 00000000000..2c293b3b9c2 --- /dev/null +++ b/pkgs/development/python-modules/meshio/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, netcdf4 +, h5py +, exdown +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "meshio"; + version = "4.3.10"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "1i34bk8bbc0dnizrlgj0yxnbzyvndkmnl6ryymxgcl9rv1abkfki"; + }; + + propagatedBuildInputs = [ + numpy + netcdf4 + h5py + ]; + + checkInputs = [ + exdown + pytestCheckHook + ]; + + pythonImportsCheck = ["meshio"]; + + meta = with lib; { + homepage = "https://github.com/nschloe/meshio"; + description = "I/O for mesh files."; + license = licenses.mit; + maintainers = with maintainers; [ wd15 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7270853d84e..b7aa6d81a60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4058,6 +4058,8 @@ in { mesa = callPackage ../development/python-modules/mesa { }; + meshio = callPackage ../development/python-modules/meshio { }; + meshlabxml = callPackage ../development/python-modules/meshlabxml { }; meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs From 28360094d87a15cfe9ef67c51380713a9bafec47 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 25 Feb 2021 21:08:32 -0500 Subject: [PATCH 184/246] pythonPackages.sfepy: 2019.4 -> 2020.4 --- .../python-modules/sfepy/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 8a37f41086e..dacd589b121 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -9,15 +9,21 @@ , cython , python , sympy +, meshio +, mpi4py +, psutil +, openssh +, pythonOlder }: buildPythonPackage rec { - name = "sfepy_${version}"; - version = "2019.4"; + name = "sfepy"; + version = "2020.4"; + disabled = pythonOlder "3.8"; src = fetchurl { url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz"; - sha256 = "1l9vgcw09l6bwhgfzlbn68fzpvns25r6nkd1pcp7hz5165hs6zzn"; + sha256 = "1wb0ik6kjg3mksxin0abr88bhsly67fpg36qjdzabhj0xn7j1yaz"; }; propagatedBuildInputs = [ @@ -28,12 +34,15 @@ buildPythonPackage rec { pyparsing tables sympy + meshio + mpi4py + psutil + openssh ]; postPatch = '' - # broken test - rm tests/test_homogenization_perfusion.py - rm tests/test_splinebox.py + # broken tests + rm tests/test_meshio.py # slow tests rm tests/test_input_*.py @@ -47,6 +56,7 @@ buildPythonPackage rec { ''; checkPhase = '' + export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh export HOME=$TMPDIR mv sfepy sfepy.hidden mkdir -p $HOME/.matplotlib From d378d727e75d0522a447940b95c21fc02ba6e59a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 3 Mar 2021 13:39:24 -0300 Subject: [PATCH 185/246] cargo-limit: 0.0.6 -> 0.0.7 Signed-off-by: Otavio Salvador --- pkgs/development/tools/rust/cargo-limit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix index 37c905879bf..3ebe5ef1304 100644 --- a/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/pkgs/development/tools/rust/cargo-limit/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-limit"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "alopatindev"; repo = "cargo-limit"; rev = version; - sha256 = "sha256-2YngMRPNiUVqg82Ck/ovcMbZV+STGyowT9zlwBkcKok="; + sha256 = "sha256-8HsYhWYeRhCPTxVnU8hOJKLXvza8i9KvKTLL6yLo0+c="; }; - cargoSha256 = "sha256-4HQhBE4kNhOhO48PBiAxtppmaqy7jaV8p/jb/Uv7vJk="; + cargoSha256 = "sha256-8uA4oFExrzDMeMV5MacbtE0Awdfx+jUUkrKd7ushOHo="; passthru = { updateScript = nix-update-script { From dd5d726be3e5cd748ee4068bfacb7bf41d9ad295 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 3 Mar 2021 21:26:42 -0300 Subject: [PATCH 186/246] cargo-cross: init at 0.2.1 Signed-off-by: Otavio Salvador --- .../tools/rust/cargo-cross/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-cross/default.nix diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/development/tools/rust/cargo-cross/default.nix new file mode 100644 index 00000000000..f7ce0283f6f --- /dev/null +++ b/pkgs/development/tools/rust/cargo-cross/default.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, fetchpatch +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-cross"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "rust-embedded"; + repo = "cross"; + rev = "v${version}"; + sha256 = "sha256:1py5w4kf612x4qxi190ilsrx0zzwdzk9i47ppvqblska1s47qa2w"; + }; + + cargoSha256 = "sha256-3xSuTBcWRGn5HH7LnvwioeRWjehaPW1HCPjN5SUUVfo="; + + cargoPatches = [ + (fetchpatch { + url = "https://github.com/rust-embedded/cross/commit/e86ad2e5a55218395df7eaaf91900e22b809083c.patch"; + sha256 = "sha256:1zrcj5fm3irmlrfkgb65kp2pjkry0rg5nn9pwsk9p0i6dpapjc7k"; + }) + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Zero setup cross compilation and cross testing"; + homepage = "https://github.com/rust-embedded/cross"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afba3f5a371..1ca19727883 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10920,6 +10920,7 @@ in cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-cross = callPackage ../development/tools/rust/cargo-cross { }; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; From d9f9d3088f671f7dd37c1cb4d6115ede661adfef Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 3 Mar 2021 18:10:07 +0800 Subject: [PATCH 187/246] kdeApplications.kamoso: init at 20.12.1 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kamoso.nix | 41 +++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/kde/kamoso.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index b312a566a70..f8719c353b0 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -91,6 +91,7 @@ let kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; kalzium = callPackage ./kalzium.nix {}; + kamoso = callPackage ./kamoso.nix {}; kapman = callPackage ./kapman.nix {}; kapptemplate = callPackage ./kapptemplate.nix { }; kate = callPackage ./kate.nix {}; diff --git a/pkgs/applications/kde/kamoso.nix b/pkgs/applications/kde/kamoso.nix new file mode 100644 index 00000000000..3e5eb53858f --- /dev/null +++ b/pkgs/applications/kde/kamoso.nix @@ -0,0 +1,41 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, wrapQtAppsHook +, qtdeclarative +, qtgraphicaleffects +, qtquickcontrols2 +, kirigami2 +, kpurpose +, gst_all_1 +, pcre +}: + +let + gst = with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-good gst-plugins-bad ]; + +in +mkDerivation { + pname = "kamoso"; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; + buildInputs = [ pcre ] ++ gst; + propagatedBuildInputs = [ + qtdeclarative + qtgraphicaleffects + qtquickcontrols2 + kirigami2 + kpurpose + ]; + + cmakeFlags = [ + "-DOpenGL_GL_PREFERENCE=GLVND" + "-DGSTREAMER_VIDEO_INCLUDE_DIR=${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" + ]; + + qtWrapperArgs = [ + "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPath "lib/gstreamer-1.0" gst}" + ]; + + meta.license = with lib.licenses; [ lgpl21Only gpl3Only ]; +} From 81aa7a13441b83d7ab8142380b613c9a1404556a Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Tue, 2 Mar 2021 12:55:32 -0800 Subject: [PATCH 188/246] erlangR23, erlangR22, erlangR21: remove obsolete substituteInPlace --- pkgs/development/interpreters/erlang/R21.nix | 4 ---- pkgs/development/interpreters/erlang/R22.nix | 5 ----- pkgs/development/interpreters/erlang/R23.nix | 5 ----- pkgs/development/interpreters/erlang/generic-builder.nix | 8 +------- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index 2fe58a76b03..e1145090c86 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -3,8 +3,4 @@ mkDerivation { version = "21.3.8.21"; sha256 = "sha256-zQCs2hOA66jxAaxl/B42EKCejAktIav2rpVQCNyKCh4="; - - prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" - ''; } diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 59bd5a5d3f7..8bfe111f065 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -5,9 +5,4 @@ mkDerivation { version = "22.3.4.16"; sha256 = "sha256-V0RwEPfjnHtEzShNh6Q49yGC5fbt2mNR4xy6f6iWvck="; - - prePatch = '' - substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" - substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" - ''; } diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 23a68b7ee85..8c07c09f221 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -5,9 +5,4 @@ mkDerivation { version = "23.2.6"; sha256 = "sha256-G930sNbr8h5ryI/IE+J6OKhR5ij68ZhGo1YIEjSOwGU="; - - prePatch = '' - substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" - substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" - ''; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 632eb9c541a..325d8e87e4a 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -64,13 +64,6 @@ in stdenv.mkDerivation ({ # On some machines, parallel build reliably crashes on `GEN asn1ct_eval_ext.erl` step enableParallelBuilding = parallelBuild; - # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense - prePatch = '' - substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' - - ${prePatch} - ''; - postPatch = '' patchShebangs make @@ -132,6 +125,7 @@ in stdenv.mkDerivation ({ // optionalAttrs (preUnpack != "") { inherit preUnpack; } // optionalAttrs (postUnpack != "") { inherit postUnpack; } // optionalAttrs (patches != []) { inherit patches; } +// optionalAttrs (prePatch != "") { inherit prePatch; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (configurePhase != "") { inherit configurePhase; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } From 35218c2c23862348d38fb93cd19b5b398b3e5e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Mar 2021 03:18:36 +0100 Subject: [PATCH 189/246] topgrade: 6.6.0 -> 6.7.0 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 6dc47e31725..c6021c0599b 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YMg5HWDvBsYJZCxYrQuQqU4xLY8DORKYkK319pryA5I="; + sha256 = "sha256-UikJZFSnkYGGGMm6hrOqs+ax9HwUsZPht9wV79rJBgE="; }; - cargoSha256 = "sha256-G6ToQzPxuKpe1YQ4nLDJLjb3qx8D3VpuigXfdf7RHCQ="; + cargoSha256 = "sha256-8MvXpJVwiIThwq8Du/9nQ0QINpqgemwiRpunzIUqkXk="; buildInputs = lib.optional stdenv.isDarwin Foundation; From 7b893f209537e75dddcdcc99cb0596fbea7ec034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Mar 2021 03:25:13 +0100 Subject: [PATCH 190/246] hound: unstable-2021-01-26 -> 0.4.0 --- pkgs/development/tools/misc/hound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 201241fb835..e5bf0708986 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "hound"; - version = "unstable-2021-01-26"; + version = "0.4.0"; src = fetchFromGitHub { owner = "hound-search"; repo = "hound"; - rev = "b88fc1f79d668e6671a478ddf4fb3e73a63067b9"; - sha256 = "00xc3cj7d3klvhsh9hivvjwgzb6lycw3r3w7nch98nv2j8iljc44"; + rev = "v${version}"; + sha256 = "0p5w54fr5xz19ff8k5xkyq3iqhjki8wc0hj2x1pnmk6hzrz6hf65"; }; vendorSha256 = "0x1nhhhvqmz3qssd2d44zaxbahj8lh9r4m5jxdvzqk6m3ly7y0b6"; From 086e9e09787431cf654b4bc18d5b688f6dc480a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Mar 2021 03:46:54 +0100 Subject: [PATCH 191/246] R: switch to pname + version --- pkgs/applications/science/math/R/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 34ad499ecb9..331faa6b147 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -12,10 +12,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { - name = "R-4.0.4"; + pname = "R"; + version = "4.0.4"; src = fetchurl { - url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; + url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; sha256 = "0bl098xcv8v316kqnf43v6gb4kcsv31ydqfm1f7qr824jzb2fgsj"; }; From bc8410692fc688bc49bede2cf67e3d5197735ba9 Mon Sep 17 00:00:00 2001 From: Chua Hou Date: Thu, 4 Mar 2021 10:56:00 +0800 Subject: [PATCH 192/246] maintainers: add chuahou --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 57fd22646f0..3f1afb073dc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1711,6 +1711,12 @@ githubId = 2245737; name = "Christopher Mark Poole"; }; + chuahou = { + email = "human+github@chuahou.dev"; + github = "chuahou"; + githubId = 12386805; + name = "Chua Hou"; + }; chvp = { email = "nixpkgs@cvpetegem.be"; github = "chvp"; From 1ebcf4af6283ea71d3a5e692540843e34caabf2c Mon Sep 17 00:00:00 2001 From: Chua Hou Date: Thu, 4 Mar 2021 10:56:32 +0800 Subject: [PATCH 193/246] stork: init at 1.1.0 --- pkgs/applications/misc/stork/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/stork/default.nix diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix new file mode 100644 index 00000000000..16d56eeaa95 --- /dev/null +++ b/pkgs/applications/misc/stork/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "stork"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "jameslittle230"; + repo = "stork"; + rev = "v${version}"; + sha256 = "sha256-pBJ9n1pQafXagQt9bnj4N1jriczr47QLtKiv+UjWgTg="; + }; + + cargoSha256 = "sha256-u8L4ZeST4ExYB2y8E+I49HCy41dOfhR1fgPpcVMVDuk="; + + meta = with lib; { + description = "Impossibly fast web search, made for static sites"; + homepage = "https://github.com/jameslittle230/stork"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ chuahou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cafb69f15f..f57a3bcaf98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29353,6 +29353,8 @@ in sndio = callPackage ../misc/sndio { }; + stork = callPackage ../applications/misc/stork { }; + oclgrind = callPackage ../development/tools/analysis/oclgrind { }; opkg = callPackage ../tools/package-management/opkg { }; From 07999ac6ea27ec1b180cb74a23faa25149c06398 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 4 Mar 2021 04:07:57 +0100 Subject: [PATCH 194/246] nix-output-monitor: 1.0.1.1 -> 1.0.2.0 --- pkgs/tools/nix/nix-output-monitor/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index 2a9935793cf..e978670ae7c 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -1,22 +1,23 @@ { mkDerivation, ansi-terminal, async, attoparsec, base, containers , cassava, directory, HUnit, mtl, nix-derivation, process, relude, lib , stm, terminal-size, text, time, unix, wcwidth, fetchFromGitHub -, expect, runtimeShell +, lock-file, data-default, expect, runtimeShell }: mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.1.1"; + version = "1.0.2.0"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "1wi1gsl5q1sy7k6k5wxhwpwzki7rghhbsyzm84hnw6h93w6401ax"; + sha256 = "12spiddjy8xhbxdh89w46kg7p2asfa4qrldwb1kps178hdhjdrgz"; rev = "v${version}"; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal async attoparsec base cassava containers directory mtl - nix-derivation relude stm terminal-size text time unix wcwidth + nix-derivation relude stm terminal-size text time unix wcwidth lock-file + data-default ]; executableHaskellDepends = [ ansi-terminal async attoparsec base containers directory mtl From 175797e48e9113e855df4460f4062c22f77fb882 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 4 Mar 2021 09:54:02 +0800 Subject: [PATCH 195/246] papirus-icon-theme: 20210201 -> 20210302 --- pkgs/data/icons/papirus-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index b18354910e4..1d4c3866b4e 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210201"; + version = "20210302"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-TQEpNFmsloq1jIg6QsuY8kllINpmwJCY+Anwker6Z5M="; + sha256 = "0h1cja8qqlnddm92hkyhkyj5rqfj494v0pss2mg95qqkjijpcgd0"; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Papirus icon theme"; homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; - license = licenses.lgpl3; + license = licenses.gpl3Only; # darwin gives hash mismatch in source, probably because of file names differing only in case platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; From 51512d843aed2fff8a0d85582a71973c27f38e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lio=E6=9D=8E=E6=AD=90?= Date: Wed, 3 Mar 2021 19:40:47 -0800 Subject: [PATCH 196/246] quantum-espresso: enable on darwin --- .../applications/science/chemistry/quantum-espresso/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 6d70e9f984f..a348c51c281 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -38,7 +38,7 @@ configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran ''; homepage = "https://www.quantum-espresso.org/"; license = licenses.gpl2; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.costrouc ]; }; } From 568b9762792af5e566e349bec196212f6fbdb3f0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 4 Mar 2021 11:58:45 +0800 Subject: [PATCH 197/246] broadlink-cli: 0.15 -> 0.16 --- pkgs/tools/misc/broadlink-cli/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index cb5f582d2de..978f2f6120e 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -1,17 +1,16 @@ { lib, python3Packages, fetchFromGitHub }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "broadlink-cli"; - inherit (python3Packages.broadlink) version; + version = "0.16"; # the tools are available as part of the source distribution from GH but # not pypi, so we have to fetch them here. src = fetchFromGitHub { owner = "mjg59"; repo = "python-broadlink"; - # this rev is version 0.15.0 - rev = "99add9e6feea6e47be4f3a58783556d7838b759c"; - sha256 = "1q1q62brvfjcb18i0j4ca5cxqzjwv1iywdrdby0yjqa4wm6ywq6b"; + rev = version; + sha256 = "sha256-fdwy58AopAcDp18APzvYionEbrKfTlH/yFpT1gG5iDs="; }; format = "other"; @@ -23,8 +22,8 @@ python3Packages.buildPythonApplication { installPhase = '' runHook preInstall - install -Dm755 -t $out/bin cli/broadlink_{cli,discovery} - install -Dm644 -t $out/share/doc/broadlink cli/README.md + install -Dm555 -t $out/bin cli/broadlink_{cli,discovery} + install -Dm444 -t $out/share/doc/broadlink cli/README.md runHook postInstall ''; From e336d3d636db9efa000ef61d7a24978387a72fc1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 4 Mar 2021 14:18:38 +0800 Subject: [PATCH 198/246] typo --- pkgs/tools/misc/broadlink-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index 978f2f6120e..4b22e6493a7 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "broadlink-cli"; - version = "0.16"; + version = "0.16.0"; # the tools are available as part of the source distribution from GH but # not pypi, so we have to fetch them here. From 7fdf9d8bcab4b8ea5dcc7f7fa3d5f8ab47a72923 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Mar 2021 09:43:37 +0200 Subject: [PATCH 199/246] python2Packages.requests: Unbreak --- pkgs/development/python-modules/requests/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 20ba44ee2a8..060866b04e8 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -33,6 +33,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # AttributeError: 'KeywordMapping' object has no attribute 'get' + doCheck = ! isPy27; + disabledTests = [ # Disable tests that require network access and use httpbin "requests.api.request" @@ -56,7 +59,5 @@ buildPythonPackage rec { homepage = "http://docs.python-requests.org/en/latest/"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; - # AttributeError: 'KeywordMapping' object has no attribute 'get' - broken = isPy27; }; } From aae6ddcb708f1872e780359791f6285815964777 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 3 Mar 2021 22:18:11 +0100 Subject: [PATCH 200/246] ocamlPackages.bigarray-compat: use Dune 2 --- pkgs/development/ocaml-modules/bigarray-compat/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/pkgs/development/ocaml-modules/bigarray-compat/default.nix index 6d833b48f26..487249ce5ae 100644 --- a/pkgs/development/ocaml-modules/bigarray-compat/default.nix +++ b/pkgs/development/ocaml-modules/bigarray-compat/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "bigarray-compat"; version = "1.0.0"; + useDune2 = true; + src = fetchFromGitHub { owner = "mirage"; repo = pname; From 4f841cba8409fa642294069c355ee12abf8c3398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 4 Mar 2021 10:28:31 +0100 Subject: [PATCH 201/246] exa: remove perl dependency The perl dependency does not seem to be necessary (anymore?). --- pkgs/tools/misc/exa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index a9d2a7b122f..326a978f060 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pandoc, perl, pkg-config, zlib +{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pandoc, pkg-config, zlib , Security, libiconv, installShellFiles }: @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "18y4v1s102lh3gvgjwdd66qlsr75wpwpcj8zsk5y5r95a405dkfm"; }; - nativeBuildInputs = [ cmake pkg-config perl installShellFiles pandoc ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; From c4c5bf8b7ce7d2adb14022829816ad786a1d987c Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Thu, 4 Mar 2021 11:04:28 +0100 Subject: [PATCH 202/246] maintainers: update my email address --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 57fd22646f0..022a073dd99 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -273,7 +273,7 @@ name = "James Alexander Feldman-Crough"; }; aforemny = { - email = "alexanderforemny@googlemail.com"; + email = "aforemny@posteo.de"; github = "aforemny"; githubId = 610962; name = "Alexander Foremny"; From 8671fe7c90efa508bcb47690ead0c45a908458ab Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 4 Mar 2021 11:49:59 +0100 Subject: [PATCH 203/246] chromiumDev: 90.0.4427.5 -> 90.0.4430.11 --- .../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 7573e08313b..5a67aed0896 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": "90.0.4427.5", - "sha256": "034czg6q84lpycgfqbcg3rrdhja3bp1akvsnyddimwxy83r2cqyg", - "sha256bin64": "0ijvsjfwmssvl14wg9cbp4h2rfdack6f89pmx2fggbnfm26m2vap", + "version": "90.0.4430.11", + "sha256": "0rzg1yji1rxddxcy03lwqv9rdqnk3c25v2g57mq9n37c6jqisyq4", + "sha256bin64": "015a1agwwf5g7x70rzfb129h6r7hfd86593853nqgy1m9yprxqab", "deps": { "gn": { "version": "2021-02-09", From 61e6aeb6b259c6acda774f958b9acb213cf137a0 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Thu, 4 Mar 2021 12:18:30 +0100 Subject: [PATCH 204/246] aws-vault: install completions (#115059) --- pkgs/tools/admin/aws-vault/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index d55b90f3b84..13860b4bf7c 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, lib, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "aws-vault"; version = "6.2.0"; @@ -12,6 +12,16 @@ buildGoModule rec { vendorSha256 = "18lmxx784377x1v0gr6fkdx5flhcajsqlzyjx508z0kih6ammc0z"; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd aws-vault \ + --bash $src/contrib/completions/bash/aws-vault.bash \ + --fish $src/contrib/completions/fish/aws-vault.fish \ + --zsh $src/contrib/completions/zsh/aws-vault.zsh + ''; + + doCheck = false; subPackages = [ "." ]; From ccd106570f3f24e41642f4cad5329e0d23fdafdf Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 21 Jan 2021 20:42:35 +0100 Subject: [PATCH 205/246] dig: alias to bind.dnsutils Everytime I want to install `dig`, I have to lookf for the package it's in. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e42ed1a0a00..7d00eefe4a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17823,6 +17823,7 @@ in bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; + dig = bind.dnsutils; inherit (callPackages ../servers/bird { }) bird bird6 bird2; From e3a4ba005213c1df01330faf9254ac665e64f8c6 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 8 Feb 2021 15:28:12 +0100 Subject: [PATCH 206/246] terraform-providers: fix impurity about Nix version used I wasn't able to figure out for which unstable version of Nix this is supposed to work so I added nix itself to the package list. Nix will now be the same stable version that is also provided in this nixpkgs checkout. To make it work with a stable Nix version I also had to trim the build error output as otherwise it would contain the sha256 prefix & a newline followed by "error:". --- .../networking/cluster/terraform-providers/update-provider | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index e1f1a0ef38a..f97bbce83fa 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl jq moreutils +#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix # shellcheck shell=bash # vim: ft=sh # @@ -161,7 +161,8 @@ if [[ -z "$vendorSha256" ]]; then exit 1 fi rm -f vendor_log.txt - vendorSha256=${BASH_REMATCH[1]} + # trim the results in case it they have a sha256: prefix or contain more than one line + vendorSha256=$(echo "${BASH_REMATCH[1]#sha256:}" | head -n 1) # Deal with nix unstable if [[ $vendorSha256 = sha256-* ]]; then vendorSha256=$(nix to-base32 "$vendorSha256") From 84e4da60df7e46ec5876543c0a5a28f036eac8b1 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 4 Mar 2021 12:27:39 +0100 Subject: [PATCH 207/246] terraform-providers.helm: 1.3.2 -> 2.0.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 91b900db347..d4b8a52d7ae 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -398,10 +398,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v1.3.2", - "sha256": "0mpbf03483jqrwd9cx4pdn2pcv4swfs5nbp021gaqr0jf1w970x6", + "rev": "v2.0.2", + "sha256": "119zvlkwa7ygwsjxxdl7z8cqb0c4m6gy21356jnsasf4c3557rrb", "vendorSha256": null, - "version": "1.3.2" + "version": "2.0.2" }, "heroku": { "owner": "terraform-providers", From 4c6e467d26f880c36f537b55923c7040035ae0fe Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 4 Mar 2021 12:28:00 +0100 Subject: [PATCH 208/246] terraform-providers.kubernetes: 1.13.3 -> 2.0.2 --- .../networking/cluster/terraform-providers/providers.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d4b8a52d7ae..4ec886a34fc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -504,9 +504,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v1.13.3", - "sha256": "01hkbb81r3k630s3ww6379p66h1fsd5cd1dz14jm833nsr142c0i", - "version": "1.13.3" + "rev": "v2.0.2", + "sha256": "129aylw6hxa44syfnb0kkkihwvlaa6d1jnxrcbwkql6xxhn9zizf", + "vendorSha256": null, + "version": "2.0.2" }, "kubernetes-alpha": { "owner": "hashicorp", From 5b05ea44fb95c1cddbb028e336789ca58ff244c0 Mon Sep 17 00:00:00 2001 From: Ninjatrappeur Date: Thu, 4 Mar 2021 12:40:01 +0100 Subject: [PATCH 209/246] pleroma-otp: 2.2.2 -> 2.3.0 (#115053) https://pleroma.social/announcements/2021/03/02/pleroma-major-release-2-3-0/ --- pkgs/servers/pleroma-otp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/pleroma-otp/default.nix b/pkgs/servers/pleroma-otp/default.nix index 4905acd0757..10fd2627743 100644 --- a/pkgs/servers/pleroma-otp/default.nix +++ b/pkgs/servers/pleroma-otp/default.nix @@ -12,19 +12,19 @@ }: stdenv.mkDerivation { pname = "pleroma-otp"; - version = "2.2.2"; + version = "2.3.0"; # To find the latest binary release stable link, have a look at # the CI pipeline for the latest commit of the stable branch # https://git.pleroma.social/pleroma/pleroma/-/tree/stable src = { aarch64-linux = fetchurl { - url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/175288/artifacts/download"; - sha256 = "107kp5zqwq1lixk1cwkx4v7zpm0h248xzlm152aj36ghb43j2snw"; + url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/182392/artifacts/download"; + sha256 = "1drpd6xh7m2damxi5impb8jwvjl6m3qv5yxynl12i8g66vi3rbwf"; }; x86_64-linux = fetchurl { - url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/175284/artifacts/download"; - sha256 = "1c6l04gga9iigm249ywwcrjg6wzy8iiid652mws3j9dnl71w2sim"; + url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/182388/artifacts/download"; + sha256 = "0glr0iiqmylwwsn5r946yqr9kx97j2zznrc0imyxm3j0vhz8xzl4"; }; }."${stdenv.hostPlatform.system}"; From 035438a26b45f5152ca1533dd8790203a4d51360 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 4 Mar 2021 13:01:35 +0100 Subject: [PATCH 210/246] shattered-pixel-dungeon: specify gpl3Plus --- pkgs/games/shattered-pixel-dungeon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index eea8d5650be..bb897bc8b58 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { homepage = "https://shatteredpixel.com/"; downloadPage = "https://github.com/00-Evan/shattered-pixel-dungeon/releases"; description = "Traditional roguelike game with pixel-art graphics and simple interface"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 From d0853a745c9771e1628ad9e7e9e3e45ea50b4af6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 4 Mar 2021 13:40:17 +0200 Subject: [PATCH 211/246] zoom-us: set src pname and version for update script Cleanup unused arguments. --- .../networking/instant-messengers/zoom-us/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index c431b5d0ce6..06c298a9000 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl , makeWrapper -, fetchFromGitHub # Dynamic libraries , alsaLib , atk @@ -38,7 +37,6 @@ let sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02"; }; }; - dontUnpack = true; libs = lib.makeLibraryPath ([ # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' @@ -68,8 +66,10 @@ let xorg.libXtst ] ++ lib.optional (pulseaudioSupport) libpulseaudio); -in stdenv.mkDerivation { - name = "zoom-${version}"; +in stdenv.mkDerivation rec { + pname = "zoom"; + inherit version; + src = srcs.${stdenv.hostPlatform.system}; dontUnpack = true; @@ -80,7 +80,7 @@ in stdenv.mkDerivation { installPhase = '' runHook preInstall mkdir $out - tar -C $out -xf ${srcs.${stdenv.hostPlatform.system}} + tar -C $out -xf ${src} mv $out/usr/* $out/ runHook postInstall ''; From 132d954d355f2224d294a8a12b15065bce7c060f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 4 Mar 2021 11:40:46 +0000 Subject: [PATCH 212/246] =?UTF-8?q?zoom-us:=205.5.7011.0206=20=E2=86=92=20?= =?UTF-8?q?5.5.7938.0228?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 06c298a9000..efb913fca73 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -30,11 +30,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.5.7011.0206"; + version = "5.5.7938.0228"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02"; + sha256 = "KM8o2tgIn0lecOM4gKdTOdk/zsohlFqtNX+ca/S6FGY="; }; }; From 10bebca08814d2e08d85531b17849406895f64e0 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Thu, 4 Mar 2021 13:06:15 +0300 Subject: [PATCH 213/246] mailhog: fix --version output --- pkgs/servers/mail/mailhog/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index 674fdbabb4e..0032c4a630e 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -13,6 +13,8 @@ buildGoPackage rec { sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y"; }; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with lib; { description = "Web and API based SMTP testing"; homepage = "https://github.com/mailhog/MailHog"; From 98f26993f2194fff34acd6c7c96b7df000584474 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 4 Mar 2021 19:54:50 +0700 Subject: [PATCH 214/246] treewide: remove stdenv where not needed --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 2 +- pkgs/applications/networking/bee/bee.nix | 2 +- .../networking/cluster/cloudfoundry-cli/default.nix | 2 +- pkgs/applications/networking/cluster/kube-capacity/default.nix | 2 +- pkgs/build-support/docker/default.nix | 1 - pkgs/build-support/fetchs3/default.nix | 2 +- pkgs/build-support/writers/test.nix | 1 - pkgs/development/compilers/llvm/rocm/default.nix | 2 +- pkgs/development/libraries/vapoursynth/editor.nix | 2 +- pkgs/development/ocaml-modules/mariadb/default.nix | 2 +- pkgs/development/python-modules/protobuf/default.nix | 1 - pkgs/development/python-modules/sphinx-autobuild/default.nix | 1 - pkgs/development/tools/checkmake/default.nix | 2 +- pkgs/development/tools/rust/cargo-valgrind/default.nix | 1 - pkgs/games/dwarf-fortress/legends-browser/default.nix | 2 +- pkgs/misc/documentation-highlighter/default.nix | 2 +- pkgs/servers/monitoring/prometheus/flow-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/smokeping-prober.nix | 2 +- pkgs/tools/networking/chisel/default.nix | 1 - pkgs/tools/networking/getmail6/default.nix | 2 +- pkgs/tools/security/proxmark3/proxmark3-rrg.nix | 2 +- 21 files changed, 15 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 14894159843..6b9b619f40f 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchFromGitHub, makeDesktopItem, prusa-slicer + lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; diff --git a/pkgs/applications/networking/bee/bee.nix b/pkgs/applications/networking/bee/bee.nix index 988a322e9f9..b0d05d928c0 100644 --- a/pkgs/applications/networking/bee/bee.nix +++ b/pkgs/applications/networking/bee/bee.nix @@ -1,4 +1,4 @@ -{ version ? "release", stdenv, lib, fetchFromGitHub, buildGoModule, coreutils }: +{ version ? "release", lib, fetchFromGitHub, buildGoModule, coreutils }: let diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index de032cc60e9..a251886ebdd 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: buildGoModule rec { pname = "cloudfoundry-cli"; diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 08dfa8bcdf0..78cbaca80ab 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kube-capacity"; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index c4e266d6c5d..da3e7b96010 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -21,7 +21,6 @@ runtimeShell, shadow, skopeo, - stdenv, storeDir ? builtins.storeDir, substituteAll, symlinkJoin, diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index 8c551c20aa0..acad0749b66 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, runCommand, awscli }: +{ lib, runCommand, awscli }: { s3url , name ? builtins.baseNameOf s3url diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 7b7a698376a..a3f15ffe366 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -7,7 +7,6 @@ python2Packages, python3Packages, runCommand, - stdenv, writers, writeText }: diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index 54a7733f4ba..5f9dba0fc3c 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, callPackage, wrapCCWith }: +{ lib, fetchFromGitHub, callPackage, wrapCCWith }: let version = "4.0.1"; diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix index 26a1a6d6808..5cd4b4608ec 100644 --- a/pkgs/development/libraries/vapoursynth/editor.nix +++ b/pkgs/development/libraries/vapoursynth/editor.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand +{ lib, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand , python3, vapoursynth , qmake, qtbase, qtwebsockets }: diff --git a/pkgs/development/ocaml-modules/mariadb/default.nix b/pkgs/development/ocaml-modules/mariadb/default.nix index ed3e5999b41..2c3c7c423ac 100644 --- a/pkgs/development/ocaml-modules/mariadb/default.nix +++ b/pkgs/development/ocaml-modules/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildOasisPackage +{ lib, fetchFromGitHub, buildOasisPackage , ctypes, mariadb, libmysqlclient }: buildOasisPackage rec { diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index aa4d00892dd..60c6f333275 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -1,6 +1,5 @@ { buildPackages , lib -, stdenv , fetchpatch , python , buildPythonPackage diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index 958c1a6b19c..739ea2afa82 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , sphinx diff --git a/pkgs/development/tools/checkmake/default.nix b/pkgs/development/tools/checkmake/default.nix index c48dbe68023..3c21af8ff38 100644 --- a/pkgs/development/tools/checkmake/default.nix +++ b/pkgs/development/tools/checkmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, git, pandoc, lib }: +{ buildGoPackage, fetchFromGitHub, git, pandoc, lib }: buildGoPackage rec { pname = "checkmake"; diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index 50cffe74848..1c1a4c32c62 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , nix-update-script diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix index 1efae4d2802..2a3da233b45 100644 --- a/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }: +{ lib, buildEnv, writeShellScriptBin, fetchurl, jre }: let name = "legends-browser-${version}"; diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index 022cc4aa834..2a34e36742d 100644 --- a/pkgs/misc/documentation-highlighter/default.nix +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand }: +{ lib, runCommand }: runCommand "documentation-highlighter" { meta = { description = "Highlight.js sources for the Nix Ecosystem's documentation"; diff --git a/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/pkgs/servers/monitoring/prometheus/flow-exporter.nix index 4b2e76f7043..c4b9f06fdde 100644 --- a/pkgs/servers/monitoring/prometheus/flow-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/flow-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "flow-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index b1c3bc6999f..d21ddcf5647 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: let baseVersion = "0.3.1"; diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index 8533958ac2b..5d82a549e88 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv }: buildGoModule rec { diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index 40be3d2944a..90f969f2d76 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/pkgs/tools/networking/getmail6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, lib }: +{ fetchFromGitHub, python3Packages, lib }: python3Packages.buildPythonApplication rec { pname = "getmail6"; diff --git a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index 04def66d03c..2ae34439472 100644 --- a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 +{ lib, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 , readline , hardwarePlatform ? "PM3RDV4" From d32be9f201ea1e94fd5933b31a979d1e2cd4bb55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Thu, 4 Mar 2021 14:48:15 +0100 Subject: [PATCH 215/246] pythonPackages.pysideShiboken: enable it for Python2 as well --- pkgs/development/python-modules/pyside/shiboken.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 2690422932f..fb6d2f6d229 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -18,7 +18,6 @@ buildPythonPackage rec { pname = "pyside-shiboken"; version = "1.2.4"; format = "other"; - disabled = !isPy3k; src = fetchFromGitHub { owner = "PySide"; From 8c26eaa144897e9031093e9f56cc15c86f259772 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Mar 2021 15:26:36 +0100 Subject: [PATCH 216/246] Revert "php: Add php package versions to extensions/packages pnames" This reverts commit a081dcf86de4f100efe604a52b32df4b14892f44. --- pkgs/build-support/build-pecl.nix | 4 ++-- pkgs/top-level/php-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index bc905ee84a0..d75d3cf943a 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -16,10 +16,10 @@ }@args: stdenv.mkDerivation (args // { - pname = "php-${php.version}-${pname}"; + name = "php-${pname}-${version}"; extensionName = pname; - inherit version src; + inherit src; nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; buildInputs = [ php ] ++ peclDeps ++ buildInputs; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3c8738565f6..c9c4414f2fb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -16,7 +16,7 @@ lib.makeScope pkgs.newScope (self: with self; { # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { - pname = "php-${php.version}-${pname}"; + pname = "php-${pname}"; }); pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; From b08b53dd490bd1f02b85ddd9d84ba692ccfa9456 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Mar 2021 15:28:39 +0100 Subject: [PATCH 217/246] python3Packages.HAP-python: 3.1.0 -> 3.3.2 --- .../python-modules/HAP-python/default.nix | 68 ++++++++++++++----- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/HAP-python/default.nix b/pkgs/development/python-modules/HAP-python/default.nix index 3cd211db755..2e740fcc2c8 100644 --- a/pkgs/development/python-modules/HAP-python/default.nix +++ b/pkgs/development/python-modules/HAP-python/default.nix @@ -1,41 +1,75 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, curve25519-donna, ed25519 -, cryptography, ecdsa, zeroconf, pytestCheckHook }: +{ lib +, buildPythonPackage +, cryptography +, curve25519-donna +, ecdsa +, ed25519 +, fetchFromGitHub +, h11 +, pytest-asyncio +, pytest-timeout +, pytestCheckHook +, pythonOlder +, zeroconf +}: buildPythonPackage rec { pname = "HAP-python"; - version = "3.1.0"; + version = "3.3.2"; + disabled = pythonOlder "3.5"; # pypi package does not include tests src = fetchFromGitHub { owner = "ikalchev"; repo = pname; rev = "v${version}"; - sha256 = "1qg38lfjby2xfm09chzc40a7i3b84kgyfs7g4xq8f5m8s39hg6d7"; + sha256 = "sha256-oDTyFIhf7oogYyh9LpmVtagi1kDXLCc/7c2UH1dL2Sg="; }; - disabled = !isPy3k; - propagatedBuildInputs = [ - curve25519-donna - ed25519 cryptography + curve25519-donna ecdsa + ed25519 + h11 zeroconf ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; disabledTests = [ - #disable tests needing network - "test_persist" - "test_setup_endpoints" + # Disable tests needing network + "camera" + "pair" + "test_async_subscribe_client_topic" "test_auto_add_aid_mac" - "test_service_callbacks" - "test_send_events" - "test_not_standalone_aid" - "test_start_stop_async_acc" + "test_connection_management" + "test_crypto_failure_closes_connection" + "test_empty_encrypted_data" "test_external_zeroconf" - "test_start_stop_sync_acc" + "test_get_accessories" + "test_get_characteristics" + "test_handle_set_handle_set" + "test_handle_snapshot_encrypted_non_existant_accessory" + "test_http_11_keep_alive" + "test_http10_close" + "test_mdns_service_info" + "test_mixing_service_char_callbacks_partial_failure" + "test_not_standalone_aid" + "test_persist" + "test_push_event" + "test_send_events" + "test_service_callbacks" + "test_set_characteristics_with_crypto" + "test_setup_endpoints" + "test_start" + "test_upgrade_to_encrypted" + "test_we_can_start_stop" + "test_xhm_uri" ]; meta = with lib; { From 5de110f8dac2de9b1da0774849786c34f2d929dc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Mar 2021 14:33:58 +0200 Subject: [PATCH 218/246] poetry2nix: 1.15.5 -> 1.16.0 --- .../tools/poetry2nix/poetry2nix/default.nix | 6 +- .../tools/poetry2nix/poetry2nix/lib.nix | 2 +- .../tools/poetry2nix/poetry2nix/overrides.nix | 73 ++- .../poetry2nix/pkgs/poetry/poetry.lock | 552 ++++++++++-------- .../poetry2nix/pkgs/poetry/pyproject.toml | 8 +- .../poetry2nix/pkgs/poetry/src.json | 4 +- .../poetry2nix/poetry2nix/pkgs/poetry/update | 2 +- .../tools/poetry2nix/poetry2nix/semver.nix | 6 +- 8 files changed, 396 insertions(+), 257 deletions(-) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index c23b50b8403..3b622c20559 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -4,6 +4,9 @@ , poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; } }: let + # Poetry2nix version + version = "1.16.0"; + inherit (poetryLib) isCompatible readTOML moduleName; /* The default list of poetry2nix override overlays */ @@ -70,8 +73,7 @@ let in lib.makeScope pkgs.newScope (self: { - # Poetry2nix version - version = "1.15.5"; + inherit version; /* Returns a package of editable sources whose changes will be available without needing to restart the nix-shell. diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index 4626f7fec37..6af37b395e0 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -157,7 +157,7 @@ let missingBuildBackendError = "No build-system.build-backend section in pyproject.toml. " + "Add such a section as described in https://python-poetry.org/docs/pyproject/#poetry-and-pep-517"; requires = lib.attrByPath [ "build-system" "requires" ] (throw missingBuildBackendError) pyProject; - requiredPkgs = builtins.map (n: lib.elemAt (builtins.match "([^!=<>~\[]+).*" n) 0) requires; + requiredPkgs = builtins.map (n: lib.elemAt (builtins.match "([^!=<>~[]+).*" n) 0) requires; in builtins.map (drvAttr: pythonPackages.${drvAttr} or (throw "unsupported build system requirement ${drvAttr}")) requiredPkgs; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 7a5233fecdf..2106708a28f 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -250,6 +250,15 @@ self: super: } ); + gdal = super.gdal.overridePythonAttrs ( + old: { + preBuild = (old.preBuild or "") + '' + substituteInPlace setup.cfg \ + --replace "../../apps/gdal-config" '${pkgs.gdal}/bin/gdal-config' + ''; + } + ); + grandalf = super.grandalf.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -360,9 +369,13 @@ self: super: } ); - # disable the removal of pyproject.toml, required because of setuptools_scm jaraco-functools = super.jaraco-functools.overridePythonAttrs ( old: { + # required for the extra "toml" dependency in setuptools_scm[toml] + buildInputs = (old.buildInputs or [ ]) ++ [ + self.toml + ]; + # disable the removal of pyproject.toml, required because of setuptools_scm dontPreferSetupPy = true; } ); @@ -378,6 +391,15 @@ self: super: } ); + jsondiff = super.jsondiff.overridePythonAttrs ( + old: { + preBuild = (old.preBuild or "") + '' + substituteInPlace setup.py \ + --replace "'jsondiff=jsondiff.cli:main_deprecated'," "" + ''; + } + ); + jsonpickle = super.jsonpickle.overridePythonAttrs ( old: { dontPreferSetupPy = true; @@ -558,6 +580,13 @@ self: super: buildInputs = oa.buildInputs ++ [ self.pbr ]; }); + moto = super.moto.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ + [ self.sshpubkeys ]; + } + ); + mpi4py = super.mpi4py.overridePythonAttrs ( old: let @@ -674,6 +703,12 @@ self: super: } ); + pdal = super.pdal.overridePythonAttrs ( + old: { + PDAL_CONFIG = "${pkgs.pdal}/bin/pdal-config"; + } + ); + peewee = super.peewee.overridePythonAttrs ( old: let @@ -733,9 +768,13 @@ self: super: ''; }); - # disable the removal of pyproject.toml, required because of setuptools_scm portend = super.portend.overridePythonAttrs ( old: { + # required for the extra "toml" dependency in setuptools_scm[toml] + buildInputs = (old.buildInputs or [ ]) ++ [ + self.toml + ]; + # disable the removal of pyproject.toml, required because of setuptools_scm dontPreferSetupPy = true; } ); @@ -920,6 +959,16 @@ self: super: } ); + pyproj = super.pyproj.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ + [ self.cython ]; + PROJ_DIR = "${pkgs.proj}"; + PROJ_LIBDIR = "${pkgs.proj}/lib"; + PROJ_INCDIR = "${pkgs.proj.dev}/include"; + } + ); + python-bugzilla = super.python-bugzilla.overridePythonAttrs ( old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ @@ -952,6 +1001,8 @@ self: super: old: { format = "other"; + dontWrapQtApps = true; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config pkgs.qt5.qmake @@ -1071,12 +1122,9 @@ self: super: pytest-runner = super.pytest-runner or super.pytestrunner; - python-jose = super.python-jose.overridePythonAttrs ( + pytest-pylint = super.pytest-pylint.overridePythonAttrs ( old: { - postPath = '' - substituteInPlace setup.py --replace "'pytest-runner'," "" - substituteInPlace setup.py --replace "'pytest-runner'" "" - ''; + buildInputs = [ self.pytest-runner ]; } ); @@ -1101,6 +1149,11 @@ self: super: ''; }); + python-jose = super.python-jose.overridePythonAttrs ( + old: { + buildInputs = [ self.pytest-runner ]; + } + ); ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( old: { @@ -1233,9 +1286,13 @@ self: super: } ); - # disable the removal of pyproject.toml, required because of setuptools_scm tempora = super.tempora.overridePythonAttrs ( old: { + # required for the extra "toml" dependency in setuptools_scm[toml] + buildInputs = (old.buildInputs or [ ]) ++ [ + self.toml + ]; + # disable the removal of pyproject.toml, required because of setuptools_scm dontPreferSetupPy = true; } ); diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock index 973733a6d61..b1be7a3f4e5 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock @@ -16,15 +16,15 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "attrs" -version = "20.2.0" +version = "20.3.0" description = "Classes Without Boilerplate" category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [package.extras] -dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "sphinx", "sphinx-rtd-theme", "pre-commit"] -docs = ["sphinx", "sphinx-rtd-theme", "zope.interface"] +dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"] +docs = ["furo", "sphinx", "zope.interface"] tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"] @@ -38,7 +38,7 @@ python-versions = ">=2.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] [[package]] name = "cachecontrol" @@ -72,7 +72,7 @@ msgpack = ["msgpack-python (>=0.5,<0.6)"] [[package]] name = "certifi" -version = "2020.6.20" +version = "2020.12.5" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -80,7 +80,7 @@ python-versions = "*" [[package]] name = "cffi" -version = "1.14.3" +version = "1.14.5" description = "Foreign Function Interface for Python calling C code." category = "main" optional = false @@ -99,11 +99,11 @@ python-versions = ">=3.6.1" [[package]] name = "chardet" -version = "3.0.4" +version = "4.0.0" description = "Universal encoding detector for Python 2 and 3" category = "main" optional = false -python-versions = "*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "cleo" @@ -134,7 +134,7 @@ typing-extensions = {version = ">=3.6,<4.0", markers = "python_version >= \"3.5\ [[package]] name = "colorama" -version = "0.4.3" +version = "0.4.4" description = "Cross-platform colored terminal text." category = "dev" optional = false @@ -150,7 +150,7 @@ python-versions = ">=2.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"] [[package]] name = "contextlib2" @@ -162,7 +162,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "coverage" -version = "5.3" +version = "5.5" description = "Code coverage measurement for Python" category = "dev" optional = false @@ -181,7 +181,7 @@ python-versions = ">=3.6,<4.0" [[package]] name = "cryptography" -version = "3.1.1" +version = "3.2.1" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = false @@ -194,11 +194,30 @@ ipaddress = {version = "*", markers = "python_version < \"3\""} six = ">=1.4.1" [package.extras] -docs = ["sphinx (>=1.6.5,<1.8.0 || >1.8.0,<3.1.0 || >3.1.0,<3.1.1 || >3.1.1)", "sphinx-rtd-theme"] +docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] ssh = ["bcrypt (>=3.1.5)"] -test = ["pytest (>=3.6.0,<3.9.0 || >3.9.0,<3.9.1 || >3.9.1,<3.9.2 || >3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"] +test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] + +[[package]] +name = "cryptography" +version = "3.4.6" +description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +cffi = ">=1.12" + +[package.extras] +docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] +docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] +pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] +sdist = ["setuptools-rust (>=0.11.4)"] +ssh = ["bcrypt (>=3.1.5)"] +test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] [[package]] name = "distlib" @@ -298,11 +317,11 @@ six = "*" [[package]] name = "identify" -version = "1.5.5" +version = "2.1.0" description = "File identification library for Python" category = "dev" optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +python-versions = ">=3.6.1" [package.extras] license = ["editdistance"] @@ -335,7 +354,7 @@ testing = ["packaging", "pep517", "importlib-resources (>=1.3)"] [[package]] name = "importlib-resources" -version = "3.0.0" +version = "3.2.1" description = "Read resources from Python packages" category = "main" optional = false @@ -361,14 +380,14 @@ python-versions = "*" [[package]] name = "jeepney" -version = "0.4.3" +version = "0.6.0" description = "Low-level, pure Python DBus protocol wrapper." category = "main" optional = false -python-versions = ">=3.5" +python-versions = ">=3.6" [package.extras] -dev = ["testpath"] +test = ["pytest", "pytest-trio", "pytest-asyncio", "testpath", "trio"] [[package]] name = "keyring" @@ -385,7 +404,7 @@ secretstorage = {version = "<3", markers = "(sys_platform == \"linux2\" or sys_p [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs", "pytest-flake8"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs", "pytest-flake8"] [[package]] name = "keyring" @@ -402,25 +421,25 @@ secretstorage = {version = "*", markers = "sys_platform == \"linux\""} [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] [[package]] name = "keyring" -version = "21.4.0" +version = "21.8.0" description = "Store and access your passwords safely." category = "main" optional = false python-versions = ">=3.6" [package.dependencies] -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} +importlib-metadata = {version = ">=1", markers = "python_version < \"3.8\""} jeepney = {version = ">=0.4.2", markers = "sys_platform == \"linux\""} pywin32-ctypes = {version = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1", markers = "sys_platform == \"win32\""} -SecretStorage = {version = ">=3", markers = "sys_platform == \"linux\""} +SecretStorage = {version = ">=3.2", markers = "sys_platform == \"linux\""} [package.extras] -docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black (>=0.3.7)", "pytest-cov", "pytest-mypy"] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "jaraco.test (>=3.2.0)", "pytest-black (>=0.3.7)", "pytest-mypy"] [[package]] name = "lockfile" @@ -460,7 +479,15 @@ six = ">=1.0.0,<2.0.0" [[package]] name = "more-itertools" -version = "8.5.0" +version = "8.6.0" +description = "More routines for operating on iterables, beyond itertools" +category = "dev" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "more-itertools" +version = "8.7.0" description = "More routines for operating on iterables, beyond itertools" category = "dev" optional = false @@ -468,7 +495,7 @@ python-versions = ">=3.5" [[package]] name = "msgpack" -version = "1.0.0" +version = "1.0.2" description = "MessagePack (de)serializer." category = "main" optional = false @@ -484,7 +511,7 @@ python-versions = "*" [[package]] name = "packaging" -version = "20.4" +version = "20.9" description = "Core utilities for Python packages" category = "main" optional = false @@ -492,7 +519,6 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [package.dependencies] pyparsing = ">=2.0.2" -six = "*" [[package]] name = "pastel" @@ -527,7 +553,7 @@ ptyprocess = ">=0.5" [[package]] name = "pkginfo" -version = "1.5.0.1" +version = "1.7.0" description = "Query metadatdata from sdists / bdists / installed packages." category = "main" optional = false @@ -552,7 +578,7 @@ dev = ["pre-commit", "tox"] [[package]] name = "poetry-core" -version = "1.0.0" +version = "1.0.2" description = "Poetry PEP 517 Build Backend" category = "main" optional = false @@ -567,7 +593,7 @@ typing = {version = ">=3.7.4.1,<4.0.0.0", markers = "python_version >= \"2.7\" a [[package]] name = "pre-commit" -version = "2.7.1" +version = "2.10.1" description = "A framework for managing and maintaining multi-language pre-commit hooks." category = "dev" optional = false @@ -585,7 +611,7 @@ virtualenv = ">=20.0.8" [[package]] name = "ptyprocess" -version = "0.6.0" +version = "0.7.0" description = "Run a subprocess in a pseudo terminal" category = "main" optional = false @@ -593,7 +619,7 @@ python-versions = "*" [[package]] name = "py" -version = "1.9.0" +version = "1.10.0" description = "library with cross-python path, ini-parsing, io, code, log facilities" category = "dev" optional = false @@ -672,23 +698,23 @@ py = ">=1.5.0" wcwidth = "*" [package.extras] -checkqa-mypy = ["mypy (v0.761)"] +checkqa-mypy = ["mypy (==v0.761)"] testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] [[package]] name = "pytest-cov" -version = "2.10.1" +version = "2.11.1" description = "Pytest plugin for measuring coverage." category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.dependencies] -coverage = ">=4.4" +coverage = ">=5.2.1" pytest = ">=4.6" [package.extras] -testing = ["fields", "hunter", "process-tests (2.0.2)", "six", "pytest-xdist", "virtualenv"] +testing = ["fields", "hunter", "process-tests (==2.0.2)", "six", "pytest-xdist", "virtualenv"] [[package]] name = "pytest-mock" @@ -728,15 +754,15 @@ python-versions = "*" [[package]] name = "pyyaml" -version = "5.3.1" +version = "5.4.1" description = "YAML parser and emitter for Python" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [[package]] name = "requests" -version = "2.24.0" +version = "2.25.1" description = "Python HTTP for Humans." category = "main" optional = false @@ -744,13 +770,13 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<4" +chardet = ">=3.0.2,<5" idna = ">=2.5,<3" -urllib3 = ">=1.21.1,<1.25.0 || >1.25.0,<1.25.1 || >1.25.1,<1.26" +urllib3 = ">=1.21.1,<1.27" [package.extras] security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] -socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"] +socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] [[package]] name = "requests-toolbelt" @@ -787,19 +813,19 @@ dbus-python = ["dbus-python"] [[package]] name = "secretstorage" -version = "3.1.2" +version = "3.3.1" description = "Python bindings to FreeDesktop.org Secret Service API" category = "main" optional = false -python-versions = ">=3.5" +python-versions = ">=3.6" [package.dependencies] -cryptography = "*" -jeepney = ">=0.4.2" +cryptography = ">=2.0" +jeepney = ">=0.6" [[package]] name = "shellingham" -version = "1.3.2" +version = "1.4.0" description = "Tool to Detect Surrounding Shell" category = "main" optional = false @@ -807,15 +833,19 @@ python-versions = "!=3.0,!=3.1,!=3.2,!=3.3,>=2.6" [[package]] name = "singledispatch" -version = "3.4.0.3" -description = "This library brings functools.singledispatch from Python 3.4 to Python 2.6-3.3." +version = "3.6.1" +description = "Backport functools.singledispatch from Python 3.4 to Python 2.6-3.3." category = "main" optional = false -python-versions = "*" +python-versions = ">=2.6" [package.dependencies] six = "*" +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "unittest2"] + [[package]] name = "six" version = "1.15.0" @@ -842,11 +872,11 @@ python-versions = "*" [[package]] name = "toml" -version = "0.10.1" +version = "0.10.2" description = "Python Library for Tom's Obvious, Minimal Language" category = "dev" optional = false -python-versions = "*" +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "tomlkit" @@ -863,7 +893,7 @@ typing = {version = ">=3.6,<4.0", markers = "python_version >= \"2.7\" and pytho [[package]] name = "tox" -version = "3.20.0" +version = "3.23.0" description = "tox is a generic virtualenv management and test command line tool" category = "dev" optional = false @@ -872,7 +902,7 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" [package.dependencies] colorama = {version = ">=0.4.1", markers = "platform_system == \"Windows\""} filelock = ">=3.0.0" -importlib-metadata = {version = ">=0.12,<2", markers = "python_version < \"3.8\""} +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} packaging = ">=14" pluggy = ">=0.12.0" py = ">=1.4.17" @@ -882,7 +912,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2, [package.extras] docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"] -testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "pytest-xdist (>=1.22.2)"] +testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "pytest-xdist (>=1.22.2)", "pathlib2 (>=2.3.3)"] [[package]] name = "typing" @@ -900,12 +930,9 @@ category = "main" optional = false python-versions = "*" -[package.dependencies] -typing = {version = ">=3.7.4", markers = "python_version < \"3.5\""} - [[package]] name = "urllib3" -version = "1.25.10" +version = "1.25.11" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false @@ -913,12 +940,12 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" [package.extras] brotli = ["brotlipy (>=0.6.0)"] -secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "pyOpenSSL (>=0.14)", "ipaddress"] -socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"] +secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] +socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "virtualenv" -version = "20.0.31" +version = "20.4.2" description = "Virtual Python Environment builder" category = "main" optional = false @@ -928,14 +955,14 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" appdirs = ">=1.4.3,<2" distlib = ">=0.3.1,<1" filelock = ">=3.0.0,<4" -importlib-metadata = {version = ">=0.12,<2", markers = "python_version < \"3.8\""} +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} importlib-resources = {version = ">=1.0", markers = "python_version < \"3.7\""} pathlib2 = {version = ">=2.3.3,<3", markers = "python_version < \"3.4\" and sys_platform != \"win32\""} six = ">=1.9.0,<2" [package.extras] docs = ["proselint (>=0.10.2)", "sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=19.9.0rc1)"] -testing = ["coverage (>=5)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "pytest-xdist (>=1.31.0)", "packaging (>=20.0)", "xonsh (>=0.9.16)"] +testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "packaging (>=20.0)", "xonsh (>=0.9.16)"] [[package]] name = "wcwidth" @@ -974,7 +1001,7 @@ testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"] [metadata] lock-version = "1.1" python-versions = "~2.7 || ^3.5" -content-hash = "1e774c9d8b7f6812d721cff08b51554f9a0cd051e2ae0e884421bcb56718d131" +content-hash = "f716089bf560bb051980ddb5ff40b200027e9d9f2ed17fc7dd5576d80f5ad62a" [metadata.files] appdirs = [ @@ -986,8 +1013,8 @@ atomicwrites = [ {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, ] attrs = [ - {file = "attrs-20.2.0-py2.py3-none-any.whl", hash = "sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc"}, - {file = "attrs-20.2.0.tar.gz", hash = "sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594"}, + {file = "attrs-20.3.0-py2.py3-none-any.whl", hash = "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6"}, + {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"}, ] "backports.functools-lru-cache" = [ {file = "backports.functools_lru_cache-1.6.1-py2.py3-none-any.whl", hash = "sha256:0bada4c2f8a43d533e4ecb7a12214d9420e66eb206d54bf2d682581ca4b80848"}, @@ -1002,54 +1029,55 @@ cachy = [ {file = "cachy-0.3.0.tar.gz", hash = "sha256:186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"}, ] certifi = [ - {file = "certifi-2020.6.20-py2.py3-none-any.whl", hash = "sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41"}, - {file = "certifi-2020.6.20.tar.gz", hash = "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3"}, + {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"}, + {file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"}, ] cffi = [ - {file = "cffi-1.14.3-2-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3eeeb0405fd145e714f7633a5173318bd88d8bbfc3dd0a5751f8c4f70ae629bc"}, - {file = "cffi-1.14.3-2-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:cb763ceceae04803adcc4e2d80d611ef201c73da32d8f2722e9d0ab0c7f10768"}, - {file = "cffi-1.14.3-2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:44f60519595eaca110f248e5017363d751b12782a6f2bd6a7041cba275215f5d"}, - {file = "cffi-1.14.3-2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c53af463f4a40de78c58b8b2710ade243c81cbca641e34debf3396a9640d6ec1"}, - {file = "cffi-1.14.3-2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:33c6cdc071ba5cd6d96769c8969a0531be2d08c2628a0143a10a7dcffa9719ca"}, - {file = "cffi-1.14.3-2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c11579638288e53fc94ad60022ff1b67865363e730ee41ad5e6f0a17188b327a"}, - {file = "cffi-1.14.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:3cb3e1b9ec43256c4e0f8d2837267a70b0e1ca8c4f456685508ae6106b1f504c"}, - {file = "cffi-1.14.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f0620511387790860b249b9241c2f13c3a80e21a73e0b861a2df24e9d6f56730"}, - {file = "cffi-1.14.3-cp27-cp27m-win32.whl", hash = "sha256:005f2bfe11b6745d726dbb07ace4d53f057de66e336ff92d61b8c7e9c8f4777d"}, - {file = "cffi-1.14.3-cp27-cp27m-win_amd64.whl", hash = "sha256:2f9674623ca39c9ebe38afa3da402e9326c245f0f5ceff0623dccdac15023e05"}, - {file = "cffi-1.14.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:09e96138280241bd355cd585148dec04dbbedb4f46128f340d696eaafc82dd7b"}, - {file = "cffi-1.14.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:3363e77a6176afb8823b6e06db78c46dbc4c7813b00a41300a4873b6ba63b171"}, - {file = "cffi-1.14.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:0ef488305fdce2580c8b2708f22d7785ae222d9825d3094ab073e22e93dfe51f"}, - {file = "cffi-1.14.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:0b1ad452cc824665ddc682400b62c9e4f5b64736a2ba99110712fdee5f2505c4"}, - {file = "cffi-1.14.3-cp35-cp35m-win32.whl", hash = "sha256:85ba797e1de5b48aa5a8427b6ba62cf69607c18c5d4eb747604b7302f1ec382d"}, - {file = "cffi-1.14.3-cp35-cp35m-win_amd64.whl", hash = "sha256:e66399cf0fc07de4dce4f588fc25bfe84a6d1285cc544e67987d22663393926d"}, - {file = "cffi-1.14.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:15f351bed09897fbda218e4db5a3d5c06328862f6198d4fb385f3e14e19decb3"}, - {file = "cffi-1.14.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4d7c26bfc1ea9f92084a1d75e11999e97b62d63128bcc90c3624d07813c52808"}, - {file = "cffi-1.14.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:23e5d2040367322824605bc29ae8ee9175200b92cb5483ac7d466927a9b3d537"}, - {file = "cffi-1.14.3-cp36-cp36m-win32.whl", hash = "sha256:a624fae282e81ad2e4871bdb767e2c914d0539708c0f078b5b355258293c98b0"}, - {file = "cffi-1.14.3-cp36-cp36m-win_amd64.whl", hash = "sha256:de31b5164d44ef4943db155b3e8e17929707cac1e5bd2f363e67a56e3af4af6e"}, - {file = "cffi-1.14.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f92cdecb618e5fa4658aeb97d5eb3d2f47aa94ac6477c6daf0f306c5a3b9e6b1"}, - {file = "cffi-1.14.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:22399ff4870fb4c7ef19fff6eeb20a8bbf15571913c181c78cb361024d574579"}, - {file = "cffi-1.14.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:f4eae045e6ab2bb54ca279733fe4eb85f1effda392666308250714e01907f394"}, - {file = "cffi-1.14.3-cp37-cp37m-win32.whl", hash = "sha256:b0358e6fefc74a16f745afa366acc89f979040e0cbc4eec55ab26ad1f6a9bfbc"}, - {file = "cffi-1.14.3-cp37-cp37m-win_amd64.whl", hash = "sha256:6642f15ad963b5092d65aed022d033c77763515fdc07095208f15d3563003869"}, - {file = "cffi-1.14.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:2791f68edc5749024b4722500e86303a10d342527e1e3bcac47f35fbd25b764e"}, - {file = "cffi-1.14.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:529c4ed2e10437c205f38f3691a68be66c39197d01062618c55f74294a4a4828"}, - {file = "cffi-1.14.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8f0f1e499e4000c4c347a124fa6a27d37608ced4fe9f7d45070563b7c4c370c9"}, - {file = "cffi-1.14.3-cp38-cp38-win32.whl", hash = "sha256:3b8eaf915ddc0709779889c472e553f0d3e8b7bdf62dab764c8921b09bf94522"}, - {file = "cffi-1.14.3-cp38-cp38-win_amd64.whl", hash = "sha256:bbd2f4dfee1079f76943767fce837ade3087b578aeb9f69aec7857d5bf25db15"}, - {file = "cffi-1.14.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:cc75f58cdaf043fe6a7a6c04b3b5a0e694c6a9e24050967747251fb80d7bce0d"}, - {file = "cffi-1.14.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:bf39a9e19ce7298f1bd6a9758fa99707e9e5b1ebe5e90f2c3913a47bc548747c"}, - {file = "cffi-1.14.3-cp39-cp39-win32.whl", hash = "sha256:d80998ed59176e8cba74028762fbd9b9153b9afc71ea118e63bbf5d4d0f9552b"}, - {file = "cffi-1.14.3-cp39-cp39-win_amd64.whl", hash = "sha256:c150eaa3dadbb2b5339675b88d4573c1be3cb6f2c33a6c83387e10cc0bf05bd3"}, - {file = "cffi-1.14.3.tar.gz", hash = "sha256:f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591"}, + {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"}, + {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"}, + {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"}, + {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"}, + {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"}, + {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"}, + {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"}, + {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"}, + {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"}, + {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"}, + {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"}, + {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"}, + {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"}, + {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"}, + {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"}, + {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"}, + {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"}, + {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"}, + {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"}, + {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"}, + {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"}, + {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"}, + {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"}, + {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"}, + {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"}, ] cfgv = [ {file = "cfgv-3.2.0-py2.py3-none-any.whl", hash = "sha256:32e43d604bbe7896fe7c248a9c2276447dbef840feb28fe20494f62af110211d"}, {file = "cfgv-3.2.0.tar.gz", hash = "sha256:cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"}, ] chardet = [ - {file = "chardet-3.0.4-py2.py3-none-any.whl", hash = "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"}, - {file = "chardet-3.0.4.tar.gz", hash = "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"}, + {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, + {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, ] cleo = [ {file = "cleo-0.8.1-py2.py3-none-any.whl", hash = "sha256:141cda6dc94a92343be626bb87a0b6c86ae291dfc732a57bf04310d4b4201753"}, @@ -1060,8 +1088,8 @@ clikit = [ {file = "clikit-0.6.2.tar.gz", hash = "sha256:442ee5db9a14120635c5990bcdbfe7c03ada5898291f0c802f77be71569ded59"}, ] colorama = [ - {file = "colorama-0.4.3-py2.py3-none-any.whl", hash = "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff"}, - {file = "colorama-0.4.3.tar.gz", hash = "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"}, + {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, + {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] configparser = [ {file = "configparser-4.0.2-py2.py3-none-any.whl", hash = "sha256:254c1d9c79f60c45dfde850850883d5aaa7f19a23f13561243a050d5a7c3fe4c"}, @@ -1072,68 +1100,93 @@ contextlib2 = [ {file = "contextlib2-0.6.0.post1.tar.gz", hash = "sha256:01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"}, ] coverage = [ - {file = "coverage-5.3-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:bd3166bb3b111e76a4f8e2980fa1addf2920a4ca9b2b8ca36a3bc3dedc618270"}, - {file = "coverage-5.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:9342dd70a1e151684727c9c91ea003b2fb33523bf19385d4554f7897ca0141d4"}, - {file = "coverage-5.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:63808c30b41f3bbf65e29f7280bf793c79f54fb807057de7e5238ffc7cc4d7b9"}, - {file = "coverage-5.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:4d6a42744139a7fa5b46a264874a781e8694bb32f1d76d8137b68138686f1729"}, - {file = "coverage-5.3-cp27-cp27m-win32.whl", hash = "sha256:86e9f8cd4b0cdd57b4ae71a9c186717daa4c5a99f3238a8723f416256e0b064d"}, - {file = "coverage-5.3-cp27-cp27m-win_amd64.whl", hash = "sha256:7858847f2d84bf6e64c7f66498e851c54de8ea06a6f96a32a1d192d846734418"}, - {file = "coverage-5.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:530cc8aaf11cc2ac7430f3614b04645662ef20c348dce4167c22d99bec3480e9"}, - {file = "coverage-5.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:381ead10b9b9af5f64646cd27107fb27b614ee7040bb1226f9c07ba96625cbb5"}, - {file = "coverage-5.3-cp35-cp35m-macosx_10_13_x86_64.whl", hash = "sha256:71b69bd716698fa62cd97137d6f2fdf49f534decb23a2c6fc80813e8b7be6822"}, - {file = "coverage-5.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:1d44bb3a652fed01f1f2c10d5477956116e9b391320c94d36c6bf13b088a1097"}, - {file = "coverage-5.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:1c6703094c81fa55b816f5ae542c6ffc625fec769f22b053adb42ad712d086c9"}, - {file = "coverage-5.3-cp35-cp35m-win32.whl", hash = "sha256:cedb2f9e1f990918ea061f28a0f0077a07702e3819602d3507e2ff98c8d20636"}, - {file = "coverage-5.3-cp35-cp35m-win_amd64.whl", hash = "sha256:7f43286f13d91a34fadf61ae252a51a130223c52bfefb50310d5b2deb062cf0f"}, - {file = "coverage-5.3-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:c851b35fc078389bc16b915a0a7c1d5923e12e2c5aeec58c52f4aa8085ac8237"}, - {file = "coverage-5.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:aac1ba0a253e17889550ddb1b60a2063f7474155465577caa2a3b131224cfd54"}, - {file = "coverage-5.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:2b31f46bf7b31e6aa690d4c7a3d51bb262438c6dcb0d528adde446531d0d3bb7"}, - {file = "coverage-5.3-cp36-cp36m-win32.whl", hash = "sha256:c5f17ad25d2c1286436761b462e22b5020d83316f8e8fcb5deb2b3151f8f1d3a"}, - {file = "coverage-5.3-cp36-cp36m-win_amd64.whl", hash = "sha256:aef72eae10b5e3116bac6957de1df4d75909fc76d1499a53fb6387434b6bcd8d"}, - {file = "coverage-5.3-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8"}, - {file = "coverage-5.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:29a6272fec10623fcbe158fdf9abc7a5fa032048ac1d8631f14b50fbfc10d17f"}, - {file = "coverage-5.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:2d43af2be93ffbad25dd959899b5b809618a496926146ce98ee0b23683f8c51c"}, - {file = "coverage-5.3-cp37-cp37m-win32.whl", hash = "sha256:c3888a051226e676e383de03bf49eb633cd39fc829516e5334e69b8d81aae751"}, - {file = "coverage-5.3-cp37-cp37m-win_amd64.whl", hash = "sha256:9669179786254a2e7e57f0ecf224e978471491d660aaca833f845b72a2df3709"}, - {file = "coverage-5.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0203acd33d2298e19b57451ebb0bed0ab0c602e5cf5a818591b4918b1f97d516"}, - {file = "coverage-5.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:582ddfbe712025448206a5bc45855d16c2e491c2dd102ee9a2841418ac1c629f"}, - {file = "coverage-5.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:0f313707cdecd5cd3e217fc68c78a960b616604b559e9ea60cc16795c4304259"}, - {file = "coverage-5.3-cp38-cp38-win32.whl", hash = "sha256:78e93cc3571fd928a39c0b26767c986188a4118edc67bc0695bc7a284da22e82"}, - {file = "coverage-5.3-cp38-cp38-win_amd64.whl", hash = "sha256:8f264ba2701b8c9f815b272ad568d555ef98dfe1576802ab3149c3629a9f2221"}, - {file = "coverage-5.3-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:50691e744714856f03a86df3e2bff847c2acede4c191f9a1da38f088df342978"}, - {file = "coverage-5.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9361de40701666b034c59ad9e317bae95c973b9ff92513dd0eced11c6adf2e21"}, - {file = "coverage-5.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:c1b78fb9700fc961f53386ad2fd86d87091e06ede5d118b8a50dea285a071c24"}, - {file = "coverage-5.3-cp39-cp39-win32.whl", hash = "sha256:cb7df71de0af56000115eafd000b867d1261f786b5eebd88a0ca6360cccfaca7"}, - {file = "coverage-5.3-cp39-cp39-win_amd64.whl", hash = "sha256:47a11bdbd8ada9b7ee628596f9d97fbd3851bd9999d398e9436bd67376dbece7"}, - {file = "coverage-5.3.tar.gz", hash = "sha256:280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0"}, + {file = "coverage-5.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf"}, + {file = "coverage-5.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:b7895207b4c843c76a25ab8c1e866261bcfe27bfaa20c192de5190121770672b"}, + {file = "coverage-5.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:c2723d347ab06e7ddad1a58b2a821218239249a9e4365eaff6649d31180c1669"}, + {file = "coverage-5.5-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:900fbf7759501bc7807fd6638c947d7a831fc9fdf742dc10f02956ff7220fa90"}, + {file = "coverage-5.5-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c"}, + {file = "coverage-5.5-cp27-cp27m-win32.whl", hash = "sha256:06191eb60f8d8a5bc046f3799f8a07a2d7aefb9504b0209aff0b47298333302a"}, + {file = "coverage-5.5-cp27-cp27m-win_amd64.whl", hash = "sha256:7501140f755b725495941b43347ba8a2777407fc7f250d4f5a7d2a1050ba8e82"}, + {file = "coverage-5.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:372da284cfd642d8e08ef606917846fa2ee350f64994bebfbd3afb0040436905"}, + {file = "coverage-5.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:8963a499849a1fc54b35b1c9f162f4108017b2e6db2c46c1bed93a72262ed083"}, + {file = "coverage-5.5-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:869a64f53488f40fa5b5b9dcb9e9b2962a66a87dab37790f3fcfb5144b996ef5"}, + {file = "coverage-5.5-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:4a7697d8cb0f27399b0e393c0b90f0f1e40c82023ea4d45d22bce7032a5d7b81"}, + {file = "coverage-5.5-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:8d0a0725ad7c1a0bcd8d1b437e191107d457e2ec1084b9f190630a4fb1af78e6"}, + {file = "coverage-5.5-cp310-cp310-manylinux1_x86_64.whl", hash = "sha256:51cb9476a3987c8967ebab3f0fe144819781fca264f57f89760037a2ea191cb0"}, + {file = "coverage-5.5-cp310-cp310-win_amd64.whl", hash = "sha256:c0891a6a97b09c1f3e073a890514d5012eb256845c451bd48f7968ef939bf4ae"}, + {file = "coverage-5.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:3487286bc29a5aa4b93a072e9592f22254291ce96a9fbc5251f566b6b7343cdb"}, + {file = "coverage-5.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:deee1077aae10d8fa88cb02c845cfba9b62c55e1183f52f6ae6a2df6a2187160"}, + {file = "coverage-5.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f11642dddbb0253cc8853254301b51390ba0081750a8ac03f20ea8103f0c56b6"}, + {file = "coverage-5.5-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:6c90e11318f0d3c436a42409f2749ee1a115cd8b067d7f14c148f1ce5574d701"}, + {file = "coverage-5.5-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:30c77c1dc9f253283e34c27935fded5015f7d1abe83bc7821680ac444eaf7793"}, + {file = "coverage-5.5-cp35-cp35m-win32.whl", hash = "sha256:9a1ef3b66e38ef8618ce5fdc7bea3d9f45f3624e2a66295eea5e57966c85909e"}, + {file = "coverage-5.5-cp35-cp35m-win_amd64.whl", hash = "sha256:972c85d205b51e30e59525694670de6a8a89691186012535f9d7dbaa230e42c3"}, + {file = "coverage-5.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:af0e781009aaf59e25c5a678122391cb0f345ac0ec272c7961dc5455e1c40066"}, + {file = "coverage-5.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:74d881fc777ebb11c63736622b60cb9e4aee5cace591ce274fb69e582a12a61a"}, + {file = "coverage-5.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:92b017ce34b68a7d67bd6d117e6d443a9bf63a2ecf8567bb3d8c6c7bc5014465"}, + {file = "coverage-5.5-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:d636598c8305e1f90b439dbf4f66437de4a5e3c31fdf47ad29542478c8508bbb"}, + {file = "coverage-5.5-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:41179b8a845742d1eb60449bdb2992196e211341818565abded11cfa90efb821"}, + {file = "coverage-5.5-cp36-cp36m-win32.whl", hash = "sha256:040af6c32813fa3eae5305d53f18875bedd079960822ef8ec067a66dd8afcd45"}, + {file = "coverage-5.5-cp36-cp36m-win_amd64.whl", hash = "sha256:5fec2d43a2cc6965edc0bb9e83e1e4b557f76f843a77a2496cbe719583ce8184"}, + {file = "coverage-5.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:18ba8bbede96a2c3dde7b868de9dcbd55670690af0988713f0603f037848418a"}, + {file = "coverage-5.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2910f4d36a6a9b4214bb7038d537f015346f413a975d57ca6b43bf23d6563b53"}, + {file = "coverage-5.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:f0b278ce10936db1a37e6954e15a3730bea96a0997c26d7fee88e6c396c2086d"}, + {file = "coverage-5.5-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:796c9c3c79747146ebd278dbe1e5c5c05dd6b10cc3bcb8389dfdf844f3ead638"}, + {file = "coverage-5.5-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:53194af30d5bad77fcba80e23a1441c71abfb3e01192034f8246e0d8f99528f3"}, + {file = "coverage-5.5-cp37-cp37m-win32.whl", hash = "sha256:184a47bbe0aa6400ed2d41d8e9ed868b8205046518c52464fde713ea06e3a74a"}, + {file = "coverage-5.5-cp37-cp37m-win_amd64.whl", hash = "sha256:2949cad1c5208b8298d5686d5a85b66aae46d73eec2c3e08c817dd3513e5848a"}, + {file = "coverage-5.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:217658ec7187497e3f3ebd901afdca1af062b42cfe3e0dafea4cced3983739f6"}, + {file = "coverage-5.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1aa846f56c3d49205c952d8318e76ccc2ae23303351d9270ab220004c580cfe2"}, + {file = "coverage-5.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:24d4a7de75446be83244eabbff746d66b9240ae020ced65d060815fac3423759"}, + {file = "coverage-5.5-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:d1f8bf7b90ba55699b3a5e44930e93ff0189aa27186e96071fac7dd0d06a1873"}, + {file = "coverage-5.5-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:970284a88b99673ccb2e4e334cfb38a10aab7cd44f7457564d11898a74b62d0a"}, + {file = "coverage-5.5-cp38-cp38-win32.whl", hash = "sha256:01d84219b5cdbfc8122223b39a954820929497a1cb1422824bb86b07b74594b6"}, + {file = "coverage-5.5-cp38-cp38-win_amd64.whl", hash = "sha256:2e0d881ad471768bf6e6c2bf905d183543f10098e3b3640fc029509530091502"}, + {file = "coverage-5.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d1f9ce122f83b2305592c11d64f181b87153fc2c2bbd3bb4a3dde8303cfb1a6b"}, + {file = "coverage-5.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:13c4ee887eca0f4c5a247b75398d4114c37882658300e153113dafb1d76de529"}, + {file = "coverage-5.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:52596d3d0e8bdf3af43db3e9ba8dcdaac724ba7b5ca3f6358529d56f7a166f8b"}, + {file = "coverage-5.5-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:2cafbbb3af0733db200c9b5f798d18953b1a304d3f86a938367de1567f4b5bff"}, + {file = "coverage-5.5-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:44d654437b8ddd9eee7d1eaee28b7219bec228520ff809af170488fd2fed3e2b"}, + {file = "coverage-5.5-cp39-cp39-win32.whl", hash = "sha256:d314ed732c25d29775e84a960c3c60808b682c08d86602ec2c3008e1202e3bb6"}, + {file = "coverage-5.5-cp39-cp39-win_amd64.whl", hash = "sha256:13034c4409db851670bc9acd836243aeee299949bd5673e11844befcb0149f03"}, + {file = "coverage-5.5-pp36-none-any.whl", hash = "sha256:f030f8873312a16414c0d8e1a1ddff2d3235655a2174e3648b4fa66b3f2f1079"}, + {file = "coverage-5.5-pp37-none-any.whl", hash = "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4"}, + {file = "coverage-5.5.tar.gz", hash = "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"}, ] crashtest = [ {file = "crashtest-0.3.1-py3-none-any.whl", hash = "sha256:300f4b0825f57688b47b6d70c6a31de33512eb2fa1ac614f780939aa0cf91680"}, {file = "crashtest-0.3.1.tar.gz", hash = "sha256:42ca7b6ce88b6c7433e2ce47ea884e91ec93104a4b754998be498a8e6c3d37dd"}, ] cryptography = [ - {file = "cryptography-3.1.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:65beb15e7f9c16e15934569d29fb4def74ea1469d8781f6b3507ab896d6d8719"}, - {file = "cryptography-3.1.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:983c0c3de4cb9fcba68fd3f45ed846eb86a2a8b8d8bc5bb18364c4d00b3c61fe"}, - {file = "cryptography-3.1.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:e97a3b627e3cb63c415a16245d6cef2139cca18bb1183d1b9375a1c14e83f3b3"}, - {file = "cryptography-3.1.1-cp27-cp27m-win32.whl", hash = "sha256:cb179acdd4ae1e4a5a160d80b87841b3d0e0be84af46c7bb2cd7ece57a39c4ba"}, - {file = "cryptography-3.1.1-cp27-cp27m-win_amd64.whl", hash = "sha256:b372026ebf32fe2523159f27d9f0e9f485092e43b00a5adacf732192a70ba118"}, - {file = "cryptography-3.1.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:680da076cad81cdf5ffcac50c477b6790be81768d30f9da9e01960c4b18a66db"}, - {file = "cryptography-3.1.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:5d52c72449bb02dd45a773a203196e6d4fae34e158769c896012401f33064396"}, - {file = "cryptography-3.1.1-cp35-abi3-macosx_10_10_x86_64.whl", hash = "sha256:f0e099fc4cc697450c3dd4031791559692dd941a95254cb9aeded66a7aa8b9bc"}, - {file = "cryptography-3.1.1-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:a7597ffc67987b37b12e09c029bd1dc43965f75d328076ae85721b84046e9ca7"}, - {file = "cryptography-3.1.1-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:4549b137d8cbe3c2eadfa56c0c858b78acbeff956bd461e40000b2164d9167c6"}, - {file = "cryptography-3.1.1-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:89aceb31cd5f9fc2449fe8cf3810797ca52b65f1489002d58fe190bfb265c536"}, - {file = "cryptography-3.1.1-cp35-cp35m-win32.whl", hash = "sha256:559d622aef2a2dff98a892eef321433ba5bc55b2485220a8ca289c1ecc2bd54f"}, - {file = "cryptography-3.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:451cdf60be4dafb6a3b78802006a020e6cd709c22d240f94f7a0696240a17154"}, - {file = "cryptography-3.1.1-cp36-abi3-win32.whl", hash = "sha256:762bc5a0df03c51ee3f09c621e1cee64e3a079a2b5020de82f1613873d79ee70"}, - {file = "cryptography-3.1.1-cp36-abi3-win_amd64.whl", hash = "sha256:b12e715c10a13ca1bd27fbceed9adc8c5ff640f8e1f7ea76416352de703523c8"}, - {file = "cryptography-3.1.1-cp36-cp36m-win32.whl", hash = "sha256:21b47c59fcb1c36f1113f3709d37935368e34815ea1d7073862e92f810dc7499"}, - {file = "cryptography-3.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:48ee615a779ffa749d7d50c291761dc921d93d7cf203dca2db663b4f193f0e49"}, - {file = "cryptography-3.1.1-cp37-cp37m-win32.whl", hash = "sha256:b2bded09c578d19e08bd2c5bb8fed7f103e089752c9cf7ca7ca7de522326e921"}, - {file = "cryptography-3.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f99317a0fa2e49917689b8cf977510addcfaaab769b3f899b9c481bbd76730c2"}, - {file = "cryptography-3.1.1-cp38-cp38-win32.whl", hash = "sha256:ab010e461bb6b444eaf7f8c813bb716be2d78ab786103f9608ffd37a4bd7d490"}, - {file = "cryptography-3.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:99d4984aabd4c7182050bca76176ce2dbc9fa9748afe583a7865c12954d714ba"}, - {file = "cryptography-3.1.1.tar.gz", hash = "sha256:9d9fc6a16357965d282dd4ab6531013935425d0dc4950df2e0cf2a1b1ac1017d"}, + {file = "cryptography-3.2.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7"}, + {file = "cryptography-3.2.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:75e8e6684cf0034f6bf2a97095cb95f81537b12b36a8fedf06e73050bb171c2d"}, + {file = "cryptography-3.2.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:4e7268a0ca14536fecfdf2b00297d4e407da904718658c1ff1961c713f90fd33"}, + {file = "cryptography-3.2.1-cp27-cp27m-win32.whl", hash = "sha256:7117319b44ed1842c617d0a452383a5a052ec6aa726dfbaffa8b94c910444297"}, + {file = "cryptography-3.2.1-cp27-cp27m-win_amd64.whl", hash = "sha256:a733671100cd26d816eed39507e585c156e4498293a907029969234e5e634bc4"}, + {file = "cryptography-3.2.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:a75f306a16d9f9afebfbedc41c8c2351d8e61e818ba6b4c40815e2b5740bb6b8"}, + {file = "cryptography-3.2.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:5849d59358547bf789ee7e0d7a9036b2d29e9a4ddf1ce5e06bb45634f995c53e"}, + {file = "cryptography-3.2.1-cp35-abi3-macosx_10_10_x86_64.whl", hash = "sha256:bd717aa029217b8ef94a7d21632a3bb5a4e7218a4513d2521c2a2fd63011e98b"}, + {file = "cryptography-3.2.1-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:efe15aca4f64f3a7ea0c09c87826490e50ed166ce67368a68f315ea0807a20df"}, + {file = "cryptography-3.2.1-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:32434673d8505b42c0de4de86da8c1620651abd24afe91ae0335597683ed1b77"}, + {file = "cryptography-3.2.1-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:7b8d9d8d3a9bd240f453342981f765346c87ade811519f98664519696f8e6ab7"}, + {file = "cryptography-3.2.1-cp35-cp35m-win32.whl", hash = "sha256:d3545829ab42a66b84a9aaabf216a4dce7f16dbc76eb69be5c302ed6b8f4a29b"}, + {file = "cryptography-3.2.1-cp35-cp35m-win_amd64.whl", hash = "sha256:a4e27ed0b2504195f855b52052eadcc9795c59909c9d84314c5408687f933fc7"}, + {file = "cryptography-3.2.1-cp36-abi3-win32.whl", hash = "sha256:13b88a0bd044b4eae1ef40e265d006e34dbcde0c2f1e15eb9896501b2d8f6c6f"}, + {file = "cryptography-3.2.1-cp36-abi3-win_amd64.whl", hash = "sha256:07ca431b788249af92764e3be9a488aa1d39a0bc3be313d826bbec690417e538"}, + {file = "cryptography-3.2.1-cp36-cp36m-win32.whl", hash = "sha256:a035a10686532b0587d58a606004aa20ad895c60c4d029afa245802347fab57b"}, + {file = "cryptography-3.2.1-cp36-cp36m-win_amd64.whl", hash = "sha256:d26a2557d8f9122f9bf445fc7034242f4375bd4e95ecda007667540270965b13"}, + {file = "cryptography-3.2.1-cp37-cp37m-win32.whl", hash = "sha256:545a8550782dda68f8cdc75a6e3bf252017aa8f75f19f5a9ca940772fc0cb56e"}, + {file = "cryptography-3.2.1-cp37-cp37m-win_amd64.whl", hash = "sha256:55d0b896631412b6f0c7de56e12eb3e261ac347fbaa5d5e705291a9016e5f8cb"}, + {file = "cryptography-3.2.1-cp38-cp38-win32.whl", hash = "sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b"}, + {file = "cryptography-3.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851"}, + {file = "cryptography-3.2.1.tar.gz", hash = "sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3"}, + {file = "cryptography-3.4.6-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:57ad77d32917bc55299b16d3b996ffa42a1c73c6cfa829b14043c561288d2799"}, + {file = "cryptography-3.4.6-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:93cfe5b7ff006de13e1e89830810ecbd014791b042cbe5eec253be11ac2b28f3"}, + {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:5ecf2bcb34d17415e89b546dbb44e73080f747e504273e4d4987630493cded1b"}, + {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:fec7fb46b10da10d9e1d078d1ff8ed9e05ae14f431fdbd11145edd0550b9a964"}, + {file = "cryptography-3.4.6-cp36-abi3-win32.whl", hash = "sha256:df186fcbf86dc1ce56305becb8434e4b6b7504bc724b71ad7a3239e0c9d14ef2"}, + {file = "cryptography-3.4.6-cp36-abi3-win_amd64.whl", hash = "sha256:66b57a9ca4b3221d51b237094b0303843b914b7d5afd4349970bb26518e350b0"}, + {file = "cryptography-3.4.6.tar.gz", hash = "sha256:2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"}, ] distlib = [ {file = "distlib-0.3.1-py2.py3-none-any.whl", hash = "sha256:8c09de2c67b3e7deef7184574fc060ab8a793e7adbb183d942c389c8b13c52fb"}, @@ -1175,8 +1228,8 @@ httpretty = [ {file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"}, ] identify = [ - {file = "identify-1.5.5-py2.py3-none-any.whl", hash = "sha256:da683bfb7669fa749fc7731f378229e2dbf29a1d1337cbde04106f02236eb29d"}, - {file = "identify-1.5.5.tar.gz", hash = "sha256:7c22c384a2c9b32c5cc891d13f923f6b2653aa83e2d75d8f79be240d6c86c4f4"}, + {file = "identify-2.1.0-py2.py3-none-any.whl", hash = "sha256:2a5fdf2f5319cc357eda2550bea713a404392495961022cf2462624ce62f0f46"}, + {file = "identify-2.1.0.tar.gz", hash = "sha256:2179e7359471ab55729f201b3fdf7dc2778e221f868410fedcb0987b791ba552"}, ] idna = [ {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, @@ -1187,24 +1240,24 @@ importlib-metadata = [ {file = "importlib_metadata-1.7.0.tar.gz", hash = "sha256:90bb658cdbbf6d1735b6341ce708fc7024a3e14e99ffdc5783edea9f9b077f83"}, ] importlib-resources = [ - {file = "importlib_resources-3.0.0-py2.py3-none-any.whl", hash = "sha256:d028f66b66c0d5732dae86ba4276999855e162a749c92620a38c1d779ed138a7"}, - {file = "importlib_resources-3.0.0.tar.gz", hash = "sha256:19f745a6eca188b490b1428c8d1d4a0d2368759f32370ea8fb89cad2ab1106c3"}, + {file = "importlib_resources-3.2.1-py2.py3-none-any.whl", hash = "sha256:e2860cf0c4bc999947228d18be154fa3779c5dde0b882bd2d7b3f4d25e698bd6"}, + {file = "importlib_resources-3.2.1.tar.gz", hash = "sha256:a9fe213ab6452708ec1b3f4ec6f2881b8ab3645cb4e5efb7fea2bbf05a91db3b"}, ] ipaddress = [ {file = "ipaddress-1.0.23-py2.py3-none-any.whl", hash = "sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc"}, {file = "ipaddress-1.0.23.tar.gz", hash = "sha256:b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"}, ] jeepney = [ - {file = "jeepney-0.4.3-py3-none-any.whl", hash = "sha256:d6c6b49683446d2407d2fe3acb7a368a77ff063f9182fe427da15d622adc24cf"}, - {file = "jeepney-0.4.3.tar.gz", hash = "sha256:3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e"}, + {file = "jeepney-0.6.0-py3-none-any.whl", hash = "sha256:aec56c0eb1691a841795111e184e13cad504f7703b9a64f63020816afa79a8ae"}, + {file = "jeepney-0.6.0.tar.gz", hash = "sha256:7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657"}, ] keyring = [ {file = "keyring-18.0.1-py2.py3-none-any.whl", hash = "sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6"}, {file = "keyring-18.0.1.tar.gz", hash = "sha256:67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838"}, {file = "keyring-20.0.1-py2.py3-none-any.whl", hash = "sha256:c674f032424b4bffc62abeac5523ec49cc84aed07a480c3233e0baf618efc15c"}, {file = "keyring-20.0.1.tar.gz", hash = "sha256:963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d"}, - {file = "keyring-21.4.0-py3-none-any.whl", hash = "sha256:4e34ea2fdec90c1c43d6610b5a5fafa1b9097db1802948e90caf5763974b8f8d"}, - {file = "keyring-21.4.0.tar.gz", hash = "sha256:9aeadd006a852b78f4b4ef7c7556c2774d2432bbef8ee538a3e9089ac8b11466"}, + {file = "keyring-21.8.0-py3-none-any.whl", hash = "sha256:4be9cbaaaf83e61d6399f733d113ede7d1c73bc75cb6aeb64eee0f6ac39b30ea"}, + {file = "keyring-21.8.0.tar.gz", hash = "sha256:1746d3ac913d449a090caf11e9e4af00e26c3f7f7e81027872192b2398b98675"}, ] lockfile = [ {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, @@ -1218,36 +1271,48 @@ more-itertools = [ {file = "more-itertools-5.0.0.tar.gz", hash = "sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"}, {file = "more_itertools-5.0.0-py2-none-any.whl", hash = "sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc"}, {file = "more_itertools-5.0.0-py3-none-any.whl", hash = "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"}, - {file = "more-itertools-8.5.0.tar.gz", hash = "sha256:6f83822ae94818eae2612063a5101a7311e68ae8002005b5e05f03fd74a86a20"}, - {file = "more_itertools-8.5.0-py3-none-any.whl", hash = "sha256:9b30f12df9393f0d28af9210ff8efe48d10c94f73e5daf886f10c4b0b0b4f03c"}, + {file = "more-itertools-8.6.0.tar.gz", hash = "sha256:b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf"}, + {file = "more_itertools-8.6.0-py3-none-any.whl", hash = "sha256:8e1a2a43b2f2727425f2b5839587ae37093f19153dc26c0927d1048ff6557330"}, + {file = "more-itertools-8.7.0.tar.gz", hash = "sha256:c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713"}, + {file = "more_itertools-8.7.0-py3-none-any.whl", hash = "sha256:5652a9ac72209ed7df8d9c15daf4e1aa0e3d2ccd3c87f8265a0673cd9cbc9ced"}, ] msgpack = [ - {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:cec8bf10981ed70998d98431cd814db0ecf3384e6b113366e7f36af71a0fca08"}, - {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aa5c057eab4f40ec47ea6f5a9825846be2ff6bf34102c560bad5cad5a677c5be"}, - {file = "msgpack-1.0.0-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:4233b7f86c1208190c78a525cd3828ca1623359ef48f78a6fea4b91bb995775a"}, - {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:b3758dfd3423e358bbb18a7cccd1c74228dffa7a697e5be6cb9535de625c0dbf"}, - {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:25b3bc3190f3d9d965b818123b7752c5dfb953f0d774b454fd206c18fe384fb8"}, - {file = "msgpack-1.0.0-cp36-cp36m-win32.whl", hash = "sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1"}, - {file = "msgpack-1.0.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5dba6d074fac9b24f29aaf1d2d032306c27f04187651511257e7831733293ec2"}, - {file = "msgpack-1.0.0-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:908944e3f038bca67fcfedb7845c4a257c7749bf9818632586b53bcf06ba4b97"}, - {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:db685187a415f51d6b937257474ca72199f393dad89534ebbdd7d7a3b000080e"}, - {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140"}, - {file = "msgpack-1.0.0-cp37-cp37m-win32.whl", hash = "sha256:e35b051077fc2f3ce12e7c6a34cf309680c63a842db3a0616ea6ed25ad20d272"}, - {file = "msgpack-1.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5bea44181fc8e18eed1d0cd76e355073f00ce232ff9653a0ae88cb7d9e643322"}, - {file = "msgpack-1.0.0-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:c901e8058dd6653307906c5f157f26ed09eb94a850dddd989621098d347926ab"}, - {file = "msgpack-1.0.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:271b489499a43af001a2e42f42d876bb98ccaa7e20512ff37ca78c8e12e68f84"}, - {file = "msgpack-1.0.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7a22c965588baeb07242cb561b63f309db27a07382825fc98aecaf0827c1538e"}, - {file = "msgpack-1.0.0-cp38-cp38-win32.whl", hash = "sha256:002a0d813e1f7b60da599bdf969e632074f9eec1b96cbed8fb0973a63160a408"}, - {file = "msgpack-1.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d"}, - {file = "msgpack-1.0.0.tar.gz", hash = "sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0"}, + {file = "msgpack-1.0.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:b6d9e2dae081aa35c44af9c4298de4ee72991305503442a5c74656d82b581fe9"}, + {file = "msgpack-1.0.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:a99b144475230982aee16b3d249170f1cccebf27fb0a08e9f603b69637a62192"}, + {file = "msgpack-1.0.2-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:1026dcc10537d27dd2d26c327e552f05ce148977e9d7b9f1718748281b38c841"}, + {file = "msgpack-1.0.2-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:fe07bc6735d08e492a327f496b7850e98cb4d112c56df69b0c844dbebcbb47f6"}, + {file = "msgpack-1.0.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:9ea52fff0473f9f3000987f313310208c879493491ef3ccf66268eff8d5a0326"}, + {file = "msgpack-1.0.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:26a1759f1a88df5f1d0b393eb582ec022326994e311ba9c5818adc5374736439"}, + {file = "msgpack-1.0.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:497d2c12426adcd27ab83144057a705efb6acc7e85957a51d43cdcf7f258900f"}, + {file = "msgpack-1.0.2-cp36-cp36m-win32.whl", hash = "sha256:e89ec55871ed5473a041c0495b7b4e6099f6263438e0bd04ccd8418f92d5d7f2"}, + {file = "msgpack-1.0.2-cp36-cp36m-win_amd64.whl", hash = "sha256:a4355d2193106c7aa77c98fc955252a737d8550320ecdb2e9ac701e15e2943bc"}, + {file = "msgpack-1.0.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:d6c64601af8f3893d17ec233237030e3110f11b8a962cb66720bf70c0141aa54"}, + {file = "msgpack-1.0.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f484cd2dca68502de3704f056fa9b318c94b1539ed17a4c784266df5d6978c87"}, + {file = "msgpack-1.0.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:f3e6aaf217ac1c7ce1563cf52a2f4f5d5b1f64e8729d794165db71da57257f0c"}, + {file = "msgpack-1.0.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:8521e5be9e3b93d4d5e07cb80b7e32353264d143c1f072309e1863174c6aadb1"}, + {file = "msgpack-1.0.2-cp37-cp37m-win32.whl", hash = "sha256:31c17bbf2ae5e29e48d794c693b7ca7a0c73bd4280976d408c53df421e838d2a"}, + {file = "msgpack-1.0.2-cp37-cp37m-win_amd64.whl", hash = "sha256:8ffb24a3b7518e843cd83538cf859e026d24ec41ac5721c18ed0c55101f9775b"}, + {file = "msgpack-1.0.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:b28c0876cce1466d7c2195d7658cf50e4730667196e2f1355c4209444717ee06"}, + {file = "msgpack-1.0.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:87869ba567fe371c4555d2e11e4948778ab6b59d6cc9d8460d543e4cfbbddd1c"}, + {file = "msgpack-1.0.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:b55f7db883530b74c857e50e149126b91bb75d35c08b28db12dcb0346f15e46e"}, + {file = "msgpack-1.0.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:ac25f3e0513f6673e8b405c3a80500eb7be1cf8f57584be524c4fa78fe8e0c83"}, + {file = "msgpack-1.0.2-cp38-cp38-win32.whl", hash = "sha256:0cb94ee48675a45d3b86e61d13c1e6f1696f0183f0715544976356ff86f741d9"}, + {file = "msgpack-1.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:e36a812ef4705a291cdb4a2fd352f013134f26c6ff63477f20235138d1d21009"}, + {file = "msgpack-1.0.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2a5866bdc88d77f6e1370f82f2371c9bc6fc92fe898fa2dec0c5d4f5435a2694"}, + {file = "msgpack-1.0.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:92be4b12de4806d3c36810b0fe2aeedd8d493db39e2eb90742b9c09299eb5759"}, + {file = "msgpack-1.0.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:de6bd7990a2c2dabe926b7e62a92886ccbf809425c347ae7de277067f97c2887"}, + {file = "msgpack-1.0.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:5a9ee2540c78659a1dd0b110f73773533ee3108d4e1219b5a15a8d635b7aca0e"}, + {file = "msgpack-1.0.2-cp39-cp39-win32.whl", hash = "sha256:c747c0cc08bd6d72a586310bda6ea72eeb28e7505990f342552315b229a19b33"}, + {file = "msgpack-1.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:d8167b84af26654c1124857d71650404336f4eb5cc06900667a493fc619ddd9f"}, + {file = "msgpack-1.0.2.tar.gz", hash = "sha256:fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984"}, ] nodeenv = [ {file = "nodeenv-1.5.0-py2.py3-none-any.whl", hash = "sha256:5304d424c529c997bc888453aeaa6362d242b6b4631e90f3d4bf1b290f1c84a9"}, {file = "nodeenv-1.5.0.tar.gz", hash = "sha256:ab45090ae383b716c4ef89e690c41ff8c2b257b85b309f01f3654df3d084bd7c"}, ] packaging = [ - {file = "packaging-20.4-py2.py3-none-any.whl", hash = "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"}, - {file = "packaging-20.4.tar.gz", hash = "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"}, + {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, + {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, ] pastel = [ {file = "pastel-0.2.1-py2.py3-none-any.whl", hash = "sha256:4349225fcdf6c2bb34d483e523475de5bb04a5c10ef711263452cb37d7dd4364"}, @@ -1262,28 +1327,28 @@ pexpect = [ {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, ] pkginfo = [ - {file = "pkginfo-1.5.0.1-py2.py3-none-any.whl", hash = "sha256:a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32"}, - {file = "pkginfo-1.5.0.1.tar.gz", hash = "sha256:7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb"}, + {file = "pkginfo-1.7.0-py2.py3-none-any.whl", hash = "sha256:9fdbea6495622e022cc72c2e5e1b735218e4ffb2a2a69cde2694a6c1f16afb75"}, + {file = "pkginfo-1.7.0.tar.gz", hash = "sha256:029a70cb45c6171c329dfc890cde0879f8c52d6f3922794796e06f577bb03db4"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, ] poetry-core = [ - {file = "poetry-core-1.0.0.tar.gz", hash = "sha256:6a664ff389b9f45382536f8fa1611a0cb4d2de7c5a5c885db1f0c600cd11fbd5"}, - {file = "poetry_core-1.0.0-py2.py3-none-any.whl", hash = "sha256:769288e0e1b88dfcceb3185728f0b7388b26d5f93d6c22d2dcae372da51d200d"}, + {file = "poetry-core-1.0.2.tar.gz", hash = "sha256:ff505d656a6cf40ffbf84393d8b5bf37b78523a15def3ac473b6fad74261ee71"}, + {file = "poetry_core-1.0.2-py2.py3-none-any.whl", hash = "sha256:ee0ed4164440eeab27d1b01bc7b9b3afdc3124f68d4ea28d0821a402a9c7c044"}, ] pre-commit = [ - {file = "pre_commit-2.7.1-py2.py3-none-any.whl", hash = "sha256:810aef2a2ba4f31eed1941fc270e72696a1ad5590b9751839c90807d0fff6b9a"}, - {file = "pre_commit-2.7.1.tar.gz", hash = "sha256:c54fd3e574565fe128ecc5e7d2f91279772ddb03f8729645fa812fe809084a70"}, + {file = "pre_commit-2.10.1-py2.py3-none-any.whl", hash = "sha256:16212d1fde2bed88159287da88ff03796863854b04dc9f838a55979325a3d20e"}, + {file = "pre_commit-2.10.1.tar.gz", hash = "sha256:399baf78f13f4de82a29b649afd74bef2c4e28eb4f021661fc7f29246e8c7a3a"}, ] ptyprocess = [ - {file = "ptyprocess-0.6.0-py2.py3-none-any.whl", hash = "sha256:d7cc528d76e76342423ca640335bd3633420dc1366f258cb31d05e865ef5ca1f"}, - {file = "ptyprocess-0.6.0.tar.gz", hash = "sha256:923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0"}, + {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, + {file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"}, ] py = [ - {file = "py-1.9.0-py2.py3-none-any.whl", hash = "sha256:366389d1db726cd2fcfc79732e75410e5fe4d31db13692115529d34069a043c2"}, - {file = "py-1.9.0.tar.gz", hash = "sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"}, + {file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"}, + {file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"}, ] pycparser = [ {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, @@ -1304,8 +1369,8 @@ pytest = [ {file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"}, ] pytest-cov = [ - {file = "pytest-cov-2.10.1.tar.gz", hash = "sha256:47bd0ce14056fdd79f93e1713f88fad7bdcc583dcd7783da86ef2f085a0bb88e"}, - {file = "pytest_cov-2.10.1-py2.py3-none-any.whl", hash = "sha256:45ec2d5182f89a81fc3eb29e3d1ed3113b9e9a873bcddb2a71faaab066110191"}, + {file = "pytest-cov-2.11.1.tar.gz", hash = "sha256:359952d9d39b9f822d9d29324483e7ba04a3a17dd7d05aa6beb7ea01e359e5f7"}, + {file = "pytest_cov-2.11.1-py2.py3-none-any.whl", hash = "sha256:bdb9fdb0b85a7cc825269a4c56b48ccaa5c7e365054b6038772c32ddcdc969da"}, ] pytest-mock = [ {file = "pytest-mock-1.13.0.tar.gz", hash = "sha256:e24a911ec96773022ebcc7030059b57cd3480b56d4f5d19b7c370ec635e6aed5"}, @@ -1319,21 +1384,31 @@ pywin32-ctypes = [ {file = "pywin32_ctypes-0.2.0-py2.py3-none-any.whl", hash = "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"}, ] pyyaml = [ - {file = "PyYAML-5.3.1-cp27-cp27m-win32.whl", hash = "sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f"}, - {file = "PyYAML-5.3.1-cp27-cp27m-win_amd64.whl", hash = "sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76"}, - {file = "PyYAML-5.3.1-cp35-cp35m-win32.whl", hash = "sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2"}, - {file = "PyYAML-5.3.1-cp35-cp35m-win_amd64.whl", hash = "sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c"}, - {file = "PyYAML-5.3.1-cp36-cp36m-win32.whl", hash = "sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2"}, - {file = "PyYAML-5.3.1-cp36-cp36m-win_amd64.whl", hash = "sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648"}, - {file = "PyYAML-5.3.1-cp37-cp37m-win32.whl", hash = "sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a"}, - {file = "PyYAML-5.3.1-cp37-cp37m-win_amd64.whl", hash = "sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf"}, - {file = "PyYAML-5.3.1-cp38-cp38-win32.whl", hash = "sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97"}, - {file = "PyYAML-5.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee"}, - {file = "PyYAML-5.3.1.tar.gz", hash = "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d"}, + {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"}, + {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, + {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, + {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, + {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, + {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, + {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, + {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, + {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, + {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, + {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, + {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, + {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, + {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, + {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, ] requests = [ - {file = "requests-2.24.0-py2.py3-none-any.whl", hash = "sha256:fe75cc94a9443b9246fc7049224f75604b113c36acb93f87b80ed42c44cbb898"}, - {file = "requests-2.24.0.tar.gz", hash = "sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b"}, + {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, + {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, ] requests-toolbelt = [ {file = "requests-toolbelt-0.9.1.tar.gz", hash = "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"}, @@ -1354,16 +1429,16 @@ scandir = [ ] secretstorage = [ {file = "SecretStorage-2.3.1.tar.gz", hash = "sha256:3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6"}, - {file = "SecretStorage-3.1.2-py3-none-any.whl", hash = "sha256:b5ec909dde94d4ae2fa26af7c089036997030f0cf0a5cb372b4cccabd81c143b"}, - {file = "SecretStorage-3.1.2.tar.gz", hash = "sha256:15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6"}, + {file = "SecretStorage-3.3.1-py3-none-any.whl", hash = "sha256:422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f"}, + {file = "SecretStorage-3.3.1.tar.gz", hash = "sha256:fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195"}, ] shellingham = [ - {file = "shellingham-1.3.2-py2.py3-none-any.whl", hash = "sha256:7f6206ae169dc1a03af8a138681b3f962ae61cc93ade84d0585cca3aaf770044"}, - {file = "shellingham-1.3.2.tar.gz", hash = "sha256:576c1982bea0ba82fb46c36feb951319d7f42214a82634233f58b40d858a751e"}, + {file = "shellingham-1.4.0-py2.py3-none-any.whl", hash = "sha256:536b67a0697f2e4af32ab176c00a50ac2899c5a05e0d8e2dadac8e58888283f9"}, + {file = "shellingham-1.4.0.tar.gz", hash = "sha256:4855c2458d6904829bd34c299f11fdeed7cfefbf8a2c522e4caea6cd76b3171e"}, ] singledispatch = [ - {file = "singledispatch-3.4.0.3-py2.py3-none-any.whl", hash = "sha256:833b46966687b3de7f438c761ac475213e53b306740f1abfaa86e1d1aae56aa8"}, - {file = "singledispatch-3.4.0.3.tar.gz", hash = "sha256:5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c"}, + {file = "singledispatch-3.6.1-py2.py3-none-any.whl", hash = "sha256:85c97f94c8957fa4e6dab113156c182fb346d56d059af78aad710bced15f16fb"}, + {file = "singledispatch-3.6.1.tar.gz", hash = "sha256:58b46ce1cc4d43af0aac3ac9a047bdb0f44e05f0b2fa2eec755863331700c865"}, ] six = [ {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"}, @@ -1371,22 +1446,23 @@ six = [ ] subprocess32 = [ {file = "subprocess32-3.5.4-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:88e37c1aac5388df41cc8a8456bb49ebffd321a3ad4d70358e3518176de3a56b"}, + {file = "subprocess32-3.5.4-cp27-cp27mu-manylinux2014_x86_64.whl", hash = "sha256:e45d985aef903c5b7444d34350b05da91a9e0ea015415ab45a21212786c649d0"}, {file = "subprocess32-3.5.4.tar.gz", hash = "sha256:eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d"}, ] termcolor = [ {file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"}, ] toml = [ - {file = "toml-0.10.1-py2.py3-none-any.whl", hash = "sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88"}, - {file = "toml-0.10.1.tar.gz", hash = "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"}, + {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, + {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, ] tomlkit = [ {file = "tomlkit-0.7.0-py2.py3-none-any.whl", hash = "sha256:6babbd33b17d5c9691896b0e68159215a9387ebfa938aa3ac42f4a4beeb2b831"}, {file = "tomlkit-0.7.0.tar.gz", hash = "sha256:ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"}, ] tox = [ - {file = "tox-3.20.0-py2.py3-none-any.whl", hash = "sha256:e6318f404aff16522ff5211c88cab82b39af121735a443674e4e2e65f4e4637b"}, - {file = "tox-3.20.0.tar.gz", hash = "sha256:eb629ddc60e8542fd4a1956b2462e3b8771d49f1ff630cecceacaa0fbfb7605a"}, + {file = "tox-3.23.0-py2.py3-none-any.whl", hash = "sha256:e007673f3595cede9b17a7c4962389e4305d4a3682a6c5a4159a1453b4f326aa"}, + {file = "tox-3.23.0.tar.gz", hash = "sha256:05a4dbd5e4d3d8269b72b55600f0b0303e2eb47ad5c6fe76d3576f4c58d93661"}, ] typing = [ {file = "typing-3.7.4.3-py2-none-any.whl", hash = "sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5"}, @@ -1398,12 +1474,12 @@ typing-extensions = [ {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"}, ] urllib3 = [ - {file = "urllib3-1.25.10-py2.py3-none-any.whl", hash = "sha256:e7983572181f5e1522d9c98453462384ee92a0be7fac5f1413a1e35c56cc0461"}, - {file = "urllib3-1.25.10.tar.gz", hash = "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a"}, + {file = "urllib3-1.25.11-py2.py3-none-any.whl", hash = "sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e"}, + {file = "urllib3-1.25.11.tar.gz", hash = "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2"}, ] virtualenv = [ - {file = "virtualenv-20.0.31-py2.py3-none-any.whl", hash = "sha256:e0305af10299a7fb0d69393d8f04cb2965dda9351140d11ac8db4e5e3970451b"}, - {file = "virtualenv-20.0.31.tar.gz", hash = "sha256:43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc"}, + {file = "virtualenv-20.4.2-py2.py3-none-any.whl", hash = "sha256:2be72df684b74df0ea47679a7df93fd0e04e72520022c57b479d8f881485dbe3"}, + {file = "virtualenv-20.4.2.tar.gz", hash = "sha256:147b43894e51dd6bba882cf9c282447f780e2251cd35172403745fc381a0a80d"}, ] wcwidth = [ {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"}, diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index 0868175ea45..02f6dabc86f 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.1.4" +version = "1.1.5" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace " @@ -24,7 +24,7 @@ classifiers = [ [tool.poetry.dependencies] python = "~2.7 || ^3.5" -poetry-core = "^1.0.0" +poetry-core = "~1.0.2" cleo = "^0.8.1" clikit = "^0.6.2" crashtest = { version = "^0.3.0", python = "^3.6" } @@ -71,6 +71,10 @@ pre-commit = { version = "^2.6", python = "^3.6.1" } tox = "^3.0" pytest-sugar = "^0.9.2" httpretty = "^0.9.6" +# We need to restrict the version of urllib3 to avoid +# httpretty breaking. This is fixed in httpretty >= 1.0.3 +# but it's not compatible with Python 2.7 and 3.5. +urllib3 = "~1.25.10" [tool.poetry.scripts] poetry = "poetry.console:main" diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index 4a1e8890c28..fcdb01e29c1 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json @@ -1,7 +1,7 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "8312e3f2dbfa126cd311c666fea30656941e1bd3", - "sha256": "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs", + "rev": "a9704149394151f4d0d28cd5d8ee2283c7d10787", + "sha256": "0bv6irpscpak6pldkzrx4j12dqnpfz5h8fy5lliglizv0avh60hf", "fetchSubmodules": true } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update index 33a2823f360..915726c658f 100755 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p curl nix-prefetch-github +#! nix-shell -i bash -p curl nix-prefetch-github jq rev=$(curl -s https://api.github.com/repos/python-poetry/poetry/releases/latest | jq -r '.name') nix-prefetch-github --rev "$rev" python-poetry poetry > src.json diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix index bf001392e6a..0ef1d4c316a 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix @@ -3,7 +3,7 @@ let inherit (builtins) elemAt match; operators = let - matchWildCard = s: match "([^\*])(\.[\*])" s; + matchWildCard = s: match "([^*])(\\.[*])" s; mkComparison = ret: version: v: builtins.compareVersions version v == ret; mkIdxComparison = idx: version: v: let @@ -52,8 +52,8 @@ let # }; re = { - operators = "([=> Date: Thu, 4 Mar 2021 15:49:11 +0100 Subject: [PATCH 219/246] jekyll: update various plugins --- .../misc/jekyll/basic/Gemfile.lock | 22 ++--- .../applications/misc/jekyll/basic/gemset.nix | 48 ++++++----- .../misc/jekyll/full/Gemfile.lock | 36 ++++---- pkgs/applications/misc/jekyll/full/gemset.nix | 84 ++++++++++++------- 4 files changed, 113 insertions(+), 77 deletions(-) diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 65c747c40a5..161aeb7720b 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.0) + activesupport (6.1.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -10,19 +10,19 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.13.1) + ffi (1.14.2) forwardable-extended (2.6.0) gemoji (3.0.1) html-pipeline (2.14.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) - i18n (1.8.5) + i18n (1.8.9) concurrent-ruby (~> 1.0) jekyll (4.2.0) addressable (~> 2.4) @@ -61,17 +61,19 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.3.3) + listen (3.4.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - mini_portile2 (2.4.0) - minitest (5.14.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + mini_portile2 (2.5.0) + minitest (5.14.4) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) + racc (1.5.2) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -82,7 +84,7 @@ GEM ffi (~> 1.9) terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) - tzinfo (2.0.3) + tzinfo (2.0.4) concurrent-ruby (~> 1.0) unicode-display_width (1.7.0) zeitwerk (2.4.2) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index cc7be93510c..bda211e6f7a 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v"; + sha256 = "00a4db64g8w5yyk6hzak2nqrmdfvyh5zc9cvnm9gglwbi87ss28h"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; type = "gem"; }; - version = "1.13.1"; + version = "1.14.2"; }; forwardable-extended = { groups = ["default"]; @@ -119,10 +119,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.9"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -250,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha"; + sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj"; type = "gem"; }; - version = "3.3.3"; + version = "3.4.1"; }; mercenary = { groups = ["default"]; @@ -270,31 +270,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -317,6 +317,16 @@ }; version = "4.0.6"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rb-fsevent = { groups = ["default"]; platforms = []; @@ -396,10 +406,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.4"; }; unicode-display_width = { groups = ["default"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 969909ca6d0..e93f78e83c0 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.0) + activesupport (6.1.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -17,24 +17,26 @@ GEM execjs coffee-script-source (1.12.2) colorator (1.1.0) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) execjs (2.7.0) - faraday (1.1.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords + faraday-net_http (1.0.1) fast-stemmer (1.0.2) - ffi (1.13.1) + ffi (1.14.2) forwardable-extended (2.6.0) gemoji (3.0.1) html-pipeline (2.14.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) - i18n (1.8.5) + i18n (1.8.9) concurrent-ruby (~> 1.0) jekyll (4.2.0) addressable (~> 2.4) @@ -64,7 +66,7 @@ GEM html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) - jekyll-polyglot (1.3.3) + jekyll-polyglot (1.4.0) jekyll (>= 3.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) @@ -90,31 +92,33 @@ GEM liquid (4.0.3) liquid-c (4.0.0) liquid (>= 3.0.0) - listen (3.3.3) + listen (3.4.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) - mini_portile2 (2.4.0) - minitest (5.14.2) + mime-types-data (3.2021.0225) + mini_portile2 (2.5.0) + minitest (5.14.4) multipart-post (2.1.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - octokit (4.19.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) + racc (1.5.2) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.2.1) + rdoc (6.3.0) rexml (3.2.4) rouge (3.26.0) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) @@ -124,7 +128,7 @@ GEM terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) tomlrb (1.3.0) - tzinfo (2.0.3) + tzinfo (2.0.4) concurrent-ruby (~> 1.0) unicode-display_width (1.7.0) yajl-ruby (1.4.1) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index bfbe428c861..ee348a80c4a 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v"; + sha256 = "00a4db64g8w5yyk6hzak2nqrmdfvyh5zc9cvnm9gglwbi87ss28h"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -90,10 +90,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -127,15 +127,25 @@ version = "2.7.0"; }; faraday = { - dependencies = ["multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; type = "gem"; }; - version = "1.1.0"; + version = "1.3.0"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; }; fast-stemmer = { groups = ["default"]; @@ -164,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; type = "gem"; }; - version = "1.13.1"; + version = "1.14.2"; }; forwardable-extended = { groups = ["default"]; @@ -216,10 +226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.9"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -303,10 +313,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "4ad9140733250b65bc1ffab84650c588d036d23129e82f0349d31e56f1fe10a8"; + sha256 = "0klf363dsdsi90rsnc9047b3hbg88gagkq2sqzmmg5r1nhy7hyyr"; type = "gem"; }; - version = "1.3.3"; + version = "1.4.0"; }; jekyll-redirect-from = { dependencies = ["jekyll"]; @@ -458,10 +468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha"; + sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj"; type = "gem"; }; - version = "3.3.3"; + version = "3.4.1"; }; mercenary = { groups = ["default"]; @@ -489,30 +499,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; + sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; type = "gem"; }; - version = "3.2020.1104"; + version = "3.2021.0225"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; multipart-post = { groups = ["default"]; @@ -525,15 +535,15 @@ version = "2.1.1"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -541,10 +551,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24"; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; type = "gem"; }; - version = "4.19.0"; + version = "4.20.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -567,6 +577,16 @@ }; version = "4.0.6"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rb-fsevent = { groups = ["default"]; platforms = []; @@ -593,10 +613,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08862mr1575j8g32wma4pv2qwj4xpllk29i5j61hgf9nwn64afhc"; + sha256 = "1rz1492df18161qwzswm86gav0dnqz715kxzw5yfnv0ka43d4zc4"; type = "gem"; }; - version = "6.2.1"; + version = "6.3.0"; }; rexml = { groups = ["default"]; @@ -623,10 +643,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; type = "gem"; }; - version = "0.0.2"; + version = "0.0.4"; }; safe_yaml = { groups = ["default"]; @@ -687,10 +707,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.4"; }; unicode-display_width = { groups = ["default"]; From 70ac808b39cecd4bcb67736d3befebc53ae9ca2a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Mar 2021 15:48:30 +0100 Subject: [PATCH 220/246] nixos/tests/php/fpm: make sure that extensions are actually loaded The phpinfo output from 127.0.0.1:80 only shows configuration options and thus leads to false-positives. --- nixos/tests/php/fpm.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 02ea5179474..3550116a201 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -3,6 +3,8 @@ import ../make-test-python.nix ({pkgs, lib, php, ...}: { meta.maintainers = lib.teams.php.members; machine = { config, lib, pkgs, ... }: { + environment.systemPackages = [ php ]; + services.nginx = { enable = true; @@ -50,5 +52,6 @@ import ../make-test-python.nix ({pkgs, lib, php, ...}: { # Check so we have database and some other extensions loaded for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]: assert ext in response, f"Missing {ext} extension" + machine.succeed(f'test -n "$(php -m | grep -i {ext})"') ''; }) From 5e5f482f32ea399128893a359fec1a451f62b443 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Mar 2021 16:06:37 +0100 Subject: [PATCH 221/246] nixos/tests/php: add apcu to php to actually test whether extensions are properly loaded --- nixos/tests/php/default.nix | 14 ++++++++++---- nixos/tests/php/fpm.nix | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/nixos/tests/php/default.nix b/nixos/tests/php/default.nix index 6ecaed24604..cf78c9db53b 100644 --- a/nixos/tests/php/default.nix +++ b/nixos/tests/php/default.nix @@ -2,8 +2,14 @@ , config ? {} , pkgs ? import ../../.. { inherit system config; } , php ? pkgs.php -}: { - fpm = import ./fpm.nix { inherit system pkgs php; }; - httpd = import ./httpd.nix { inherit system pkgs php; }; - pcre = import ./pcre.nix { inherit system pkgs php; }; +}: + +let + php' = php.buildEnv { + extensions = { enabled, all }: with all; enabled ++ [ apcu ]; + }; +in { + fpm = import ./fpm.nix { inherit system pkgs; php = php'; }; + httpd = import ./httpd.nix { inherit system pkgs; php = php'; }; + pcre = import ./pcre.nix { inherit system pkgs; php = php'; }; } diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 3550116a201..b11f85d39cb 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -50,7 +50,7 @@ import ../make-test-python.nix ({pkgs, lib, php, ...}: { assert "PHP Version ${php.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded - for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]: + for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite", "apcu"]: assert ext in response, f"Missing {ext} extension" machine.succeed(f'test -n "$(php -m | grep -i {ext})"') ''; From 78f322f2d0e41fb72ee617e6dda0596845dba695 Mon Sep 17 00:00:00 2001 From: Ozan Sener Date: Thu, 4 Mar 2021 14:37:12 +0100 Subject: [PATCH 222/246] dockerTools: fix build on Darwin Fixes #110665 Introduced by #109420 --- .../virtualization/docker/default.nix | 22 ++++++++++--------- pkgs/build-support/docker/default.nix | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 207ebdf2211..73f4812ee59 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,11 +1,11 @@ -{ lib, callPackage }: +{ lib, callPackage, fetchFromGitHub }: with lib; rec { dockerGen = { version, rev, sha256 - , mobyRev, mobySha256 + , moby-src , runcRev, runcSha256 , containerdRev, containerdSha256 , tiniRev, tiniSha256, buildxSupport ? false @@ -65,12 +65,7 @@ rec { inherit version; inherit docker-runc docker-containerd docker-proxy docker-tini; - src = fetchFromGitHub { - owner = "moby"; - repo = "moby"; - rev = mobyRev; - sha256 = mobySha256; - }; + src = moby-src; goPackagePath = "github.com/docker/docker"; @@ -211,6 +206,9 @@ rec { maintainers = with maintainers; [ offline tailhook vdemeester periklis ]; platforms = with platforms; linux ++ darwin; }; + + # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix) + inherit moby-src; }); # Get revisions from @@ -219,8 +217,12 @@ rec { version = "20.10.2"; rev = "v${version}"; sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; - mobyRev = "v${version}"; - mobySha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; + moby-src = fetchFromGitHub { + owner = "moby"; + repo = "moby"; + rev = "v${version}"; + sha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; + }; runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92 runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3 diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index c4e266d6c5d..401689fef39 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -120,7 +120,7 @@ rec { export GOPATH=$(pwd) export GOCACHE="$TMPDIR/go-cache" mkdir -p src/github.com/docker/docker/pkg - ln -sT ${docker.moby.src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum + ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum go build mkdir -p $out/bin From bc483459e2754433ea6f8e481d62ef4c230c7bca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Mar 2021 15:47:49 +0000 Subject: [PATCH 223/246] gdu: 4.6.5 -> 4.7.0 --- pkgs/tools/system/gdu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 9202b31709e..c6f4d5dc585 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "4.6.5"; + version = "4.7.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pky6YY0K4pilPcUY3sJSf4cEF10obZOHd9Jih9Igu6M="; + sha256 = "sha256-HIVLerSx0XLMvRRJUUGT1M50DbSsFNutOSM5HTTV9mc="; }; - vendorSha256 = "1aw9cgm9m3bflncpfk2qsid2aqs710nn2bpxx46n54kw9jkvj8s2"; + vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; nativeBuildInputs = [ installShellFiles ]; From 75078f712d5c2989549028ce8f13ebe8a8f78a6e Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 4 Mar 2021 11:41:15 +0100 Subject: [PATCH 224/246] cbonsai: init at 1.0.0 --- pkgs/games/cbonsai/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/games/cbonsai/default.nix diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/games/cbonsai/default.nix new file mode 100644 index 00000000000..4702991c290 --- /dev/null +++ b/pkgs/games/cbonsai/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchFromGitLab, ncurses, pkg-config, nix-update-script }: + +stdenv.mkDerivation rec { + version = "1.0.0"; + pname = "cbonsai"; + + src = fetchFromGitLab { + owner = "jallbrit"; + repo = pname; + rev = "v${version}"; + sha256 = "1jc34j627pnyjgs8hjxqaa89j24gyf0rq9w61mkhgg0kria62as7"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ncurses ]; + installFlags = [ "PREFIX=$(out)" ]; + + passthru.updateScript = nix-update-script { attrPath = pname; }; + + meta = with lib; { + description = "Grow bonsai trees in your terminal"; + homepage = "https://gitlab.com/jallbrit/cbonsai"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ manveru ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cafb69f15f..084b2489a5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26739,6 +26739,8 @@ in cataclysm-dda-git = cataclysmDDA.git.tiles; + cbonsai = callPackage ../games/cbonsai { }; + chessdb = callPackage ../games/chessdb { }; chessx = libsForQt5.callPackage ../games/chessx { }; From 4b99dbbbcc38fff85e7cd9444a80d2f2284c1a70 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sun, 10 Jan 2021 01:00:17 -0300 Subject: [PATCH 225/246] doc/builders/images/dockertools.xml: Convert to markdown and start improvements Need to verify things like `error: IDREF "" without matching ID` and `::: {.note}` Signed-off-by: Bryan A. S --- doc/builders/images.xml | 2 +- doc/builders/images/dockertools.section.md | 296 ++++++++++++ doc/builders/images/dockertools.xml | 499 --------------------- 3 files changed, 297 insertions(+), 500 deletions(-) create mode 100644 doc/builders/images/dockertools.section.md delete mode 100644 doc/builders/images/dockertools.xml diff --git a/doc/builders/images.xml b/doc/builders/images.xml index 5e042a8ada8..b72fe094db1 100644 --- a/doc/builders/images.xml +++ b/doc/builders/images.xml @@ -6,7 +6,7 @@ This chapter describes tools for creating various types of images. - + diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md new file mode 100644 index 00000000000..f0b17aeb067 --- /dev/null +++ b/doc/builders/images/dockertools.section.md @@ -0,0 +1,296 @@ +# pkgs.dockerTools {#sec-pkgs-dockerTools} + +`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120). Docker itself is not used to perform any of the operations done by these functions. + +## buildImage {#ssec-pkgs-dockerTools-buildImage} + +This function is analogous to the `docker build` command, in that it can be used to build a Docker-compatible repository tarball containing a single image with one or multiple layers. As such, the result is suitable for being loaded in Docker with `docker load`. + +The parameters of `buildImage` with relative example values are described below: + +```nix + buildImage { + name = "redis"; + tag = "latest"; + + fromImage = someBaseImage; + fromImageName = null; + fromImageTag = "latest"; + + contents = pkgs.redis; + runAsRoot = '' + #!${pkgs.runtimeShell} + mkdir -p /data + ''; + + config = { + Cmd = [ "/bin/redis-server" ]; + WorkingDir = "/data"; + Volumes = { + "/data" = {}; + }; + }; + } +``` + +The above example will build a Docker image `redis/latest` from the given base image. Loading and running this image in Docker results in `redis-server` being started automatically. + +- `name` specifies the name of the resulting image. This is the only required argument for `buildImage`. + +- `tag` specifies the tag of the resulting image. By default it\'s `null`, which indicates that the nix output hash will be used as tag. + +- `fromImage` is the repository tarball containing the base image. It must be a valid Docker image, such as exported by `docker save`. By default it\'s `null`, which can be seen as equivalent to `FROM scratch` of a `Dockerfile`. + +- `fromImageName` can be used to further specify the base image within the repository, in case it contains multiple images. By default it\'s `null`, in which case `buildImage` will peek the first image available in the repository. + +- `fromImageTag` can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it\'s `null`, in which case `buildImage` will peek the first tag available for the base image. + +- `contents` is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as `ADD contents/ /` in a `Dockerfile`. By default it\'s `null`. + +- `runAsRoot` is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied `contents` derivation. This can be similarly seen as `RUN ...` in a `Dockerfile`. + + ::: {.note} Using this parameter requires the `kvm` device to be available. ::: + +- `config` is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). + +After the new layer has been created, its closure (to which `contents`, `config` and `runAsRoot` contribute) will be copied in the layer itself. Only new dependencies that are not already in the existing layers will be copied. + +At the end of the process, only one new single layer will be produced and added to the resulting image. + +The resulting repository will only list the single image `image/tag`. In the case of [example_title](#ex-dockerTools-buildImage) it would be `redis/latest`. + +It is possible to inspect the arguments with which an image was built using its `buildArgs` attribute. + +::: {.note} If you see errors similar to `getProtocolByName: does not exist (no such protocol name: tcp)` you may need to add `pkgs.iana-etc` to `contents`. ::: + +::: {.note} If you see errors similar to `Error_Protocol ("certificate has unknown CA",True,UnknownCa)` you may need to add `pkgs.cacert` to `contents`. ::: + +By default `buildImage` will use a static date of one second past the UNIX Epoch. This allows `buildImage` to produce binary reproducible images. When listing images with `docker images`, the newly created images will be listed like this: + +```ShellSession +$ docker images +REPOSITORY TAG IMAGE ID CREATED SIZE +hello latest 08c791c7846e 48 years ago 25.2MB +``` + +You can break binary reproducibility but have a sorted, meaningful `CREATED` column by setting `created` to `now`. + +```nix + pkgs.dockerTools.buildImage { + name = "hello"; + tag = "latest"; + created = "now"; + contents = pkgs.hello; + + config.Cmd = [ "/bin/hello" ]; + } +``` + +and now the Docker CLI will display a reasonable date and sort the images as expected: + +```ShellSession +$ docker images +REPOSITORY TAG IMAGE ID CREATED SIZE +hello latest de2bf4786de6 About a minute ago 25.2MB +``` + +however, the produced images will not be binary reproducible. + +## buildLayeredImage {#ssec-pkgs-dockerTools-buildLayeredImage} + +Create a Docker image with many of the store paths being on their own layer to improve sharing between images. The image is realized into the Nix store as a gzipped tarball. Depending on the intended usage, many users might prefer to use `streamLayeredImage` instead, which this function uses internally. + +`name` + +: The name of the resulting image. + +`tag` _optional_ + +: Tag of the generated image. + + *Default:* the output path\'s hash + +`contents` _optional_ + +: Top level paths in the container. Either a single derivation, or a list of derivations. + + *Default:* `[]` + +`config` _optional_ + +: Run-time configuration of the container. A full list of the options are available at in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). + + *Default:* `{}` + +`created` _optional_ + +: Date and time the layers were created. Follows the same `now` exception supported by `buildImage`. + + *Default:* `1970-01-01T00:00:01Z` + +`maxLayers` _optional_ + +: Maximum number of layers to create. + + *Default:* `100` + + *Maximum:* `125` + +`extraCommands` _optional_ + +: Shell commands to run while building the final layer, without access to most of the layer contents. Changes to this layer are \"on top\" of all the other layers, so can create additional directories and files. + +### Behavior of `contents` in the final image {#dockerTools-buildLayeredImage-arg-contents} + +Each path directly listed in `contents` will have a symlink in the root of the image. + +For example: + +```nix + pkgs.dockerTools.buildLayeredImage { + name = "hello"; + contents = [ pkgs.hello ]; + } +``` + +will create symlinks for all the paths in the `hello` package: + +```ShellSession + /bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello + /share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info + /share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo +``` + +### Automatic inclusion of `config` references {#dockerTools-buildLayeredImage-arg-config} + +The closure of `config` is automatically included in the closure of the final image. + +This allows you to make very simple Docker images with very little code. This container will start up and run `hello`: + +```nix + pkgs.dockerTools.buildLayeredImage { + name = "hello"; + config.Cmd = [ "${pkgs.hello}/bin/hello" ]; + } +``` + +### Adjusting `maxLayers` {#dockerTools-buildLayeredImage-arg-maxLayers} + +Increasing the `maxLayers` increases the number of layers which have a chance to be shared between different images. + +Modern Docker installations support up to 128 layers, however older versions support as few as 42. + +If the produced image will not be extended by other Docker builds, it is safe to set `maxLayers` to `128`. However it will be impossible to extend the image further. + +The first (`maxLayers-2`) most \"popular\" paths will have their own individual layers, then layer \#`maxLayers-1` will contain all the remaining \"unpopular\" paths, and finally layer \#`maxLayers` will contain the Image configuration. + +Docker\'s Layers are not inherently ordered, they are content-addressable and are not explicitly layered until they are composed in to an Image. + +## streamLayeredImage {#ssec-pkgs-dockerTools-streamLayeredImage} + +Builds a script which, when run, will stream an uncompressed tarball of a Docker image to stdout. The arguments to this function are as for `buildLayeredImage`. This method of constructing an image does not realize the image into the Nix store, so it saves on IO and disk/cache space, particularly with large images. + +The image produced by running the output script can be piped directly into `docker load`, to load it into the local docker daemon: + +```ShellSession +$(nix-build) | docker load +``` + +Alternatively, the image be piped via `gzip` into `skopeo`, e.g. to copy it into a registry: + +```ShellSession +$(nix-build) | gzip --fast | skopeo copy docker-archive:/dev/stdin docker://some_docker_registry/myimage:tag +``` + +## pullImage {#ssec-pkgs-dockerTools-fetchFromRegistry} + +This function is analogous to the `docker pull` command, in that it can be used to pull a Docker image from a Docker registry. By default [Docker Hub](https://hub.docker.com/) is used to pull images. + +Its parameters are described in the example below: + +```nix + pullImage { + imageName = "nixos/nix"; + imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; + finalImageName = "nix"; + finalImageTag = "1.11"; + sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; + os = "linux"; + arch = "x86_64"; + } +``` + +- `imageName` specifies the name of the image to be downloaded, which can also include the registry namespace (e.g. `nixos`). This argument is required. + +- `imageDigest` specifies the digest of the image to be downloaded. This argument is required. + +- `finalImageName`, if specified, this is the name of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it\'s equal to `imageName`. + +- `finalImageTag`, if specified, this is the tag of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it\'s `latest`. + +- `sha256` is the checksum of the whole fetched image. This argument is required. + +- `os`, if specified, is the operating system of the fetched image. By default it\'s `linux`. + +- `arch`, if specified, is the cpu architecture of the fetched image. By default it\'s `x86_64`. + +`nix-prefetch-docker` command can be used to get required image parameters: + +```ShellSession +$ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5 +``` + +Since a given `imageName` may transparently refer to a manifest list of images which support multiple architectures and/or operating systems, you can supply the `--os` and `--arch` arguments to specify exactly which image you want. By default it will match the OS and architecture of the host the command is run on. + +```ShellSession +$ nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux +``` + +Desired image name and tag can be set using `--final-image-name` and `--final-image-tag` arguments: + +```ShellSession +$ nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod +``` + +## exportImage {#ssec-pkgs-dockerTools-exportImage} + +This function is analogous to the `docker export` command, in that it can be used to flatten a Docker image that contains multiple layers. It is in fact the result of the merge of all the layers of the image. As such, the result is suitable for being imported in Docker with `docker import`. + +::: {.note} Using this function requires the `kvm` device to be available. ::: + +The parameters of `exportImage` are the following: + +```nix + exportImage { + fromImage = someLayeredImage; + fromImageName = null; + fromImageTag = null; + + name = someLayeredImage.name; + } +``` + +The parameters relative to the base image have the same synopsis as described in [buildImage](#ssec-pkgs-dockerTools-buildImage), except that `fromImage` is the only required argument in this case. + +The `name` argument is the name of the derivation output, which defaults to `fromImage.name`. + +## shadowSetup {#ssec-pkgs-dockerTools-shadowSetup} + +This constant string is a helper for setting up the base files for managing users and groups, only if such files don\'t exist already. It is suitable for being used in a `runAsRoot` [co_title](#ex-dockerTools-buildImage-runAsRoot) script for cases like in the example below: + +```nix + buildImage { + name = "shadow-basic"; + + runAsRoot = '' + #!${pkgs.runtimeShell} + ${shadowSetup} + groupadd -r redis + useradd -r -g redis redis + mkdir /data + chown redis:redis /data + ''; + } +``` + +Creating base files like `/etc/passwd` or `/etc/login.defs` is necessary for shadow-utils to manipulate users and groups. diff --git a/doc/builders/images/dockertools.xml b/doc/builders/images/dockertools.xml deleted file mode 100644 index d881e712a04..00000000000 --- a/doc/builders/images/dockertools.xml +++ /dev/null @@ -1,499 +0,0 @@ -
- pkgs.dockerTools - - - pkgs.dockerTools is a set of functions for creating and manipulating Docker images according to the Docker Image Specification v1.2.0 . Docker itself is not used to perform any of the operations done by these functions. - - -
- buildImage - - - This function is analogous to the docker build command, in that it can be used to build a Docker-compatible repository tarball containing a single image with one or multiple layers. As such, the result is suitable for being loaded in Docker with docker load. - - - - The parameters of buildImage with relative example values are described below: - - - - Docker build - -buildImage { - name = "redis"; - tag = "latest"; - - fromImage = someBaseImage; - fromImageName = null; - fromImageTag = "latest"; - - contents = pkgs.redis; - runAsRoot = '' - #!${pkgs.runtimeShell} - mkdir -p /data - ''; - - config = { - Cmd = [ "/bin/redis-server" ]; - WorkingDir = "/data"; - Volumes = { - "/data" = {}; - }; - }; -} - - - - - The above example will build a Docker image redis/latest from the given base image. Loading and running this image in Docker results in redis-server being started automatically. - - - - - - name specifies the name of the resulting image. This is the only required argument for buildImage. - - - - - tag specifies the tag of the resulting image. By default it's null, which indicates that the nix output hash will be used as tag. - - - - - fromImage is the repository tarball containing the base image. It must be a valid Docker image, such as exported by docker save. By default it's null, which can be seen as equivalent to FROM scratch of a Dockerfile. - - - - - fromImageName can be used to further specify the base image within the repository, in case it contains multiple images. By default it's null, in which case buildImage will peek the first image available in the repository. - - - - - fromImageTag can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it's null, in which case buildImage will peek the first tag available for the base image. - - - - - contents is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as ADD contents/ / in a Dockerfile. By default it's null. - - - - - runAsRoot is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied contents derivation. This can be similarly seen as RUN ... in a Dockerfile. - - - Using this parameter requires the kvm device to be available. - - - - - - - config is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the Docker Image Specification v1.2.0 . - - - - - - After the new layer has been created, its closure (to which contents, config and runAsRoot contribute) will be copied in the layer itself. Only new dependencies that are not already in the existing layers will be copied. - - - - At the end of the process, only one new single layer will be produced and added to the resulting image. - - - - The resulting repository will only list the single image image/tag. In the case of it would be redis/latest. - - - - It is possible to inspect the arguments with which an image was built using its buildArgs attribute. - - - - - If you see errors similar to getProtocolByName: does not exist (no such protocol name: tcp) you may need to add pkgs.iana-etc to contents. - - - - - - If you see errors similar to Error_Protocol ("certificate has unknown CA",True,UnknownCa) you may need to add pkgs.cacert to contents. - - - - - Impurely Defining a Docker Layer's Creation Date - - By default buildImage will use a static date of one second past the UNIX Epoch. This allows buildImage to produce binary reproducible images. When listing images with docker images, the newly created images will be listed like this: - - -$ docker images -REPOSITORY TAG IMAGE ID CREATED SIZE -hello latest 08c791c7846e 48 years ago 25.2MB - - - You can break binary reproducibility but have a sorted, meaningful CREATED column by setting created to now. - - - - and now the Docker CLI will display a reasonable date and sort the images as expected: - -$ docker images -REPOSITORY TAG IMAGE ID CREATED SIZE -hello latest de2bf4786de6 About a minute ago 25.2MB - - however, the produced images will not be binary reproducible. - - -
- -
- buildLayeredImage - - - Create a Docker image with many of the store paths being on their own layer to improve sharing between images. The image is realized into the Nix store as a gzipped tarball. Depending on the intended usage, many users might prefer to use streamLayeredImage instead, which this function uses internally. - - - - - - name - - - - The name of the resulting image. - - - - - - tag optional - - - - Tag of the generated image. - - - Default: the output path's hash - - - - - - contents optional - - - - Top level paths in the container. Either a single derivation, or a list of derivations. - - - Default: [] - - - - - - config optional - - - - Run-time configuration of the container. A full list of the options are available at in the Docker Image Specification v1.2.0 . - - - Default: {} - - - - - - created optional - - - - Date and time the layers were created. Follows the same now exception supported by buildImage. - - - Default: 1970-01-01T00:00:01Z - - - - - - maxLayers optional - - - - Maximum number of layers to create. - - - Default: 100 - - - Maximum: 125 - - - - - - extraCommands optional - - - - Shell commands to run while building the final layer, without access to most of the layer contents. Changes to this layer are "on top" of all the other layers, so can create additional directories and files. - - - - - -
- Behavior of <varname>contents</varname> in the final image - - - Each path directly listed in contents will have a symlink in the root of the image. - - - - For example: - - will create symlinks for all the paths in the hello package: - /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello -/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info -/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo -]]> - -
- -
- Automatic inclusion of <varname>config</varname> references - - - The closure of config is automatically included in the closure of the final image. - - - - This allows you to make very simple Docker images with very little code. This container will start up and run hello: - - -
- -
- Adjusting <varname>maxLayers</varname> - - - Increasing the maxLayers increases the number of layers which have a chance to be shared between different images. - - - - Modern Docker installations support up to 128 layers, however older versions support as few as 42. - - - - If the produced image will not be extended by other Docker builds, it is safe to set maxLayers to 128. However it will be impossible to extend the image further. - - - - The first (maxLayers-2) most "popular" paths will have their own individual layers, then layer #maxLayers-1 will contain all the remaining "unpopular" paths, and finally layer #maxLayers will contain the Image configuration. - - - - Docker's Layers are not inherently ordered, they are content-addressable and are not explicitly layered until they are composed in to an Image. - -
-
- -
- streamLayeredImage - - - Builds a script which, when run, will stream an uncompressed tarball of a Docker image to stdout. The arguments to this function are as for buildLayeredImage. This method of constructing an image does not realize the image into the Nix store, so it saves on IO and disk/cache space, particularly with large images. - - - - The image produced by running the output script can be piped directly into docker load, to load it into the local docker daemon: - - - - Alternatively, the image be piped via gzip into skopeo, e.g. to copy it into a registry: - - -
- -
- pullImage - - - This function is analogous to the docker pull command, in that it can be used to pull a Docker image from a Docker registry. By default Docker Hub is used to pull images. - - - - Its parameters are described in the example below: - - - - Docker pull - -pullImage { - imageName = "nixos/nix"; - imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; - finalImageName = "nix"; - finalImageTag = "1.11"; - sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; - os = "linux"; - arch = "x86_64"; -} - - - - - - - imageName specifies the name of the image to be downloaded, which can also include the registry namespace (e.g. nixos). This argument is required. - - - - - imageDigest specifies the digest of the image to be downloaded. This argument is required. - - - - - finalImageName, if specified, this is the name of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's equal to imageName. - - - - - finalImageTag, if specified, this is the tag of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's latest. - - - - - sha256 is the checksum of the whole fetched image. This argument is required. - - - - - os, if specified, is the operating system of the fetched image. By default it's linux. - - - - - arch, if specified, is the cpu architecture of the fetched image. By default it's x86_64. - - - - - - nix-prefetch-docker command can be used to get required image parameters: - -$ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5 - - Since a given imageName may transparently refer to a manifest list of images which support multiple architectures and/or operating systems, you can supply the and arguments to specify exactly which image you want. By default it will match the OS and architecture of the host the command is run on. - -$ nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux - - Desired image name and tag can be set using and arguments: - -$ nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod - - -
- -
- exportImage - - - This function is analogous to the docker export command, in that it can be used to flatten a Docker image that contains multiple layers. It is in fact the result of the merge of all the layers of the image. As such, the result is suitable for being imported in Docker with docker import. - - - - - Using this function requires the kvm device to be available. - - - - - The parameters of exportImage are the following: - - - - Docker export - -exportImage { - fromImage = someLayeredImage; - fromImageName = null; - fromImageTag = null; - - name = someLayeredImage.name; -} - - - - - The parameters relative to the base image have the same synopsis as described in , except that fromImage is the only required argument in this case. - - - - The name argument is the name of the derivation output, which defaults to fromImage.name. - -
- -
- shadowSetup - - - This constant string is a helper for setting up the base files for managing users and groups, only if such files don't exist already. It is suitable for being used in a runAsRoot script for cases like in the example below: - - - - Shadow base files - -buildImage { - name = "shadow-basic"; - - runAsRoot = '' - #!${pkgs.runtimeShell} - ${shadowSetup} - groupadd -r redis - useradd -r -g redis redis - mkdir /data - chown redis:redis /data - ''; -} - - - - - Creating base files like /etc/passwd or /etc/login.defs is necessary for shadow-utils to manipulate users and groups. - -
-
From 06e40b3caf0c9f2acf18ae1705fa1434f7f0474e Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sun, 10 Jan 2021 02:12:12 -0300 Subject: [PATCH 226/246] doc/builders/images/dockertools.section.md: Indent nix code Signed-off-by: Bryan A. S --- doc/builders/images/dockertools.section.md | 125 ++++++++++----------- 1 file changed, 62 insertions(+), 63 deletions(-) diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index f0b17aeb067..b88a66689ac 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -9,28 +9,26 @@ This function is analogous to the `docker build` command, in that it can be used The parameters of `buildImage` with relative example values are described below: ```nix - buildImage { - name = "redis"; - tag = "latest"; +buildImage { + name = "redis"; + tag = "latest"; - fromImage = someBaseImage; - fromImageName = null; - fromImageTag = "latest"; + fromImage = someBaseImage; + fromImageName = null; + fromImageTag = "latest"; - contents = pkgs.redis; - runAsRoot = '' - #!${pkgs.runtimeShell} - mkdir -p /data - ''; + contents = pkgs.redis; + runAsRoot = '' + #!${pkgs.runtimeShell} + mkdir -p /data + ''; - config = { - Cmd = [ "/bin/redis-server" ]; - WorkingDir = "/data"; - Volumes = { - "/data" = {}; - }; - }; - } + config = { + Cmd = [ "/bin/redis-server" ]; + WorkingDir = "/data"; + Volumes = { "/data" = { }; }; + }; +} ``` The above example will build a Docker image `redis/latest` from the given base image. Loading and running this image in Docker results in `redis-server` being started automatically. @@ -76,14 +74,14 @@ hello latest 08c791c7846e 48 years ago 25.2MB You can break binary reproducibility but have a sorted, meaningful `CREATED` column by setting `created` to `now`. ```nix - pkgs.dockerTools.buildImage { - name = "hello"; - tag = "latest"; - created = "now"; - contents = pkgs.hello; +pkgs.dockerTools.buildImage { + name = "hello"; + tag = "latest"; + created = "now"; + contents = pkgs.hello; - config.Cmd = [ "/bin/hello" ]; - } + config.Cmd = [ "/bin/hello" ]; +} ``` and now the Docker CLI will display a reasonable date and sort the images as expected: @@ -147,18 +145,18 @@ Each path directly listed in `contents` will have a symlink in the root of the i For example: ```nix - pkgs.dockerTools.buildLayeredImage { - name = "hello"; - contents = [ pkgs.hello ]; - } +pkgs.dockerTools.buildLayeredImage { + name = "hello"; + contents = [ pkgs.hello ]; +} ``` will create symlinks for all the paths in the `hello` package: ```ShellSession - /bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello - /share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info - /share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo +/bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello +/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info +/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo ``` ### Automatic inclusion of `config` references {#dockerTools-buildLayeredImage-arg-config} @@ -168,10 +166,10 @@ The closure of `config` is automatically included in the closure of the final im This allows you to make very simple Docker images with very little code. This container will start up and run `hello`: ```nix - pkgs.dockerTools.buildLayeredImage { - name = "hello"; - config.Cmd = [ "${pkgs.hello}/bin/hello" ]; - } +pkgs.dockerTools.buildLayeredImage { + name = "hello"; + config.Cmd = [ "${pkgs.hello}/bin/hello" ]; +} ``` ### Adjusting `maxLayers` {#dockerTools-buildLayeredImage-arg-maxLayers} @@ -209,15 +207,16 @@ This function is analogous to the `docker pull` command, in that it can be used Its parameters are described in the example below: ```nix - pullImage { - imageName = "nixos/nix"; - imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; - finalImageName = "nix"; - finalImageTag = "1.11"; - sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; - os = "linux"; - arch = "x86_64"; - } +pullImage { + imageName = "nixos/nix"; + imageDigest = + "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; + finalImageName = "nix"; + finalImageTag = "1.11"; + sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; + os = "linux"; + arch = "x86_64"; +} ``` - `imageName` specifies the name of the image to be downloaded, which can also include the registry namespace (e.g. `nixos`). This argument is required. @@ -261,13 +260,13 @@ This function is analogous to the `docker export` command, in that it can be use The parameters of `exportImage` are the following: ```nix - exportImage { - fromImage = someLayeredImage; - fromImageName = null; - fromImageTag = null; +exportImage { + fromImage = someLayeredImage; + fromImageName = null; + fromImageTag = null; - name = someLayeredImage.name; - } + name = someLayeredImage.name; +} ``` The parameters relative to the base image have the same synopsis as described in [buildImage](#ssec-pkgs-dockerTools-buildImage), except that `fromImage` is the only required argument in this case. @@ -279,18 +278,18 @@ The `name` argument is the name of the derivation output, which defaults to `fro This constant string is a helper for setting up the base files for managing users and groups, only if such files don\'t exist already. It is suitable for being used in a `runAsRoot` [co_title](#ex-dockerTools-buildImage-runAsRoot) script for cases like in the example below: ```nix - buildImage { - name = "shadow-basic"; +buildImage { + name = "shadow-basic"; - runAsRoot = '' - #!${pkgs.runtimeShell} - ${shadowSetup} - groupadd -r redis - useradd -r -g redis redis - mkdir /data - chown redis:redis /data - ''; - } + runAsRoot = '' + #!${pkgs.runtimeShell} + ${shadowSetup} + groupadd -r redis + useradd -r -g redis redis + mkdir /data + chown redis:redis /data + ''; +} ``` Creating base files like `/etc/passwd` or `/etc/login.defs` is necessary for shadow-utils to manipulate users and groups. From 5a1a08c0a785c0d5f74a0b350847a2eb39e90735 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Mon, 15 Feb 2021 21:10:54 -0300 Subject: [PATCH 227/246] doc/builders/images/dockertools.section.md: Fix anchor errors Also change note notation Signed-off-by: Bryan A. S --- doc/builders/images/dockertools.section.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index b88a66689ac..ce149bf174f 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -8,6 +8,9 @@ This function is analogous to the `docker build` command, in that it can be used The parameters of `buildImage` with relative example values are described below: +[]{#ex-dockerTools-buildImage} +[]{#ex-dockerTools-buildImage-runAsRoot} + ```nix buildImage { name = "redis"; @@ -47,7 +50,7 @@ The above example will build a Docker image `redis/latest` from the given base i - `runAsRoot` is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied `contents` derivation. This can be similarly seen as `RUN ...` in a `Dockerfile`. - ::: {.note} Using this parameter requires the `kvm` device to be available. ::: +> **_NOTE:_** Using this parameter requires the `kvm` device to be available. - `config` is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). @@ -59,9 +62,9 @@ The resulting repository will only list the single image `image/tag`. In the cas It is possible to inspect the arguments with which an image was built using its `buildArgs` attribute. -::: {.note} If you see errors similar to `getProtocolByName: does not exist (no such protocol name: tcp)` you may need to add `pkgs.iana-etc` to `contents`. ::: +> **_NOTE:_** If you see errors similar to `getProtocolByName: does not exist (no such protocol name: tcp)` you may need to add `pkgs.iana-etc` to `contents`. -::: {.note} If you see errors similar to `Error_Protocol ("certificate has unknown CA",True,UnknownCa)` you may need to add `pkgs.cacert` to `contents`. ::: +> **_NOTE:_** If you see errors similar to `Error_Protocol ("certificate has unknown CA",True,UnknownCa)` you may need to add `pkgs.cacert` to `contents`. By default `buildImage` will use a static date of one second past the UNIX Epoch. This allows `buildImage` to produce binary reproducible images. When listing images with `docker images`, the newly created images will be listed like this: @@ -255,7 +258,7 @@ $ nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr This function is analogous to the `docker export` command, in that it can be used to flatten a Docker image that contains multiple layers. It is in fact the result of the merge of all the layers of the image. As such, the result is suitable for being imported in Docker with `docker import`. -::: {.note} Using this function requires the `kvm` device to be available. ::: +> **_NOTE:_** Using this function requires the `kvm` device to be available. The parameters of `exportImage` are the following: From 91838d4dcc122dd5dc3955d4c10d2d29bd622e22 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Mar 2021 16:19:04 +0000 Subject: [PATCH 228/246] go-ethereum: 1.9.25 -> 1.10.0 --- pkgs/applications/blockchains/go-ethereum.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index dd3904b27cb..4dab912cf15 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -8,17 +8,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.9.25"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0cbgqs17agwdap4g37sb2g6mhyn7qkqbjk7kwb5jvj8nbi5n3kbd"; + sha256 = "sha256-pEzaEpqr+Ird8d5zmoXMyAoS0aEGBYFmpgdPcH4OsMI="; }; runVend = true; - vendorSha256 = "08wgah8gxb5bscm5ca6zkfgssnmw2y2l6k9gfw7gbxyflsx74lya"; + vendorSha256 = "sha256-DgyOvplk1JWn6D/z4zbXHLNLuAVQ5beEHi0NuSv236A="; doCheck = false; From a1cf35fbfd6f3292858f55fa58b91a8444e81d06 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 4 Mar 2021 17:44:33 +0100 Subject: [PATCH 229/246] doc/builders/images/dockertools.section.md: Fix link labels --- doc/builders/images/dockertools.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index ce149bf174f..0d7774e891e 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -58,7 +58,7 @@ After the new layer has been created, its closure (to which `contents`, `config` At the end of the process, only one new single layer will be produced and added to the resulting image. -The resulting repository will only list the single image `image/tag`. In the case of [example_title](#ex-dockerTools-buildImage) it would be `redis/latest`. +The resulting repository will only list the single image `image/tag`. In the case of [the `buildImage` example](#ex-dockerTools-buildImage) it would be `redis/latest`. It is possible to inspect the arguments with which an image was built using its `buildArgs` attribute. @@ -278,7 +278,7 @@ The `name` argument is the name of the derivation output, which defaults to `fro ## shadowSetup {#ssec-pkgs-dockerTools-shadowSetup} -This constant string is a helper for setting up the base files for managing users and groups, only if such files don\'t exist already. It is suitable for being used in a `runAsRoot` [co_title](#ex-dockerTools-buildImage-runAsRoot) script for cases like in the example below: +This constant string is a helper for setting up the base files for managing users and groups, only if such files don\'t exist already. It is suitable for being used in a [`buildImage` `runAsRoot`](#ex-dockerTools-buildImage-runAsRoot) script for cases like in the example below: ```nix buildImage { From 0355cd98e86e662474cd1c315cfe7777cbaaeacb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 4 Mar 2021 15:44:31 +0000 Subject: [PATCH 230/246] =?UTF-8?q?sbt-extras:=202021-03-01=20=E2=86=92=20?= =?UTF-8?q?2021-03-03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/build-managers/sbt-extras/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index f16d2838c9e..f25dfe6c28a 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "dc4f350f112580fcdf5f6fa7e8d5d2116475f84a"; - version = "2021-03-01"; + rev = "2c582cdbb37dd487bf2140010ddd2e20f3c1394e"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "00qlmxnxmsjs5z03sd46j9spcz1jjkabip4z6f6r43pahjqyd0dk"; + sha256 = "1j4j46gzw05bis7akvzfdj36xdwxcabq66wyf917z8vsy31vvajp"; }; dontBuild = true; @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin substituteInPlace bin/sbt --replace 'declare java_cmd="java"' 'declare java_cmd="${jdk}/bin/java"' @@ -25,6 +27,8 @@ stdenv.mkDerivation rec { install bin/sbt $out/bin wrapProgram $out/bin/sbt --prefix PATH : ${lib.makeBinPath [ which curl ]} + + runHook postInstall ''; doInstallCheck = true; From e789af819861dbce2b4d15313ee249987a7b39a4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 4 Mar 2021 10:42:44 -0500 Subject: [PATCH 231/246] python3Packages.sagemaker: 2.27.0 -> 2.28.0 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index ad25df58b10..116f4b6f676 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.27.0"; + version = "2.28.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1u5icjqz23j0QUToStZZMklBAYF4A1cfBqzg83MQAQI="; + sha256 = "sha256-SOk4VM227gAlLX615xPy0lcATRzth7M3HGH557iF2Wc="; }; pythonImportsCheck = [ From 739381f0c1bef136ed822b15dfa7a6587d9da636 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 27 Feb 2021 18:57:20 +0000 Subject: [PATCH 232/246] freetype: patch pkg-config in -config better When we have build == host != target, we don't want to patch in a prefixed pkg-config used for cross compiling. Using `pkgsHostHost` expressses the intent. Then again, per https://github.com/NixOS/nixpkgs/issues/51176 leaving `buildPackages.pkg-config` is arguably also correct, if we do further cross compilation and want to run `freetype-config`. Really, there is no good solution. --- pkgs/development/libraries/freetype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 7b5fff29a28..adda15696e8 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, buildPackages +, buildPackages, pkgsHostHost , pkg-config, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { postInstall = glib.flattenInclude + '' substituteInPlace $dev/bin/freetype-config \ - --replace ${buildPackages.pkg-config} ${pkg-config} + --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" From 9a02192dc50c024cfd5e835a320577b9f26a37ed Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Mar 2021 18:54:05 +0100 Subject: [PATCH 233/246] gitea: 1.13.2 -> 1.13.3 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.13.3 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 566459afa18..00bc73c8541 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -9,11 +9,11 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.13.2"; + version = "1.13.3"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-uezg8GdNqgKVHgJj9rTqHFLWuLdyDp63fzr7DMslOII="; + sha256 = "sha256-+uuadtpDC4br+DUHpoY2aOwklpD9LxvkSqcBMC0+UHE="; }; unpackPhase = '' From aee60bef7a615c93de5fb726a1c85aeb45e99aa0 Mon Sep 17 00:00:00 2001 From: s1341 Date: Wed, 10 Feb 2021 20:38:17 +0200 Subject: [PATCH 234/246] android_prebuilt: Fix eval --- pkgs/build-support/bintools-wrapper/default.nix | 3 ++- pkgs/build-support/cc-wrapper/default.nix | 5 ++++- .../mobile/androidenv/compose-android-packages.nix | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 8fef2ca6624..3243e883e4d 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -53,7 +53,8 @@ let dynamicLinker = /**/ if libc == null then null else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*" - else if targetPlatform.libc == "bionic" then "/system/bin/linker" + else if (targetPlatform.libc == "bionic" && targetPlatform.is32bit) then "/system/bin/linker" + else if (targetPlatform.libc == "bionic" && targetPlatform.is64bit) then "/system/bin/linker64" else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index c8af8789fcc..65f9791597e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -298,7 +298,10 @@ stdenv.mkDerivation { # vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See # https://clang.llvm.org/docs/Toolchain.html for all the axes one might # break `useLLVM` into.) - + optionalString (isClang && gccForLibs != null && targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + + optionalString (isClang && gccForLibs != null + && targetPlatform.isLinux + && !(stdenv.targetPlatform.useAndroidPrebuilt or false) + && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags '' diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index fd78fa9ac0f..5db3538563f 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -24,7 +24,8 @@ }: let - inherit (pkgs) stdenv lib fetchurl makeWrapper unzip; + inherit (pkgs) stdenv lib fetchurl; + inherit (pkgs.buildPackages) makeWrapper unzip; # Determine the Android os identifier from Nix's system identifier os = if stdenv.system == "x86_64-linux" then "linux" From 8f0cff4da9110f17481579cf8cde0c60fac22a09 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 4 Mar 2021 19:29:59 +0100 Subject: [PATCH 235/246] nix-output-monitor: 1.0.2.0 -> 1.0.3.0 --- pkgs/tools/nix/nix-output-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index e978670ae7c..46020233ff1 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.2.0"; + version = "1.0.3.0"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "12spiddjy8xhbxdh89w46kg7p2asfa4qrldwb1kps178hdhjdrgz"; + sha256 = "1gidg03cwz8ss370bgz4a2g9ldj1lap5ws7dmfg6vigpx8mxigpb"; rev = "v${version}"; }; isLibrary = true; From 1a2ee59f513af30722d94300a77b41199b9a91c0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Mar 2021 20:06:08 +0100 Subject: [PATCH 236/246] citrix_workspace: pmenke wants to take over See https://discourse.nixos.org/t/citrix-workspace-installation/9777/6 --- maintainers/maintainer-list.nix | 10 ++++++++++ .../networking/remote/citrix-workspace/generic.nix | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d3a35283b78..63dcb61fd95 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7435,6 +7435,16 @@ githubId = 103822; name = "Patrick Mahoney"; }; + pmenke = { + email = "nixos@pmenke.de"; + github = "pmenke-de"; + githubId = 898922; + name = "Philipp Menke"; + keys = [{ + longkeyid = "rsa4096/0xEB7F2D4CCBE23B69"; + fingerprint = "ED54 5EFD 64B6 B5AA EC61 8C16 EB7F 2D4C CBE2 3B69"; + }]; + }; pmeunier = { email = "pierre-etienne.meunier@inria.fr"; github = "P-E-Meunier"; diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index fcd8a80cff4..35faeb20b75 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -202,7 +202,7 @@ stdenv.mkDerivation rec { license = licenses.unfree; description = "Citrix Workspace"; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pmenke ]; inherit homepage; }; } From f4daac3c83bc74935206242faf048ed1e37536e3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 4 Mar 2021 10:39:08 -0500 Subject: [PATCH 237/246] python3Packages.botocore: 1.20.18 -> 1.20.20 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 514e63fdbbf..5714cbf5fb8 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.18"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.20"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-UZALENpK5FvksWBF5bL/fRFYp5VdnXzF5am6MXDxBYY="; + sha256 = "sha256-gMMqgfse6L36B0p5v7iFuyAG6Kl4LyNTwMn2OScE4To="; }; propagatedBuildInputs = [ From 49d1dfa72b42731ac17a0620f052bdaa68ccb792 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 4 Mar 2021 10:40:07 -0500 Subject: [PATCH 238/246] python3Packages.boto3: 1.17.18 -> 1.17.20 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 6077d6335fa..1c035a2470a 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.18"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.20"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-NXCjwPvYC8swRJ+Hz50vertn+sKl4xfQAvmSHFm+mxc="; + sha256 = "sha256-Ihnx6+iNJmr6VRb5k5g+uodCuVf6T9aFTzxzqjAw6TE="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 4f9a414094c08e6dd682352528096a0364ae0901 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 4 Mar 2021 10:41:36 -0500 Subject: [PATCH 239/246] awscli: 1.19.18 -> 1.19.20 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 23c37ef3ebd..264eb7b09c4 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.18"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.20"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-K+Q2IXMHywtyyjPz1jtkFAHy9vkSFH4znjdD+0GnU1o="; + sha256 = "sha256-Fu+KuGOGDUMXgwUKabZjaCBQHdlLLBwPJXU4rlohKNs="; }; # https://github.com/aws/aws-cli/issues/4837 From e92d63eecea429b705b1c1e60d3334596ea5989c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Mar 2021 21:47:37 +0200 Subject: [PATCH 240/246] emacs.pkgs.pdf-tools: Fix darwin build As reported in https://github.com/NixOS/nixpkgs/pull/114484#discussion_r587722662 --- .../editors/emacs-modes/melpa-packages.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6a099639d59..e5e2bac964f 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -141,14 +141,18 @@ let buildInputs = old.buildInputs ++ [ pkgs.libpng pkgs.zlib pkgs.poppler ]; preBuild = '' make server/epdfinfo - remove-references-to \ - -t ${pkgs.stdenv.cc.libc.dev} \ - -t ${pkgs.glib.dev} \ - -t ${pkgs.libpng.dev} \ - -t ${pkgs.poppler.dev} \ - -t ${pkgs.zlib.dev} \ - -t ${pkgs.cairo.dev} \ - server/epdfinfo + remove-references-to ${lib.concatStringsSep " " ( + map (output: "-t " + output) ( + [ + pkgs.glib.dev + pkgs.libpng.dev + pkgs.poppler.dev + pkgs.zlib.dev + pkgs.cairo.dev + ] + ++ lib.optional pkgs.stdenv.isLinux pkgs.stdenv.cc.libc.dev + ) + )} server/epdfinfo ''; recipe = pkgs.writeText "recipe" '' (pdf-tools From 677af53363765797c6f4323494200b53828b53b3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 5 Mar 2021 05:35:33 +1000 Subject: [PATCH 241/246] gh: 1.6.2 -> 1.7.0 https://github.com/cli/cli/releases/tag/v1.7.0 --- .../version-management/git-and-tools/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index a52b11bff92..153a948d8ed 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1wq8k626w3w2cnqp9gqdk7g4pjnqjjybkjgbfq5cvqsql3jdjg65"; + sha256 = "0ndi264rrssqin03qmv7n0fpzs3kasfqykidrlcyizw1ngyfgc1a"; }; - vendorSha256 = "0nk5axyr3nd9cbk8wswfhqf25dks22mky3rdn6ba9s0fpxhhkr5g"; + vendorSha256 = "0ywh5d41b1c5ivwngsgn46d6yb7s1wqyzl5b0j1x4mcvydi5yi98"; nativeBuildInputs = [ installShellFiles ]; From 690449f3ae63a28c7aef107c433a6fb06b1e18bc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Mar 2021 21:13:51 +0100 Subject: [PATCH 242/246] nixos/nextcloud: enable apc cache for cli if apcu is enabled As described in the admin manual[1] of Nextcloud. [1] https://docs.nextcloud.com/server/21/admin_manual/configuration_server/caching_configuration.html#id1 --- nixos/modules/services/web-apps/nextcloud.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 6497a259dba..5636415f6a0 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -28,7 +28,10 @@ let upload_max_filesize = cfg.maxUploadSize; post_max_size = cfg.maxUploadSize; memory_limit = cfg.maxUploadSize; - } // cfg.phpOptions; + } // cfg.phpOptions + // optionalAttrs cfg.caching.apcu { + "apc.enable_cli" = "1"; + }; occ = pkgs.writeScriptBin "nextcloud-occ" '' #! ${pkgs.runtimeShell} From b1ef946de6c436a3544bb19c0665a2622de8a06e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Mar 2021 21:15:18 +0100 Subject: [PATCH 243/246] nextcloud19: update todo note --- pkgs/servers/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 53625941b61..8205f4f860a 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -43,7 +43,7 @@ in { [1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html ''; - # FIXME(@Ma27) remove on 2021-06 + # FIXME(@Ma27) remove on 21.05 nextcloud19 = generic { version = "19.0.6"; sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg="; From 6dbb06111d5c6250080389bfea17b26b9c4f896f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Mar 2021 17:08:30 +0000 Subject: [PATCH 244/246] helmfile: 0.138.4 -> 0.138.6 --- pkgs/applications/networking/cluster/helmfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 72fcc2f9c35..5ac152c849b 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.138.4"; + version = "0.138.6"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-Y0/0wC00s7QY7/B6igOoPKXv5TE2P8NoGd9UhfVmLOk="; + sha256 = "sha256-slqHG4uD0sbCNNr5Ve9eemyylUs4w1JizfoIMbrbVeg="; }; vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to="; From 0e7add819023480f7e5a9352ff8528db51faad65 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 4 Mar 2021 22:00:10 +0100 Subject: [PATCH 245/246] ocamlPackages.biniou: use Dune 2 --- pkgs/development/ocaml-modules/biniou/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 8e0780ae6c5..535b34b03dc 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "biniou"; version = "1.2.1"; + useDune2 = true; + src = fetchFromGitHub { owner = "ocaml-community"; repo = pname; From 98207d2573f47d37cb33cb73375c4a720007d3e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Mar 2021 16:05:25 +0000 Subject: [PATCH 246/246] gleam: 0.14.1 -> 0.14.2 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 5e6621dbe71..b371cadb1db 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KAcb+YNfdNc5LJIApuzjXKnPTFOK0C5Jui32nij4O4U="; + sha256 = "sha256-C56aM3FFnjtTQawQOnITVGXK5XSA/Pk7surt8MJHZK0="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-Hxat6UZziIxHGLPydnnmgzdwtvjaeeqOgD+ZC823uJU="; + cargoSha256 = "sha256-AkkXV1cOM5YFvG5dUt7VarSzWyBZmvFMW08n1KqSAxY="; meta = with lib; { description = "A statically typed language for the Erlang VM";