From a646f4b45436bd16aa390b22e0548efd3c7a118f Mon Sep 17 00:00:00 2001 From: Daniel Gorin Date: Tue, 10 Mar 2020 14:33:25 +0000 Subject: Fix missing default-policy.json in skopeo We started having issues with `pkgs.dockerTools.pullImage`, were it would fail with: ``` FATA[0000] Error loading trust policy: open /etc/containers/policy.json: no such file or directory ``` It turns out that since `skopeo` was bumped to `0.1.40`, it was accidentally no longer being built with a default policy. This may happen again, see https://github.com/containers/skopeo/issues/787 --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 957f691d2250..c065629018c9 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -33,8 +33,8 @@ buildGoPackage { buildFlagsArray = '' -ldflags= - -X github.com/containers/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile} - -X github.com/containers/skopeo/vendor/github.com/containers/image/internal/tmpdir.unixTempDirForBigFiles=/tmp + -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/signature.systemDefaultPolicyPath=${defaultPolicyFile} + -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/internal/tmpdir.unixTempDirForBigFiles=/tmp ''; preBuild = '' -- cgit 1.4.1 From 9c4f24a63e7cfe574ccc5a74b7f7b1b4b2444e67 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 11 Mar 2020 13:53:15 +0100 Subject: meson: add jtojnar to maintainers --- pkgs/development/tools/build-managers/meson/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index f9f4c344e322..2930cc79374b 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -98,7 +98,7 @@ python3Packages.buildPythonApplication rec { homepage = https://mesonbuild.com; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; license = licenses.asl20; - maintainers = with maintainers; [ mbe rasendubi ]; + maintainers = with maintainers; [ jtojnar mbe rasendubi ]; platforms = platforms.all; }; } -- cgit 1.4.1 From 51dc1795352b460071121936de0cf97344da27bc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 10 Mar 2020 04:20:00 -0500 Subject: lazygit: 0.15.7 -> 0.16.2 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 37c6396e2e3a..9a27c7d44e9c 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.15.7"; + version = "0.16.2"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "18scwla36bjpylha4fwis0aa333r14bavzd7xhx4677xgaz7l73j"; + sha256 = "0lvhj4iz74h97lkylqg7hl18xcxcl9msxxvap7jqdj2mf2iwxi32"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From c9fc7a2a9cba048f84311efe11fd8cc849bc859b Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 8 Mar 2020 11:00:52 -0700 Subject: dune: 2.3.1 -> 2.4.0 --- pkgs/development/tools/ocaml/dune/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 45a2a3123041..47e71c41568d 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1jzm29z58l34kpqll9jcz5dkkhh36lncba1yb32ghknkvyfdvcxj"; + sha256 = "096wp6aawgh1ffhbnjfxgakwqd02kfkz2i6m6cc040w1g554iw98"; }; buildInputs = [ ocaml findlib ]; -- cgit 1.4.1 From b7cdb64ac2e65237c4257e69ac1a892f476e2d31 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 Mar 2020 22:20:26 +0100 Subject: treewide: remove myself from a few packages I don't use anymore --- nixos/modules/services/misc/autorandr.nix | 2 +- .../networking/irc/weechat/scripts/weechat-autosort/default.nix | 2 +- pkgs/development/python-modules/python-jenkins/default.nix | 2 +- pkgs/development/tools/repository-managers/nexus/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/tools') diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 4708e16e2a6c..cf7fb5f78d3d 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -48,5 +48,5 @@ in { }; - meta.maintainers = with maintainers; [ gnidorah ma27 ]; + meta.maintainers = with maintainers; [ gnidorah ]; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix index c39b7fe15963..23a6996bcdd2 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Autosort is a weechat script to automatically or manually keep your buffers sorted"; homepage = https://github.com/de-vri-es/weechat-autosort; license = licenses.gpl3; - maintainers = with maintainers; [ ma27 emily ]; + maintainers = with maintainers; [ emily ]; }; } diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index 4de5e2910633..06a5d234ecf6 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { description = "Python bindings for the remote Jenkins API"; homepage = "https://pypi.python.org/pypi/python-jenkins"; license = licenses.bsd3; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index a727eebe0541..416dafe2872e 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = http://www.sonatype.org/nexus; license = licenses.epl10; platforms = platforms.all; - maintainers = with maintainers; [ aespinosa ironpinguin ma27 zaninime ]; + maintainers = with maintainers; [ aespinosa ironpinguin zaninime ]; }; } -- cgit 1.4.1 From cd8c987fbc72beee00cfa0458f272eecfe6991ac Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 9 Mar 2020 17:57:39 -0400 Subject: rainicorn: remove broken package that has been abandoned upstream The upstream project is dead, with the last commit being in 2016: https://github.com/RustDT/Rainicorn This no longer builds in NixPkgs, and has been marked as broken for a very long time. Since the package is not maintained and is dead upstream, let's delete. --- pkgs/development/tools/rust/rainicorn/default.nix | 28 ----------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 29 deletions(-) delete mode 100644 pkgs/development/tools/rust/rainicorn/default.nix (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix deleted file mode 100644 index 94ee2a773f26..000000000000 --- a/pkgs/development/tools/rust/rainicorn/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -with rustPlatform; - -buildRustPackage rec { - pname = "rainicorn"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "RustDT"; - repo = "Rainicorn"; - rev = "0f8594079a7f302f4940cc4320f5e4f39f95cdc4"; - sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01"; - }; - - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "07zsj12g4ff0cdb9pwz302vxvajr8g6nl3bpz4vdyi84csfvmahz"; - - meta = with stdenv.lib; { - broken = true; - description = "Rust IDEs. parse-analysis"; - homepage = https://github.com/RustDT/Rainicorn; - license = with licenses; [ mit asl20 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79fa50cf6a1e..d0c069663919 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8912,7 +8912,6 @@ in }; maturin = callPackage ../development/tools/rust/maturin { }; - rainicorn = callPackage ../development/tools/rust/rainicorn { }; inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { -- cgit 1.4.1