git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit424697d51222211c33d37b5925d56731362f8e86 authorFrederik Rietdijk <fridh@fridh.nl> dateWed 12 Feb 2020, 09:55 (7 years ago) parent1a6c3cbc6218f9
48 files changed+372−204
nixos/modules/config/swap.nix+2 nixos/modules/security/rngd.nix+4−1 pkgs/applications/audio/ncspot/default.nix+3−3 pkgs/applications/editors/android-studio/default.nix+3−3 pkgs/applications/misc/hugo/default.nix+2−2 pkgs/applications/misc/tipp10/default.nix+25 pkgs/applications/networking/cluster/kops/default.nix+2−2 pkgs/applications/science/biology/delly/default.nix+13−4 pkgs/applications/version-management/git-repo/default.nix+2−2 pkgs/build-support/rust/build-rust-crate/build-crate.nix+1 pkgs/data/fonts/spleen/default.nix+6−5 pkgs/data/misc/spdx-license-list-data/default.nix+3−2 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+1 pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix+2−2 pkgs/development/compilers/glslang/default.nix+2−2 pkgs/development/compilers/purescript/psc-package/default.nix+2−2 pkgs/development/compilers/shaderc/default.nix+8−8 pkgs/development/libraries/gegl/4.0.nix+2−1 pkgs/development/libraries/tdlib/default.nix+2−2 pkgs/development/libraries/vulkan-headers/default.nix+2−2 pkgs/development/libraries/vulkan-loader/default.nix+3−8 pkgs/development/python-modules/credstash/default.nix+2−2 pkgs/development/python-modules/pysaml2/default.nix+7 pkgs/development/tools/grabserial/default.nix+2−2 pkgs/development/tools/vulkan-validation-layers/default.nix+3−3 pkgs/development/web/cypress/default.nix+3−3 pkgs/misc/screensavers/xlockmore/default.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.5.nix+2−2 pkgs/servers/radarr/default.nix+2−2 pkgs/servers/trezord/default.nix+2−2 pkgs/servers/web-apps/matomo/default.nix+87−83 pkgs/shells/zsh/bracketed-paste-magic.patch+22 pkgs/shells/zsh/default.nix+7 pkgs/shells/zsh/oh-my-zsh/default.nix+3−3 pkgs/tools/admin/tigervnc/default.nix+2 pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch+21 pkgs/tools/graphics/vulkan-tools/default.nix+2−2 pkgs/tools/misc/brotab/default.nix+33 pkgs/tools/misc/clipman/default.nix+3−3 pkgs/tools/misc/fluent-bit/default.nix+2−2 pkgs/tools/misc/ncdu/default.nix+2−2 pkgs/tools/package-management/nix/default.nix+16−23 pkgs/tools/security/safe/default.nix+31 pkgs/tools/text/gist/default.nix+2−2 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+19−11
nixos/modules/config/swap.nix+2
@@ -185,6 +185,8 @@ in
185185 { description = "Initialisation of swap device ${sw.device}";
186186 wantedBy = [ "${realDevice'}.swap" ];
187187 before = [ "${realDevice'}.swap" ];
188+ # If swap is encrypted, depending on rngd resolves a possible entropy starvation during boot
189+ after = mkIf (config.security.rngd.enable && sw.randomEncryption.enable) [ "rngd.service" ];
188190 path = [ pkgs.utillinux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
189191
190192 script =
nixos/modules/security/rngd.nix+4−1
@@ -39,12 +39,15 @@ in
3939
4040 description = "Hardware RNG Entropy Gatherer Daemon";
4141
42+ # rngd may have to start early to avoid entropy starvation during boot with encrypted swap
43+ unitConfig.DefaultDependencies = false;
4244 serviceConfig = {
4345 ExecStart = "${pkgs.rng-tools}/sbin/rngd -f"
4446 + optionalString cfg.debug " -d";
47+ # PrivateTmp would introduce a circular dependency if /tmp is on tmpfs and swap is encrypted,
48+ # thus depending on rngd before swap, while swap depends on rngd to avoid entropy starvation.
4549 NoNewPrivileges = true;
4650 PrivateNetwork = true;
47− PrivateTmp = true;
4851 ProtectSystem = "full";
4952 ProtectHome = true;
5053 };
pkgs/applications/audio/ncspot/default.nix+3−3
@@ -12,16 +12,16 @@ let
1212in
1313rustPlatform.buildRustPackage rec {
1414 pname = "ncspot";
15− version = "0.1.1";
15+ version = "0.1.2";
1616
1717 src = fetchFromGitHub {
1818 owner = "hrkfdn";
1919 repo = "ncspot";
2020 rev = "v${version}";
21− sha256 = "0ldisr45w6ys1j62qv99ssqfg5q9dwrrzxh2maggyrx1zqdlsk6m";
21+ sha256 = "10jp2yh8jlvdwh297658q9fi3i62vwsbd9fbwjsir7s1c9bgdy8k";
2222 };
2323
24− cargoSha256 = "0k765hinqxfm30li1z66m1chsv69v6hiz109q2zlkxzg937qbnjh";
24+ cargoSha256 = "1gw8wvms1ry2shvm3c79wp5nkpc39409af4qfm5hd4wgz2grh8d2";
2525
2626 cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
2727
pkgs/applications/editors/android-studio/default.nix+3−3
@@ -13,9 +13,9 @@ let
1313 sha256Hash = "1nsm4d3vdx90szqd78a8mjq65xc9m5ipd35cqrlx3c3ny900sqxg";
1414 };
1515 betaVersion = {
16− version = "3.6.0.19"; # "Android Studio 3.6 RC 2"
17− build = "192.6165589";
18− sha256Hash = "1d47nfhzb0apfzin4bg5bck4jjid3jipm5s4n36r7fh20lpx93z5";
16+ version = "3.6.0.20"; # "Android Studio 3.6 RC 3"
17+ build = "192.6186006";
18+ sha256Hash = "153piq67yps5jwqrbciam4kpxziavml29d8ya5bi2rvfhipdd7da";
1919 };
2020 latestVersion = { # canary & dev
2121 version = "4.0.0.9"; # "Android Studio 4.0 Canary 9"
pkgs/applications/misc/hugo/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoModule rec {
44 pname = "hugo";
5− version = "0.64.0";
5+ version = "0.64.1";
66
77 goPackagePath = "github.com/gohugoio/hugo";
88
@@ -10,7 +10,7 @@ buildGoModule rec {
1010 owner = "gohugoio";
1111 repo = pname;
1212 rev = "v${version}";
13− sha256 = "10zbi2414c9grqhi9vcj3sczjh7hf20dihvcsirj551fmiqxrvpy";
13+ sha256 = "1h5n5d7g3l2lp25sjrcmavbkqqm1csgv2q5z7afwbb57j0m1nkn8";
1414 };
1515
1616 modSha256 = "18wfsp3ypfxj5qljmb19kzyc5byf413nkabz5mfvq8srjhcq1ifl";
pkgs/applications/misc/tipp10/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ cmake, stdenv, mkDerivation, fetchFromGitLab,
2+ qtmultimedia, qttools, ... }:
3+
4+mkDerivation rec {
5+ pname = "tipp10";
6+ version = "3.1.0";
7+
8+ src = fetchFromGitLab {
9+ owner = "a_a";
10+ repo = pname;
11+ rev = "v${version}";
12+ sha256 = "1mksga1zyqz1y2s524nkw86irg36zpjwz7ff87n2ygrlysczvnx1";
13+ };
14+
15+ nativeBuildInputs = [ cmake qttools ];
16+ buildInputs = [ qtmultimedia ];
17+
18+ meta = with stdenv.lib; {
19+ description = "Learn and train typing with the ten-finger system";
20+ homepage = "https://gitlab.com/a_a/tipp10";
21+ license = licenses.gpl2;
22+ maintainers = with maintainers; [ petabyteboy ];
23+ platforms = platforms.all;
24+ };
25+}
pkgs/applications/networking/cluster/kops/default.nix+2−2
@@ -67,7 +67,7 @@ in rec {
6767 };
6868
6969 kops_1_15 = mkKops {
70− version = "1.15.1";
71− sha256 = "0iq2bqq6zv6sk2psar33c3smnz79rk5v623qx4kr5h47wnqvrfvj";
70+ version = "1.15.2";
71+ sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3";
7272 };
7373}
pkgs/applications/science/biology/delly/default.nix+13−4
@@ -1,16 +1,25 @@
1−{ stdenv, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }:
1+{ stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }:
22
3−stdenv.mkDerivation rec {
3+let
4+ htslibPatch = fetchpatch {
5+ url = "https://github.com/dellytools/delly/commit/0e5c710b0c5ea790bb39699d4cbd49cf4fb86f14.diff";
6+ sha256 = "09bz1qqvzhdzm99hf9zgrv80kq9jlr1m2mdvx96p2hk5lpnbdl7y";
7+ excludes = [ "src/htslib" ];
8+ };
9+
10+in stdenv.mkDerivation rec {
411 pname = "delly";
5− version = "0.8.1";
12+ version = "0.8.2";
613
714 src = fetchFromGitHub {
815 owner = "dellytools";
916 repo = pname;
1017 rev = "v${version}";
11− sha256 = "18gm86j1g1k4z1cjv2m5v9rsl1xqs2w3dhwcsnzx2mhkrvmlc4i1";
18+ sha256 = "14bkmixz7737xj192ww96s3a20zc7xs7r04db8avw3ggi3i1s1cs";
1219 };
1320
21+ patches = [ htslibPatch ];
22+
1423 buildInputs = [ zlib htslib bzip2 lzma ncurses boost ];
1524
1625 EBROOTHTSLIB = htslib;
pkgs/applications/version-management/git-repo/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "git-repo";
7− version = "2.0";
7+ version = "2.1.1";
88
99 src = fetchFromGitHub {
1010 owner = "android";
1111 repo = "tools_repo";
1212 rev = "v${version}";
13− sha256 = "077fsg2mh47c7qvqwpivkw474rpnw5xs36j23rxj2k5m700bz3hq";
13+ sha256 = "0p09yak0vrdg8apk76kbx5gy7z57mzis9702rbw8mfx9p0ag6fy7";
1414 };
1515
1616 patches = [ ./import-ssl-module.patch ];
pkgs/build-support/rust/build-rust-crate/build-crate.nix+1
@@ -11,6 +11,7 @@
1111 baseRustcOpts =
1212 [(if release then "-C opt-level=3" else "-C debuginfo=2")]
1313 ++ ["-C codegen-units=$NIX_BUILD_CORES"]
14+ ++ ["--remap-path-prefix=$NIX_BUILD_TOP=/" ]
1415 ++ [(mkRustcDepArgs dependencies crateRenames)]
1516 ++ [crateFeatures]
1617 ++ extraRustcOpts
pkgs/data/fonts/spleen/default.nix+6−5
@@ -1,4 +1,4 @@
1−{ lib, fetchurl, mkfontdir }:
1+{ lib, fetchurl, mkfontscale }:
22
33let
44 pname = "spleen";
@@ -11,14 +11,15 @@ in fetchurl {
1111 recursiveHash = true;
1212 postFetch = ''
1313 tar xvf $downloadedFile --strip=1
14− d="$out/share/fonts/X11/misc/spleen"
15− install -Dm644 *.{pcf.gz,psfu,bdf} -t $d
14+ d="$out/share/fonts/misc"
15+ install -D -m 644 *.{pcf,bdf,otf} -t "$d"
16+ install -D -m 644 *.psfu -t "$out/share/consolefonts"
1617 install -m644 fonts.alias-spleen $d/fonts.alias
1718
1819 # create fonts.dir so NixOS xorg module adds to fp
19− ${mkfontdir}/bin/mkfontdir $d
20+ ${mkfontscale}/bin/mkfontdir "$d"
2021 '';
21− sha256 = "0h9gj7syn87hl5rhwckih92r228zac6b1dvh3034caml8ad3fyla";
22+ sha256 = "0x1xiw4gyfkyvwqg0f47rl92zq76d0c6jfncdnq8m2wwpxz9697b";
2223
2324 meta = with lib; {
2425 description = "Monospaced bitmap fonts";
pkgs/data/misc/spdx-license-list-data/default.nix+3−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "spdx-license-list-data";
5− version = "3.7";
5+ version = "3.8";
66
77 src = fetchFromGitHub {
88 owner = "spdx";
99 repo = "license-list-data";
1010 rev = "v${version}";
11− sha256 = "1zll1d4apqh762iplzcm90v3yp3b36whc3vqx1vlmjgdrfss9jhn";
11+ sha256 = "1pfy0vbs7sk7m670mclmlkpcanizdmgsm1qgwzrw28w3hxfq7gdb";
1212 };
1313
1414 phases = [ "unpackPhase" "installPhase" ];
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
2121 description = "Various data formats for the SPDX License List";
2222 homepage = "https://github.com/spdx/license-list-data";
2323 license = lib.licenses.cc0;
24+ platforms = lib.platforms.all;
2425 };
2526}
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+1
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
4949 "-Dopenssl_path=${openssl}/bin/openssl"
5050 "-Dsshadd_path=${openssh}/bin/ssh-add"
5151 "-Dsshkeygen_path=${openssh}/bin/ssh-keygen"
52+ "-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services"
5253 "-Dpost_install=true"
5354 ];
5455
pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix+2−2
@@ -3,13 +3,13 @@
33
44mkDerivation rec {
55 pname = "krohnkite";
6− version = "0.6";
6+ version = "0.6.1";
77
88 src = fetchFromGitHub {
99 owner = "esjeon";
1010 repo = "krohnkite";
1111 rev = "v${version}";
12− sha256 = "0gib39vvnpdynyfqfrkzri67dhr4lf3zpk3njw4zzkz97c8k6psq";
12+ sha256 = "1rjmpnd5fc5dmxwq9pr0l858185h4580fhicgaywx9l3nppam72a";
1313 };
1414
1515 buildInputs = [
pkgs/development/compilers/glslang/default.nix+2−2
@@ -9,13 +9,13 @@
99
1010stdenv.mkDerivation rec {
1111 pname = "glslang";
12− version = "7.11.3214";
12+ version = "8.13.3559";
1313
1414 src = fetchFromGitHub {
1515 owner = "KhronosGroup";
1616 repo = "glslang";
1717 rev = version;
18− sha256 = "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins";
18+ sha256 = "0waamlh2vqh1k40m169294xdlm0iqjkx2vis4qyxfki0r0cnsmnk";
1919 };
2020
2121 # These get set at all-packages, keep onto them for child drvs
pkgs/development/compilers/purescript/psc-package/default.nix+2−2
@@ -4,13 +4,13 @@ with lib;
44
55mkDerivation rec {
66 pname = "psc-package";
7− version = "0.6.0";
7+ version = "0.6.2";
88
99 src = fetchFromGitHub {
1010 owner = "purescript";
1111 repo = pname;
1212 rev = "v${version}";
13− sha256 = "165yax131rj1mdlqd28g6wcy1ps3k4w50z8gj9yc3nfs09dy0lab";
13+ sha256 = "0536mijma61khldnpbdviq2vvpfzzz7w8bxr59mvr19i10njdq0y";
1414 };
1515
1616 isLibrary = false;
pkgs/development/compilers/shaderc/default.nix+8−8
@@ -8,24 +8,24 @@ let
88 glslang = fetchFromGitHub {
99 owner = "KhronosGroup";
1010 repo = "glslang";
11− rev = "d3692c701b1265955221aa0d6ebc656bc4442b2a";
12− sha256 = "11cvwbzlpr4zrcmmyd9h0kbfhmhr6r696ydmn0yp1jrixby4bmji";
11+ rev = "3ed344dd784ecbbc5855e613786f3a1238823e56";
12+ sha256 = "00s2arfvw78d9k9fmangqlkvkmkpqzrin3g91vfab4wr8srb09dx";
1313 };
1414 spirv-tools = fetchFromGitHub {
1515 owner = "KhronosGroup";
1616 repo = "SPIRV-Tools";
17− rev = "08cc49ec59c3ff4d6bd4bb4f2097ede35e802158";
18− sha256 = "1xhgcppx02fp3nr7654mr3qrgy1fxlxdyl87jhmn3k9jf24gmmmz";
17+ rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6";
18+ sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv";
1919 };
2020 spirv-headers = fetchFromGitHub {
2121 owner = "KhronosGroup";
2222 repo = "SPIRV-Headers";
23− rev = "8b911bd2ba37677037b38c9bd286c7c05701bcda";
24− sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2";
23+ rev = "204cd131c42b90d129073719f2766293ce35c081";
24+ sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
2525 };
2626in stdenv.mkDerivation rec {
2727 pname = "shaderc";
28− version = "2019.0";
28+ version = "2019.1";
2929
3030 outputs = [ "out" "lib" "bin" "dev" "static" ];
3131
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
3333 owner = "google";
3434 repo = "shaderc";
3535 rev = "v${version}";
36− sha256 = "1l5mmyxhzsbp0a6y2d86i8jmf46c6bjgjkdgkr5l8hmhflmm7gi2";
36+ sha256 = "0x514rpignnb4vvl7wmijfakqc59986knjw3dh1zx0ah42xa7x37";
3737 };
3838
3939 patchPhase = ''
pkgs/development/libraries/gegl/4.0.nix+2−1
@@ -29,6 +29,7 @@
2929, luajit
3030, openexr
3131, OpenCL
32+, suitesparse
3233}:
3334
3435stdenv.mkDerivation rec {
@@ -76,6 +77,7 @@ stdenv.mkDerivation rec {
7677 gexiv2
7778 luajit
7879 openexr
80+ suitesparse
7981 ] ++ stdenv.lib.optional stdenv.isDarwin OpenCL;
8082
8183 # for gegl-4.0.pc
@@ -93,7 +95,6 @@ stdenv.mkDerivation rec {
9395 "-Dlibav=disabled"
9496 "-Dlibv4l=disabled"
9597 "-Dlibv4l2=disabled"
96− "-Dumfpack=disabled"
9798 # Disabled due to multiple vulnerabilities, see
9899 # https://github.com/NixOS/nixpkgs/pull/73586
99100 "-Djasper=disabled"
pkgs/development/libraries/tdlib/default.nix+2−2
@@ -1,14 +1,14 @@
11{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }:
22
33stdenv.mkDerivation rec {
4− version = "1.5.0";
4+ version = "1.6.0";
55 pname = "tdlib";
66
77 src = fetchFromGitHub {
88 owner = "tdlib";
99 repo = "td";
1010 rev = "v${version}";
11− sha256 = "1rqxdvzlryqln5jzj35cwz1fjwy4s8xq97p0wdnpzbfjpcalvrm5";
11+ sha256 = "0zlzpl6fgszg18kwycyyyrnkm255dvc6fkq0b0y32m5wvwwl36cv";
1212 };
1313
1414 buildInputs = [ gperf openssl readline zlib ];
pkgs/development/libraries/vulkan-headers/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, cmake }:
22stdenv.mkDerivation rec {
33 pname = "vulkan-headers";
4− version = "1.1.114.0";
4+ version = "1.2.131.1";
55
66 nativeBuildInputs = [ cmake ];
77
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 owner = "KhronosGroup";
1010 repo = "Vulkan-Headers";
1111 rev = "sdk-${version}";
12− sha256 = "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka";
12+ sha256 = "1yf42c2cnhx1y4wkxsdl6g653xl2vvamhpkldz6jb4ca5wk03gxf";
1313 };
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/vulkan-loader/default.nix+3−8
@@ -1,20 +1,15 @@
11{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig
22, xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }:
33
4−let
5− version = "1.1.114.0";
6−in
7−
8−assert version == vulkan-headers.version;
9−stdenv.mkDerivation {
4+stdenv.mkDerivation rec {
105 pname = "vulkan-loader";
11− inherit version;
6+ version = "1.2.131.2";
127
138 src = fetchFromGitHub {
149 owner = "KhronosGroup";
1510 repo = "Vulkan-Loader";
1611 rev = "sdk-${version}";
17− sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww";
12+ sha256 = "12n4mxc6db89258k8i47ql1zna7k94lkwv7lpxg39nm8ypa1ywrv";
1813 };
1914
2015 nativeBuildInputs = [ pkgconfig ];
pkgs/development/python-modules/credstash/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "credstash";
5− version = "1.16.1";
5+ version = "1.16.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "019wviz3hx0pkh3mgqr3prg55njyhzvhjqcpndgrfmkykjkcj435";
9+ sha256 = "1l3g76dm9csmx0z8s7zd75wfzw9dcyvrq0a81gfzwxk0c0w8c79r";
1010 };
1111
1212 # The install phase puts an executable and a copy of the library it imports in
pkgs/development/python-modules/pysaml2/default.nix+7
@@ -2,6 +2,7 @@
22, buildPythonPackage
33, isPy3k
44, fetchFromGitHub
5+, fetchpatch
56, substituteAll
67, xmlsec
78, cryptography, defusedxml, future, pyopenssl, dateutil, pytz, requests, six
@@ -27,6 +28,12 @@ buildPythonPackage rec {
2728 src = ./hardcode-xmlsec1-path.patch;
2829 inherit xmlsec;
2930 })
31+ # remove on next release
32+ (fetchpatch {
33+ name = "fix-test-dates.patch";
34+ url = "https://github.com/IdentityPython/pysaml2/commit/1d97d2d26f63e42611558fdd0e439bb8a7496a27.patch";
35+ sha256 = "0r6d6hkk6z9yw7aqnsnylii516ysmdsc8dghwmgnwvw6cm7l388p";
36+ })
3037 ];
3138
3239 propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ];
pkgs/development/tools/grabserial/default.nix+2−2
@@ -2,13 +2,13 @@
22
33pythonPackages.buildPythonApplication rec {
44 pname = "grabserial";
5− version = "1.9.9";
5+ version = "2.0.2";
66
77 src = fetchFromGitHub {
88 owner = "tbird20d";
99 repo = "grabserial";
1010 rev = "v${version}";
11− sha256 = "0cwrajkh605gfhshrlpbc32gmx86a8kv3pq7cv713k60sgqrgpqx";
11+ sha256 = "0ryk4w8q6zfmia71nwnk5b7xaxw0sf45dw9q50xp7k76i3k5f9f3";
1212 };
1313
1414 propagatedBuildInputs = [ pythonPackages.pyserial ];
pkgs/development/tools/vulkan-validation-layers/default.nix+3−3
@@ -1,16 +1,16 @@
11{ stdenv, fetchFromGitHub, cmake, writeText, python3
22, vulkan-headers, vulkan-loader, glslang
3−, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland, spirv-headers }:
3+, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
44
55stdenv.mkDerivation rec {
66 pname = "vulkan-validation-layers";
7− version = "1.1.114.0";
7+ version = "1.2.131.2";
88
99 src = fetchFromGitHub {
1010 owner = "KhronosGroup";
1111 repo = "Vulkan-ValidationLayers";
1212 rev = "sdk-${version}";
13− sha256 = "0f8dlrjw1nz2adhzi4sbvljys4h0dyiwafdihsdyrg3xncgffks4";
13+ sha256 = "1sz0388cr018ldx6ziplvk4v3zbg44pww77kv6kv5wxl69plwfcn";
1414 };
1515
1616 nativeBuildInputs = [ pkgconfig cmake python3 ];
pkgs/development/web/cypress/default.nix+3−3
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec{
44 pname = "cypress";
5− version = "3.6.1";
5+ version = "3.8.3";
66
77 src = fetchzip {
88 url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
9− sha256 = "0vlfmhsz7zkp3bjsgqmp9n716d5znicl42hm0m9hl7ndvgm9z9z0";
9+ sha256 = "1ncq64s5y5dsx0lrz950vab2yzwihl2wd7yapp12305bjjsihj3z";
1010 };
1111
1212 # don't remove runtime deps
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec{
3030 mkdir -p $out/bin/resources/app
3131 printf '{"version":"%b"}' $version > $out/bin/resources/app/package.json
3232 # Cypress now looks for binary_state.json in bin
33− echo '{"verified": true}' > $out/bin/binary_state.json
33+ echo '{"verified": true}' > $out/binary_state.json
3434 ln -s $out/opt/cypress/Cypress $out/bin/Cypress
3535 '';
3636
pkgs/misc/screensavers/xlockmore/default.nix+2−2
@@ -2,11 +2,11 @@
22, libXdmcp, libXt }:
33
44stdenv.mkDerivation rec {
5− name = "xlockmore-5.61";
5+ name = "xlockmore-5.62";
66
77 src = fetchurl {
88 url = "http://sillycycle.com/xlock/${name}.tar.xz";
9− sha256 = "012wsfcphahwwylyfk9c848nwj1v08hpnja2yfs0j8pnq7milnva";
9+ sha256 = "0b05wgj4mpssy4hd7km5c48i454dfg45p11mfmsr7xjd2gnz5gqi";
1010 curlOpts = "--user-agent 'Mozilla/5.0'";
1111 };
1212
pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "4.19.102";
6+ version = "4.19.103";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "05g0gkwvlwfx1wlinnwm3ryq7fblmxjzhp12g6vx2jbvvn486bih";
16+ sha256 = "0hxvqkjy63370sr9j4j0a1kzqwxxdn3i8i6wwc5c2gbzpmqlay5l";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "5.4.18";
6+ version = "5.4.19";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "12ad4fnxag16ar2afiljv4nnv15i4f493sz6m7i9qgjld7yz3scj";
16+ sha256 = "1f3pzg8vai5qz19gy9gf3rxs2z4dsw78zjkkfnha8iiy2mqvk14m";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.5.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "5.5.2";
6+ version = "5.5.3";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "17pr9v04g3lrar585l1zpnsmrivryqxwyfvjc3qp8wrkn21z7x94";
16+ sha256 = "1cnaa64i72cfxmspi0lw6598rq8k42dq0jjz0j1n6x2cykf3xvrb";
1717 };
1818} // (args.argsOverride or {}))
pkgs/servers/radarr/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "radarr";
5− version = "0.2.0.1358";
5+ version = "0.2.0.1450";
66
77 src = fetchurl {
88 url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
9− sha256 = "0lyd9gcrfdp7nc4myg22ardsig30lgkvma03zzdjrwvsngqclmv7";
9+ sha256 = "1sknq6fifpmgzryr07dnriaw2x425v2zxdcqzm65viw5p5j9xh00";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
pkgs/servers/trezord/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 pname = "trezord-go";
5− version = "2.0.27";
5+ version = "2.0.28";
66
77 goPackagePath = "github.com/trezor/trezord-go";
88
@@ -10,7 +10,7 @@ buildGoPackage rec {
1010 owner = "trezor";
1111 repo = "trezord-go";
1212 rev = "v${version}";
13− sha256 = "00d90qmmk1pays78a2jm8gb7dncvlsjjn4033q1yd1ii3fxc6nh8";
13+ sha256 = "02c1mvn01gcfls37sa0c7v2lwffg14x54np8z7d4hjzxxzwg4gpw";
1414 };
1515
1616 propagatedBuildInputs = [ trezor-udev-rules ];
pkgs/servers/web-apps/matomo/default.nix+87−83
@@ -3,103 +3,107 @@
33let
44 versions = {
55 matomo = {
6− version = "3.13.1";
7− sha256 = "071m3sw3rrhlccbwdyklcn8rwp4mcnii5m2a7zmgx3rv87i9n2ni";
6+ version = "3.13.2";
7+ sha256 = "1psysdz60h5rvgbsflkfprygxnh3kq60snqamyss07rk0ahbcb16";
88 };
99
1010 matomo-beta = {
11− version = "3.12.0";
12− beta = 3;
13− sha256 = "1n7b8cag7rpi6y4145cll2irz3in4668jkiicy06wm5nq6lb4bdf";
11+ version = "3.13.2";
12+ # `beta` examples: "b1", "rc1", null
13+ # TOOD when updating: use null if stable version is >= latest beta or release candidate
14+ beta = null;
15+ sha256 = "1psysdz60h5rvgbsflkfprygxnh3kq60snqamyss07rk0ahbcb16";
1416 };
1517 };
16− common = pname: {version, sha256, beta ? null}:
17− let fullVersion = version + stdenv.lib.optionalString (beta != null) "-b${toString beta}";
18− name = "${pname}-${fullVersion}";
19−in
18+ common = pname: { version, sha256, beta ? null }:
19+ let
20+ fullVersion = version + stdenv.lib.optionalString (beta != null) "-${toString beta}";
21+ name = "${pname}-${fullVersion}";
22+ in
2023
21−stdenv.mkDerivation rec {
22− inherit name;
23− version = fullVersion;
24+ stdenv.mkDerivation rec {
25+ inherit name;
26+ version = fullVersion;
2427
25− src = fetchurl {
26− url = "https://builds.matomo.org/matomo-${version}.tar.gz";
27− inherit sha256;
28− };
28+ src = fetchurl {
29+ url = "https://builds.matomo.org/matomo-${version}.tar.gz";
30+ inherit sha256;
31+ };
2932
30− nativeBuildInputs = [ makeWrapper ];
33+ nativeBuildInputs = [ makeWrapper ];
3134
32− # make-localhost-default-database-server.patch:
33− # This changes the default value of the database server field
34− # from 127.0.0.1 to localhost.
35− # unix socket authentication only works with localhost,
36− # but password-based SQL authentication works with both.
37− # TODO: is upstream interested in this?
38− # -> discussion at https://github.com/matomo-org/matomo/issues/12646
39− patches = [ ./make-localhost-default-database-host.patch ];
35+ # make-localhost-default-database-server.patch:
36+ # This changes the default value of the database server field
37+ # from 127.0.0.1 to localhost.
38+ # unix socket authentication only works with localhost,
39+ # but password-based SQL authentication works with both.
40+ # TODO: is upstream interested in this?
41+ # -> discussion at https://github.com/matomo-org/matomo/issues/12646
42+ patches = [ ./make-localhost-default-database-host.patch ];
4043
41− # this bootstrap.php adds support for getting PIWIK_USER_PATH
42− # from an environment variable. Point it to a mutable location
43− # to be able to use matomo read-only from the nix store
44− postPatch = ''
45− cp ${./bootstrap.php} bootstrap.php
46− '';
44+ # this bootstrap.php adds support for getting PIWIK_USER_PATH
45+ # from an environment variable. Point it to a mutable location
46+ # to be able to use matomo read-only from the nix store
47+ postPatch = ''
48+ cp ${./bootstrap.php} bootstrap.php
49+ '';
4750
48− # TODO: future versions might rename the PIWIK_… variables to MATOMO_…
49− # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH.
50− # See https://forum.matomo.org/t/bootstrap-php/5926/10 and
51− # https://github.com/matomo-org/matomo/issues/11654#issuecomment-297730843
52− installPhase = ''
53− runHook preInstall
51+ # TODO: future versions might rename the PIWIK_… variables to MATOMO_…
52+ # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH.
53+ # See https://forum.matomo.org/t/bootstrap-php/5926/10 and
54+ # https://github.com/matomo-org/matomo/issues/11654#issuecomment-297730843
55+ installPhase = ''
56+ runHook preInstall
5457
55− # copy everything to share/, used as webroot folder, and then remove what's known to be not needed
56− mkdir -p $out/share
57− cp -ra * $out/share/
58− # tmp/ is created by matomo in PIWIK_USER_PATH
59− rmdir $out/share/tmp
60− # config/ needs to be accessed by PIWIK_USER_PATH anyway
61− ln -s $out/share/config $out/
58+ # copy everything to share/, used as webroot folder, and then remove what's known to be not needed
59+ mkdir -p $out/share
60+ cp -ra * $out/share/
61+ # tmp/ is created by matomo in PIWIK_USER_PATH
62+ rmdir $out/share/tmp
63+ # config/ needs to be accessed by PIWIK_USER_PATH anyway
64+ ln -s $out/share/config $out/
6265
63− makeWrapper ${php}/bin/php $out/bin/matomo-console \
64− --add-flags "$out/share/console"
66+ makeWrapper ${php}/bin/php $out/bin/matomo-console \
67+ --add-flags "$out/share/console"
6568
66− runHook postInstall
67− '';
69+ runHook postInstall
70+ '';
6871
69− filesToFix = [
70− "misc/composer/build-xhprof.sh"
71− "misc/composer/clean-xhprof.sh"
72− "misc/cron/archive.sh"
73− "plugins/Installation/FormDatabaseSetup.php"
74− "vendor/leafo/lessphp/package.sh"
75− "vendor/pear/archive_tar/sync-php4"
76− "vendor/szymach/c-pchart/coverage.sh"
77− # drupal_test.sh does not exist in 3.12.0-b3; added for 3.13.0
78− "vendor/twig/twig/drupal_test.sh"
79− ];
72+ filesToFix = [
73+ "misc/composer/build-xhprof.sh"
74+ "misc/composer/clean-xhprof.sh"
75+ "misc/cron/archive.sh"
76+ "plugins/Installation/FormDatabaseSetup.php"
77+ "vendor/leafo/lessphp/package.sh"
78+ "vendor/pear/archive_tar/sync-php4"
79+ "vendor/szymach/c-pchart/coverage.sh"
80+ # drupal_test.sh does not exist in 3.12.0-b3; added for 3.13.0
81+ "vendor/twig/twig/drupal_test.sh"
82+ ];
8083
81− # This fixes the consistency check in the admin interface
82− #
83− # The filesToFix list may contain files that are exclusive to only one of the versions we build
84− # make sure to test for existence to avoid erroring on an incompatible version and failing
85− postFixup = ''
86− pushd $out/share > /dev/null
87− for f in $filesToFix; do
88− if [ -f "$f" ]; then
89− length="$(wc -c "$f" | cut -d' ' -f1)"
90− hash="$(md5sum "$f" | cut -d' ' -f1)"
91− sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php
92− fi
93− done
94− popd > /dev/null
95− '';
84+ # This fixes the consistency check in the admin interface
85+ #
86+ # The filesToFix list may contain files that are exclusive to only one of the versions we build
87+ # make sure to test for existence to avoid erroring on an incompatible version and failing
88+ postFixup = ''
89+ pushd $out/share > /dev/null
90+ for f in $filesToFix; do
91+ if [ -f "$f" ]; then
92+ length="$(wc -c "$f" | cut -d' ' -f1)"
93+ hash="$(md5sum "$f" | cut -d' ' -f1)"
94+ sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php
95+ fi
96+ done
97+ popd > /dev/null
98+ '';
9699
97− meta = with stdenv.lib; {
98− description = "A real-time web analytics application";
99− license = licenses.gpl3Plus;
100− homepage = https://matomo.org/;
101− platforms = platforms.all;
102− maintainers = with maintainers; [ florianjacob kiwi ];
103− };
104−};
105−in stdenv.lib.mapAttrs common versions
100+ meta = with stdenv.lib; {
101+ description = "A real-time web analytics application";
102+ license = licenses.gpl3Plus;
103+ homepage = https://matomo.org/;
104+ platforms = platforms.all;
105+ maintainers = with maintainers; [ florianjacob kiwi ];
106+ };
107+ };
108+in
109+stdenv.lib.mapAttrs common versions
pkgs/shells/zsh/bracketed-paste-magic.patchnew file+22
@@ -0,0 +1,22 @@
1+diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic
2+index 4baae82..840091b 100644
3+--- a/Functions/Zle/bracketed-paste-magic
4++++ b/Functions/Zle/bracketed-paste-magic
5+@@ -162,7 +162,7 @@ bracketed-paste-magic() {
6+
7+ # There are active widgets. Reprocess $PASTED as keystrokes.
8+ NUMERIC=1
9+- zle -U - $PASTED
10++ zle -U - "$PASTED"
11+
12+ # Just in case there are active undo widgets
13+
14+@@ -212,7 +212,7 @@ bracketed-paste-magic() {
15+ # Arrange to display highlighting if necessary
16+ if [[ -z $zle_highlight || -n ${(M)zle_highlight:#paste:*} ]]; then
17+ zle -R
18+- zle .read-command && zle -U - $KEYS
19++ zle .read-command && zle -U - "$KEYS"
20+ fi
21+ }
22+
pkgs/shells/zsh/default.nix+7
@@ -18,6 +18,13 @@ stdenv.mkDerivation {
1818 sha256 = "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j";
1919 };
2020
21+ patches = [
22+ # Bracketed-paste-magic error in Putty due to empty $PASTED variable
23+ # http://www.zsh.org/mla/workers/2019/msg00808.html
24+ # This patch included in the next version
25+ ./bracketed-paste-magic.patch
26+ ];
27+
2128 buildInputs = [ ncurses pcre ];
2229
2330 configureFlags = [
pkgs/shells/zsh/oh-my-zsh/default.nix+3−3
@@ -4,13 +4,13 @@
44{ stdenv, fetchgit }:
55
66stdenv.mkDerivation rec {
7− version = "2020-02-07";
7+ version = "2020-02-11";
88 pname = "oh-my-zsh";
9− rev = "e81782ac3faf24cac2384a99366f748040b3f20a";
9+ rev = "17428f3c9a99c8d81e57bcf565d39011669e65ed";
1010
1111 src = fetchgit { inherit rev;
1212 url = "https://github.com/ohmyzsh/ohmyzsh";
13− sha256 = "0mry8a43kfmb1wap85ss4dvmy5x3sil14z98fd15l9cgkqxpjnlb";
13+ sha256 = "1i2f5gvr8gdvwx4x135j949x4q1q721jq2936p33c1zk9wq4kzwc";
1414 };
1515
1616 pathsToLink = [ "/share/oh-my-zsh" ];
pkgs/tools/admin/tigervnc/default.nix+2
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
2323
2424 inherit fontDirectories;
2525
26+ patches = [ ./u_xorg-server-1.20.7-ddxInputThreadInit.patch ];
27+
2628 postPatch = ''
2729 sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver
2830 fontPath=
pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patchnew file+21
@@ -0,0 +1,21 @@
1+Origin: https://build.opensuse.org/package/view_file/X11:XOrg/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch
2+diff -u -p -r tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c
3+--- tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c 2020-01-15 11:19:19.486731848 +0000
4++++ tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c 2020-01-15 11:37:33.275445409 +0000
5+@@ -295,6 +295,15 @@ void ddxBeforeReset(void)
6+ }
7+ #endif
8+
9++#if INPUTTHREAD
10++/** This function is called in Xserver/os/inputthread.c when starting
11++ the input thread. */
12++void
13++ddxInputThreadInit(void)
14++{
15++}
16++#endif
17++
18+ void ddxUseMsg(void)
19+ {
20+ vncPrintBanner();
21+
pkgs/tools/graphics/vulkan-tools/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "vulkan-tools";
6− version = "1.1.114.0";
6+ version = "1.2.131.1";
77
88 src = fetchFromGitHub {
99 owner = "KhronosGroup";
1010 repo = "Vulkan-Tools";
1111 rev = "sdk-${version}";
12− sha256 = "1d4fcy11gk21x7r7vywdcc1dy9j1d2j78hvd5vfh3vy9fnahx107";
12+ sha256 = "0ws47ansrr8cq4qjf6k4q0ygm9wwd3w7mhwqcl1qxms8lh5vmhfq";
1313 };
1414
1515 nativeBuildInputs = [ cmake pkgconfig ];
pkgs/tools/misc/brotab/default.nixnew file+33
@@ -0,0 +1,33 @@
1+{ lib, fetchFromGitHub, glibcLocales, python }:
2+
3+python.pkgs.buildPythonApplication rec {
4+ version = "1.1.0";
5+ pname = "brotab";
6+
7+ src = fetchFromGitHub {
8+ owner = "balta2ar";
9+ repo = pname;
10+ rev = version;
11+ sha256 = "17yj5i8p28a7zmixdfa1i4gfc7c2fmdkxlymazasar58dz8m68mw";
12+ };
13+
14+ propagatedBuildInputs = with python.pkgs; [
15+ requests
16+ flask
17+ requests
18+ pytest
19+ psutil
20+ ];
21+
22+ # test_integration.py requires Chrome browser session
23+ checkPhase = ''
24+ ${python.interpreter} -m unittest brotab/tests/test_{brotab,utils}.py
25+ '';
26+
27+ meta = with lib; {
28+ homepage = "https://github.com/balta2ar/brotab";
29+ description = "Control your browser's tabs from the command line";
30+ license = licenses.mit;
31+ maintainers = with maintainers; [ doronbehar ];
32+ };
33+}
pkgs/tools/misc/clipman/default.nix+3−3
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "clipman";
5− version = "1.2.0";
5+ version = "unstable-2019-12-10";
66
77 src = fetchFromGitHub {
88 owner = "yory8";
99 repo = pname;
10− rev = "v${version}";
11− sha256 = "0266qb8p5l8j25nn51ajsbiij8bh5r7ywphf2x1l7wfhbzgxz12d";
10+ rev = "c57453be90bb4496f67275db8c0beb2116a6ce14";
11+ sha256 = "0zvqk3gcpx67dsn7qr0p9bgjp0sljl3yrlsfbqzrbrmj2lwr98ys";
1212 };
1313
1414 modSha256 = "0aw0ng8pk8qzn1iv79iw0v9zr8xdc8p9xnigr3ij86038f7aqdhv";
pkgs/tools/misc/fluent-bit/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "fluent-bit";
5− version = "1.3.6";
5+ version = "1.3.7";
66
77 src = fetchFromGitHub {
88 owner = "fluent";
99 repo = "fluent-bit";
1010 rev = "v${version}";
11− sha256 = "0gkn5axjxaa52f3w2qxwwab4m46xrxymbkcpw1v1jihil34pxw7a";
11+ sha256 = "1j0fzhakk4kpfpq4p4c0byw99adxd9w7irfn83rlvw8bw32j2lrj";
1212 };
1313
1414 nativeBuildInputs = [ cmake flex bison ];
pkgs/tools/misc/ncdu/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "ncdu";
5− version = "1.14.1";
5+ version = "1.14.2";
66
77 src = fetchurl {
88 url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
9− sha256 = "0gp1aszzrh8b6fhv8fspvkmr0qwc55z6z4w6l7r8j09sq7lf0cdy";
9+ sha256 = "1cf6a9qw7ljaw09b0g7c5i252dl7wb2mnkrbwwwf7m0c3mf7yyll";
1010 };
1111
1212 buildInputs = [ ncurses ];
pkgs/tools/package-management/nix/default.nix+16−23
@@ -1,4 +1,4 @@
1−{ lib, fetchurl, fetchFromGitHub, callPackage
1+{ lib, fetchurl, callPackage
22, storeDir ? "/nix/store"
33, stateDir ? "/nix/var"
44, confDir ? "/etc"
@@ -11,7 +11,7 @@ let
1111common =
1212 { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
1313 , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
14− , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns, jq
14+ , jq, libarchive, rustc, cargo
1515 , busybox-sandbox-shell
1616 , storeDir
1717 , stateDir
@@ -19,7 +19,7 @@ common =
1919 , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
2020 , withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp
2121
22− , name, suffix ? "", src, includesPerl ? false, fromGit ? false
22+ , name, suffix ? "", src, includesPerl ? false
2323
2424 }:
2525 let
@@ -29,19 +29,21 @@ common =
2929 version = lib.getVersion name;
3030
3131 is20 = lib.versionAtLeast version "2.0pre";
32+ is24 = lib.versionAtLeast version "2.4pre";
3233
33− VERSION_SUFFIX = lib.optionalString fromGit suffix;
34+ VERSION_SUFFIX = suffix;
3435
3536 outputs = [ "out" "dev" "man" "doc" ];
3637
3738 nativeBuildInputs =
3839 [ pkgconfig ]
3940 ++ lib.optionals (!is20) [ curl perl ]
40− ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ];
41+ ++ lib.optionals is24 [ jq ];
4142
4243 buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json ]
4344 ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
4445 ++ lib.optionals is20 [ brotli boost editline ]
46+ ++ lib.optionals is24 [ libarchive rustc cargo ]
4547 ++ lib.optional withLibseccomp libseccomp
4648 ++ lib.optional (withAWS && is20)
4749 ((aws-sdk-cpp.override {
@@ -126,8 +128,6 @@ common =
126128 };
127129
128130 passthru = {
129− inherit fromGit;
130−
131131 perl-bindings = if includesPerl then nix else stdenv.mkDerivation {
132132 pname = "nix-perl";
133133 inherit version;
@@ -140,7 +140,6 @@ common =
140140 # but noting for future travellers.
141141 nativeBuildInputs =
142142 [ perl pkgconfig curl nix libsodium ]
143− ++ lib.optionals fromGit [ autoreconfHook autoconf-archive ]
144143 ++ lib.optional is20 boost;
145144
146145 configureFlags =
@@ -186,29 +185,23 @@ in rec {
186185 });
187186
188187 nixUnstable = lib.lowPrio (callPackage common rec {
189− name = "nix-2.3${suffix}";
190− suffix = "pre6895_84de821";
191− src = fetchFromGitHub {
192− owner = "NixOS";
193− repo = "nix";
194− rev = "84de8210040580ce7189332b43038d52c56a9689";
195− sha256 = "062pdly0m2hk8ly8li5psvpbj1mi7m1a15k8wyzf79q7294l5li3";
188+ name = "nix-2.4${suffix}";
189+ suffix = "pre7250_94c93437";
190+ src = fetchurl {
191+ url = "https://hydra.nixos.org/build/112193977/download/3/nix-2.4${suffix}.tar.xz";
192+ sha256 = "f9baf241c9449c1e3e5c9610adbcd2ce9e5fbcab16aff3ba3030d2fad7b34d7b";
196193 };
197− fromGit = true;
198194
199195 inherit storeDir stateDir confDir boehmgc;
200196 });
201197
202198 nixFlakes = lib.lowPrio (callPackage common rec {
203199 name = "nix-2.4${suffix}";
204− suffix = "pre20191022_9cac895";
205− src = fetchFromGitHub {
206− owner = "NixOS";
207− repo = "nix";
208− rev = "9cac895406724e0304dff140379783c4d786e855";
209− hash = "sha256-Y1cdnCNoJmjqyC/a+Nt2N+5L3Ttg7K7zOD7gmtg1QzA=";
200+ suffix = "pre20200207_d2032ed";
201+ src = fetchurl {
202+ url = "https://hydra.nixos.org/build/111815420/download/3/nix-2.4${suffix}.tar.xz";
203+ sha256 = "e72a20efeee4ccc704cca3a06de9185fb8742bc7ef1a62af5896ec0f379b9ceb";
210204 };
211− fromGit = true;
212205
213206 inherit storeDir stateDir confDir boehmgc;
214207 });
pkgs/tools/security/safe/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ stdenv
2+, buildGoPackage
3+, fetchFromGitHub
4+}:
5+
6+with builtins;
7+
8+buildGoPackage rec {
9+ pname = "safe";
10+ version = "1.5.1";
11+
12+ src = fetchFromGitHub {
13+ owner = "starkandwayne";
14+ repo = "safe";
15+ rev = "v${version}";
16+ sha256 = "12gzxrnyl890h79z9yx23m1wwgy8ahm74q4qwi8n2nh7ydq6mn2d";
17+ };
18+
19+ goPackagePath = "github.com/starkandwayne/safe";
20+
21+ preBuild = ''
22+ buildFlagsArray+=("-ldflags" "-X main.Version=${version}")
23+ '';
24+
25+ meta = with stdenv.lib; {
26+ description = "A Vault CLI";
27+ homepage = "https://github.com/starkandwayne/safe";
28+ license = licenses.mit;
29+ maintainers = with maintainers; [ eonpatapon ];
30+ };
31+}
pkgs/tools/text/gist/default.nix+2−2
@@ -4,8 +4,8 @@ buildRubyGem rec {
44 inherit ruby;
55 name = "${gemName}-${version}";
66 gemName = "gist";
7− version = "5.0.0";
8− source.sha256 = "1i0a73mzcjv4mj5vjqwkrx815ydsppx3v812lxxd9mk2s7cj1vyd";
7+ version = "5.1.0";
8+ source.sha256 = "0s69y6hi5iq5k6317j1kjmhi3mk586j1543q8wa608grwcmbq3fw";
99
1010 meta = with lib; {
1111 description = "Upload code to https://gist.github.com (or github enterprise)";
pkgs/top-level/aliases.nix+1
@@ -347,6 +347,7 @@ mapAliases ({
347347 pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14
348348 pinentry_qt = pinentry-qt; # added 2019-10-14
349349 pinentry_gnome = pinentry-gnome; # added 2019-10-14
350+ pinentry_qt5 = pinentry-qt; # added 2020-02-11
350351 postgis = postgresqlPackages.postgis;
351352 # end
352353 ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream.";
pkgs/top-level/all-packages.nix+19−11
@@ -6269,6 +6269,8 @@ in
62696269
62706270 safecopy = callPackage ../tools/system/safecopy { };
62716271
6272+ safe = callPackage ../tools/security/safe { };
6273+
62726274 safe-rm = callPackage ../tools/system/safe-rm { };
62736275
62746276 safeeyes = callPackage ../applications/misc/safeeyes { };
@@ -8300,16 +8302,16 @@ in
83008302 src = fetchFromGitHub {
83018303 owner = "KhronosGroup";
83028304 repo = "SPIRV-Tools";
8303− rev = "26c1b8878315a7a5c188df45e0bc236bb222b698";
8304− sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b";
8305+ rev = "5c019b5923c1f6bf00a3ac28114ec4a7b1faa0e2";
8306+ sha256 = "17a0kiyb7zjsg7ws12diip84vds1ajl98ni9c2wria6ymcvbvsvz";
83058307 };
83068308 });
83078309 spirv-headers = spirv-headers.overrideAttrs (_: {
83088310 src = fetchFromGitHub {
83098311 owner = "KhronosGroup";
83108312 repo = "SPIRV-Headers";
8311− rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f";
8312− sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm";
8313+ rev = "204cd131c42b90d129073719f2766293ce35c081";
8314+ sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
83138315 };
83148316 });
83158317 };
@@ -14593,24 +14595,24 @@ in
1459314595 src = fetchFromGitHub {
1459414596 owner = "KhronosGroup";
1459514597 repo = "SPIRV-Tools";
14596− rev = "aa9e8f538041db3055ea443080e0ccc315fa114f";
14597− sha256 = "1nbii0xa5zgs36dmpvzpli1jbzb9ijr7bkgvzmlpcjrjsl02cnbk";
14598+ rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6";
14599+ sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv";
1459814600 };
1459914601 });
1460014602 spirv-headers = spirv-tools.overrideAttrs (_: {
1460114603 src = fetchFromGitHub {
1460214604 owner = "KhronosGroup";
1460314605 repo = "SPIRV-Headers";
14604− rev = "45c2cc37276d69e5b257507d97fd90d2a5684ccc";
14605− sha256 = "1jrzazv5j8nsn8hz5vc43vz4msps05d65wdy9spfg2hg36r1s2pm";
14606+ rev = "204cd131c42b90d129073719f2766293ce35c081";
14607+ sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
1460614608 };
1460714609 });
1460814610 }).overrideAttrs (_: {
1460914611 src = fetchFromGitHub {
1461014612 owner = "KhronosGroup";
1461114613 repo = "glslang";
14612− rev = "333d1c95792692205472c457d7bec915a94c8000";
14613− sha256 = "04srq1zcilhs7p1xz7wcnrncjxqskhfnqggisvxw5f774gk01ks6";
14614+ rev = "4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3";
14615+ sha256 = "1dghz8zl774dx2xpa4dv8xhxirbylgyn6kx18ib4qirna1njp0zg";
1461414616 };
1461514617 });
1461614618 };
@@ -17920,7 +17922,7 @@ in
1792017922 source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese;
1792117923 source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese;
1792217924
17923− spleen = callPackage ../data/fonts/spleen { inherit (xorg) mkfontdir; };
17925+ spleen = callPackage ../data/fonts/spleen { inherit (buildPackages.xorg) mkfontscale; };
1792417926
1792517927 stilo-themes = callPackage ../data/themes/stilo { };
1792617928
@@ -18431,6 +18433,10 @@ in
1843118433
1843218434 browsh = callPackage ../applications/networking/browsers/browsh { };
1843318435
18436+ brotab = callPackage ../tools/misc/brotab {
18437+ python = python3;
18438+ };
18439+
1843418440 bookworm = callPackage ../applications/office/bookworm { };
1843518441
1843618442 chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});
@@ -21721,6 +21727,8 @@ in
2172121727
2172221728 tiny = callPackage ../applications/networking/irc/tiny { };
2172321729
21730+ tipp10 = qt5.callPackage ../applications/misc/tipp10 { };
21731+
2172421732 tixati = callPackage ../applications/networking/p2p/tixati { };
2172521733
2172621734 tkcvs = callPackage ../applications/version-management/tkcvs { };