From 07d22cf075818674ba6b38e46e5d5c5ce83e4bcd Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Fri, 23 Oct 2020 17:54:16 +0200 Subject: [PATCH 01/33] fiche: init at version 0.9.1 --- maintainers/maintainer-list.nix | 10 +++++++++ pkgs/servers/fiche/default.nix | 38 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/servers/fiche/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 498fa758904..1e722a1b6bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6751,6 +6751,16 @@ fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; }]; }; + pinpox = { + email = "mail@pablo.tools"; + github = "pinpox"; + githubId = 1719781; + name = "Pablo Ovelleiro Corral"; + keys = [{ + longkeyid = "sa4096/0x823A6154426408D3"; + fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; + }]; + }; piotr = { email = "ppietrasa@gmail.com"; name = "Piotr Pietraszkiewicz"; diff --git a/pkgs/servers/fiche/default.nix b/pkgs/servers/fiche/default.nix new file mode 100644 index 00000000000..5f300b6c6eb --- /dev/null +++ b/pkgs/servers/fiche/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "fiche"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "solusipse"; + repo = "fiche"; + rev = version; + sha256 = "1102r39xw17kip7mjp987jy8na333gw9vxv31f7v8q05cr7d7kfb"; + }; + + installPhase = '' + mkdir -p $out/bin + install -m 0755 fiche $out/bin + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Command line pastebin for sharing terminal output"; + longDescription = '' + Fiche is a command line pastebin server for sharing terminal output. + It can be used without any graphical tools from a TTY and has minimal requirements. + A live instance can be found at https://termbin.com. + + Example usage: + echo just testing! | nc termbin.com 9999 + ''; + + homepage = "https://github.com/solusipse/fiche"; + changelog = "https://github.com/solusipse/fiche/releases/tag/${version}"; + license = licenses.mit; + maintainers = [ maintainers.pinpox ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f486528562..73fd49b7cee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -142,6 +142,8 @@ in ankisyncd = callPackage ../servers/ankisyncd { }; + fiche = callPackage ../servers/fiche { }; + avro-tools = callPackage ../development/tools/avro-tools { }; # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: From 73a07960ed4ea478f5d49b1a15aa0188b6d112e0 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 28 Oct 2020 00:05:47 +0100 Subject: [PATCH 02/33] Update pkgs/servers/fiche/default.nix Co-authored-by: Nikolay Korotkiy --- pkgs/servers/fiche/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/fiche/default.nix b/pkgs/servers/fiche/default.nix index 5f300b6c6eb..19978212fc7 100644 --- a/pkgs/servers/fiche/default.nix +++ b/pkgs/servers/fiche/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - install -m 0755 fiche $out/bin + install -Dm755 fiche -t $out/bin ''; doCheck = true; From 90c318246727ec5d1dae6706ebe1d8f1ffc3d6f6 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 28 Oct 2020 00:06:44 +0100 Subject: [PATCH 03/33] Update default.nix --- pkgs/servers/fiche/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/fiche/default.nix b/pkgs/servers/fiche/default.nix index 19978212fc7..10ce1c30a0c 100644 --- a/pkgs/servers/fiche/default.nix +++ b/pkgs/servers/fiche/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/bin install -Dm755 fiche -t $out/bin ''; From 67062ad05d5c3de0ca3c84411bfdbc61fa08a519 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Wed, 9 Dec 2020 11:49:09 +0100 Subject: [PATCH 04/33] vimPlugins.vim-erlang-runtime: init at 2020-11-22 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 94f92b21efb..0a2b87b612f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4885,6 +4885,18 @@ let meta.homepage = "https://github.com/tpope/vim-endwise/"; }; + vim-erlang-runtime = buildVimPluginFrom2Nix { + pname = "vim-erlang-runtime"; + version = "2020-11-22"; + src = fetchFromGitHub { + owner = "vim-erlang"; + repo = "vim-erlang-runtime"; + rev = "8a8ec7cb54d52be5fc5dce2a028888c2a2f50e35"; + sha256 = "13qfyl9v0a82hn574x6h7rq9kl3rhg6ivlpj69n2jn0lf33ij8qq"; + }; + meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; + }; + vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; version = "2020-08-07"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d77ace1b04e..4376bfbbecd 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -590,6 +590,7 @@ vhda/verilog_systemverilog.vim vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes +vim-erlang/vim-erlang-runtime vim-pandoc/vim-pandoc vim-pandoc/vim-pandoc-after vim-pandoc/vim-pandoc-syntax From b067c51d356529a67ae1d6c8288d70d97b6e3691 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Wed, 9 Dec 2020 12:32:59 +0100 Subject: [PATCH 05/33] vimPlugins.vim-erlang-compiler: init at 2020-11-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 0a2b87b612f..aade3361d86 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4885,6 +4885,18 @@ let meta.homepage = "https://github.com/tpope/vim-endwise/"; }; + vim-erlang-compiler = buildVimPluginFrom2Nix { + pname = "vim-erlang-compiler"; + version = "2020-11-16"; + src = fetchFromGitHub { + owner = "vim-erlang"; + repo = "vim-erlang-compiler"; + rev = "17e47d28141c961e567b39d8d9956cbdb6e720d0"; + sha256 = "1j27zk2gfig3zv7cg7dwg5x0c3nsik5blcci8a16wq050pi8bsr1"; + }; + meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/"; + }; + vim-erlang-runtime = buildVimPluginFrom2Nix { pname = "vim-erlang-runtime"; version = "2020-11-22"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4376bfbbecd..a647810ef6c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -590,6 +590,7 @@ vhda/verilog_systemverilog.vim vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes +vim-erlang/vim-erlang-compiler vim-erlang/vim-erlang-runtime vim-pandoc/vim-pandoc vim-pandoc/vim-pandoc-after From 4713f3e3b66deeaf5c85ff981cc6d4536dfd4859 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Thu, 10 Dec 2020 08:48:47 +0100 Subject: [PATCH 06/33] vimPlugins.vim-erlang-omnicomplete: init at 2020-08-29 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index aade3361d86..afbb5815747 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4897,6 +4897,18 @@ let meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/"; }; + vim-erlang-omnicomplete = buildVimPluginFrom2Nix { + pname = "vim-erlang-omnicomplete"; + version = "2020-08-29"; + src = fetchFromGitHub { + owner = "vim-erlang"; + repo = "vim-erlang-omnicomplete"; + rev = "2f980dd8f1861e00ea14dcd5ecc370e71af695fb"; + sha256 = "1i3c7ybahmb4az2njzvfnvx39bqiyqhf43n32rhpc3xg05y3bk7d"; + }; + meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/"; + }; + vim-erlang-runtime = buildVimPluginFrom2Nix { pname = "vim-erlang-runtime"; version = "2020-11-22"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a647810ef6c..63da5d465ab 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -591,6 +591,7 @@ vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes vim-erlang/vim-erlang-compiler +vim-erlang/vim-erlang-omnicomplete vim-erlang/vim-erlang-runtime vim-pandoc/vim-pandoc vim-pandoc/vim-pandoc-after From 91bad063f3957850c39eea75923d97e139d1536e Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Thu, 10 Dec 2020 19:09:34 +0100 Subject: [PATCH 07/33] vimPlugins.vim-erlang-tags: init at 2020-10-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index afbb5815747..22acc45256b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4921,6 +4921,18 @@ let meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; + vim-erlang-tags = buildVimPluginFrom2Nix { + pname = "vim-erlang-tags"; + version = "2020-10-16"; + src = fetchFromGitHub { + owner = "vim-erlang"; + repo = "vim-erlang-tags"; + rev = "a5bc6a90a166073d74e5103f40735740ae40a3cb"; + sha256 = "02d3y2296nh8qv0kgx119c1niim6ci2bahi7q3k0jsl2f86fl7dy"; + }; + meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; + }; + vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; version = "2020-08-07"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 63da5d465ab..e24374f32c4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -593,6 +593,7 @@ vim-airline/vim-airline-themes vim-erlang/vim-erlang-compiler vim-erlang/vim-erlang-omnicomplete vim-erlang/vim-erlang-runtime +vim-erlang/vim-erlang-tags vim-pandoc/vim-pandoc vim-pandoc/vim-pandoc-after vim-pandoc/vim-pandoc-syntax From 40d50c27bcae0853516556848d10d0504be18aea Mon Sep 17 00:00:00 2001 From: Tom Manner Date: Mon, 21 Dec 2020 11:20:35 -0500 Subject: [PATCH 08/33] rapidcheck: unstable-2018-09-27 -> unstable-2020-12-19 Updated to point at a much newer version of the library. Moving forward before was difficult because of a segfault introduced to rapidcheck when it's static library was optimized or stripped. That was fixed by a commit on 19 December 2020. --- pkgs/development/libraries/rapidcheck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index 492e1228978..571566909c4 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rapidcheck"; - version = "unstable-2018-09-27"; + version = "unstable-2020-12-19"; src = fetchFromGitHub { owner = "emil-e"; repo = "rapidcheck"; - rev = "de54478fa35c0d9cea14ec0c5c9dfae906da524c"; - sha256 = "0n8l0mlq9xqmpkgcj5xicicd1my2cfwxg25zdy8347dqkl1ppgbs"; + rev = "b78f89288c7e086d06e2a1e10b605d8375517a8a"; + sha256 = "0fj11gbhkaxbsgix2im7vdfvr26l75b8djk462sfw8xrwrfkjbdz"; }; nativeBuildInputs = [ cmake ]; From 37375215ccd76ef3812c6c71f0b10352e5256f51 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 Dec 2020 12:55:32 +0000 Subject: [PATCH 09/33] quilter: 2.5.1 -> 2.5.4 --- pkgs/applications/editors/quilter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index b69d20850ad..7cbbe66dc61 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.5.1"; + version = "2.5.4"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0ya1iwzfzvrci083zyrjj6ac4ys25j90slpk8yydw9n99kb750rk"; + sha256 = "sha256-A8Ov0rITHuMLDYTueeDO89KtxlP0pNk1pA7O4x3Q9fE="; }; nativeBuildInputs = [ From 0d3811c52fdc116203c1dd9c29aefa41f1fbfc83 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Dec 2020 21:22:48 +0000 Subject: [PATCH 10/33] pantheon.elementary-calculator: 1.5.5 -> 1.6.0 --- pkgs/desktops/pantheon/apps/elementary-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 0695b6e4006..803cc1a6bb9 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "1.5.5"; + version = "1.6.0"; repoName = "calculator"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-ctKUtaBU0qvDYquGCPL7tiTwQ7IcqvT7SXRjxETWXbM="; + sha256 = "sha256-kDqUwTi3XnFGUwAjnWcaKqDylUFqpus9WurLoqbV1xk="; }; passthru = { From 71590db8fbe50340f44b241a6718986d6300314f Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 10 Jan 2021 13:41:09 +0100 Subject: [PATCH 11/33] tests/installer: give installer VM more cores ZFS installer test runtime went from 637s to 380s on my Ryzen 3600 --- nixos/tests/installer.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index d80cfb4bd83..a59e088d2ae 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -284,7 +284,9 @@ let extraInstallerConfig ]; + # builds stuff in the VM, needs more juice virtualisation.diskSize = 8 * 1024; + virtualisation.cores = 8; virtualisation.memorySize = 1536; # Use a small /dev/vdb as the root disk for the From 94f8a6994eeab68a26925eaa41a31c6d76060922 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 14 Jan 2021 15:36:32 -0500 Subject: [PATCH 12/33] wrangler: 1.12.3 -> 1.13.0 --- pkgs/development/tools/wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 04690552894..b7a37f8b8d7 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.12.3"; + version = "1.13.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "1h9020yf5jsbilzn94h7qyxw9qnz3vw43g8a2415wvjqq6ihzfvm"; + sha256 = "0xhldarzb71x4k7ydk4yd6g0qv6y2l0mn2lc43hvl9jm29pnz95q"; }; - cargoSha256 = "12azc41y2yx936ax9b1yylc0gy91k0m7ih6p0bkw7m928f762hpx"; + cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk"; nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; From 19f017df5cafb4b1a5f823923737c079b2ad164d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Jan 2021 04:20:00 +0000 Subject: [PATCH 13/33] spotifyd: 0.2.24 -> 0.3.0 https://github.com/Spotifyd/spotifyd/releases/tag/v0.3.0 --- pkgs/applications/audio/spotifyd/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 4d52648a847..84cb64d8cc9 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPackages_1_45, pkgconfig, openssl +{ lib, fetchFromGitHub, rustPackages, pkgconfig, openssl , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null @@ -7,21 +7,18 @@ , dbus ? null }: -# rust >= 1.48 causes a panic within spotifyd on music playback. as long as -# there is no upstream fix for the issue we use an older version of rust. -# Upstream issue: https://github.com/Spotifyd/spotifyd/issues/719 -rustPackages_1_45.rustPlatform.buildRustPackage rec { +rustPackages.rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.2.24"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; rev = "v${version}"; - sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8"; + sha256 = "055njhy9if4qpsbgbr6615xxhcx9plava1m4l323vi4dbw09wh5r"; }; - cargoSha256 = "0200apqbx769ggjnjr0m72g61ikhml2xak5n1il2pvfx1yf5nw0n"; + cargoSha256 = "1ijrl208607abjwpr3cajcbj6sr35bk6ik778a58zf28kzdhrawc"; cargoBuildFlags = [ "--no-default-features" From 6a5e88d0f8e77c875046c0a5cd7d7ff9dc9f2263 Mon Sep 17 00:00:00 2001 From: nyanotech Date: Mon, 18 Jan 2021 05:05:01 +0000 Subject: [PATCH 14/33] charybdis: fix motd without this change, it looks for motd in the etc/ inside the store path, so services.charybdis.motd ends up having no effect --- pkgs/servers/irc/charybdis/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index bf31633e41e..3b2508a7760 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis' + substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/charybdis' ''; autoreconfPhase = "sh autogen.sh"; From 364de6ddd2a9f4508ba4375668221b930aa9fc73 Mon Sep 17 00:00:00 2001 From: Phil Dyer Date: Mon, 18 Jan 2021 15:30:28 +1000 Subject: [PATCH 15/33] r-modules: fix clustermq and rzmq build rzmq uses pkgconfig. clustermq now incorporates ZMQ libs directly, rather than using the rzmq package. clustermq now uses zeromq and pkgconfig. Both packages needed patchShebangs, due to pkgconfig. --- pkgs/development/r-modules/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 5492874efda..362e7b81da4 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -329,7 +329,8 @@ let rtiff = [ pkgs.libtiff.dev ]; runjags = [ pkgs.jags ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; - rzmq = [ pkgs.zeromq ]; + rzmq = [ pkgs.zeromq pkgs.pkgconfig ]; + clustermq = [ pkgs.zeromq ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; sdcTable = [ pkgs.gmp pkgs.glpk ]; seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; @@ -384,6 +385,7 @@ let nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; + clustermq = [ pkgs.pkgconfig ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; RcppEigen = [ pkgs.libiconv ]; @@ -663,6 +665,14 @@ let ''; }); + rzmq = old.rzmq.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + + clustermq = old.clustermq.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + Cairo = old.Cairo.overrideDerivation (attrs: { NIX_LDFLAGS = "-lfontconfig"; }); From 856d019ece8329728687543897eafc6f1954c884 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jan 2021 05:55:51 +0000 Subject: [PATCH 16/33] cargo-wipe: 0.3.0 -> 0.3.1 --- pkgs/development/tools/rust/cargo-wipe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix index 7be91e69f9d..6c73b245e04 100644 --- a/pkgs/development/tools/rust/cargo-wipe/default.nix +++ b/pkgs/development/tools/rust/cargo-wipe/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-wipe"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mihai-dinculescu"; repo = "cargo-wipe"; rev = "v${version}"; - sha256 = "1kwkifdp98zsinh7xcsz2va252wxbw73xlrv0r7h3m0bn51d52vw"; + sha256 = "sha256-sVekfGHg2wspP5/zJzXTXupspwJr4hQBucY5+8iUjUQ="; }; - cargoSha256 = "15snr1b1pybwcjzwddxybvry3jyllcmrp8dyfm9yiagks3wrcfb4"; + cargoSha256 = "sha256-IzEurJcPoM/JMQlSL7N84wzZddNpynrsjQEOUNms2YQ="; passthru = { updateScript = nix-update-script { From 426a0a6c9deed61def77dabe1c068950aaa35c23 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 16 Jan 2021 13:24:58 +0100 Subject: [PATCH 17/33] ocamlPackages.awa: init at 0.0.1 --- .../development/ocaml-modules/awa/default.nix | 38 +++++++++++++++++++ pkgs/development/ocaml-modules/awa/lwt.nix | 15 ++++++++ pkgs/development/ocaml-modules/awa/mirage.nix | 15 ++++++++ pkgs/top-level/ocaml-packages.nix | 6 +++ 4 files changed, 74 insertions(+) create mode 100644 pkgs/development/ocaml-modules/awa/default.nix create mode 100644 pkgs/development/ocaml-modules/awa/lwt.nix create mode 100644 pkgs/development/ocaml-modules/awa/mirage.nix diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix new file mode 100644 index 00000000000..49d614cda88 --- /dev/null +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -0,0 +1,38 @@ +{ lib, buildDunePackage, fetchurl +, ppx_sexp_conv, ppx_cstruct +, mirage-crypto, mirage-crypto-rng, mirage-crypto-pk +, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib +, rresult, mtime, logs, fmt, cmdliner, base64, hacl_x25519 +, zarith +}: + +buildDunePackage rec { + pname = "awa"; + version = "0.0.1"; + + minimumOCamlVersion = "4.07"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-v${version}.tbz"; + sha256 = "c1d604645517b191184a5800f5c48a6a9a3e5a2fce4a0e2ecfeee74586301400"; + }; + + nativeBuildInputs = [ ppx_sexp_conv ppx_cstruct ]; + + propagatedBuildInputs = [ + mirage-crypto mirage-crypto-rng mirage-crypto-pk x509 + cstruct cstruct-sexp sexplib rresult mtime + logs base64 hacl_x25519 zarith + ]; + + doCheck = true; + checkInputs = [ cstruct-unix cmdliner fmt ]; + + meta = with lib; { + description = "SSH implementation in OCaml"; + license = licenses.isc; + homepage = "https://github.com/mirage/awa-ssh"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/awa/lwt.nix b/pkgs/development/ocaml-modules/awa/lwt.nix new file mode 100644 index 00000000000..00be799ddff --- /dev/null +++ b/pkgs/development/ocaml-modules/awa/lwt.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, awa +, cstruct, mtime, lwt, cstruct-unix, mirage-crypto-rng +}: + +buildDunePackage { + pname = "awa-lwt"; + + inherit (awa) version src useDune2; + + propagatedBuildInputs = [ + awa cstruct mtime lwt cstruct-unix mirage-crypto-rng + ]; + + inherit (awa) meta; +} diff --git a/pkgs/development/ocaml-modules/awa/mirage.nix b/pkgs/development/ocaml-modules/awa/mirage.nix new file mode 100644 index 00000000000..4f9b425f8a0 --- /dev/null +++ b/pkgs/development/ocaml-modules/awa/mirage.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, awa +, cstruct, mtime, lwt, mirage-flow, mirage-clock, logs +}: + +buildDunePackage { + pname = "awa-mirage"; + + inherit (awa) version src useDune2; + + propagatedBuildInputs = [ + awa cstruct mtime lwt mirage-flow mirage-clock logs + ]; + + inherit (awa) meta; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b123658a3ff..e840953b4b6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -44,6 +44,12 @@ let atdgen = callPackage ../development/ocaml-modules/atdgen { }; + awa = callPackage ../development/ocaml-modules/awa { }; + + awa-lwt = callPackage ../development/ocaml-modules/awa/lwt.nix { }; + + awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { }; + base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { From 6fb0c40bbf730c98809732986d7a1bdfba687d45 Mon Sep 17 00:00:00 2001 From: Robbert Gurdeep Singh Date: Mon, 18 Jan 2021 09:11:12 +0100 Subject: [PATCH 18/33] nextcloud: 20.0.4 -> 20.0.5 Signed-off-by: Robbert Gurdeep Singh --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 75fa1ff0824..3bea50b5620 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -58,7 +58,7 @@ in { }; nextcloud20 = generic { - version = "20.0.4"; - sha256 = "sha256-Jp8WIuMm9dEeOH04YarU4rDnkzSul+7Vp7M1K6dmFCA="; + version = "20.0.5"; + sha256 = "5c70dd33024012a1651fd099133d052d129a4dadc6935f44bb9c3e2b360befe3"; }; } From 629065b91c6ac5a8729d826ed4baffa28c840686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 18 Jan 2021 09:40:24 +0100 Subject: [PATCH 19/33] setzer: 0.3.9 -> 0.4.0 --- pkgs/applications/editors/setzer/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index aa1b86d64db..5c62dc06a7d 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.3.9"; + version = "0.4.0"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - sha256 = "1qmy2bxl8x6pijjaaj91v6rqdipha6iyy0b6b9y1lk3r2p3azd42"; + sha256 = "036xbg65h255zlvz9l86sw6w9l4qfyf13x8p8ml7dj52hcdfvyb9"; }; format = "other"; @@ -51,7 +51,8 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg - pypdf2 + pdfminer + pycairo ]; meta = with lib; { From c6aab40c9dbdee3b8532514c552025d90af34b05 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Mon, 18 Jan 2021 16:42:56 +0800 Subject: [PATCH 20/33] act: 0.2.17 -> 0.2.18 --- pkgs/development/tools/misc/act/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 4bb2d3d6245..6bf13ce7ec6 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0s7bgm2q7z9xpaj6kfvg63v12k35ckaxwmh6bbjh15xibaw58183"; + sha256 = "16c5qxxi37pdcqrf8aliad6lkqx9jk57yc2q6gpw9ffar49km4qi"; }; - vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; + vendorSha256 = "1xw80vb49bd0n620yaxwcvyf9glkscc42i847blan4hw6k957hii"; doCheck = false; From 04585f097f243a37f33ab9bdf8558c6b5a5e5ee5 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 14 Jan 2021 17:16:49 +0100 Subject: [PATCH 21/33] anki: replace mplayer with mpv Mplayer is not available for aarch64. --- pkgs/games/anki/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 14e9704a432..6edddfeed5c 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -4,8 +4,9 @@ , python , fetchurl , fetchFromGitHub +, fetchpatch , lame -, mplayer +, mpv-unwrapped , libpulseaudio , pyqtwebengine , decorator @@ -105,11 +106,16 @@ buildPythonApplication rec { checkInputs = [ pytest glibcLocales nose ]; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; - buildInputs = [ lame mplayer libpulseaudio ]; + buildInputs = [ lame mpv-unwrapped libpulseaudio ]; patches = [ # Disable updated version check. ./no-version-check.patch + (fetchpatch { + name = "fix-mpv-args.patch"; + url = "https://sources.debian.org/data/main/a/anki/2.1.15+dfsg-3/debian/patches/fix-mpv-args.patch"; + sha256 = "1dimnnawk64m5bbdbjrxw5k08q95l728n94cgkrrwxwavmmywaj2"; + }) ]; # Anki does not use setup.py @@ -173,7 +179,7 @@ buildPythonApplication rec { preFixup = '' makeWrapperArgs+=( "''${qtWrapperArgs[@]}" - --prefix PATH ':' "${lame}/bin:${mplayer}/bin" + --prefix PATH ':' "${lame}/bin:${mpv-unwrapped}/bin" ) ''; @@ -197,7 +203,6 @@ buildPythonApplication rec { or even practicing guitar chords! ''; license = licenses.agpl3Plus; - broken = stdenv.hostPlatform.isAarch64; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ oxij Profpatsch ]; }; From 3bdf95ceb5660273a01ed2e5be2676487f7e820e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Jan 2021 08:36:31 +0100 Subject: [PATCH 22/33] python3Packages.msldap: 0.3.22 -> 0.3.24 --- pkgs/development/python-modules/msldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 3a5546c0afe..ea2ae26c96b 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.3.22"; + version = "0.3.24"; src = fetchPypi { inherit pname version; - sha256 = "1ivq56953skql8f255nqx2sg4mm0kz2pr5b4dx62dx7jdgd1xym3"; + sha256 = "0q9bhw0lfw9iykjdsqz62ipy3ihfz6kprzw5sc7v1678l2pvs84j"; }; propagatedBuildInputs = [ From e29d45b44d58171a278f5d797d6450579cb1bb88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Jan 2021 10:12:00 +0100 Subject: [PATCH 23/33] scilla: init at 20210118-74dd814 --- pkgs/tools/security/scilla/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/security/scilla/default.nix diff --git a/pkgs/tools/security/scilla/default.nix b/pkgs/tools/security/scilla/default.nix new file mode 100644 index 00000000000..1983aef1726 --- /dev/null +++ b/pkgs/tools/security/scilla/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "scilla"; + version = "20210118-${lib.strings.substring 0 7 rev}"; + rev = "74dd81492fef92b95765df1d0f629276a146a5a4"; + + src = fetchFromGitHub { + owner = "edoardottt"; + repo = pname; + inherit rev; + sha256 = "10qvaigfarljydfb9vx2fb9nk293j4g9w2h9mr8xw6adbvl0qr9q"; + }; + + vendorSha256 = "04wqsl4269gc3r6l9srqhcq19zarnyyab8k1shj3w6lkfcc61z25"; + + meta = with lib; { + description = "Information gathering tool for DNS, ports and more"; + homepage = "https://github.com/edoardottt/scilla"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cb8685d773..5edac9ecdb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27988,6 +27988,8 @@ in scilab-bin = callPackage ../applications/science/math/scilab-bin {}; + scilla = callPackage ../tools/security/scilla { }; + scotch = callPackage ../applications/science/math/scotch { }; mininet = callPackage ../tools/virtualization/mininet { }; From 2b014ef903e62145157f3f0a15bd311a40ce7ab6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 15 Jan 2021 10:54:17 +0100 Subject: [PATCH 24/33] ocamlPackages.mimic: init at 0.0.1 --- .../ocaml-modules/mimic/default.nix | 47 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mimic/default.nix diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix new file mode 100644 index 00000000000..01b2c813f2f --- /dev/null +++ b/pkgs/development/ocaml-modules/mimic/default.nix @@ -0,0 +1,47 @@ +{ lib, buildDunePackage, fetchurl +, fmt, mirage-flow, result, rresult, cstruct, logs, ke +, alcotest, alcotest-lwt, bigstringaf, bigarray-compat +}: + +buildDunePackage rec { + pname = "mimic"; + version = "0.0.1"; + + minimumOCamlVersion = "4.08"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz"; + sha256 = "0j4l99sgm5mdmv67vakkz2pw45l6i89bpza88xqkgmskfk50c5pk"; + }; + + # don't install changelogs for other packages + postPatch = '' + rm -f CHANGES.md CHANGES.carton.md + ''; + + propagatedBuildInputs = [ + fmt + mirage-flow + result + rresult + cstruct + logs + ]; + + doCheck = true; + checkInputs = [ + alcotest + alcotest-lwt + bigstringaf + bigarray-compat + ke + ]; + + meta = with lib; { + description = "A simple protocol dispatcher"; + license = licenses.isc; + homepage = "https://github.com/mirage/ocaml-git"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e840953b4b6..97650eca2c6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -580,6 +580,8 @@ let mezzo = callPackage ../development/compilers/mezzo { }; + mimic = callPackage ../development/ocaml-modules/mimic { }; + minisat = callPackage ../development/ocaml-modules/minisat { }; mirage = callPackage ../development/ocaml-modules/mirage { }; From f2c5d663b2585d8de3512e30b3f501e1774b7fc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Jan 2021 10:42:38 +0100 Subject: [PATCH 25/33] python3Packages.vulture: 2.1 -> 2.3 --- pkgs/development/python-modules/vulture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index b657d26c706..64e89cc214c 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.1"; + version = "2.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "933bf7f3848e9e39ecab6a12faa59d5185471c887534abac13baea6fe8138cc2"; + sha256 = "0ryrmsm72z3fzaanyblz49q40h9d3bbl4pspn2lvkkp9rcmsdm83"; }; checkInputs = [ coverage pytest pytestcov ]; From 68fcde294da913d405149848fbec0699199bf360 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 18 Jan 2021 01:45:34 -0800 Subject: [PATCH 26/33] kakoune.plugins.kak-fzf: fix assertion --- pkgs/applications/editors/kakoune/plugins/kak-fzf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix index 1f6a4ea561f..b52584b4456 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fzf }: +{ lib, stdenv, fetchFromGitHub, fzf }: assert lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ]; From 2d32864d00d5a74273e106b185380b518f72dad2 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Mon, 4 Jan 2021 13:58:49 -0300 Subject: [PATCH 27/33] python3Packages.nitime: 0.8.1 -> 0.9 --- pkgs/development/python-modules/nitime/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index 68eeab46afc..ccbf540f75f 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , python , fetchPypi +, isPy27 , pytestCheckHook , cython , numpy @@ -13,19 +14,17 @@ buildPythonPackage rec { pname = "nitime"; - version = "0.8.1"; - disabled = python.pythonVersion != "3.7"; # gcc error when running Cython with Python 3.8 + version = "0.9"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0hb3x5196z2zaawb8s7lhja0vd3n983ncaynqfl9qg315x9ax7i6"; + sha256 = "sha256-bn2QrbsfqUJim84vH5tt5T6h3YsGAlgu9GCMiNQ0OHQ="; }; - buildInputs = [ cython ]; - - propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ]; - checkInputs = [ pytestCheckHook ]; + buildInputs = [ cython ]; + propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ]; meta = with lib; { homepage = "https://nipy.org/nitime"; From eecfd010c721847aec6cd020c83c82e0e4e49850 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Jan 2021 10:56:20 +0100 Subject: [PATCH 28/33] python3Packages.vulture: switch to pytestCheckHook --- .../python-modules/vulture/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index 64e89cc214c..7ab5bcbb65b 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, coverage, pytest, pytestcov }: +{ lib +, buildPythonPackage +, coverage +, fetchPypi +, isPy27 +, pytest-cov +, pytestCheckHook +, toml +}: buildPythonPackage rec { pname = "vulture"; @@ -10,8 +18,15 @@ buildPythonPackage rec { sha256 = "0ryrmsm72z3fzaanyblz49q40h9d3bbl4pspn2lvkkp9rcmsdm83"; }; - checkInputs = [ coverage pytest pytestcov ]; - checkPhase = "pytest"; + propagatedBuildInputs = [ toml ]; + + checkInputs = [ + coverage + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "vulture" ]; meta = with lib; { description = "Finds unused code in Python programs"; From 9af9718ccbe4236cb56c66e38823c0a284b59173 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jan 2021 10:18:33 +0000 Subject: [PATCH 29/33] atomicparsley: 20200701.154658.b0d6223 -> 20210114.184825.1dbe1be --- pkgs/tools/video/atomicparsley/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 42c3b11c08f..41d4dd63d58 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "atomicparsley"; - version = "20200701.154658.b0d6223"; + version = "20210114.184825.1dbe1be"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; - sha256 = "sha256-EHO4WkxoAXUhuJKMNYmBbGfOgtO9uklzXtWS4QsV1c8="; + sha256 = "sha256-dyrfr3bsRzEWaAr9K+7SchFVl63cZawyIjmstOI9e5I="; }; nativeBuildInputs = [ cmake ]; From f7ecd2984b714af028e8a421ac3c45886ae0e51b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jan 2021 10:28:24 +0000 Subject: [PATCH 30/33] aws-okta: 1.0.8 -> 1.0.11 --- pkgs/tools/security/aws-okta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index e6672e1b3d9..73d95f52b8c 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-okta"; - version = "1.0.8"; + version = "1.0.11"; goPackagePath = "github.com/segmentio/aws-okta"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "segmentio"; repo = "aws-okta"; rev = "v${version}"; - sha256 = "14bg9rdfxkpw00phc8faz4ghiyb0j7a9qai74lidrzplzl139bzf"; + sha256 = "sha256-1cprKpIFgM3+lUEHNvda34nJTH4Ch3LtTRq/Dp6QBQ8="; }; buildFlags = [ "--tags" "release" ]; From 8cde8bb11d0e64851afc3e568dc49b0bd2dbac65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jan 2021 10:34:01 +0000 Subject: [PATCH 31/33] awsweeper: 0.10.2 -> 0.11.1 --- pkgs/tools/admin/awsweeper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index f148bd088f4..0ff42ca20fc 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "awsweeper"; - version = "0.10.2"; + version = "0.11.1"; src = fetchFromGitHub { owner = "jckuester"; repo = pname; rev = "v${version}"; - sha256 = "1ln4s04n1qd1wv88ahhvvvphlxf6c9krqz9lmbcx3n67sb8xngm5"; + sha256 = "sha256-fpWoLFSwSVxaiWyVMSmQTd3o/zOySUXNM2YhxMQ7nsA="; }; - vendorSha256 = "0zlhb84fmrnwq71d0h83p28aqlfclcydndl0z2j9nx2skjlxax2i"; + vendorSha256 = "sha256-1u1mzANLlWduAQF1GUX7BJSyYlSZwNQISqKwbyRlGog="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ]; From 9ee046db6b9a106926133dfe415490399d664ca2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jan 2021 11:27:23 +0000 Subject: [PATCH 32/33] blogc: 0.20.0 -> 0.20.1 --- pkgs/applications/misc/blogc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blogc/default.nix b/pkgs/applications/misc/blogc/default.nix index c74718c52fb..86d52625dc2 100644 --- a/pkgs/applications/misc/blogc/default.nix +++ b/pkgs/applications/misc/blogc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "blogc"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "blogc"; repo = pname; rev = "v${version}"; - sha256 = "0hx0gpvmv7rd910czafvmcpxabbvfmvdyxk4d1mckmblx8prb807"; + sha256 = "sha256-YAwGgV5Vllz8JlIASbGIkdRzpciQbgPiXl5DjiSEJyE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 04f67666991d1d88f616a7c3a115dcd83b6a5b76 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jan 2021 12:02:39 +0000 Subject: [PATCH 33/33] cargo-make: 0.32.9 -> 0.32.10 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index e10590f5e59..c90761309e6 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,11 +4,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.9"; + version = "0.32.10"; src = fetchCrate { inherit pname version; - sha256 = "0f6avprq0d65v5fk3kn2kvw3w024f21yq6v8y7d9rbwqxxf87jlf"; + sha256 = "sha256-cDpEFw9uICB/4aZheTWwDqYGjLz+C6gLie/S3ehhifg="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "0v0657hh8ivqaq4sn0saaiz06shxavhrh9mksjlzj7c2ym6cxkih"; + cargoSha256 = "sha256-Qh14lks72bsetwyv0ALF7nZo3m3FDEmVxzFkHJoEuzE="; # Some tests fail because they need network access. # However, Travis ensures a proper build.