From 2edd97625004c0eb677ff3f639f817b6bc700fab Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 22 Mar 2021 15:06:52 -0400 Subject: [PATCH 01/33] apacheHttpdPackages.mod_perl: 2.0.10 -> 2.0.11 --- pkgs/servers/http/apache-modules/mod_perl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix index 04746d678c52..2762f636f592 100644 --- a/pkgs/servers/http/apache-modules/mod_perl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, apacheHttpd, perl }: stdenv.mkDerivation rec { - name = "mod_perl-2.0.10"; + pname = "mod_perl"; + version = "2.0.11"; src = fetchurl { - url = "mirror://apache/perl/${name}.tar.gz"; - sha256 = "0r1bhzwl5gr0202r6448943hjxsickzn55kdmb7dzad39vnq7kyi"; + url = "mirror://apache/perl/${pname}-${version}.tar.gz"; + sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana"; }; buildInputs = [ apacheHttpd perl ]; From 7afa8dca4e52ca869c68e3de5e1833fa200ced52 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 23 Mar 2021 10:48:15 +0100 Subject: [PATCH 02/33] amdvlk: 2021.Q1.5 -> 2020.Q1.6 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 24ad128a5842..1d0256f3b274 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q1.5"; + version = "2021.Q1.6"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "OSX4alrR49jqIu2QZcTieurUnyWQJ0wheDwFiNd9QcY="; + sha256 = "FSQ/bYlvdw0Ih3Yl329o8Gizw0YcZTLtiI222Ju4M8w="; }; buildInputs = [ From f0d4a1ce7d4aa3980b15bbf203113b82456f2098 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 24 Mar 2021 00:17:58 +0700 Subject: [PATCH 03/33] tz: init at 0.4 --- pkgs/tools/misc/tz/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/tz/default.nix diff --git a/pkgs/tools/misc/tz/default.nix b/pkgs/tools/misc/tz/default.nix new file mode 100644 index 000000000000..c0c6fe9ec33b --- /dev/null +++ b/pkgs/tools/misc/tz/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "tz"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "oz"; + repo = "tz"; + rev = "v${version}"; + sha256 = "sha256-36nTau7xjABdeUOioHar28cuawFWW3DBaDH0YAvdufI="; + }; + + vendorSha256 = "sha256-Soa87I7oMa34LjYKxNAz9Limi0kQ6JUtb/zI4G7yZnw="; + + meta = with lib; { + description = "A time zone helper"; + homepage = "https://github.com/oz/tz"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6990a193ff02..5b0320815f6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8765,6 +8765,8 @@ in tydra = callPackage ../tools/misc/tydra { }; + tz = callPackage ../tools/misc/tz { }; + u9fs = callPackage ../servers/u9fs { }; ua = callPackage ../tools/networking/ua { }; From 316146ae563c2940940d6c12e2acce98f1f7a4b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Mar 2021 21:20:18 +0100 Subject: [PATCH 04/33] ldeep: 1.0.9 -> 1.0.10 --- pkgs/tools/security/ldeep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 855ffc6fdba1..db4d14ba3ed7 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "ldeep"; - version = "1.0.9"; + version = "1.0.10"; src = fetchPypi { inherit pname version; - sha256 = "0n38idkn9hy31m5xkrc36dmw364d137c7phssvj76gr2gqsrqjy3"; + sha256 = "sha256-/7mcmAj69NmuiK+xlQijAk39sMLDX8kHatmSI6XYbwE="; }; propagatedBuildInputs = [ From e7c159f21b2e2c6bfb370ec87eeb5ec1b6e0d3d0 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Tue, 23 Mar 2021 20:35:36 +0100 Subject: [PATCH 05/33] josm: 17560 -> 17580 --- pkgs/applications/misc/josm/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 894b44a8451a..b8e72daa6f77 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "17560"; + version = "17580"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1ffrbg2d4s2dmc9zy9b4fbsqnp9g0pvp6vnrq7gbsmxh0y23sw56"; + sha256 = "05y1g48llnpbyv0r8dn3kyhcfqylsg4fbp540xn1n7sk3h17gwsw"; }; macosx = fetchurl { - url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "17qrilj20bvzd8ydfjjirpqjrsbqbkxyj4q35q87z9j3pgnd1h71"; + url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; + sha256 = "0aqkr6951zbi7a6zawvpsh51i0c4nyz2xkj52gg8n4vxli5pp3y1"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "0wmncbi5g3ijn19qvmvwszb2m79wnv4jpdmpjd7332d3qi5rfmwn"; + sha256 = "04mxrirlyjy8i5s6y8w84kxv3wjlhhdfmlaxxlxd25viim73g3zv"; }; }; in From af52343ae931b7392a317f9cfad7d56b201c9546 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Tue, 23 Mar 2021 15:52:50 -0400 Subject: [PATCH 06/33] python3Packages.forbiddenfruit: unbreak --- .../python-modules/forbiddenfruit/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix index 6ad99a12581e..13c46ba1e8aa 100644 --- a/pkgs/development/python-modules/forbiddenfruit/default.nix +++ b/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , nose }: @@ -8,13 +8,20 @@ buildPythonPackage rec { version = "0.1.4"; pname = "forbiddenfruit"; - src = fetchPypi { - inherit pname version; - sha256 = "e3f7e66561a29ae129aac139a85d610dbf3dd896128187ed5454b6421f624253"; + src = fetchFromGitHub { + owner = "clarete"; + repo = "forbiddenfruit"; + rev = version; + sha256 = "16chhrxbbmg6lfbzm532fq0v00z8qihcsj0kg2b5jlgnb6qijwn8"; }; checkInputs = [ nose ]; + preBuild = '' + export FFRUIT_EXTENSION="true"; + ''; + + # https://github.com/clarete/forbiddenfruit/pull/47 required to switch to pytest checkPhase = '' find ./build -name '*.so' -exec mv {} tests/unit \; nosetests @@ -22,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Patch python built-in objects"; - homepage = "https://pypi.python.org/pypi/forbiddenfruit"; + homepage = "https://github.com/clarete/forbiddenfruit"; license = licenses.mit; }; From 0432eccae8794f654ba843e408d19f1fb04313b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Mar 2021 01:03:57 +0100 Subject: [PATCH 07/33] bit: init at 1.05 --- .../git-and-tools/bit/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/bit/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/bit/default.nix b/pkgs/applications/version-management/git-and-tools/bit/default.nix new file mode 100644 index 000000000000..e41c2569fcb3 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/bit/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +}: + +buildGoModule rec { + pname = "bit"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "chriswalz"; + repo = pname; + rev = "v${version}"; + sha256 = "0dv6ma2vwb21cbxkxzrpmj7cqlhwr7a86i4g728m3y1aclh411sn"; + }; + + vendorSha256 = "1j6w7bll4zyp99579dhs2rza4y9kgfz3g8d5grfzgqck6cjj9mn8"; + + propagatedBuildInputs = [ git ]; + + # Tests require a repository + doCheck = false; + + meta = with lib; { + description = "Command-line tool for git"; + homepage = "https://github.com/chriswalz/bit"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bdccaeb3fcd..8dbe29eb6d9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1138,6 +1138,8 @@ in bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; + bit = callPackage ../applications/version-management/git-and-tools/bit { }; + bitwarden = callPackage ../tools/security/bitwarden { }; inherit (nodePackages) bitwarden-cli; From 9db47b0a3a7e4d3d19add50719705a30b0de5be8 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 24 Mar 2021 12:36:26 +0900 Subject: [PATCH 08/33] cargo-audit: add cargo audit fix by default --- pkgs/tools/package-management/cargo-audit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 12bf27165f7e..d5be54b71b05 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; + # enables `cargo audit fix` + cargoBuildFlags = [ "--features fix" ]; + # The tests require network access which is not available in sandboxed Nix builds. doCheck = false; From c28c61b7a5b455f8d2e956a36b18c0b8712fdaca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= <65870+suhr@users.noreply.github.com> Date: Wed, 24 Mar 2021 12:56:01 +0300 Subject: [PATCH 09/33] helio-workstation: 3.3 -> 3.4 --- pkgs/applications/audio/helio-workstation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index e2c19ac156d4..bb92682b141f 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-meeNqV1jKUwWc7P3p/LicPsbpzpKKFmQ1wP9DuXc9NY="; + sha256 = "sha256-zXsDu/xi7OV6VtnZK9ZJ8uwPeA5uTgNpAQsqe90iwG4="; }; buildInputs = [ From 2b2f6cf361fb05c0a1a7f151f8b0925729e4658d Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Tue, 23 Mar 2021 18:25:27 +0100 Subject: [PATCH 10/33] mill: 0.9.3 -> 0.9.5 --- pkgs/development/tools/build-managers/mill/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 5942e20ec920..4538c212da58 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.9.3"; + version = "0.9.5"; src = fetchurl { - url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "0x9mvcm5znyi7w6cpiasj2v6f63y7d8qdck7lx03p2k6i9aa2f77"; + url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}"; + sha256 = "142vr40p60mapvvb5amn8hz6a8930kxsz510baql40hai4yhga7z"; }; nativeBuildInputs = [ makeWrapper ]; From 877dc28455ba410aafbbf85c3280b21fc5ecb409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 24 Mar 2021 11:55:58 +0100 Subject: [PATCH 11/33] pika-backup: 0.2.1 -> 0.2.2 --- pkgs/applications/backup/pika-backup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index 51f00d021c39..7f7be99f9a24 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - sha256 = "0fm6vwpw0pa98v2yn8p3818rrlv9lk3pmgnal1b2kh52im5ll7m8"; + sha256 = "16284gv31wdwmb99056962d1gh6xz26ami6synr47nsbbp5l0s6k"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1f5s6a0wjrs2spsicirhbvb5xlz9iflwsaqchij9k02hfcsr308y"; + sha256 = "12ymjwpxx3sdna8w5j9fnwwfk8ynk9ziwl0lkpq68y0vyllln5an"; }; patches = [ From e264b3cb14b08d05daac145eceb23f6dda1bb9b1 Mon Sep 17 00:00:00 2001 From: lasers Date: Tue, 23 Mar 2021 11:09:48 -0500 Subject: [PATCH 12/33] cen64: unstable-2020-02-20 -> unstable-2021-03-12 --- pkgs/misc/emulators/cen64/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/cen64/default.nix b/pkgs/misc/emulators/cen64/default.nix index 0153ed11cd2d..ddf455473378 100644 --- a/pkgs/misc/emulators/cen64/default.nix +++ b/pkgs/misc/emulators/cen64/default.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { pname = "cen64"; - version = "unstable-2020-02-20"; + version = "unstable-2021-03-12"; src = fetchFromGitHub { owner = "n64dev"; repo = "cen64"; - rev = "6f9f5784bf0a720522c4ecb0915e20229c126aed"; - sha256 = "08q0a3b2ilb95zlz4cw681gwz45n2wrb2gp2z414cf0bhn90vz0s"; + rev = "1b31ca9b3c3bb783391ab9773bd26c50db2056a8"; + sha256 = "0x1fz3z4ffl5xssiyxnmbhpjlf0k0fxsqn4f2ikrn17742dx4c0z"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ libGL libiconv openal libX11 ]; installPhase = '' - mkdir -p $out/bin - mv cen64 $out/bin + runHook preInstall + install -D {,$out/bin/}${pname} + runHook postInstall ''; meta = with lib; { From 31439b83161bae0c8aa2ba6a908eb021c5c9c810 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Mar 2021 13:36:21 +0100 Subject: [PATCH 13/33] slowhttptest: init at 1.8.2 --- pkgs/tools/security/slowhttptest/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/security/slowhttptest/default.nix diff --git a/pkgs/tools/security/slowhttptest/default.nix b/pkgs/tools/security/slowhttptest/default.nix new file mode 100644 index 000000000000..5dce5d5439ac --- /dev/null +++ b/pkgs/tools/security/slowhttptest/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, fetchFromGitHub +, openssl +}: + +stdenv.mkDerivation rec { + pname = "slowhttptest"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "shekyan"; + repo = pname; + rev = "v${version}"; + sha256 = "1xv2j3hl4zj0s2cxcsvlwgridh9ap4g84g7c4918d03id15wydcx"; + }; + + buildInputs = [ openssl ]; + + meta = with lib; { + description = "Application Layer DoS attack simulator"; + homepage = "https://github.com/shekyan/slowhttptest"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb66cdde0eed..aa9331f033ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25285,6 +25285,8 @@ in slop = callPackage ../tools/misc/slop {}; + slowhttptest = callPackage ../tools/security/slowhttptest { }; + slrn = callPackage ../applications/networking/newsreaders/slrn { }; sniproxy = callPackage ../applications/networking/sniproxy { }; From 14efa32fa5147ed9cbe060558739d1362b217fa3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 24 Mar 2021 13:40:00 +0100 Subject: [PATCH 14/33] chromiumDev: 91.0.4449.6 -> 91.0.4455.2 --- .../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 da36f2de68e3..d45f21d3603e 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": "91.0.4449.6", - "sha256": "1y6z7p64fi4dxyrxrnlmg0wwczgw58cinrsywhnrpl2wp2y3v6m3", - "sha256bin64": "1baxra0hg981awinyyvm1x46rlskjmhs2m1h0zf72l11y1jyj5vc", + "version": "91.0.4455.2", + "sha256": "0nqw1jxysyl72dg2bqls7w9cm366j6i1p4sadf3s5vc0i7yr7h3i", + "sha256bin64": "0d7s7bg58489ph4i92yj4vkww0cl7473pk9sir64gcmm9z18yjc3", "deps": { "gn": { "version": "2021-03-12", From d87bbeb7242a53817c6d6e9e0b8f86263fc2c8da Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 24 Mar 2021 00:32:43 +0000 Subject: [PATCH 15/33] coursier: 2.0.15 -> 2.0.16 --- pkgs/development/tools/coursier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 69e55463cc67..64c48b702cf1 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.15"; + version = "2.0.16"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-XfTW8GNoPsNXamy0K9Ai3SSzBSyS1dNNCeWsbD8xCQI="; + sha256 = "sha256-Yx6PvBo763GnEwU5s7AYUs++Au25TF6cZ4WYGgruHpw="; }; nativeBuildInputs = [ makeWrapper ]; From bac80b5af2b10aa37143650322e01dfbd8120542 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Mar 2021 09:35:09 -0400 Subject: [PATCH 16/33] python3Packages.botocore: 1.20.33 -> 1.20.34 --- 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 4aef369c60a9..e04c2e5aeff4 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.33"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.34"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-41UwUwlpnTrKHgBQ/CHUhZW0DbBGyw0kkc1X/1smkgs="; + sha256 = "sha256-dJvbFR40AynxslYAv+nSI+kw+LomvXS3FHjKV4Hy/q8="; }; propagatedBuildInputs = [ From 27d4f20c9754e504c783070826d9301ecb6d1df8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Mar 2021 09:36:04 -0400 Subject: [PATCH 17/33] python3Packages.boto3: 1.17.33 -> 1.17.34 --- 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 8868b402595f..4f4aece6761c 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.33"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.34"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-DKwv/8G6kV97tezuU5MYUy21HyGMkooij6/j5QHpRy4="; + sha256 = "sha256-jzPLPS/EKwVHpVYKbXOXqpMzb1CJk4Z2KyRQaCwOmSs="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 7014daec3dab0d305add20407f3ed9f736de80ff Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Mar 2021 09:37:26 -0400 Subject: [PATCH 18/33] awscli: 1.19.33 -> 1.19.34 --- 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 e9d2bb713dde..445d32be1225 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.33"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.34"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-Rz0aZTsFV3RAdH04d3jvvqi1wFuIIx3SFddONhM8c8E="; + sha256 = "sha256-RJ+ibZmOxH4r+pGI/rrkRES89u0IRUU3sSE5OFSJ2qw="; }; # https://github.com/aws/aws-cli/issues/4837 From 60b490b83f6e5c6256f8f2f2c0689fad4890e78c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Mar 2021 09:29:48 -0400 Subject: [PATCH 19/33] linux-hardened: Switch to 5.11 --- 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 eca4aa48ea16..3238827b5220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19880,7 +19880,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_10; + linux_latest_for_hardened = pkgs.linux_5_11; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { From 09406084bdd328cabf2c4440a908930bc4e7eeab Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Mar 2021 09:50:52 -0400 Subject: [PATCH 20/33] linux-hardened: Fix page poisoning for 5.11 `PAGE_POISONING_NO_SANITY` was removed in https://git.kernel.org/linus/8f424750baaafcef229791882e879da01c9473b5 `PAGE_POISONING_ZERO` was removed in https://git.kernel.org/linus/f289041ed4cf9a3f6e8a32068fef9ffb2acc5662 --- pkgs/os-specific/linux/kernel/hardened/config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index acffa383f076..e4a7522fe597 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -55,8 +55,8 @@ assert (versionAtLeast version "4.9"); # Wipe higher-level memory allocations on free() with page_poison=1 PAGE_POISONING = yes; - PAGE_POISONING_NO_SANITY = yes; - PAGE_POISONING_ZERO = yes; + PAGE_POISONING_NO_SANITY = whenOlder "5.11" yes; + PAGE_POISONING_ZERO = whenOlder "5.11" yes; # Enable the SafeSetId LSM SECURITY_SAFESETID = whenAtLeast "5.1" yes; From 7865db274bffa497feef0c07aa7d7ace86734561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 24 Mar 2021 12:00:16 +0100 Subject: [PATCH 21/33] ghostwriter: 2.0.0-rc4 -> 2.0.0-rc5 --- pkgs/applications/editors/ghostwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 23a81c9cb00a..2249009af777 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.0.0-rc4"; + version = "2.0.0-rc5"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - sha256 = "07547503a209hc0fcg902w3x0s1m899c10nj3gqz3hak0cmrasi3"; + sha256 = "sha256-Gc0/AHxxJd5Cq3dBQ0Xy2TF78CBmQFYUzm4s7q1aHEE="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; From 28876daed313cafd1311061cbc5ae75cc67fe127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 20 Mar 2021 20:23:01 +0100 Subject: [PATCH 22/33] pythonPackages.graphite-web: update dependencies --- .../python-modules/graphite-web/default.nix | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 17ac91329163..81260110f929 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,6 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir +{ lib, buildPythonPackage, fetchPypi +, django +, memcached +, txamqp +, django_tagging +, gunicorn +, pytz +, pyparsing +, cairocffi +, whisper +, whitenoise +, scandir +, urllib3 +, six }: + buildPythonPackage rec { pname = "graphite-web"; version = "1.1.7"; @@ -15,8 +28,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - django django_tagging whisper pycairo cairocffi - ldap memcached pytz urllib3 scandir + django + memcached + txamqp + django_tagging + gunicorn + pytz + pyparsing + cairocffi + whisper + whitenoise + scandir + urllib3 + six ]; # Carbon-s default installation is /opt/graphite. This env variable ensures @@ -28,6 +52,8 @@ buildPythonPackage rec { --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" ''; + pythonImportsCheck = [ "graphite" ]; + meta = with lib; { homepage = "http://graphiteapp.org/"; description = "Enterprise scalable realtime graphing"; From 873c008c3342b9d70d5c902f632284db8218e0e0 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 24 Mar 2021 15:24:12 +0100 Subject: [PATCH 23/33] vscode: fix download link --- pkgs/applications/editors/vscode/vscode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index ba03bb65c267..ddede59a837d 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -34,7 +34,7 @@ in src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; - url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable"; + url = "https://update.code.visualstudio.com/${version}/${plat}/stable"; inherit sha256; }; From 5efaab8ad67e9c111a54df48009b5047fd24e970 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 24 Mar 2021 14:42:56 +0000 Subject: [PATCH 24/33] jbang: 0.68.0 -> 0.69.1 --- pkgs/development/tools/jbang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index bb244c57cc23..4c35aaaae05a 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.68.0"; + version = "0.69.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-+hBI4asgRZg1nu50GMCl0/djqCxjb92xlO3roU4LZS8="; + sha256 = "sha256-FuwivcF1SpGbLcoQshVNSWSQ7PgWC0XPCQF+i9zHb/w="; }; nativeBuildInputs = [ makeWrapper ]; From e485ab8ce5176727cb6277616a1a7d249a69506e Mon Sep 17 00:00:00 2001 From: Git Machete Release Bot Date: Wed, 24 Mar 2021 14:50:19 +0000 Subject: [PATCH 25/33] gitAndTools.git-machete: 3.0.0 -> 3.1.0 ###### Motivation for this change Update to latest upstream version ###### Things done * [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) * Built on platform(s) * [x] NixOS * [ ] macOS * [ ] other Linux distributions * [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) * [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"` * [x] Tested execution of all binary files (usually in `./result/bin/`) * [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after) * [ ] Ensured that relevant documentation is up to date * [x] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). ###### Notify maintainers cc @blitz @Ma27 @tfc @worldofpeace --- .../version-management/git-and-tools/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 9933535475a3..99772f60bc50 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "077xs3grjidahxz1gc93565b25blf97lwsljmkmr0yapps8z630d"; + sha256 = "0bb6ap8sdp4ad0xkh3y8vj46a363g5gdw0dzf9ycw0z9ah8ispfx"; }; nativeBuildInputs = [ installShellFiles pbr ]; From 877c07041509f4b4ff9ec480e85188cb1766371c Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Tue, 23 Mar 2021 18:30:55 -0400 Subject: [PATCH 26/33] python3Packages.hdbscan: unbreak --- .../python-modules/hdbscan/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 6e381794cff5..d2590d14955c 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage +, fetchpatch , cython , numpy -, nose +, pytestCheckHook , scipy , scikitlearn , fetchPypi @@ -18,11 +19,22 @@ buildPythonPackage rec { inherit pname version; sha256 = "e3a418d0d36874f7b6a1bf0b7461f3857fc13a525fd48ba34caed2fe8973aa26"; }; - - checkInputs = [ nose ]; + patches = [ + # This patch fixes compatibility with numpy 1.20. It will be in the next release + # after 0.8.27 + (fetchpatch { + url = "https://github.com/scikit-learn-contrib/hdbscan/commit/5b67a4fba39c5aebe8187a6a418da677f89a63e0.patch"; + sha256 = "07d7jdwk0b8kgaqkifd529sarji01j1jiih7cfccc5kxmlb5py9h"; + }) + ]; nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ]; + preCheck = '' + cd hdbscan/tests + rm __init__.py + ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; From f3a032dee5d2da64b0e925bf81293dd42d58e7fc Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 14 Feb 2021 22:07:40 +0300 Subject: [PATCH 27/33] nixos/mastodon: enable sandbox mode --- nixos/modules/services/web-apps/mastodon.nix | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index ea7aebc3b12d..16e8ae2ec0b2 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -43,8 +43,32 @@ let LogsDirectoryMode = "0750"; # Access write directories UMask = "0027"; + # Capabilities + CapabilityBoundingSet = ""; + # Security + NoNewPrivileges = true; # Sandboxing + ProtectSystem = "strict"; + ProtectHome = true; PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ]; + RestrictNamespaces = true; + LockPersonality = true; + MemoryDenyWriteExecute = false; + RestrictRealtime = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + # System Call Filtering + SystemCallArchitectures = "native"; + SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @reboot @resources @setuid @swap"; }; envFile = pkgs.writeText "mastodon.env" (lib.concatMapStrings (s: s + "\n") ( From 3cd3e3167ce0f54115a929d817ead1c51a6b4cb8 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Wed, 24 Mar 2021 11:11:11 -0400 Subject: [PATCH 28/33] python3Packages.prance: unbreak --- .../python-modules/prance/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 3c9bc5c7c5ba..f9d5b6f80b1f 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -6,10 +6,9 @@ , requests , six , semver -, pytest +, pytestCheckHook , pytestcov , pytestrunner -, sphinx , openapi-spec-validator }: @@ -35,18 +34,28 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook pytestcov openapi-spec-validator ]; postPatch = '' substituteInPlace setup.py \ - --replace "tests_require = dev_require," "tests_require = None," + --replace "tests_require = dev_require," "tests_require = None," \ + --replace "chardet~=4.0" "" \ + --replace "semver~=2.13" "" + substituteInPlace setup.cfg \ + --replace "--cov-fail-under=90" "" ''; - # many tests require network connection - doCheck = false; + # Disable tests that require network + disabledTestPaths = [ + "tests/test_convert.py" + ]; + disabledTests = [ + "test_fetch_url_http" + ]; + pythonImportsCheck = [ "prance" ]; meta = with lib; { description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; From 66d2e53a33d071da7e0d4a5d6fddc8522b4fa07b Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Wed, 24 Mar 2021 10:20:26 -0400 Subject: [PATCH 29/33] python3Packages.numtraits: remove This package has long been replaced by https://github.com/jupyter-widgets/traittypes --- .../python-modules/numtraits/default.nix | 32 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/development/python-modules/numtraits/default.nix diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix deleted file mode 100644 index 624f32fd337b..000000000000 --- a/pkgs/development/python-modules/numtraits/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, six -, numpy -, traitlets -}: - -buildPythonPackage rec { - pname = "numtraits"; - version = "0.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e"; - }; - - checkInputs = [ pytest ]; - propagatedBuildInputs = [ six numpy traitlets]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Numerical traits for Python objects"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ fridh ]; - homepage = "https://github.com/astrofrog/numtraits"; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2629d8bb381..04e87616e901 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4712,8 +4712,6 @@ in { numpy-stl = callPackage ../development/python-modules/numpy-stl { }; - numtraits = callPackage ../development/python-modules/numtraits { }; - nunavut = callPackage ../development/python-modules/nunavut { }; nvchecker = callPackage ../development/python-modules/nvchecker { }; From ac977c317deead4950483d61d365546c1b5afa91 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Fri, 19 Mar 2021 17:03:02 -0300 Subject: [PATCH 30/33] python3Packages.onnx: fix build --- pkgs/development/python-modules/onnx/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 807b6cf5f5e1..90683a84f46a 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -46,7 +46,8 @@ buildPythonPackage rec { ]; postPatch = '' - patchShebangs tools/protoc-gen-mypy.py + chmod +x tools/protoc-gen-mypy.sh.in + patchShebangs tools/protoc-gen-mypy.sh.in tools/protoc-gen-mypy.py ''; preBuild = '' From c6a367715fc74d5a340cb9885cc29cbc91e9e2d1 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 17 Mar 2021 14:23:09 +0100 Subject: [PATCH 31/33] sphinx-autobuild: Use correct package --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04e87616e901..3f3a3d8f8d14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7865,7 +7865,7 @@ in { sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; - sphinx-autobuild = callPackage ../development/python-modules/sphinx-argparse { }; + sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { }; sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; From a62e67c09eb7e1e8035816effe61f56b02d13dd7 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 17 Mar 2021 22:22:00 +0100 Subject: [PATCH 32/33] sphinx-autoload: Fix typo in maintainers --- pkgs/development/python-modules/sphinx-autobuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index 739ea2afa820..94047b359aa9 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Rebuild Sphinx documentation on changes, with live-reload in the browser"; homepage = "https://github.com/executablebooks/sphinx-autobuild"; license = with licenses; [ mit ]; - maintainer = with maintainers; [holgerpeters]; + maintainers = with maintainers; [holgerpeters]; }; } From 3071774c907ae635df55963ac15806dce8a5c8c6 Mon Sep 17 00:00:00 2001 From: endorama Date: Wed, 24 Mar 2021 19:02:58 +0100 Subject: [PATCH 33/33] go-task: rename executable to task (#117455) --- pkgs/development/tools/go-task/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index b9241174eadc..d2ea8a4f6bd5 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { ]; postInstall = '' - mv $out/bin/task $out/bin/go-task + ln -s $out/bin/task $out/bin/go-task ''; meta = with lib; {