From 9708bf6d965fada4ea37fcf5b5d39cd1436004a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Jan 2021 13:51:00 +0000 Subject: [PATCH 01/11] visidata: 2.1 -> 2.1.1 --- pkgs/applications/misc/visidata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 450be72a28c..2d0a5598343 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -15,13 +15,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1psb3ycrb7k00b5blg9zr52bzdxs1mkdc7rpjn4m9kh09yfs3sx4"; + sha256 = "018z06bfcw0l4k2zdwbgxna9fss4wdqj64ckw5qjis14sb3zkr28"; }; propagatedBuildInputs = [ From afaef8a77a406e3e3bcd718905aa1f39b918ca41 Mon Sep 17 00:00:00 2001 From: afreakk Date: Mon, 4 Jan 2021 15:59:28 +0100 Subject: [PATCH 02/11] eksctl: 0.34.0 -> 0.35.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 6f38b14f44b..54d78d8fab7 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1n2mvnis6r5vpb60jlb3c84sllsbvy93gzsds54igsp6l3zngq19"; + sha256 = "0l4wlg6x074slndkihvwdvw4frsyzwxfqm1pkzqwc3x8awa9nlbv"; }; - vendorSha256 = "0ggxilp44mm81b8hrxyb7642vy2q1109yz619z97mgvk0drhkhc0"; + vendorSha256 = "0sfx8x1iwdqwbyiid5hc9wiwjc16aig8vplpjlqxkmcvig8qlwff"; doCheck = false; From f284b44089bfd83bdba704789cb4ac457c374831 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 4 Jan 2021 13:35:39 -0500 Subject: [PATCH 03/11] linux: 5.11-rc1 -> 5.11-rc2 Added temporary patch for a syntax error in the wireless drivers --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index ac84e70bae4..6cf74a504a1 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.11-rc1"; + version = "5.11-rc2"; extraMeta.branch = "5.11"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "sha256-nPJpz058khWE83QV9ITylTXjimBBw7SQwg7WBjWA7H0="; + sha256 = "092jgmzqfpylwbwhv7j8hy5y0ai14b6wm7p7vw6pxj7alixyynq0"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 23c01d04192..b0eb2be2a4c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -104,4 +104,14 @@ name = "mac_nvme_t2"; patch = ./mac-nvme-t2.patch; }; + + # https://lkml.org/lkml/2020/12/18/461 + wireless_syntax_error = rec { + name = "wireless-syntax_error"; + patch = fetchpatch { + name = name + ".patch"; + url = "https://lkml.org/lkml/diff/2020/12/18/461/1"; + sha256 = "11rnw9z7311crsx37sk68b71q51cni70lzf40ildqjnnn71m3q58"; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97a3bf3a330..036d4c3d590 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18633,6 +18633,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.wireless_syntax_error ]; }; From 559cf76fa3642106d9f23c9e845baf4d354be682 Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Mon, 4 Jan 2021 20:02:23 +0100 Subject: [PATCH 04/11] warsow: fix src url Signed-off-by: Marc 'risson' Schmitt --- pkgs/games/warsow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 4c2cd1b5a28..64c275ec444 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.1.2"; src = fetchurl { - url = "http://slice.sh/warsow/${pname}-${version}.tar.gz"; + url = "http://warsow.net/${pname}-${version}.tar.gz"; sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc"; }; From 75dfb5f00fdac101d76977a8652dc3502b9d6654 Mon Sep 17 00:00:00 2001 From: Joe Dupuis Date: Mon, 4 Jan 2021 11:36:50 -0800 Subject: [PATCH 05/11] overmind: 2.1.1 -> 2.2.0 --- pkgs/applications/misc/overmind/default.nix | 4 ++-- pkgs/applications/misc/overmind/deps.nix | 18 ------------------ 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index ca05facaa48..537ae3741ef 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "overmind"; - version = "2.1.1"; + version = "2.2.0"; goPackagePath = "github.com/DarthSim/overmind"; nativeBuildInputs = [ makeWrapper ]; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "DarthSim"; repo = pname; rev = "v${version}"; - sha256 = "0akqn8s1mgk5q00gzh3ymq7nrnkyi6avyaxxvbxnjyq9bxsqz327"; + sha256 = "00v6l4138vv32bqfkzrhk4hfl52a00rlg9ywhp4difgrnz7zj6xb"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/overmind/deps.nix b/pkgs/applications/misc/overmind/deps.nix index afcc8d9726f..b4c9211a24a 100644 --- a/pkgs/applications/misc/overmind/deps.nix +++ b/pkgs/applications/misc/overmind/deps.nix @@ -45,15 +45,6 @@ sha256 = "1a82lclk56y7c44jg7wn5vq733dmn0g20r5yqbchrxnpfl75dw89"; }; } - { - goPackagePath = "github.com/pkg/term"; - fetch = { - type = "git"; - url = "https://github.com/pkg/term"; - rev = "aa71e9d9e942"; - sha256 = "1gyxnj4jq3z2k4gjwwlz8hn56c1ys8jvafdd61nd6qs8jwp6iqp3"; - }; - } { goPackagePath = "github.com/pmezard/go-difflib"; fetch = { @@ -126,15 +117,6 @@ sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; }; } - { - goPackagePath = "gopkg.in/urfave/cli.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/urfave/cli.v1"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } { goPackagePath = "gopkg.in/yaml.v2"; fetch = { From 2bb0558d0af21024c8c0d5ed5fa5e30792e32130 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 4 Jan 2021 14:33:03 -0500 Subject: [PATCH 06/11] aws-nuke: init at 2.14.0 --- pkgs/tools/admin/aws-nuke/default.nix | 36 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/admin/aws-nuke/default.nix diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix new file mode 100644 index 00000000000..ee29c7402e7 --- /dev/null +++ b/pkgs/tools/admin/aws-nuke/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "aws-nuke"; + version = "2.14.0"; + + src = fetchFromGitHub { + owner = "rebuy-de"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ULHT2ysAVZHSojIdsbPTuwskwOQVrK8f14r9eq+Effs="; + }; + + vendorSha256 = "sha256-GUCsl5VyptNvStJZgCsJDlllZasX1OhbVkahcQFuiC8="; + + preBuild = '' + if [ "x$outputHashAlgo" != "x" ]; then + # Only `go generate` when fetching the go mod vendor code + go generate ./... + fi + ''; + + doCheck = false; + + subPackages = [ "." ]; + + meta = with stdenv.lib; { + description = "Nuke a whole AWS account and delete all its resources"; + homepage = "https://github.com/rebuy-de/aws-nuke"; + license = licenses.mit; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 036d4c3d590..2af5d181280 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -967,6 +967,8 @@ in aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; + aws-nuke = callPackage ../tools/admin/aws-nuke { }; + aws-okta = callPackage ../tools/security/aws-okta { }; aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; From d815581d9820503e345bc99dea0a048abc06bc63 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 4 Jan 2021 21:12:45 +0100 Subject: [PATCH 07/11] linuxPackages.wireguard: 1.0.20201112 -> 1.0.20201221 https://lists.zx2c4.com/pipermail/wireguard/2020-December/006210.html --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 25a59b14ab8..4ba02fa6c84 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20201112"; + version = "1.0.20201221"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "sha256-HnYvjZ3VUH79NwNIvyTTygWYbVqEL2ttvlOlLiHhb5s="; + sha256 = "sha256-8RPJEk+6NaJP3LNZYEncLlkdrw2jHxNekKwEr+YpHeQ="; }; hardeningDisable = [ "pic" ]; From 214effeb9da65d36e3b49723ebfb142bb2f184ce Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 4 Jan 2021 21:13:08 +0100 Subject: [PATCH 08/11] evcxr: 0.6.0 -> 0.7.0 https://github.com/google/evcxr/blob/v0.7.0/RELEASE_NOTES.md#version-070 --- pkgs/development/interpreters/evcxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index a97f132b3b2..59abf36f7ac 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-QpUhUE65/IuT/VenziPX6z+CbJswbPPIv/ZnTthZpEU="; + sha256 = "sha256-33XeepqwYmTMcObroPTuxykYuM9qYI1+LV5lZIFSomg="; }; - cargoSha256 = "sha256-iUzVd4XtD+41yTV/BmqWLenzAUNPfS7vIHm1KfuPe9A="; + cargoSha256 = "sha256-tjCID3YeGkxcq/LqJDMHGNpv1MCXKtcLlDnNkFwx1zU="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; From 61b8a2c72011b5dd53f212cc9edcc2078ba28bde Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 4 Jan 2021 21:13:49 +0100 Subject: [PATCH 09/11] rustracer: 2.1.35 -> 2.1.40, fix build Failing build: https://hydra.nixos.org/build/134175791 ChangeLog: https://github.com/racer-rust/racer/blob/v2.1.40/CHANGELOG.md A few more things are worth noting: * It's not possible to update to latest version (2.1.42) at the time of committing since this requires a newer `rustc` (1.51 to be precise) to compile. * For proper completion, `rustLibSrc` rather than `rustcSrc` must be used now. The two were separated here previously[1]. * Dropped the `checkPhase` and replaced it with a list of `checkFlags`. This has the benefit that the default `checkPhase` from `buildRustPackage` can be used which properly configures parallelism and which target to use (i.e. `release` in this case which reduces build time). [1] 68060f6f6f491201724192ea0997d67dbeb2e302 --- pkgs/development/tools/rust/racer/default.nix | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 86f1989729e..7de30855dd3 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.35"; + version = "2.1.40"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = "v${version}"; - sha256 = "0c00b81s7abnadjbf4i39lhdkipx7z44sr8p78jd1fl61yyrspli"; + sha256 = "sha256-8Is+RBfcXKbGSFzYoolLHs30rxlNI//xVGEOhxP2TV8="; }; - cargoSha256 = "1nbp2jp65fqwsq9i04iyi4pbszs035w6id50p5ypw234cqxznikm"; + cargoSha256 = "sha256-iUomr9viCdZk4nV75/OP8vHtJpMbmy+pq1IbaA2lLmE="; nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -19,21 +19,20 @@ rustPlatform.buildRustPackage rec { # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP = 1; - RUST_SRC_PATH = rustPlatform.rustcSrc; + RUST_SRC_PATH = rustPlatform.rustLibSrc; postInstall = '' - wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc} + wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc} ''; - checkPhase = '' - cargo test -- \ - --skip nameres::test_do_file_search_std \ - --skip util::test_get_rust_src_path_rustup_ok \ - --skip util::test_get_rust_src_path_not_rust_source_tree \ - --skip extern --skip completes_pub_fn --skip find_crate_doc \ - --skip follows_use_local_package --skip follows_use_for_reexport \ - --skip follows_rand_crate --skip get_completion_in_example_dir \ - --skip test_resolve_global_path_in_modules - ''; + checkFlags = [ + "--skip nameres::test_do_file_search_std" + "--skip util::test_get_rust_src_path_rustup_ok" + "--skip util::test_get_rust_src_path_not_rust_source_tree" + "--skip extern --skip completes_pub_fn --skip find_crate_doc" + "--skip follows_use_local_package --skip follows_use_for_reexport" + "--skip follows_rand_crate --skip get_completion_in_example_dir" + "--skip test_resolve_global_path_in_modules" + ]; doInstallCheck = true; installCheckPhase = '' From a080e9b9ff0a41ea90aec7b97566297406a71eec Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 1 Jan 2021 15:33:02 +0100 Subject: [PATCH 10/11] ocamlPackages.ppx_import: use dependencies as listed in opam file --- .../ocaml-modules/ppx_import/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index f4977992759..b5651a8cec2 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,24 +1,27 @@ { lib, fetchurl, buildDunePackage, ocaml , ounit, ppx_deriving, ppx_tools_versioned +, ppxlib, ocaml-migrate-parsetree }: -if !lib.versionAtLeast ocaml.version "4.04" -then throw "ppx_import is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "ppx_import"; version = "1.7.1"; + useDune2 = true; + + minimumOCamlVersion = "4.04"; + src = fetchurl { url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-v${version}.tbz"; sha256 = "16dyxfb7syz659rqa7yq36ny5vzl7gkqd7f4m6qm2zkjc1gc8j4v"; }; - buildInputs = [ ounit ppx_deriving ]; - propagatedBuildInputs = [ ppx_tools_versioned ]; + propagatedBuildInputs = [ + ppxlib ppx_tools_versioned ocaml-migrate-parsetree + ]; doCheck = true; + checkInputs = [ ounit ppx_deriving ]; meta = { description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; From a43963db12774a01af9159981d877bb8326463ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Jan 2021 12:55:16 +0000 Subject: [PATCH 11/11] python37Packages.flufl_i18n: 3.1.3 -> 3.1.4 --- pkgs/development/python-modules/flufl/i18n.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index b980449661e..8b0c9863550 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "flufl.i18n"; - version = "3.1.3"; + version = "3.1.4"; propagatedBuildInputs = [ atpublic ]; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "dcca738be27f2c43ddf6f9307667a17478353190071f38a9f92c9af8d2252ba4"; + sha256 = "e19036292a825a69f0e0a87566d1628830c69eecd3b0295d22f582039477a6bb"; }; }