From 08dc02a07b52380008b33256ca6ef1a87df6bc08 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 1 Feb 2020 06:27:00 -0500 Subject: [PATCH 01/93] rclone: install completions --- .../networking/sync/rclone/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index c40b1573e56..d6f37583abe 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages }: buildGoPackage rec { pname = "rclone"; @@ -17,9 +17,19 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; - postInstall = '' - install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 - ''; + postInstall = + let + rcloneBin = + if stdenv.buildPlatform == stdenv.hostPlatform + then "$bin" + else stdenv.lib.getBin buildPackages.rclone; + in + '' + install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 + mkdir -p $bin/share/zsh/site-functions $bin/share/bash-completion/completions/ + ${rcloneBin}/bin/rclone genautocomplete zsh $bin/share/zsh/site-functions/_rclone + ${rcloneBin}/bin/rclone genautocomplete bash $bin/share/bash-completion/completions/rclone.bash + ''; meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; From 76e748889ca744237e9d68ad5e3963926be2f211 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 14:58:18 +0000 Subject: [PATCH 02/93] kdevelop-pg-qt: 2.2.0 -> 2.2.1 --- pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index 0ed4fe0aaad..b3315313813 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -2,7 +2,7 @@ let pname = "kdevelop-pg-qt"; - version = "2.2.0"; + version = "2.2.1"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "01a4y98hf8zlrdf5l8f4izqh4n3j3xs93j8ny5a3f4z50nb6hxq7"; + sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; }; nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; From 9c0ab2f26db26c21950e5c61fb06570cb4c5c79a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 24 Feb 2020 00:15:36 +0100 Subject: [PATCH 03/93] lib/modules.nix: Add file context to unmerged values in mergeDefinitions This helps with troubleshooting exceptions in config values, which were hard to track down for options with many definitions. The trace will look like: error: while evaluating the attribute 'config.foo' at undefined position: [...] while evaluating the option `foo': [...] while evaluating definitions from `/home/user/mymod.nix': while evaluating 'dischargeProperties' at /home/user/nixpkgs/lib/modules.nix:464:25, called from /home/user/nixpkgs/lib/modules.nix:392:137: while evaluating the attribute 'value' at /home/user/nixpkgs/lib/modules.nix:277:44: Value error! where the `/home/user/mymod.nix` module is { lib, ... }: { options.foo = lib.mkOption { type = lib.types.lines; }; config.foo = builtins.throw "Value error!"; } --- lib/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/modules.nix b/lib/modules.nix index 2b1faf4f0c2..6cbef5632bd 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -389,7 +389,7 @@ rec { let # Process mkMerge and mkIf properties. defs' = concatMap (m: - map (value: { inherit (m) file; inherit value; }) (dischargeProperties m.value) + map (value: { inherit (m) file; inherit value; }) (builtins.addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value)) ) defs; # Process mkOverride properties. From 1439ba682e0fba84efdd4e46671f3335e0ea1b0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Mar 2020 22:28:37 +0000 Subject: [PATCH 04/93] bacula: 9.4.4 -> 9.6.2 --- pkgs/tools/backup/bacula/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index e5e26169b74..f40d54adfc8 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.4.4"; + name = "bacula-9.6.2"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "1gi0zkkzh6a87xk4sm051hwz5bv4qc4kbl6hk40752knr817mqqg"; + sha256 = "0hw7wvgh7ymyyar5diqjn9kflhcb8a9kjgz6phb0x9r06j8yahaw"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Enterprise ready, Network Backup Tool"; - homepage = http://bacula.org/; + homepage = "http://bacula.org/"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar lovek323 eleanor ]; platforms = platforms.all; From 55247e7c26bb4c65c6656d77f48916cd5f9d795a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Mar 2020 14:21:23 +0000 Subject: [PATCH 05/93] liblo: 0.30 -> 0.31 --- pkgs/development/libraries/liblo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index 2ba5750b1bf..a25666dfcf2 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "liblo-0.30"; + name = "liblo-0.31"; src = fetchurl { - url = "mirror://sourceforge/liblo/liblo/0.30/${name}.tar.gz"; - sha256 = "06wdjzxjdshr6hyl4c94yvg3jixiylap8yjs8brdfpm297gck9rh"; + url = "mirror://sourceforge/liblo/liblo/0.31/${name}.tar.gz"; + sha256 = "0l67rkdhfa8cffa0nynql3lh2xlbn1454h6qxhjddp1029p48krb"; }; doCheck = false; # fails 1 out of 3 tests meta = { description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; - homepage = https://sourceforge.net/projects/liblo; + homepage = "https://sourceforge.net/projects/liblo"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = with stdenv.lib.platforms; linux ++ darwin; From e633927c811b574b45418aac9273e0aa876bf69f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Mar 2020 19:42:45 +0000 Subject: [PATCH 06/93] palemoon: 28.8.2.1 -> 28.8.4 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 1065f349972..7c010b91a1e 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.8.2.1"; + version = "28.8.4"; src = fetchFromGitHub { owner = "MoonchildProductions"; repo = "UXP"; rev = "PM${version}_Release"; - sha256 = "1m7dfgy5vjw1ndjsh0aksvsp0ii2kj7gxn0sp3h0xgwi0yq7lwyb"; + sha256 = "1k2j4rlgjwkns3a592pbiwwhrpja3fachvzby1his3d1mhdvyc6f"; }; desktopItem = makeDesktopItem { From 01e352ac449d51480ca4750f5637bc7ad156ceb4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 14 Feb 2020 12:56:51 +0100 Subject: [PATCH 07/93] fetchpatch: Allow using base64-encoded hash Nix now returns base64-encoded SRI hashes on hash mismatch. Usually, people copy the returned hashes in TOFU fashion but since base64-encoded strings can contain slashes, they often broke our use of them for temporary file name. Escaping them should prevent the failures. --- pkgs/build-support/fetchpatch/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 2fb32b2324f..71c0d466498 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -11,9 +11,13 @@ let in { stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args: +let + # Make base-64 encoded SRI hash filename-safe using RFC 4648 §5 + tmpname = lib.replaceStrings [ "+" "/" "=" ] [ "-" "_" "" ] args.sha256; +in fetchurl ({ postFetch = '' - tmpfile="$TMPDIR/${args.sha256}" + tmpfile="$TMPDIR/${tmpname}" if [ ! -s "$out" ]; then echo "error: Fetched patch file '$out' is empty!" 1>&2 exit 1 From 0c855100a27524762117ea91a96ef4c6f3e8d441 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Mar 2020 06:17:13 +0000 Subject: [PATCH 08/93] python27Packages.msal: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/msal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 6f2566c2c1c..10e62f5cc58 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc"; + sha256 = "16l2bmmm5pdlb61av5748mhy0lg9r965lmyn69is6mhsyr9zi38s"; }; propagatedBuildInputs = [ From 6212e0aa152ac8483170964eba07cbaa26d526cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Mar 2020 13:09:48 +0000 Subject: [PATCH 09/93] python27Packages.spotipy: 2.7.1 -> 2.9.0 --- pkgs/development/python-modules/spotipy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index aebe38fc69a..e733c269cd0 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -2,17 +2,17 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.7.1"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1i4gpmvjk608fxz1kwfb3dnmm4dydr0bir0zw9k2nng7n8b6knvr"; + sha256 = "163z3j0sd9a7cc9pv9hcrh230gisvvi2fxabh1f6nzhfr8avrncr"; }; propagatedBuildInputs = [ requests ]; meta = with stdenv.lib; { - homepage = https://spotipy.readthedocs.org/; + homepage = "https://spotipy.readthedocs.org/"; description = "A light weight Python library for the Spotify Web API"; license = licenses.mit; maintainers = [ maintainers.rvolosatovs ]; From 79b582b1ff000881f8b50ad00e5532c7a8413b44 Mon Sep 17 00:00:00 2001 From: Bruce Toll <4109762+tollb@users.noreply.github.com> Date: Tue, 3 Mar 2020 09:08:17 -0500 Subject: [PATCH 10/93] python-mapnik: 3.0.16 -> unstable-2020-02-24 Update to fix build errors with mapnik 3.0.23, along with other pending upstream commits. Upstream has not tagged a python-mapnik release since 2017. This unstable commit, however, is also the basis for the python-mapnik package in Debian testing. --- pkgs/development/python-modules/python-mapnik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 35b7a706f60..2b3c4ba1e9b 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -18,13 +18,13 @@ let in buildPythonPackage rec { pname = "python-mapnik"; - version = "3.0.16"; + version = "unstable-2020-02-24"; src = pkgs.fetchFromGitHub { owner = "mapnik"; repo = "python-mapnik"; - rev = "v${version}"; - sha256 = "1gqs4kvmjawdgl80j0ab5r8y0va9kw0rvwix3093xsv4hwd00lcc"; + rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b"; + sha256 = "0snn7q7w1ab90311q8wgd1z64kw1svm5w831q0xd6glqhah86qc8"; }; disabled = isPyPy; From 18f7b5e404be70fb153d8b78fb26a097556eaf07 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Mar 2020 15:54:33 +0000 Subject: [PATCH 11/93] snd: 20.0 -> 20.1 --- pkgs/applications/audio/snd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 54f8fe4c9ad..cfe79f4e361 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-20.0"; + name = "snd-20.1"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "195j0mkxvkb0znwhc0pjp4r0r8j4i12i27nxbkq27wg9rck6likc"; + sha256 = "0v7zhavkkbh1bagzy3l08kb235hhdqn28y0m4znkd3k31p4l4dz8"; }; nativeBuildInputs = [ pkgconfig ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Sound editor"; - homepage = http://ccrma.stanford.edu/software/snd; + homepage = "http://ccrma.stanford.edu/software/snd"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [ ]; From c7b428de3aad930f1f25dbce4f9b986365121ecd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Mar 2020 17:19:45 +0000 Subject: [PATCH 12/93] python27Packages.ROPGadget: 6.0 -> 6.2 --- pkgs/development/python-modules/ROPGadget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index 310e84a918d..dc3ff1dbf4d 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ROPGadget"; - version = "6.0"; + version = "6.2"; src = fetchPypi { inherit pname version; - sha256 = "02wgrdrg0s0cr9yjsb4945244m8x8rr8jzxr8h8c6k2na4d17xf4"; + sha256 = "0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh"; }; propagatedBuildInputs = [ capstone ]; From 0b121e343d6f3064a382bfccb3c2aa9407eb5033 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Mar 2020 18:59:55 +0000 Subject: [PATCH 13/93] stress-ng: 0.10.19 -> 0.11.01 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 29a838e4914..b1d04d992ea 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.10.19"; + version = "0.11.01"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0v85q5sch1rx68cr69s1wrr79ny9gv99awgqkailk76z2cjva38g"; + sha256 = "152lyqv7g6jl4xsvg639n6y8h6v2qag3afxynaws38bsr149bqcz"; }; postPatch = '' From 43568a2f048b22a9941bdf46407e9b8ec92a91cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Mar 2020 19:10:15 +0000 Subject: [PATCH 14/93] talloc: 2.1.16 -> 2.3.1 --- pkgs/development/libraries/talloc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 4c0b16c140b..9e9bc1c804b 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "talloc"; - version = "2.1.16"; + version = "2.3.1"; src = fetchurl { url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; - sha256 = "1aajda08yf7njgvg6r21ccxlvkarb9bwvf4jqh8yn3871a1zcnqr"; + sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g"; }; nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hierarchical pool based memory allocator with destructors"; - homepage = https://tdb.samba.org/; + homepage = "https://tdb.samba.org/"; license = licenses.gpl3; platforms = platforms.all; }; From b66896f2224d0fdd9ff4cfbc61c581732d7571d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Mar 2020 19:29:13 +0000 Subject: [PATCH 15/93] tribler: 7.4.1 -> 7.4.4 --- pkgs/applications/networking/p2p/tribler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 8bd53662408..e9c5f274143 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "tribler"; - version = "7.4.1"; + version = "7.4.4"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "1s9hzr0n00d3hb1z2srq75j7mbml6csylb14hzy9psw27q2c0fqs"; + sha256 = "0hxiyf1k07ngym2p8r1b5mcx1y2crkyz43gi9sgvsvsyijyaff3p"; }; nativeBuildInputs = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { maintainers = with maintainers; [ xvapx ]; - homepage = https://www.tribler.org/; + homepage = "https://www.tribler.org/"; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; license = licenses.lgpl21; platforms = platforms.linux; From 58ea5f3a177b0eb50497f60be136c94c1d70c2c3 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 27 Feb 2020 21:25:50 -0800 Subject: [PATCH 16/93] rclone: 1.50.2 -> 1.51.0 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 71421eaf1e7..c40b1573e56 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "rclone"; - version = "1.50.2"; + version = "1.51.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0yaspkh88q8i58i8g8mm6sqb75hczavz2lvzdd1iif1bqgi6b5fz"; + sha256 = "0z4kaq6wnj5dgl52g7f86phxlvnk5pbpda7prgh3hahpyhxj0z7d"; }; goPackagePath = "github.com/rclone/rclone"; From 51b6f9c6ae277652572bfbc9d85caa298f4c5415 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 3 Mar 2020 22:10:36 +0100 Subject: [PATCH 17/93] chromium: 80.0.3987.122 -> 80.0.3987.132 https://chromereleases.googleblog.com/2020/03/stable-channel-update-for-desktop.html This update includes 4 security fixes. CVEs: CVE-2020-6420 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 8c8e8149f93..a58131ce0e0 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1bahnvn6i08gg10r9p012n7xjwhnjk1xq4c70kw6sqr4p53423mn"; - sha256bin64 = "066lvnh18k5982dv9481g9i31g9pq6a8q92g93xkqgj2bipbv6si"; - version = "81.0.4044.26"; + sha256 = "1yam7lg38dbpvmva7pc3bw3npvgi3d1v6im8ld4z92gjgniwsjh2"; + sha256bin64 = "0vsly218wv9x2nv5i82slz8pmb0hmdcl1z2mlhf2j5adnsxn9c5z"; + version = "81.0.4044.34"; }; dev = { - sha256 = "0k35sa1qq54cixybb12nyzkjyrwb4cbjfffwfvr5dl859i5bz1kk"; - sha256bin64 = "0ckbgk6jw3zq3gqvvwdlcrqlm110hkvija6jfh9dk0ip1wdx8wkm"; - version = "82.0.4062.3"; + sha256 = "0pxvwjvkajlidk5m7jiqk69mxnxg3h56dr7vpi916r51w17pds0l"; + sha256bin64 = "1jdyp0f2ig4251155db3m7lzd4jlmczcjqqnvdj5nwl2bn3ykc3s"; + version = "82.0.4068.4"; }; stable = { - sha256 = "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8"; - sha256bin64 = "0kipzd0q3p3wwklcl1fb937xhklc0s76apsfrjwy0jcmcy47blzf"; - version = "80.0.3987.122"; + sha256 = "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c"; + sha256bin64 = "00xhacrs74ks3nrpsnnbqm5vk0r9ydyxrq5ifajzviqqyk2n24b8"; + version = "80.0.3987.132"; }; } From e3461b75e7237dcb6dfdfa95a477cb2b95a4751c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 10:59:53 +0000 Subject: [PATCH 18/93] randoop: 4.2.1 -> 4.2.2 --- pkgs/development/tools/analysis/randoop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 9c318b0a454..274418172d1 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.1"; + version = "4.2.2"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "0sq6zyagb8qrj629rq7amzi0dnm6q00mll6gd5yx1nqdnjbfb4qd"; + sha256 = "1ac4llphh16n5ihc2hb1vggl65mbkw1xd1j3ixfskvmcy8valgqw"; }; buildInputs = [ unzip ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automatic test generation for Java"; - homepage = https://randoop.github.io/randoop/; + homepage = "https://randoop.github.io/randoop/"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; From 86e6080daf5936ddd34804c1106af35956127219 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 13:41:09 +0000 Subject: [PATCH 19/93] workcraft: 3.2.5 -> 3.2.6 --- pkgs/applications/science/logic/workcraft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index c0d6d541d6b..685d6ee4861 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "11dk00b17yhk7cv8zms4nlffc0qwgsapimzr8csb89qmgabd7rj3"; + sha256 = "1sfbxmk71gp7paw4l5azqr0lsgsyp4308gx2jz8w4k3nasfshz25"; }; buildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://workcraft.org/; + homepage = "https://workcraft.org/"; description = "Framework for interpreted graph modeling, verification and synthesis"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; From 1332cea0318897fefc5047fbf9956bd5546a601a Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 4 Mar 2020 14:51:30 +0100 Subject: [PATCH 20/93] buildah: v1.14.1 -> v1.14.2 Signed-off-by: Sascha Grunert --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 3e758af0a7b..55e0dc790ed 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -4,13 +4,13 @@ buildGoPackage rec { pname = "buildah"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "12x80g83xjcjiafcxyqrhg952nq5w91df35d7lnvc2vz8vvpkyx1"; + sha256 = "1475k8h1l8rbbs6hyq9gxksh9884l1674z77fmiyr5vzql5yf7ca"; }; outputs = [ "bin" "man" "out" ]; From 0aed07bca2d4fb11cd6f842d0d6836588a389f24 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 Mar 2020 15:51:19 +0100 Subject: [PATCH 21/93] =?UTF-8?q?libnotify:=200.7.8=20=E2=86=92=200.7.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We added manpage upstream 🎉 https://ftp.gnome.org/pub/GNOME/sources/libnotify/0.7/libnotify-0.7.9.news --- .../libraries/libnotify/default.nix | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index f5138383341..aacadc5ea0a 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -3,7 +3,8 @@ , meson , ninja , pkgconfig -, fetchpatch +, libxslt +, docbook-xsl-ns , glib , gdk-pixbuf , gobject-introspection @@ -12,24 +13,15 @@ stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.7.8"; + version = "0.7.9"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1371csx0n92g60b5dmai4mmzdnx8081mc3kcgc6a0xipcq5rw839"; + sha256 = "ZsBRftFt968ljoMgj6r1Bpcn39ZplcS7xRwWlU1nR2E="; }; - patches = [ - # Fix darwin build - # https://gitlab.gnome.org/GNOME/libnotify/merge_requests/9 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libnotify/commit/55eb69247fe2b479ea43311503042fc03bf4e67d.patch"; - sha256 = "1hlb5b7c5axiyir1i5j2pi94bm2gyr1ybkp6yaqy7yk6iiqlvv50"; - }) - ]; - mesonFlags = [ # disable tests as we don't need to depend on GTK (2/3) "-Dtests=false" @@ -42,6 +34,8 @@ stdenv.mkDerivation rec { meson ninja pkgconfig + libxslt + docbook-xsl-ns ]; propagatedBuildInputs = [ From 1c0de27df32d7646304108219695f5987775c588 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 3 Mar 2020 17:29:41 +0100 Subject: [PATCH 22/93] bazel_0: init at 0.26.0 --- .../build-managers/bazel/bazel_0/default.nix | 375 ++++++++++++++++++ .../build-managers/bazel/bazel_0/glibc.patch | 78 ++++ .../bazel/bazel_0/python-stub-path-fix.patch | 13 + pkgs/top-level/all-packages.nix | 9 + 4 files changed, 475 insertions(+) create mode 100644 pkgs/development/tools/build-managers/bazel/bazel_0/default.nix create mode 100644 pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch create mode 100644 pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0/default.nix new file mode 100644 index 00000000000..f54868de533 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_0/default.nix @@ -0,0 +1,375 @@ +{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper +, zip, unzip, bash, writeCBin, coreutils +, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils +# Apple dependencies +, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation +# Allow to independently override the jdks used to build and run respectively +, buildJdk, runJdk +, buildJdkName +, runtimeShell +# Always assume all markers valid (don't redownload dependencies). +# Also, don't clean up environment variables. +, enableNixHacks ? false +}: + +let + srcDeps = [ + # From: $REPO_ROOT/WORKSPACE + (fetchurl { + url = "https://github.com/google/desugar_jdk_libs/archive/915f566d1dc23bc5a8975320cd2ff71be108eb9c.zip"; + sha256 = "0b926df7yxyyyiwm9cmdijy6kplf0sghm23sf163zh8wrk87wfi7"; + }) + (fetchurl { + url = "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz"; + sha256 = "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f"; + }) + (fetchurl { + url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz"; + sha256 = "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52"; + }) + (fetchurl { + url = "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"; + sha256 = "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898"; + }) + (fetchurl { + url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.1/java_tools_javac10_linux-v3.1.zip"; + sha256 = "a0cd51f9db1bf05a722ff7f5c60a07fa1c7d27428fff0815c342d32aa6c53576"; + }) + (fetchurl { + url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.1/java_tools_javac10_darwin-v3.1.zip"; + sha256 = "c646aad8808b8ec5844d6a80a1287fc8e13203375fe40d6af4819eff48b9bbaf"; + }) + (fetchurl { + url = "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip"; + sha256 = "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889"; + }) + (fetchurl { + url = "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip"; + sha256 = "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0"; + }) + (fetchurl { + url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.2.tar.gz"; + sha256 = "04f85f2dd049e87805511e3babc5cea3f5e72332b1627e34f3a5461cc38e815f"; + }) + ]; + + distDir = runCommand "bazel-deps" {} '' + mkdir -p $out + for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done + ''; + + defaultShellPath = lib.makeBinPath + # Keep this list conservative. For more exotic tools, prefer to use + # @rules_nixpkgs to pull in tools from the nix repository. Example: + # + # WORKSPACE: + # + # nixpkgs_git_repository( + # name = "nixpkgs", + # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", + # ) + # + # # This defines an external Bazel workspace. + # nixpkgs_package( + # name = "bison", + # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, + # ) + # + # some/BUILD.bazel: + # + # genrule( + # ... + # cmd = "$(location @bison//:bin/bison) -other -args", + # tools = [ + # ... + # "@bison//:bin/bison", + # ], + # ) + # + [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ]; + + # Java toolchain used for the build and tests + javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; + +in +stdenv.mkDerivation rec { + + version = "0.26.0"; + + meta = with lib; { + homepage = "https://github.com/bazelbuild/bazel/"; + description = "Build tool that builds code quickly and reliably"; + license = licenses.asl20; + platforms = platforms.linux ++ platforms.darwin; + }; + + # Additional tests that check bazel’s functionality. Execute + # + # nix-build . -A bazel.tests + # + # in the nixpkgs checkout root to exercise them locally. + passthru.tests = { + pythonBinPath = callPackage ./python-bin-path-test.nix {}; + bashTools = callPackage ./bash-tools-test.nix {}; + }; + + name = "bazel-${version}"; + + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip"; + sha256 = "d26dadf62959255d58e523da3448a6222af768fe1224e321b120c1d5bbe4b4f2"; + }; + + # Necessary for the tests to pass on Darwin with sandbox enabled. + # Bazel starts a local server and needs to bind a local address. + __darwinAllowLocalNetworking = true; + + sourceRoot = "."; + + patches = [ + ./glibc.patch + ./python-stub-path-fix.patch + ] ++ lib.optional enableNixHacks ../nix-hacks.patch; + + # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. + + customBash = writeCBin "bash" '' + #include + #include + #include + #include + + extern char **environ; + + int main(int argc, char *argv[]) { + char *path = getenv("PATH"); + char *pathToAppend = "${defaultShellPath}"; + char *newPath; + if (path != NULL) { + int length = strlen(path) + 1 + strlen(pathToAppend) + 1; + newPath = malloc(length * sizeof(char)); + snprintf(newPath, length, "%s:%s", path, pathToAppend); + } else { + newPath = pathToAppend; + } + setenv("PATH", newPath, 1); + execve("${bash}/bin/bash", argv, environ); + return 0; + } + ''; + + postPatch = let + + darwinPatches = '' + # Disable Bazel's Xcode toolchain detection which would configure compilers + # and linkers from Xcode instead of from PATH + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + + # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails + export GCOV=${coreutils}/bin/false + + # Framework search paths aren't added by bintools hook + # https://github.com/NixOS/nixpkgs/pull/41914 + export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + + # libcxx includes aren't added by libcxx hook + # https://github.com/NixOS/nixpkgs/pull/41589 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + + # don't use system installed Xcode to run clang, use Nix clang instead + sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD + + # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead + sed -i -e "/#include /i #include " src/main/cpp/blaze_util_darwin.cc + + # clang installed from Xcode has a compatibility wrapper that forwards + # invocations of gcc to clang, but vanilla clang doesn't + sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + + sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper + done + ''; + + genericPatches = '' + # Substitute python's stub shebang to plain python path. (see TODO add pr URL) + # See also `postFixup` where python is added to $out/nix-support + substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\ + --replace "/usr/bin/env python" "${python}/bin/python" \ + --replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \ + + # md5sum is part of coreutils + sed -i 's|/sbin/md5|md5sum|' \ + src/BUILD + + # substituteInPlace is rather slow, so prefilter the files with grep + grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do + # If you add more replacements here, you must change the grep above! + # Only files containing /bin are taken into account. + substituteInPlace "$path" \ + --replace /bin/bash ${customBash}/bin/bash \ + --replace /usr/bin/env ${coreutils}/bin/env \ + --replace /bin/true ${coreutils}/bin/true + done + + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/bash ${customBash}/bin/bash + + # add nix environment vars to .bazelrc + cat >> .bazelrc <> runfiles.bash.tmp + cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp + mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash + + patchShebangs . + ''; + in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + + genericPatches; + + buildInputs = [ + buildJdk + ]; + + # when a command can’t be found in a bazel build, you might also + # need to add it to `defaultShellPath`. + nativeBuildInputs = [ + zip + python + unzip + makeWrapper + which + customBash + ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; + + # Bazel makes extensive use of symlinks in the WORKSPACE. + # This causes problems with infinite symlinks if the build output is in the same location as the + # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a + # subdirectory. + # Failing to do this causes "infinite symlink expansion detected" + preBuildPhases = ["preBuildPhase"]; + preBuildPhase = '' + mkdir bazel_src + shopt -s dotglob extglob + mv !(bazel_src) bazel_src + ''; + + buildPhase = '' + # Increasing memory during compilation might be necessary. + # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" + ./bazel_src/compile.sh + ./bazel_src/scripts/generate_bash_completion.sh \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.bash \ + --prepend=./bazel_src/scripts/bazel-complete-header.bash \ + --prepend=./bazel_src/scripts/bazel-complete-template.bash + ''; + + installPhase = '' + mkdir -p $out/bin + + # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel + # if it can’t find something in tools, it calls $out/bin/bazel-real + cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + mv ./bazel_src/output/bazel $out/bin/bazel-real + + wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}" + + # shell completion files + mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions + mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel + cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ + ''; + + # Temporarily disabling for now. A new approach is needed for this derivation as Bazel + # accesses the internet during the tests which fails in a sandbox. + doInstallCheck = false; + installCheckPhase = '' + export TEST_TMPDIR=$(pwd) + + hello_test () { + $out/bin/bazel test \ + --test_output=errors \ + --java_toolchain='${javaToolchain}' \ + examples/cpp:hello-success_test \ + examples/java-native/src/test/java/com/example/myproject:hello + } + + cd ./bazel_src + + # test whether $WORKSPACE_ROOT/tools/bazel works + + mkdir -p tools + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exit 1 + EOF + chmod +x tools/bazel + + # first call should fail if tools/bazel is used + ! hello_test + + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exec "$BAZEL_REAL" "$@" + EOF + + # second call succeeds because it defers to $out/bin/bazel-real + hello_test + ''; + + # Save paths to hardcoded dependencies so Nix can detect them. + postFixup = '' + mkdir -p $out/nix-support + echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends + # The templates get tar’d up into a .jar, + # so nix can’t detect python is needed in the runtime closure + echo "${python}" >> $out/nix-support/depends + ''; + + dontStrip = true; + dontPatchELF = true; +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch b/pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch new file mode 100644 index 00000000000..c4de48068f1 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch @@ -0,0 +1,78 @@ +From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853 +From: Benjamin Peterson +Date: Fri, 3 May 2019 08:11:00 -0700 +Subject: [PATCH] Rename gettid() functions. + +glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. +--- + src/core/lib/gpr/log_linux.cc | 6 ++---- + src/core/lib/gpr/log_posix.cc | 4 ++-- + src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- + 3 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 81026e5689b..8b597b4cf2f 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_linux.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,7 @@ + #include + #include + +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = gettid(); ++ if (tid == 0) tid = sys_gettid(); + + timer = static_cast(now.tv_sec); + final_slash = strrchr(args->file, '/'); +diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc +index b6edc14ab6b..2f7c6ce3760 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_posix.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc +@@ -31,7 +31,7 @@ + #include + #include + +-static intptr_t gettid(void) { return (intptr_t)pthread_self(); } ++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { + char* prefix; + gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", + gpr_log_severity_string(args->severity), time_buffer, +- (int)(now.tv_nsec), gettid(), display_file, args->line); ++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); + + fprintf(stderr, "%-70s %s\n", prefix, args->message); + gpr_free(prefix); +diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc +index c2d80c08ddb..4a83cb6c215 100644 +--- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc ++++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc +@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, + } + + #ifndef NDEBUG +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + #endif + + /* pollset->mu lock must be held by the caller before calling this. +@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, + #define WORKER_PTR (&worker) + #endif + #ifndef NDEBUG +- WORKER_PTR->originator = gettid(); ++ WORKER_PTR->originator = sys_gettid(); + #endif + if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { + gpr_log(GPR_INFO, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch b/pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch new file mode 100644 index 00000000000..cbc4192d2d9 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch @@ -0,0 +1,13 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt +index dac21c9a83..69b11c283f 100644 +--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt ++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt +@@ -67,7 +67,7 @@ def FindPythonBinary(module_space): + return os.path.join(module_space, PYTHON_BINARY) + else: + # Case 4: Path has to be looked up in the search path. +- return SearchPath(PYTHON_BINARY) ++ return "NIX_STORE_PYTHON_PATH" + + def CreatePythonPathEntries(python_imports, module_space): + parts = python_imports.split(':'); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d01b8bd074..6af7ad3f34f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9777,6 +9777,15 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; + bazel_0 = callPackage ../development/tools/build-managers/bazel/bazel_0 { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + buildJdk = jdk8; + buildJdkName = "jdk8"; + runJdk = jdk11_headless; + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; + bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; From c7adb4ee7282672c330b2f8b37ac5f6d74e1a523 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 3 Mar 2020 17:27:44 +0100 Subject: [PATCH 23/93] pythonPackages.tensorflow: use bazel_0 This allows us to get rid of the compatibility hacks that we had to add (tf-1.15-bazel-1.0.patch) and also fixes #77626. --- .../python-modules/tensorflow/default.nix | 13 +- .../tensorflow/tf-1.15-bazel-1.0.patch | 213 ------------------ 2 files changed, 7 insertions(+), 219 deletions(-) delete mode 100644 pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index cdf659a74dc..0cddbd5a0a4 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, bazel_1, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +{ stdenv, pkgs, bazel_0, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin , addOpenGLRunpath # Python deps , buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python @@ -94,7 +94,7 @@ let bazel-build = buildBazelPackage { name = "${pname}-${version}"; - bazel = bazel_1; + bazel = bazel_0; src = fetchFromGitHub { owner = "tensorflow"; @@ -121,7 +121,6 @@ let sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz"; }) - ./tf-1.15-bazel-1.0.patch (fetchpatch { # be compatible with gast >0.2 instead of only gast 0.2.2 @@ -283,7 +282,6 @@ let bazelFlags = [ # temporary fixes to make the build work with bazel 0.27 "--incompatible_no_support_tools_in_action_inputs=false" - "--incompatible_use_native_patch=false" ]; bazelBuildFlags = [ "--config=opt" # optimize using the flags set in the configure phase @@ -299,9 +297,9 @@ let # FIXME: can't (re)produce this output with current bazel. # FIXME: build log: https://gist.github.com/andir/eff3e9c8eda5b56c8ea84903aed9cc35 sha256 = if cudaSupport then - "0gyhjvzshgj59mbns8njlfl9qpz4sdg4j0xs2dva0w2nql7cr7im" + "0bzkqjnw1crf0v91yb1frvy0l7kmjawbfwdhm89h73i8fqjab8jw" else - "04jvg3mc2si4xdbszc1vnw1rmf22p7snbjphmnklp7bc39jxkcrz"; + "1d7czp43a3a4aksvdcskbdy7dgifily1amqbz9fa6d8mkhdj5if5"; }; buildAttrs = { @@ -422,6 +420,9 @@ in buildPythonPackage { x = np.random.uniform(size=(1,1)) y = np.random.uniform(size=(1,)) model.fit(x, y, epochs=1) + + # regression test for #77626 + from tensorflow.contrib import tensor_forest EOF ''; diff --git a/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch b/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch deleted file mode 100644 index 4d70e99108b..00000000000 --- a/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch +++ /dev/null @@ -1,213 +0,0 @@ -diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD -index f740ba66b5..6cc9003787 100644 ---- a/tensorflow/c/BUILD -+++ b/tensorflow/c/BUILD -@@ -270,6 +270,7 @@ tf_cuda_library( - "//tensorflow/core/platform", - "@com_google_absl//absl/strings", - ], -+ alwayslink = 1, - ) - - exports_files( -diff --git a/tensorflow/c/eager/BUILD b/tensorflow/c/eager/BUILD -index 5c42e508f7..16b421862c 100644 ---- a/tensorflow/c/eager/BUILD -+++ b/tensorflow/c/eager/BUILD -@@ -79,6 +79,7 @@ tf_cuda_library( - "//tensorflow/core/profiler/lib:profiler_session", - "//tensorflow/core:gpu_runtime", - ], -+ alwayslink = 1, - ) - - tf_cuda_library( -@@ -226,6 +227,7 @@ tf_cuda_library( - "//tensorflow/core/profiler/rpc/client:capture_profile", - "//tensorflow/core:gpu_runtime", - ], -+ alwayslink = 1, - ) - - tf_cuda_cc_test( -diff --git a/tensorflow/cc/saved_model/BUILD b/tensorflow/cc/saved_model/BUILD -index 39b84922d1..b2affdd999 100644 ---- a/tensorflow/cc/saved_model/BUILD -+++ b/tensorflow/cc/saved_model/BUILD -@@ -123,6 +123,7 @@ cc_library( - "//tensorflow/core/util/tensor_bundle:naming", - # mobile not supported yet - ]), -+ alwayslink = 1, - ) - - tf_cc_test( -diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD -index c23c1f9b39..805643b217 100644 ---- a/tensorflow/core/BUILD -+++ b/tensorflow/core/BUILD -@@ -777,6 +777,7 @@ cc_library( - ":lib_proto_parsing", - ":protos_all_cc", - ], -+ alwayslink = 1, - ) - - # DEPRECATED: use platform:stringpiece instead. -@@ -2496,6 +2497,7 @@ cc_library( - "@com_google_protobuf//:protobuf", - ] + tf_protos_all_impl() + tf_protos_grappler_impl() + - tf_additional_numa_deps(), -+ alwayslink = 1, - ) - - # File compiled with extra flags to get cpu-specific acceleration. -diff --git a/tensorflow/core/lib/random/BUILD b/tensorflow/core/lib/random/BUILD -index 3bd933261b..e1e589e76d 100644 ---- a/tensorflow/core/lib/random/BUILD -+++ b/tensorflow/core/lib/random/BUILD -@@ -50,6 +50,7 @@ cc_library( - "//tensorflow/core/platform:types", - "//third_party/eigen3", - ], -+ alwayslink = 1, - ) - - filegroup( -diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl -index 5459d8d428..feba3a5686 100644 ---- a/tensorflow/core/platform/default/build_config.bzl -+++ b/tensorflow/core/platform/default/build_config.bzl -@@ -228,6 +228,7 @@ def cc_proto_library( - hdrs = gen_hdrs, - deps = cc_libs + deps, - includes = includes, -+ alwayslink = 1, - **kargs - ) - native.cc_library( -diff --git a/tensorflow/lite/java/src/test/native/BUILD b/tensorflow/lite/java/src/test/native/BUILD -index 6dcdab2aee..32bb0a8d85 100644 ---- a/tensorflow/lite/java/src/test/native/BUILD -+++ b/tensorflow/lite/java/src/test/native/BUILD -@@ -19,6 +19,7 @@ cc_library( - "//tensorflow/lite/java/jni", - "//tensorflow/lite/kernels:kernel_util", - ], -+ alwayslink = 1, - ) - - tflite_jni_binary( -diff --git a/tensorflow/lite/python/testdata/BUILD b/tensorflow/lite/python/testdata/BUILD -index 7bda81358f..ac1188d844 100644 ---- a/tensorflow/lite/python/testdata/BUILD -+++ b/tensorflow/lite/python/testdata/BUILD -@@ -60,6 +60,7 @@ cc_library( - deps = [ - "//tensorflow/lite/c:c_api_internal", - ], -+ alwayslink = 1, - ) - - cc_binary( -diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD -index 6fd9b4f273..29df3a3dff 100644 ---- a/tensorflow/python/BUILD -+++ b/tensorflow/python/BUILD -@@ -375,6 +375,7 @@ cc_library( - "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", - ], -+ alwayslink = 1, - ) - - cc_library( -@@ -411,6 +412,7 @@ cc_library( - "//third_party/py/numpy:headers", - "//third_party/python_runtime:headers", - ], -+ alwayslink = 1, - ) - - cc_library( -@@ -617,6 +619,7 @@ cc_library( - "//tensorflow/core:op_gen_lib", - "//tensorflow/core:protos_all_cc", - ], -+ alwayslink = 1, - ) - - py_library( -diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl -index a3956322fe..32752f59ad 100644 ---- a/tensorflow/tensorflow.bzl -+++ b/tensorflow/tensorflow.bzl -@@ -2331,6 +2331,7 @@ def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs, protodeps = [] - hdrs = out_hdrs, - visibility = visibility, - deps = deps, -+ alwayslink = 1, - ) - - def tf_genrule_cmd_append_to_srcs(to_append): -diff --git a/tensorflow/tools/graph_transforms/BUILD b/tensorflow/tools/graph_transforms/BUILD -index adafe2aca1..8965316b12 100644 ---- a/tensorflow/tools/graph_transforms/BUILD -+++ b/tensorflow/tools/graph_transforms/BUILD -@@ -223,6 +223,7 @@ cc_library( - "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", - ], -+ alwayslink = 1, - ) - - # This library includes a main function, to make it easy to create other -diff --git a/third_party/icu/data/BUILD.bazel b/third_party/icu/data/BUILD.bazel -index 7db21566e4..8e18c7cc3a 100644 ---- a/third_party/icu/data/BUILD.bazel -+++ b/third_party/icu/data/BUILD.bazel -@@ -43,4 +43,5 @@ cc_library( - name = "conversion_data", - srcs = [":conversion_data.c"], - deps = ["@icu//:headers"], -+ alwayslink = 1, - ) -diff --git a/third_party/protobuf/protobuf.patch b/third_party/protobuf/protobuf.patch -index df0648563d..18fc6cdf35 100644 ---- a/third_party/protobuf/protobuf.patch -+++ b/third_party/protobuf/protobuf.patch -@@ -11,7 +11,15 @@ index 2fb26050..c2744d5b 100644 - - ################################################################################ - # Protobuf Runtime Library --@@ -218,7 +218,7 @@ cc_library( -+@@ -209,6 +209,7 @@ cc_library( -+ copts = COPTS, -+ includes = ["src/"], -+ linkopts = LINK_OPTS, -++ alwayslink = 1, -+ visibility = ["//visibility:public"], -+ deps = [":protobuf_lite"] + PROTOBUF_DEPS, -+ ) -+@@ -219,7 +220,7 @@ cc_library( - # TODO(keveman): Remove this target once the support gets added to Bazel. - cc_library( - name = "protobuf_headers", -@@ -20,3 +28,4 @@ index 2fb26050..c2744d5b 100644 - includes = ["src/"], - visibility = ["//visibility:public"], - ) -+ -\ No newline at end of file -diff --git a/third_party/systemlibs/protobuf.bzl b/third_party/systemlibs/protobuf.bzl -index 774514f3fd..1c415b018b 100644 ---- a/third_party/systemlibs/protobuf.bzl -+++ b/third_party/systemlibs/protobuf.bzl -@@ -262,6 +262,7 @@ def cc_proto_library( - hdrs = gen_hdrs, - deps = cc_libs + deps, - includes = includes, -+ alwayslink = 1, - **kargs - ) - From 64310331a5f48c5ce9b1d05d70a1bb790b922e76 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 17:19:28 +0000 Subject: [PATCH 24/93] avocode: 4.3.0 -> 4.4.3 --- pkgs/applications/graphics/avocode/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index c5c29459b45..8b1811c645f 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.3.0"; + version = "4.4.3"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0ifb4nsh1mw61gb0hqphr1fmdkq1rjbrvvc9hvpclqg7wc7awids"; + sha256 = "03pq55mdgbaf6c2q57ww2990wr6qz8hk1r6xs1irqy8990m4afvk"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://avocode.com/; + homepage = "https://avocode.com/"; description = "The bridge between designers and developers"; license = licenses.unfree; platforms = platforms.linux; From 2113013ca6a4ce9e49e2bc44530652a7a2c5e1aa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 4 Mar 2020 13:00:00 -0500 Subject: [PATCH 25/93] nodejs-13_x: 13.9.0 -> 13.10.0 Changelog: https://github.com/nodejs/node/releases/tag/v13.10.0 --- pkgs/development/web/nodejs/v13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index 89ef27c8c5e..6b332da79be 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "13.9.0"; - sha256 = "0z68hj3z2y8aj4bc14h77mj5l99jb4ljjc10gp0dpg8s4g1x5xzw"; + version = "13.10.0"; + sha256 = "11m8sisi3dmr70fpnb7xi6nljil3rm36liz0wfzd7kgxmv6p9mhj"; } From c5f077c0c146b18f3407c77db8918fa5459b2310 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 18:56:56 +0000 Subject: [PATCH 26/93] closurecompiler: 20200204 -> 20200224 --- pkgs/development/compilers/closure/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index f90e6b4bcfe..0efdabcde2e 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200204"; + version = "20200224"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0diqnvyfh8w7yf7l5zqvb4msw07n50k9grz0k2znykaqwmjsidx9"; + sha256 = "0qlnpnd64rrlyz7ybdnp7zk5ns2s0071zs1fcrcq9ba2lnhfbmmb"; }; sourceRoot = "."; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for making JavaScript download and run faster"; - homepage = https://developers.google.com/closure/compiler/; + homepage = "https://developers.google.com/closure/compiler/"; license = licenses.asl20; platforms = platforms.all; }; From e384126b17e77b51d5934255bd6af3a5e539dee1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 19:12:08 +0000 Subject: [PATCH 27/93] cloudflared: 2020.2.0 -> 2020.2.1 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index c5d6e45ac88..d441e539aaa 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.2.0"; + version = "2020.2.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "1fzndqkmfpx15fllxqxbh7n4m13ydlp50dvkdh8n384j09ndmx4r"; + sha256 = "1wyvf4bilhiwabqgdwmnhifwc845m4g17pz7xmndzvqwmfd7riw5"; }; modSha256 = "1y5vh8g967rrm9b9hjlr70bs2rm09cpik673brgk3nzqxka10w7p"; From 88b22b68904419c26d21f58bc2b95c1daf792aca Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 Mar 2020 20:22:15 +0100 Subject: [PATCH 28/93] =?UTF-8?q?php74:=207.4.2=20=E2=86=92=207.4.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/php/php-src/blob/php-7.4.3/NEWS#L3-L90 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 0e4d83c1352..a31bbe73cae 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -286,7 +286,7 @@ in { }; php74 = generic { - version = "7.4.2"; - sha256 = "05p8z0ld058yjanxaphy3ka20hn7x7d6nak5sm782w4wprs9k402"; + version = "7.4.3"; + sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ="; }; } From c522b865b959431c1e5723f47eb320c7897a3003 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 20:39:16 +0000 Subject: [PATCH 29/93] eternal-terminal: 6.0.6 -> 6.0.7 --- pkgs/tools/networking/eternal-terminal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 7ee959905ce..bd39cfba8ae 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.0.6"; + version = "6.0.7"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "0vhhiccyvp9pjdmmscwdwcynxfwd2kgv418z90blnir0yfkvsryq"; + sha256 = "03pdspggqxkmz95qb96pig5x0xw18hy9a7ivszydr32ry6kxxx1h"; }; nativeBuildInputs = [ cmake ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Remote shell that automatically reconnects without interrupting the session"; license = licenses.asl20; - homepage = https://mistertea.github.io/EternalTerminal/; + homepage = "https://mistertea.github.io/EternalTerminal/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ dezgeg pingiun ]; }; From 950cde99c112a506b682c4cfefce8071e1266da5 Mon Sep 17 00:00:00 2001 From: Stephane Schitter Date: Wed, 4 Mar 2020 10:36:00 +0100 Subject: [PATCH 30/93] adminer: init at 4.7.6 --- pkgs/servers/adminer/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/adminer/default.nix diff --git a/pkgs/servers/adminer/default.nix b/pkgs/servers/adminer/default.nix new file mode 100644 index 00000000000..6d7b12df56d --- /dev/null +++ b/pkgs/servers/adminer/default.nix @@ -0,0 +1,31 @@ +{ stdenv, libbsd, fetchurl, phpPackages, php }: + +stdenv.mkDerivation rec { + version = "4.7.6"; + pname = "adminer"; + + # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file + src = fetchurl { + url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz"; + sha256 = "1zgvscz7jk32qga8hp2dg89h7y72v05vz4yh4lq2ahhwwkbnsxpi"; + }; + + nativeBuildInputs = with phpPackages; [ php composer ]; + + buildPhase = '' + composer --no-cache run compile + ''; + + installPhase = '' + mkdir $out + cp adminer-${version}.php $out/adminer.php + ''; + + meta = with stdenv.lib; { + description = "Database management in a single PHP file"; + homepage = "https://www.adminer.org"; + license = with licenses; [ asl20 gpl2 ]; + maintainers = with maintainers; [ sstef ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d8b08c97b0..b0ff8ff4f4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -541,6 +541,8 @@ in pname = "OPNplug"; }; + adminer = callPackage ../servers/adminer { }; + advancecomp = callPackage ../tools/compression/advancecomp {}; aefs = callPackage ../tools/filesystems/aefs { }; From aeee7de22b9383a265e07d3a2b9c3853536b2185 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Feb 2020 23:50:46 +0100 Subject: [PATCH 31/93] cargo-xbuild: 0.5.24 -> 0.5.28 --- pkgs/development/tools/rust/cargo-xbuild/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index b92a65842cc..4ae2b55f015 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.24"; + version = "0.5.28"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "1haq8gv4k6qgihyjplf76589d2hbb1720g6yvwk88aksjxmqj4jm"; + sha256 = "1rczflf6fllxkag5nah195shwqvqmlna9a1gkcwp9ljlgxlr9zvq"; }; - cargoSha256 = "08y64yqvar1ph1pcbh6lhqf4kj85zw74dfg0ii9lycvzxvkwvhqp"; + cargoSha256 = "0xr8wpcw3x0343hm6clygsbikhrp6gcqb8vh7g7h9nijjrbnzxxb"; meta = with stdenv.lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; From 308d840f03b805ea97ba596432dc73623ce0a585 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Wed, 4 Mar 2020 23:47:31 +0200 Subject: [PATCH 32/93] brscan4: 0.4.4-4 -> 0.4.8-1 (#79872) --- .../applications/graphics/sane/backends/brscan4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index b431cf51b01..cd75088ea53 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -10,17 +10,17 @@ let udevRules = callPackage ./udev_rules_type1.nix {}; in stdenv.mkDerivation rec { - name = "brscan4-0.4.4-4"; + name = "brscan4-0.4.8-1"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb"; - sha256 = "13mhjbzf9nvpdzrc2s98684r7likg76zxs1wlz2h8w59fsqgx4k2"; + sha256 = "15hrf1gpm36lniqi6yf47dvdqjinm644xb752c6rcv8n06wb79ag"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; - sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd"; + sha256 = "0pyprjl0capg403yp6pp07gd6msx9kn7bzjcdswdbn28fyxrk5l4"; } else throw "${name} is not supported on ${stdenv.hostPlatform.system} (only i686-linux and x86_64 linux are supported)"; From 9c8b500354aabedc28547778c11efb35535d6485 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 21:49:16 +0000 Subject: [PATCH 33/93] eventstat: 0.04.08 -> 0.04.09 --- pkgs/os-specific/linux/eventstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 15579d066a4..6dfaa6ab38b 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "eventstat"; - version = "0.04.08"; + version = "0.04.09"; src = fetchzip { url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "08a2fg2bl7rf29br1mryix5hp2njy0cjl648lnyiv7wngi341qsm"; + sha256 = "1b3m58mak62ym2amnmk62c2d6fypk30fw6jsmirh1qz7dwix4bl5"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; From 4656fba5ab3bed79af2bbd8f6a2f52549dc3faf4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 5 Mar 2020 07:49:38 +1000 Subject: [PATCH 34/93] gitAndTools.gh 0.6.0 -> 0.6.1 https://github.com/cli/cli/releases/tag/v0.6.1 --- .../version-management/git-and-tools/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 03c7bdc1b6e..a7e6918b4d8 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0wqc9c30iydwylw53idff1ny2v410jcbhn7hpiinc4x5m3dy7827"; + sha256 = "0jqr7i67s00gvi6cbww397jnh8qzwr37prd7frbl12j89glshwy1"; }; - modSha256 = "191ds0dkllc0l2lbqnwlca26js90b2g9f70jsid0zhmz3z9f1zh9"; + modSha256 = "03m193ny5z77yy586cwh099ypi1lmhb5vdj7d4kphxycnvpndr66"; buildFlagsArray = [ "-ldflags=-X github.com/cli/cli/command.Version=${version}" From f14ee5bce58fc4e63fda449e9d1370a85465a8b0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 5 Mar 2020 07:50:51 +1000 Subject: [PATCH 35/93] conmon: 2.0.10 -> 2.0.11 https://github.com/containers/conmon/releases/tag/v2.0.11 --- .../virtualization/conmon/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 802272c4b5d..53a31c65634 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -1,31 +1,30 @@ { stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , glib , glibc , systemd }: stdenv.mkDerivation rec { - project = "conmon"; - name = "${project}-${version}"; - version = "2.0.10"; + pname = "conmon"; + version = "2.0.11"; src = fetchFromGitHub { owner = "containers"; - repo = project; + repo = pname; rev = "v${version}"; - sha256 = "194wach3yrkvll2xaj0x77hzlngk2016mflgnd5k8knjn2b9dgvl"; + sha256 = "1mdnfkbbv41g590a1ja4rfw69z6kp03znyhikdmg6zqp4qsv32ib"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib systemd ] ++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; - installPhase = "install -Dm755 bin/${project} $out/bin/${project}"; + installPhase = "install -Dm755 bin/${pname} $out/bin/${pname}"; meta = with stdenv.lib; { - homepage = https://github.com/containers/conmon; + homepage = "https://github.com/containers/conmon"; description = "An OCI container runtime monitor"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester saschagrunert ]; From 983a77a46cecee4ccf78a41735d08d7e5342b1dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 22:17:43 +0000 Subject: [PATCH 36/93] fanficfare: 3.15.0 -> 3.16.0 --- pkgs/tools/text/fanficfare/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 105a2d3308f..ac89b6af32a 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.15.0"; + version = "3.16.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "12nsrl8nvg52mi136m7ayvaivwjapn7ry95137ynj1njy2w990hm"; + sha256 = "1l76fh23a9wmw47bahd5l1bxyqcy54lahvid373iy9p3586fskis"; }; propagatedBuildInputs = with python3Packages; [ @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Tool for making eBooks from fanfiction web sites"; - homepage = https://github.com/JimmXinu/FanFicFare; + homepage = "https://github.com/JimmXinu/FanFicFare"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ dwarfmaster ]; From e468301c1924fae3983fe5896a4fcaebafc2d071 Mon Sep 17 00:00:00 2001 From: Greg Roodt Date: Thu, 5 Mar 2020 09:20:23 +1100 Subject: [PATCH 37/93] argo: 2.6.0 -> 2.6.1 --- pkgs/applications/networking/cluster/argo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 52da70bc8b8..f02b64e92c8 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "0hlvsi706jwlf43mdwic6j7iriii4daxjr82qgi80ac4h4x0z3h2"; + sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf"; }; modSha256 = "1394bav1k1xv9n1rvji0j9a09mibk97xpha24640jkgmy9bnmg45"; From 2954d5544d08ea3ed2e0137d56862206f85ffa94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 22:58:13 +0000 Subject: [PATCH 38/93] graylog: 3.2.1 -> 3.2.2 --- pkgs/tools/misc/graylog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 48b471e3b40..6ded4f28e9d 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1pilksik3bbd4sgmnpns9gg9sddybzxzxkn9sknn40dav08k1x6h"; + sha256 = "1n9nwxq0aklihhp0v39klq4za63ks6v5z76dp5821jcv1cbk96g9"; }; dontBuild = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source log management solution"; - homepage = https://www.graylog.org/; + homepage = "https://www.graylog.org/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.fadenb ]; From 70296be9f6865e4779df453c721f43018d1407ab Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 4 Mar 2020 18:00:00 -0500 Subject: [PATCH 39/93] chezmoi: 1.7.13 -> 1.7.16 --- pkgs/tools/misc/chezmoi/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index da8f8c78918..b2fb6925aba 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.7.13"; + version = "1.7.16"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1xqmr7sps5s3ib4q91z7drwlglp1av37gb2jm0zw7y3ijyp2c749"; + sha256 = "1fkjdpqal0yzm58l146pf5xpbhij9iq79933i9a77v2jihdbjn52"; }; - modSha256 = "07fglc3k3a5y70slly4ri3izwnyk4nwghmvkjwgc8lbw8m1zx0r8"; + modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}" @@ -20,7 +20,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installShellCompletion --bash completions/chezmoi-completion.bash + installShellCompletion --bash --name chezmoi.bash completions/chezmoi-completion.bash installShellCompletion --fish completions/chezmoi.fish installShellCompletion --zsh completions/chezmoi.zsh ''; @@ -28,7 +28,7 @@ buildGoModule rec { subPackages = [ "." ]; meta = with stdenv.lib; { - homepage = https://github.com/twpayne/chezmoi; + homepage = "https://www.chezmoi.io/"; description = "Manage your dotfiles across multiple machines, securely"; license = licenses.mit; maintainers = with maintainers; [ jhillyerd ]; From 248f387e6d8ef8b896474bc06cdc92c5b8c963ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 23:04:43 +0000 Subject: [PATCH 40/93] fwts: 19.11.00 -> 20.02.00 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 435086512f6..c230ecaae79 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "19.11.00"; + version = "20.02.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "07adim2pxh1d0395632ds78hcy7xs3jqgdijksq10ridivhqxcli"; + sha256 = "1mplv4866w3w1vixn7abq9cgh8gxgzhdyxsvj952vkhv3b8in4jq"; stripRoot = false; }; From adcdd7b0a77c81f37001e6fe55026352f7c51631 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 23:10:39 +0000 Subject: [PATCH 41/93] gromacs: 2020 -> 2020.1 --- .../science/molecular-dynamics/gromacs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 7536d071f6b..fadd60d9ebb 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation { - name = "gromacs-2020"; + name = "gromacs-2020.1"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.tar.gz"; - sha256 = "00ds83n5wnm7g7wq91jycp8h82vnam5b4rwg3fv9rk9x5ca5czj7"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.1.tar.gz"; + sha256 = "1kwrk3i1dxp8abhqqsl049lh361n4910h0415g052f8shdc6arp1"; }; nativeBuildInputs = [ cmake ]; From cde784aaa383e95e8370bf23db47c5bf97e226d8 Mon Sep 17 00:00:00 2001 From: ngerstle Date: Thu, 5 Mar 2020 00:31:01 +0100 Subject: [PATCH 42/93] kube3d: correct k3s version tag --- pkgs/applications/networking/cluster/kube3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index c34065bb22c..2eea6adb28d 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -3,7 +3,7 @@ buildGoModule rec { pname = "kube3d"; version = "1.6.0"; - k3sVersion = "1.17.3+k3s1"; + k3sVersion = "1.17.3-k3s1"; goPackagePath = "github.com/rancher/k3d"; From 8ca769e051c6a28d2db8ac1a0e2d80c2772a852a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 23:34:31 +0000 Subject: [PATCH 43/93] gallery-dl: 1.12.3 -> 1.13.1 --- pkgs/applications/misc/gallery-dl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 941b6050a1a..d0cf9673180 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.12.3"; + version = "1.13.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "06q6vmbliy935zlf4bbnfgiqyrx9vskz3fsks4jpxi47xs80rqkz"; + sha256 = "0a5k7gcs3vn6x1f2qg3ajpqsl39pmw2hsj2srd5y2l1xw7mkkqj6"; }; doCheck = false; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; - homepage = https://github.com/mikf/gallery-dl; + homepage = "https://github.com/mikf/gallery-dl"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ dawidsowa ]; }; From 03cf599ae23d3f38ea8eb7bdad47ea80749465d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 23:46:59 +0000 Subject: [PATCH 44/93] forkstat: 0.02.13 -> 0.02.14 --- pkgs/os-specific/linux/forkstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index 78ecded20cf..eee4691aeb3 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "forkstat"; - version = "0.02.13"; + version = "0.02.14"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"; - sha256 = "01ih89yw9gi6j3l40q5m26la1y0p1jidkxs3yffbdiqm6gwz0xbx"; + sha256 = "10kibb5psb5gqdmq9lfb7qw566diwg54gdb49b5zd71qwpybk3dl"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' From 9974067129ac0cac98a536f055804635a238cb51 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 00:20:08 +0000 Subject: [PATCH 45/93] gmsh: 4.5.2 -> 4.5.4 --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index e55bcd8fe21..e65cf52d581 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.5.2"; + version = "4.5.4"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "10i6i1s68lkccnl73lzr04cf1hc5rd8b7dpiaxs1vzrj1ljgw801"; + sha256 = "1k9f7qxlwja9i40qy55070sjnr21bl165677mdqw7qyb8d7wgy6c"; }; buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL From 7de490a28a9d4aa8d10ce53323485c1104089127 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 5 Mar 2020 02:07:23 +0100 Subject: [PATCH 46/93] gnomeExtensions.sound-output-device-chooser: 24 -> 25 https://github.com/kgshank/gse-sound-output-device-chooser/releases/tag/25 --- .../sound-output-device-chooser/default.nix | 21 ++++++++++++++---- .../fix-paths.patch | 22 +++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index a5f94288ae5..cc1c2deeef9 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -1,16 +1,29 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv +, substituteAll +, fetchFromGitHub +, libpulseaudio +, python3 +}: stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "24"; + version = "25"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; rev = version; - sha256 = "0n1rf4pdf0b78ivmz89x223sqlzv30qydkvlnvn7hwx0j32kyr0x"; + sha256 = "16xaa4r01575ix9lrvww8n6pird8r3ml1j037b3sm6dfrf8kvzxs"; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + libpulse = "${libpulseaudio}/lib/libpulse.so"; + python = python3.interpreter; + }) + ]; + dontBuild = true; uuid = "sound-output-device-chooser@kgshank.net"; @@ -23,6 +36,6 @@ stdenv.mkDerivation rec { description = "GNOME Shell extension adding audio device chooser to panel"; license = licenses.gpl3; maintainers = with maintainers; [ jtojnar ]; - homepage = https://github.com/kgshank/gse-sound-output-device-chooser; + homepage = "https://github.com/kgshank/gse-sound-output-device-chooser"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch new file mode 100644 index 00000000000..a0a6551fcf8 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch @@ -0,0 +1,22 @@ +--- a/sound-output-device-chooser@kgshank.net/convenience.js ++++ b/sound-output-device-chooser@kgshank.net/convenience.js +@@ -111,7 +111,7 @@ function refreshCards() { + log("New logic"); + let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path(); + try { +- let [result, out, err, exit_code] = GLib.spawn_command_line_sync('python ' + pyLocation); ++ let [result, out, err, exit_code] = GLib.spawn_command_line_sync('@python@ ' + pyLocation); + // log("result" + result +" out"+out + " exit_code" + exit_code + " + // err" +err); + if(result && !exit_code) { +--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py ++++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py +@@ -86,7 +86,7 @@ else: + + _libraries = {} + +-libpulse_library_name = find_library('pulse') ++libpulse_library_name = '@libpulse@' + if libpulse_library_name is None: + raise Exception('No libpulse.so library found!') + From cc92c86ea9070c977746dea23f718bb9d90a8579 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 01:43:08 +0000 Subject: [PATCH 47/93] flyway: 6.2.2 -> 6.2.4 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index dc9abdbcccc..1498d179d22 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.2.2"; + version = "6.2.4"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "09x62dbid9gx26q8m7gz4b21kinsx1ag3961krbxks28ihmwlm6a"; + sha256 = "1ng4ygd44hl63amjaizldsngn72jfz5pqw7wgr1vyvdxdzjfcnwm"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 12628187a9b684b0df4e5fd99ebf9723c74a41eb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 4 Mar 2020 20:45:00 -0500 Subject: [PATCH 48/93] nodejs-13_x: 13.10.0 -> 13.10.1 Changelog: https://github.com/nodejs/node/releases/tag/v13.10.1 --- pkgs/development/web/nodejs/v13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index 6b332da79be..affb86bece8 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "13.10.0"; - sha256 = "11m8sisi3dmr70fpnb7xi6nljil3rm36liz0wfzd7kgxmv6p9mhj"; + version = "13.10.1"; + sha256 = "14pvqwhilq210zn830zmh04a62rj3si0ijc4ihrhdf3dvghrx2c3"; } From 3f6d356654db6641895d274b1fdac8a15c452c06 Mon Sep 17 00:00:00 2001 From: Jeff Labonte Date: Wed, 4 Mar 2020 21:15:47 -0500 Subject: [PATCH 49/93] brave: 1.4.95 -> 1.4.96 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 63d56a48038..cf3750addf8 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.4.95"; + version = "1.4.96"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1a7rk4r7phlf1y3ap3942z5sfvb6i4qglvq06qqhz49wq1wbgvq1"; + sha256 = "12fdef417180d295170dd61ff0586e568a0c6475fabc0b3d003921ec924a84fc"; }; dontConfigure = true; From 94c7f25f69af939823e3055d15efac236eba9f8b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 02:36:00 +0000 Subject: [PATCH 50/93] joker: 0.14.1 -> 0.14.2 --- pkgs/development/interpreters/joker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index e7741ed81ec..ed82f76eec2 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "0da07fswj7x87njd9bi3gf8rzfyaq3zfcszgyb37w7q0ng4gg25n"; + sha256 = "1wi80sr8h9fwh4xipff0y6qdzrliwyk2w1bmi33ncykxd9r2g7nk"; }; modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j"; @@ -20,7 +20,7 @@ buildGoModule rec { subPackages = [ "." ]; meta = with stdenv.lib; { - homepage = https://github.com/candid82/joker; + homepage = "https://github.com/candid82/joker"; description = "A small Clojure interpreter and linter written in Go"; license = licenses.epl10; platforms = platforms.all; From 03090454286f689ddf275fd0162a2d75b0c32299 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 02:38:48 +0000 Subject: [PATCH 51/93] jgmenu: 4.0.2 -> 4.1.0 --- pkgs/applications/misc/jgmenu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index df690727b27..47f02e32d77 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jgmenu"; - version = "4.0.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "086p91l1igx5mv2i6fwbgx5p72war9aavc7v3m7sd0c0xvb334br"; + sha256 = "1wsh37rapb1bszlq36hvwxqvfds39hbvbl152m8as4zlh93wfvvk"; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/johanmalm/jgmenu; + homepage = "https://github.com/johanmalm/jgmenu"; description = "Small X11 menu intended to be used with openbox and tint2"; license = licenses.gpl2; platforms = platforms.linux; From d08fb3b92238d8abe6bd909b2b19b7b4ce56d29e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 02:42:20 +0000 Subject: [PATCH 52/93] jruby: 9.2.10.0 -> 9.2.11.0 --- pkgs/development/interpreters/jruby/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 82624d2272b..3784b6ab282 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.2.10.0"; + version = "9.2.11.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "0lwmqyg06rv3iyhmfnqcg4xzaxcfrgjivjrc4ljwb0y629vp16ci"; + sha256 = "01yzpasnpqqm0vfc0ki8vkxbzijjfws135jw8k0r50b5lahjvs4a"; }; buildInputs = [ makeWrapper ]; @@ -48,7 +48,7 @@ jruby = stdenv.mkDerivation rec { meta = { description = "Ruby interpreter written in Java"; - homepage = http://jruby.org/; + homepage = "http://jruby.org/"; license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ]; platforms = stdenv.lib.platforms.unix; }; From e08b7fff16b9d11c6e3647dfb5474723b4a7e5b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 04:38:58 +0000 Subject: [PATCH 53/93] haproxy: 2.1.2 -> 2.1.3 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index a1e87e3153b..9c7adfce21d 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "0xqb64nyl7hqnzpqb2jhv1ash47fcf4sspl3lalybb85i65b0yb0"; + sha256 = "0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv"; }; buildInputs = [ openssl zlib ] From c882a90bc6f8f880222b3f77dc8c5b12894774e0 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 5 Mar 2020 01:30:08 -0500 Subject: [PATCH 54/93] procs: 0.9.11 -> 0.9.18 --- pkgs/tools/admin/procs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 453bbfb426a..7c2c66f9fba 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.9.11"; + version = "0.9.18"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0nz06q1rdrqgprclgr30la2vp4bx0qgibh22vdlqpd4rzi3x0h2r"; + sha256 = "0bqaj4a56h26sgiw2r453k6f252sy6lrb71ammr0ki3bqqqjhvdi"; }; - cargoSha256 = "0hmz19ndfcg7bsrjk89ck9x99ibsvghqwmvgcd89vxmjr5h13rsg"; + cargoSha256 = "1rrwmi1wwjjql3chw996wki7mx0biaw9wc4v2xzv3vrxspvlvb5g"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From ebd985439fc1071a45a27be9ddd2e836db1c120c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 08:05:02 +0000 Subject: [PATCH 55/93] link-grammar: 5.7.0 -> 5.8.0 --- pkgs/tools/text/link-grammar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index ce9b0bfa883..25a5d129c81 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }: stdenv.mkDerivation rec { - version = "5.7.0"; + version = "5.8.0"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0ak1v469k56v3511kxxkxvx1nw6zcxcl0f1kcvc82ffacqbr4y96"; + sha256 = "1v8ngx77nachxln68xpvyw2lh7z59pzsi99h8j0mnrm0gjsacrdd"; }; nativeBuildInputs = [ pkgconfig python3 ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Grammar Checking library"; - homepage = https://www.abisource.com/projects/link-grammar/; + homepage = "https://www.abisource.com/projects/link-grammar/"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; From bbc2cd89ef4aa3788fc8664f7940f6e15aec8cbb Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 5 Mar 2020 09:00:26 +0100 Subject: [PATCH 56/93] users.groups.disnix instead of a list related to #63103. --- nixos/modules/services/misc/disnix.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index c21cb2afc3c..b7b6eb7cd66 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -61,10 +61,7 @@ in ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar"; services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService; - users.groups = singleton - { name = "disnix"; - gid = config.ids.gids.disnix; - }; + users.groups.disnix.gid = config.ids.gids.disnix; systemd.services = { disnix = mkIf cfg.enableMultiUser { From 3d6cdfa24bd771b36e8c87241d17275dd144c7a3 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 5 Mar 2020 08:28:11 +0000 Subject: [PATCH 57/93] nixpkgs-fmt: 0.6.1 -> 0.7.0 (#81805) --- pkgs/tools/nix/nixpkgs-fmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index 1088884dca6..dfd7eb63b12 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "1iylldgyvrcarfigpbhicg6j6qyipfiqn7gybza7qajfzyprjqfa"; + sha256 = "0b9wwv77bpq24yxky44ndgvxsx2zgsl15lvl6wklbkr41mwz3xis"; }; - cargoSha256 = "1jxvy4w9jxv898wgqyj9bpkhnc7pkj9dxg5x0b39xsnkzl2lr239"; + cargoSha256 = "1vv2gypbmgd9lksrk5h2z3agcs1269p1i3im9529nhcsl62ckj7n"; meta = with lib; { description = "Nix code formatter for nixpkgs"; From 706f13a787a2e89752c806f923078d1e3e8108c4 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 5 Mar 2020 08:39:15 +0000 Subject: [PATCH 58/93] mdsh: 0.3.0 -> 0.4.0 (#81802) --- pkgs/development/tools/documentation/mdsh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index 714ea15cd61..7e21019ea3f 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "mdsh"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - sha256 = "1a9i6h8fzrrfzjyfxaps73lxgkz92k0bnmwbjbwdmiwci4qgi9ms"; + sha256 = "0y0k6rsspvpia4lssals4c3rdz9fgvlrhwd8gw38say02hn5b7ip"; }; - cargoSha256 = "1fxajh1n0qvcdas6w7dy3g92wilhfldy90pyk3779mrnh57fa6n5"; + cargoSha256 = "07f2ajg9jpp666915cwsjn5clmi9ghkw25qfqj0lj3kfj79n5ash"; meta = with stdenv.lib; { description = "Markdown shell pre-processor"; - homepage = https://github.com/zimbatm/mdsh; + homepage = "https://github.com/zimbatm/mdsh"; license = with licenses; [ mit ]; maintainers = with maintainers; [ zimbatm ]; platforms = platforms.all; From 05e6cc4944331e0e54ba05f5261d95102a4188d7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 5 Mar 2020 11:57:38 +0100 Subject: [PATCH 59/93] signal-desktop: 1.31.0 -> 1.32.0 --- .../instant-messengers/signal-desktop/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c5921e645f0..ce9c1327db3 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.31.0"; # Please backport all updates to the stable channel. + version = "1.32.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "19vsv7jv30xvfgq1nr3091b6x4agymy9afpy9r9mxzgn0xfb0ap9"; + sha256 = "1ggblpw2xxhm78sqadswcv0314zagksj34z8pywjnr8h9zkcyiap"; }; nativeBuildInputs = [ @@ -127,7 +127,8 @@ in stdenv.mkDerivation rec { Signal Desktop is an Electron application that links with your "Signal Android" or "Signal iOS" app. ''; - homepage = https://signal.org/; + homepage = "https://signal.org/"; + changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ixmatus primeos equirosa ]; platforms = [ "x86_64-linux" ]; From 269d1eab10bf37b49ec568ea469effeb33c4dd40 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Mar 2020 07:50:26 -0500 Subject: [PATCH 60/93] vivaldi: 2.11.1811.44-1 -> 2.11.1811.47-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 70c93ee03e5..d0e1114bdd3 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.11.1811.44-1"; + version = "2.11.1811.47-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1hzlcvbp056nzxdiig91rsm5f0s0cjqs0imlgn7822jadp9wwnwn"; + sha256 = "16fw6v00xy66mxkkq0b4k49jd0wwlyyvxaaml2gglfk7swxy7i02"; }; unpackPhase = '' From 03003d433ce9079ca9f2fa5583b8a6962e504a36 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Mar 2020 07:53:12 -0500 Subject: [PATCH 61/93] jenkins: 2.204.3 -> 2.204.4 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 662daeb873f..3f6a7229b30 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.204.3"; + version = "2.204.4"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1sn9km7r3dbhbchn1szmhkwmx5im3qmy4lkzv4gm2aw1j9pghdda"; + sha256 = "0m4g0hm7cfmma5lrs9jsdy2gzp383hhh4k968s41krdms2pf5jhf"; }; buildCommand = '' From ae189056ef924b5559bac0b13b0838e829d6fe79 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 5 Mar 2020 07:53:39 -0500 Subject: [PATCH 62/93] oh-my-zsh: 2020-03-03 -> 2020-03-05 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 871791dd458..ea43057a07f 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-03-03"; + version = "2020-03-05"; pname = "oh-my-zsh"; - rev = "bbe54e4e6009dcbb69a4ace22ddae3672b323fdc"; + rev = "2f345a3d0c9a94891c909a9ae6f6e2e2dc6df5b2"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "13znfpr9dvvvasrszdi2qr4iprx1s1z5rx16f01hc6r9jqnbqi5s"; + sha256 = "1xs6rz73i04b91ans8j3k46xxb64ljvx7v06j2wmr38lqfplw0ym"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 1cf4fea33f97d35f86fdebf307ba8e7a94926c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Mar 2020 14:03:27 +0100 Subject: [PATCH 63/93] nixos/release-notes: fix a tiny typo --- nixos/doc/manual/release-notes/rl-2003.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 78618ed18a5..918906d27e7 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -154,7 +154,7 @@ services.xserver.displayManager.defaultSession = "xfce+icewm"; - The 99-main.network file was removed. Maching all + The 99-main.network file was removed. Matching all network interfaces caused many breakages, see #18962 and #71106. From b18995ef1002e1047d33c83bd884160825ee5d0a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 5 Mar 2020 13:44:27 +0100 Subject: [PATCH 64/93] wayvnc: 0.1.0 -> 0.1.1 --- pkgs/applications/networking/remote/wayvnc/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index b1498d0a9ce..7cf989de33e 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -4,15 +4,20 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "17c30c33zzhhlqzc4a5dd1y74ch7c8gsm98wvcn4n1fv50fbmpbd"; + sha256 = "1qk8xrqd8ls2hpkj7g4aknr73x3lbzzdjpja16rbp2r0m4iv95ld"; }; + postPatch = '' + substituteInPlace meson.build \ + --replace "version: '0.1.0'" "version: '${version}'" + ''; + nativeBuildInputs = [ meson pkg-config ninja ]; buildInputs = [ pixman libuv libGL libxkbcommon wayland neatvnc libdrm libX11 ]; @@ -26,6 +31,7 @@ stdenv.mkDerivation rec { display attached. ''; inherit (src.meta) homepage; + changelog = "https://github.com/any1/wayvnc/releases/tag/v${version}"; license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; From 0e5d4573d4b408ba13711f2e3a48e1f3f4e043dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 5 Mar 2020 15:08:03 +0100 Subject: [PATCH 65/93] nix-bash-completions: 0.6.7 -> 0.6.8 (#81019) --- pkgs/shells/bash/nix-bash-completions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix index affbd219958..5dfd673a629 100644 --- a/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/pkgs/shells/bash/nix-bash-completions/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.6.7"; + version = "0.6.8"; pname = "nix-bash-completions"; src = fetchFromGitHub { owner = "hedning"; repo = "nix-bash-completions"; rev = "v${version}"; - sha256 = "067j1gavpm9zv3vzw9gq0bi3bi0rjrijwprc1j016g44kvpq49qi"; + sha256 = "1n5zs6xcnv4bv1hdaypmz7fv4j7dsr4a0ifah99iyj4p5j85i1bc"; }; # To enable lazy loading via. bash-completion we need a symlink to the script @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/hedning/nix-bash-completions; + homepage = "https://github.com/hedning/nix-bash-completions"; description = "Bash completions for Nix, NixOS, and NixOps"; license = licenses.bsd3; platforms = platforms.all; From e1611f85c25fbe8df4ad7cf971b6448a3d711822 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 5 Mar 2020 07:18:44 -0800 Subject: [PATCH 66/93] docker: 19.03.6 -> 19.03.7 --- .../applications/virtualization/docker/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 2154daa2a2c..e4093ea87e7 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -206,14 +206,14 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.6"; - rev = "369ce74a3ce86a392e39e45d3960ce970fdfac97"; - sha256 = "0myvh7p9h0j4xc35zhcvp8cqxd3r6p6jx5zxl5rzh14m6lgzmkh0"; - runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; + version = "19.03.7"; + rev = "7141c199a2edb2a90b778175f836f9dd2a22c95a"; + sha256 = "1h1hrp6cw3ah2gaq2vfdd1d9vh7gyf7rs6bdxwpxk9ixc19fxsm4"; + runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; - containerdRev = "35bd7a5f69c13e1563af8a93431411cd9ecf5021"; - containerdSha256 = "076355bkbdsgsxryhhr9gbpyypdx8gg149lylyd6q5ig98p179ap"; - tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; + containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 + containerdSha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn"; + tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; } From c25756f91ccfc8b3c085d91de6ec4d6e469ccc20 Mon Sep 17 00:00:00 2001 From: Milan Date: Thu, 5 Mar 2020 16:37:21 +0100 Subject: [PATCH 67/93] gitlab: 12.8.1 -> 12.8.2 (#81803) Includes multiple security fixes mentioned in https://about.gitlab.com/releases/2020/03/04/gitlab-12-dot-8-dot-2-released/ (unfortunately, no CVE numbers as of yet) - Directory Traversal to Arbitrary File Read - Account Takeover Through Expired Link - Server Side Request Forgery Through Deprecated Service - Group Two-Factor Authentication Requirement Bypass - Stored XSS in Merge Request Pages - Stored XSS in Merge Request Submission Form - Stored XSS in File View - Stored XSS in Grafana Integration - Contribution Analytics Exposed to Non-members - Incorrect Access Control in Docker Registry via Deploy Tokens - Denial of Service via Permission Checks - Denial of Service in Design For Public Issue - GitHub Tokens Displayed in Plaintext on Integrations Page - Incorrect Access Control via LFS Import - Unescaped HTML in Header - Private Merge Request Titles Leaked via Widget - Project Namespace Exposed via Vulnerability Feedback Endpoint - Denial of Service Through Recursive Requests - Project Authorization Not Being Updated - Incorrect Permission Level For Group Invites - Disclosure of Private Group Epic Information - User IP Address Exposed via Badge images - Update postgresql (GitLab Omnibus) --- pkgs/applications/version-management/gitlab/data.json | 8 ++++---- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../version-management/gitlab/gitaly/deps.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 87c37f1c75f..2772ef5b6f4 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,11 +1,11 @@ { - "version": "12.8.1", - "repo_hash": "1h844a79scf3an5rv0wi332lrf7mv1zcv2mg6zllk82f7nf341gn", + "version": "12.8.2", + "repo_hash": "1d27s61kglryr5pashwfq55z7fh16fxkx1m4gc82xihwfzarf4x9", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.1-ee", + "rev": "v12.8.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.1", + "GITALY_SERVER_VERSION": "12.8.2", "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", "GITLAB_WORKHORSE_VERSION": "8.21.0" diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index bac51cd278c..af97873463e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -28,14 +28,14 @@ let }; }); in buildGoPackage rec { - version = "12.8.1"; + version = "12.8.2"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "0sjkh0j36dpakqmq7l5gd1ydmx1kxgij53bjvvn37r19liqdijnx"; + sha256 = "1zc44y5yl799vqg12w3iaivk4xwj9i4k6f198svplipa760nl9ic"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 83a2f0f5f74..5ab063d1dea 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -1319,8 +1319,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "v1.1.4"; - sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; }; } { From e7387ad05cd88d17094ed965660022b263bd5970 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 16:54:20 +0000 Subject: [PATCH 68/93] broot: 0.13.1 -> 0.13.2 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 572bee3d262..16aaabee618 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "13b1w9g68aj3r70w9bmrmdc772y959n77ajbdm2cpjs5f4kgfpak"; + sha256 = "0lrrbzs7s2dgifamp81g41fhg6274pvri4hr3xxr1swpvsinxwfn"; }; - cargoSha256 = "0zrwpmsrzwnjml0964zky8w222zmlargha3z0n6hf8cfshx23s4k"; + cargoSha256 = "1whnisc30f7qsd8xdr25s64sd1qlbcasd0b06f216sxsf6bmf8a1"; nativeBuildInputs = [ installShellFiles ]; From ee85ecaed97d2b30e5507854fcfbaae2102e5486 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 17:28:58 +0000 Subject: [PATCH 69/93] clojure-lsp: 20200121T234305 -> 20200305T151710 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 53c2bf9a6bc..4f8ae1a4149 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200121T234305"; + version = "20200305T151710"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "04598vxay85q2blr49xh4pb58i4rsgjbznnn2cszcqgyzh05fs4y"; + sha256 = "0zi05skp36azv0b6spxdscal32cj5rc6g0d0gzfnsaavvxd128lg"; }; dontUnpack = true; From 05ee8890bd9b6704e30f8363a82f33f2c3bd9887 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Thu, 5 Mar 2020 18:57:23 +0100 Subject: [PATCH 70/93] python3Packages.sapi-python-client: init at 0.13.1 (#81184) python3Packages.sapi-python-client: init at 0.13.1 --- .../sapi-python-client/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/sapi-python-client/default.nix diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix new file mode 100644 index 00000000000..155950dff2c --- /dev/null +++ b/pkgs/development/python-modules/sapi-python-client/default.nix @@ -0,0 +1,31 @@ +{ stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: + +buildPythonPackage rec { + pname = "sapi-python-client"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "keboola"; + repo = pname; + rev = version; + sha256 = "1xja4v5d30hy26lfys21vcz1lcs88v8mvjxwl2dc3wxx2pzdvcf6"; + }; + + postPatch = '' + sed -i 's|use_scm_version=True|version="${version}"|' setup.py + ''; + + doCheck = false; # requires API token and an active keboola bucket + + nativeBuildInputs = [ git setuptools_scm ]; + + propagatedBuildInputs = [ setuptools requests boto3 responses ]; + + meta = with stdenv.lib; { + description = "Keboola Connection Storage API client"; + homepage = "https://github.com/keboola/sapi-python-client"; + maintainers = with maintainers; [ mrmebelman ]; + license = licenses.mit; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74f2112f0ec..29fbf3cd8a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1377,6 +1377,8 @@ in { sanic-auth = callPackage ../development/python-modules/sanic-auth { }; + sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; + seekpath = callPackage ../development/python-modules/seekpath { }; selectors2 = callPackage ../development/python-modules/selectors2 { }; From 4e5b0571ed29c1f1c50702821c517764e059b24c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 5 Mar 2020 18:00:03 +0000 Subject: [PATCH 71/93] create-amis: Add eu-north-1 --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 5dc1c5aaed5..145eb49ced7 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -18,7 +18,7 @@ state_dir=$HOME/amis/ec2-images home_region=eu-west-1 bucket=nixos-amis -regions=(eu-west-1 eu-west-2 eu-west-3 eu-central-1 +regions=(eu-west-1 eu-west-2 eu-west-3 eu-central-1 eu-north-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 From d2bea921e263bdc7aea6b56c4e8e3e99e515552c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 18:20:16 +0000 Subject: [PATCH 72/93] emplace: 0.2.10 -> 0.2.12 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 321897369db..8845c54b571 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.2.10"; + version = "0.2.12"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "1y77cla6bgy8pjb21cawx7cb69hhri4r7gyjkhnjyiixkh945mwj"; + sha256 = "1jhv7c68ymwaq9fr586rjbgcaxpkxcr0d3pq7lyhbzihaywz7m6m"; }; - cargoSha256 = "1vkcr239axxqya0iin74jxkmx6z9nwb67pjjdh89v4qwjvwhiqg3"; + cargoSha256 = "1n4k8mnsix3sy6pmqkk7wymknn1mn5dkwa9i90nlb4k2h9y709wj"; meta = with lib; { description = "Mirror installed software on multiple machines"; From 6c20f4def3e9908867943bfcccceb01c74d591e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 18:36:27 +0000 Subject: [PATCH 73/93] findomain: 1.4.1 -> 1.4.2 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 98c4473ac09..c78a6ad5526 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "1mg0awsf8z5sd7s7vj5rs18my3aksxsggb5y85kaf0skq79ybmrx"; + sha256 = "0c6jjr1343lqwggvpxdhbjyi1far4f7f3yzq1y0nj1j952j7a36x"; }; - cargoSha256 = "0mnp2hl9q6qsfj4x37ss9gfhss184lzs63zv327l6jnd2m1yq8b2"; + cargoSha256 = "1cyfxfhbc2xhavnkhva1xdcw8vy9i5pqhfbiwn6idpfy6hm1w0bx"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; From f730d6da490fe455803d89a2029b5e442936933d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 20:22:27 +0000 Subject: [PATCH 74/93] khronos: 1.0.5 -> 1.0.6 --- pkgs/applications/office/khronos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index d7726c13e64..e672b5c3efd 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "khronos"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0dk1b2d82gli3z35dn5p002lfkgq326janql0vn1z5hs8jvjakqh"; + sha256 = "0s6yx05k0x90bmdmr61hw07nf9a1kyvvk6gwlg8m97zq1n3qc0f3"; }; nativeBuildInputs = [ From 18848216eaf556a3f2b1fe14294bf6f3bd0577ce Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 5 Mar 2020 23:16:02 +0100 Subject: [PATCH 75/93] riot-web: 1.5.10 -> 1.5.12 --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ee86ba65891..e633f60d977 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.10"; + version = "1.5.12"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1c11x8903p38c0f9k3ff4pnpb3n7hzs4pj6g65a4cvp6jgg1zfnn"; + sha256 = "064zghrsl348ydzngwxhwjn0d0gkkf3nkzq03v5gad2f11qwnwb6"; }; installPhase = '' From abc58dc1d0d233f62b909a71305533d965131c6a Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 5 Mar 2020 23:16:31 +0100 Subject: [PATCH 76/93] riot-desktop: 1.5.10 -> 1.5.12 --- .../instant-messengers/riot/riot-desktop-package.json | 2 +- .../instant-messengers/riot/riot-desktop.nix | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 3dc7c79b00b..418375e80c3 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.10", + "version": "1.5.12", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index f94d7ad165d..122a7e74f86 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, mkYarnPackage }: +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }: # Notes for maintainers: # * versions of `riot-web` and `riot-desktop` should be kept in sync. @@ -6,13 +6,14 @@ let executableName = "riot-desktop"; - version = "1.5.10"; + version = "1.5.12"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "0yr5f3i24qh9b8hjfalpqxwr0qhs7hax450g83vf06skap1l5i5j"; + sha256 = "1qz3n2dlklhbi6rbhv2v769xbr4rcp9s6pm2cc9r33ak6axn4aym"; }; + electron = electron_7; in mkYarnPackage rec { name = "riot-desktop-${version}"; @@ -45,7 +46,7 @@ in mkYarnPackage rec { ln -s "${desktopItem}/share/applications" "$out/share/applications" # executable wrapper - makeWrapper '${electron_5}/bin/electron' "$out/bin/${executableName}" \ + makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ --add-flags "$out/share/riot/electron" ''; @@ -78,6 +79,6 @@ in mkYarnPackage rec { homepage = https://about.riot.im/; license = licenses.asl20; maintainers = with maintainers; [ pacien worldofpeace ]; - inherit (electron_5.meta) platforms; + inherit (electron.meta) platforms; }; } From 384ed011544f7bb5e4defaf78ea0955b47744ddd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 05:10:55 +0000 Subject: [PATCH 77/93] heimer: 1.15.0 -> 1.15.1 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index fe746349155..f301122a92d 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "1qh8nr6yvxiy8pxl5pkhzlfr7hanxxc8hd8h00gsdxa0vgmqz11q"; + sha256 = "13a9yfq7m8jhirb31i0mmigqb135r585zwqddknl090d88164fic"; }; nativeBuildInputs = [ cmake ]; From 9328cff6be0384fa83f9ed42ded71fcfccc9eabd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 18:54:57 +0000 Subject: [PATCH 78/93] gleam: 0.6.0 -> 0.7.1 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 9d2f828dfa6..5179142e40e 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "1fvy2j6pw1rwm0rg7555q3qg2069cx2b9lk0nsyc3jxsqp9hbn6i"; + sha256 = "1bcxq7bgn0kf1vdw6id8s3izz6mwf3ivr8iph4miig302qm9lmmr"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1vhra9v4jsy9hyhjrmxjy6rnraxz13h1b7l51xvbai5wxsxm7z8m"; + cargoSha256 = "17bvms65frxhw0d196qswh3jjqlriidq3xi3mfjjgfh6n17rh608"; meta = with stdenv.lib; { description = "A statically typed language for the Erlang VM"; From 0c0f3186856ffaa6dd74e7be6ebb98c6a6b525e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 04:29:32 +0000 Subject: [PATCH 79/93] go-license-detector: 3.0.2 -> 3.1.0 --- pkgs/development/tools/misc/go-license-detector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index 31e0158eb6b..6675f7ed3e2 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-license-detector"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "src-d"; repo = pname; rev = "v${version}"; - sha256 = "0gp7na2hqn5crr5x4khllsq7ka9h7rx8b4y10yzxmi0wpmxr53sw"; + sha256 = "0ln1z3y9q5igf9djkxw05ql2hb1ijcvvz0mrbwz11cdv9xrsa4z4"; }; modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb"; From 10e44571d82efac50e6fcb234942d6bafe44c262 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 06:59:17 +0000 Subject: [PATCH 80/93] libqalculate: 3.7.0 -> 3.8.0 --- pkgs/development/libraries/libqalculate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index dd6e3cbe952..8acfcb4b751 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "0g3047lwd0rh0dds196iija3kq06mhkh6y8x5whcbv3s0db66h18"; + sha256 = "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df"; }; outputs = [ "out" "dev" "doc" ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An advanced calculator library"; - homepage = http://qalculate.github.io; + homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ gebner ]; license = licenses.gpl2Plus; platforms = platforms.all; From ceeaf410be9a1d111aec4cc34ddfde8405a5972f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 16:32:23 +0000 Subject: [PATCH 81/93] abcmidi: 2019.12.09 -> 2020.02.12 --- pkgs/tools/audio/abcmidi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 1b1dd10dd13..b0b65a560bf 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2019.12.09"; + version = "2020.02.12"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "1pc7wm4np43ax13k4sfwr12dzyinw9p2ghacdw0rwdljg0k000a2"; + sha256 = "1h0ixdbhxdfvii9in9pdidkdv12qfwbhjy3diknywl0yvaa40xw0"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase makefile = "Makefile"; meta = with stdenv.lib; { - homepage = http://abc.sourceforge.net/abcMIDI/; + homepage = "http://abc.sourceforge.net/abcMIDI/"; downloadPage = https://ifdo.ca/~seymour/runabc/top.html; license = licenses.gpl2Plus; description = "Utilities for converting between abc and MIDI"; From 4b4dcda1b1c596a4b43ae5e35c8d81153c8defa7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 02:00:13 +0000 Subject: [PATCH 82/93] chafa: 1.2.1 -> 1.2.2 --- pkgs/tools/misc/chafa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 5055ce67d30..e3cc8c938ea 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ - version = "1.2.1"; + version = "1.2.2"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "19dck47v4hd07q9742mgb928h7y1y9638qlh2rzsvqsfqvqmxh85"; + sha256 = "10in960wzvmb25biifi480dz87c034vwb8mcshclssl7gmzgpzdn"; }; nativeBuildInputs = [ autoconf @@ -37,7 +37,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Terminal graphics for the 21st century."; - homepage = https://hpjansson.org/chafa/; + homepage = "https://hpjansson.org/chafa/"; license = licenses.lgpl3Plus; platforms = platforms.all; maintainers = [ maintainers.mog ]; From e17a1a098c5108b05cc3b0fb00071ea069630d99 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 02:29:15 +0000 Subject: [PATCH 83/93] codeql: 2.0.2 -> 2.0.4 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index fbe85307b0b..309ba9d392b 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.0.2"; + version = "2.0.4"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "11siv8qmj4arl6qxks7bqnhx5669r3kxqcxq37ai7sf9f7v78k1i"; + sha256 = "02sqs7shxqrq6c6h12ldskk30k7sisa75wjxz99xyg49m4b2lw4m"; }; nativeBuildInputs = [ From 00c8e2b625cbc26e551b673a2b73d96975bd5edc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Mar 2020 23:53:39 +0000 Subject: [PATCH 84/93] zsh-syntax-highlighting: 0.6.0 -> 0.7.1 --- pkgs/shells/zsh/zsh-syntax-highlighting/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix index 0dbfba52c0f..906352b8b3e 100644 --- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix @@ -3,14 +3,14 @@ # To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.7.1"; pname = "zsh-syntax-highlighting"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-syntax-highlighting"; rev = version; - sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4"; + sha256 = "03r6hpb5fy4yaakqm3lbf4xcvd408r44jgpv4lnzl9asp4sb9qc0"; }; buildInputs = [ zsh ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fish shell like syntax highlighting for Zsh"; - homepage = https://github.com/zsh-users/zsh-syntax-highlighting; + homepage = "https://github.com/zsh-users/zsh-syntax-highlighting"; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.loskutov ]; From 7948c35be61657a2dad9557682b26449c5dcfa73 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 01:11:45 +0000 Subject: [PATCH 85/93] bitwarden_rs-vault: 2.12.0c -> 2.12.0e --- pkgs/tools/security/bitwarden_rs/vault.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 6c6ef6ccaa9..b5f00a4abf9 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.12.0c"; + version = "2.12.0e"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "040bqbx6hpwq4qvv4s7d77gwp5n2ay9rr7kdb135582d80wjq5sp"; + sha256 = "1jy3c5ywlplrjsy37i90x5s8k0i5n1mn8y0fyl074s807glqaxbf"; }; buildCommand = '' From 98968b1854d01f76c7f11c97eb6aadd33df87ffa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Mar 2020 21:31:41 +0000 Subject: [PATCH 86/93] wpgtk: 6.0.12 -> 6.0.13 --- pkgs/tools/X11/wpgtk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index f85878528db..4125229237a 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.0.12"; + version = "6.0.13"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "1wqdjq3pjgwb1da549izw3bzi1bk6q7d1hjw3i2zg5nhig1vvxw6"; + sha256 = "1fphv6k2hqfi3fzazjqmvip7sz9fhy5ccsgpqv68vfylrf8g1f92"; }; buildInputs = [ @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf. ''; - homepage = https://github.com/deviantfero/wpgtk; + homepage = "https://github.com/deviantfero/wpgtk"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.melkor333 ]; From cd7765c5877be725b8895a3c7c8d7ec8a134b982 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 23:23:04 +0000 Subject: [PATCH 87/93] pueue: 0.1.5 -> 0.1.6 --- pkgs/applications/misc/pueue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index d2ee27ed1d1..aac371164fa 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "03aj4vw8kvwqk1i1a4kah5b574ahs930ij7xmqsvdy7f8c2g6pbq"; + sha256 = "1qp9h1xlfxwswcqi1qn2hfybxl547z13xjbvfgsx1nc8yj51bi3c"; }; nativeBuildInputs = [ installShellFiles ]; - cargoSha256 = "08zqhj3b0v4fxj8vi323zrxg4xvbp9gndm2khzs6daacglbwbvhk"; + cargoSha256 = "00va292bjdp42bkqdkjqajmzc2nshhqa1fj0yfwdf3rrx4nhssjd"; postInstall = '' installShellCompletion utils/completions/pueue.{bash,fish} --zsh utils/completions/_pueue From 6c6091a7755ec4ae92c4ef754e0fa4820a65cfea Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Mon, 17 Feb 2020 21:55:26 -0800 Subject: [PATCH 88/93] azure-storage-azcopy: v10.3.2 -> v10.3.4 --- pkgs/development/tools/azcopy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index e3e85ffcd40..328092feafc 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.3.2"; + version = "10.3.4"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; - rev = "v${version}"; - sha256 = "0n4yns81kwwx725smsgqg8hc693ygqlzrgkqdrhrfszkpm205479"; + rev = version; + sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g"; }; subPackages = [ "." ]; From 3aa3291b2088602c85f965030c1b44e60a32dfab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 01:03:10 +0000 Subject: [PATCH 89/93] bitcoin-abc: 0.20.12 -> 0.21.1 --- pkgs/applications/blockchains/bitcoin-abc.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 6b339091701..1fb4078696b 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.20.12"; + version = "0.21.1"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "0ar3syrz7psf83bh24hn2y0mxjgn7cjqk2h8q4cgdp7mq55v8ynj"; + sha256 = "1aswgmzqk3vhxhp5k0m0awk22lf5ayaqg2cmlqy12jvfmpka9lrj"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; @@ -37,7 +37,7 @@ mkDerivation rec { Bitcoin ABC is a fork of the Bitcoin Core software project. ''; - homepage = https://bitcoinabc.org/; + homepage = "https://bitcoinabc.org/"; maintainers = with maintainers; [ lassulus ]; license = licenses.mit; broken = stdenv.isDarwin; From 5db4396b9190ef256aaeab587544ec2c15b237e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 19:34:32 +0000 Subject: [PATCH 90/93] debootstrap: 1.0.117 -> 1.0.119 --- pkgs/tools/misc/debootstrap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index c016b857de3..04b55a6a6b4 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.117"; + version = "1.0.119"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz"; - sha256 = "0rsdw1yjkx35jd1i45646l07glnwsn9gzd6k8sjccv2xvhcljq77"; + sha256 = "1q5kw5mm5cnm97j0iz8hfbmjrpdc3n3pcw7f9as1n6h0xp0bmgp6"; }; nativeBuildInputs = [ makeWrapper ]; @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to create a Debian system in a chroot"; - homepage = https://wiki.debian.org/Debootstrap; + homepage = "https://wiki.debian.org/Debootstrap"; license = licenses.mit; maintainers = with maintainers; [ marcweber ]; platforms = platforms.linux; From 6e103b062e9e5fa41c9c6f41ef5624d5c0a0c210 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Mar 2020 20:34:32 +0000 Subject: [PATCH 91/93] xmrig: 5.5.3 -> 5.7.0 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index b87e62b0406..252d9dd87c6 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.5.3"; + version = "5.7.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1an68ghs65dvxs8lvcflv7wmf431lqw417np76895w10w436gh7x"; + sha256 = "14mqfjwff7mj3xckz4wkxlmqm6a0ci1bz0zj1h045ac8hfvw5k4k"; }; nativeBuildInputs = [ cmake ]; From f9b4b8940563318af9b53f76f1fdef6b26dfa321 Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei <6884440+dingxiangfei2009@users.noreply.github.com> Date: Fri, 6 Mar 2020 09:58:17 +0800 Subject: [PATCH 92/93] alsa-firmware: enable cross compilation (#63866) Co-authored-by: Matthew Bauer --- .../linux/alsa-firmware/cross.patch | 347 ++++++++++++++++++ .../linux/alsa-firmware/default.nix | 9 +- 2 files changed, 355 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/alsa-firmware/cross.patch diff --git a/pkgs/os-specific/linux/alsa-firmware/cross.patch b/pkgs/os-specific/linux/alsa-firmware/cross.patch new file mode 100644 index 00000000000..989ccea2b98 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-firmware/cross.patch @@ -0,0 +1,347 @@ +--- a/hdsploader/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/hdsploader/Makefile.am 2019-06-28 00:43:41.557803832 +0800 +@@ -32,5 +32,14 @@ + tobin.c + CLEANFILES = $(dsp_hex_files) + +-$(dsp_hex_files): tobin +- ./tobin ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(tobin_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(tobin_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(tobin_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++tobin$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(dsp_hex_files): tobin$(BUILD_EXEEXT) ++ ./$< +--- a/m4/ax_prog_cc_for_build.m4 2019-06-27 15:50:02.274134717 +0800 ++++ b/m4/ax_prog_cc_for_build.m4 2019-06-28 01:32:45.088117432 +0800 +@@ -0,0 +1,125 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_PROG_CC_FOR_BUILD ++# ++# DESCRIPTION ++# ++# This macro searches for a C compiler that generates native executables, ++# that is a C compiler that surely is not a cross-compiler. This can be ++# useful if you have to generate source code at compile-time like for ++# example GCC does. ++# ++# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything ++# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). ++# The value of these variables can be overridden by the user by specifying ++# a compiler with an environment variable (like you do for standard CC). ++# ++# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object ++# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if ++# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are ++# substituted in the Makefile. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Paolo Bonzini ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 9 ++ ++AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) ++AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_PROG_CPP])dnl ++AC_REQUIRE([AC_EXEEXT])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ ++dnl Use the standard macros, but make them use other variable names ++dnl ++pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl ++pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl ++pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl ++pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl ++pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl ++pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl ++pushdef([ac_cv_objext], ac_cv_build_objext)dnl ++pushdef([ac_exeext], ac_build_exeext)dnl ++pushdef([ac_objext], ac_build_objext)dnl ++pushdef([CC], CC_FOR_BUILD)dnl ++pushdef([CPP], CPP_FOR_BUILD)dnl ++pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl ++pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl ++pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl ++pushdef([host], build)dnl ++pushdef([host_alias], build_alias)dnl ++pushdef([host_cpu], build_cpu)dnl ++pushdef([host_vendor], build_vendor)dnl ++pushdef([host_os], build_os)dnl ++pushdef([ac_cv_host], ac_cv_build)dnl ++pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl ++pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl ++pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl ++pushdef([ac_cv_host_os], ac_cv_build_os)dnl ++pushdef([ac_cpp], ac_build_cpp)dnl ++pushdef([ac_compile], ac_build_compile)dnl ++pushdef([ac_link], ac_build_link)dnl ++ ++save_cross_compiling=$cross_compiling ++save_ac_tool_prefix=$ac_tool_prefix ++cross_compiling=no ++ac_tool_prefix= ++ ++AC_PROG_CC ++AC_PROG_CPP ++AC_EXEEXT ++ ++ac_tool_prefix=$save_ac_tool_prefix ++cross_compiling=$save_cross_compiling ++ ++dnl Restore the old definitions ++dnl ++popdef([ac_link])dnl ++popdef([ac_compile])dnl ++popdef([ac_cpp])dnl ++popdef([ac_cv_host_os])dnl ++popdef([ac_cv_host_vendor])dnl ++popdef([ac_cv_host_cpu])dnl ++popdef([ac_cv_host_alias])dnl ++popdef([ac_cv_host])dnl ++popdef([host_os])dnl ++popdef([host_vendor])dnl ++popdef([host_cpu])dnl ++popdef([host_alias])dnl ++popdef([host])dnl ++popdef([LDFLAGS])dnl ++popdef([CPPFLAGS])dnl ++popdef([CFLAGS])dnl ++popdef([CPP])dnl ++popdef([CC])dnl ++popdef([ac_objext])dnl ++popdef([ac_exeext])dnl ++popdef([ac_cv_objext])dnl ++popdef([ac_cv_exeext])dnl ++popdef([ac_cv_prog_cc_g])dnl ++popdef([ac_cv_prog_cc_cross])dnl ++popdef([ac_cv_prog_cc_works])dnl ++popdef([ac_cv_prog_gcc])dnl ++popdef([ac_cv_prog_CPP])dnl ++ ++dnl Finally, set Makefile variables ++dnl ++BUILD_EXEEXT=$ac_build_exeext ++BUILD_OBJEXT=$ac_build_objext ++AC_SUBST(BUILD_EXEEXT)dnl ++AC_SUBST(BUILD_OBJEXT)dnl ++AC_SUBST([CFLAGS_FOR_BUILD])dnl ++AC_SUBST([CPPFLAGS_FOR_BUILD])dnl ++AC_SUBST([LDFLAGS_FOR_BUILD])dnl ++]) +--- a/configure.ac 2019-06-27 23:58:31.045413144 +0800 ++++ b/configure.ac 2019-06-28 01:45:36.511771656 +0800 +@@ -1,6 +1,8 @@ + AC_PREREQ(2.59) + AC_INIT(alsa-firmware, 1.0.29) ++AC_CONFIG_MACRO_DIR([m4]) + AC_PROG_CC ++AC_PROG_CC_FOR_BUILD + AC_PROG_INSTALL + AC_PROG_LN_S + AC_HEADER_STDC +--- a/vxloader/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/vxloader/Makefile.am 2019-06-28 01:55:19.525947146 +0800 +@@ -43,5 +43,14 @@ + hotplugfw_DATA = + endif + +-%.xlx: %.rbt toxlx +- ./toxlx < $< > $@ ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(toxlx_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(toxlx_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(toxlx_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++toxlx$(BUILD_EXEEXT): $(toxlx_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++%.xlx: %.rbt toxlx$(BUILD_EXEEXT) ++ ./toxlx$(BUILD_EXEEXT) < $< > $@ +--- a/echoaudio/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/echoaudio/Makefile.am 2019-06-28 02:00:00.579426080 +0800 +@@ -74,33 +74,42 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer DSP/LoaderDSP.c loader_dsp.fw +- ./fw_writer DSP/Darla20DSP.c darla20_dsp.fw +- ./fw_writer DSP/Gina20DSP.c gina20_dsp.fw +- ./fw_writer DSP/Layla20DSP.c layla20_dsp.fw +- ./fw_writer ASIC/LaylaASIC.c layla20_asic.fw +- ./fw_writer DSP/Darla24DSP.c darla24_dsp.fw +- ./fw_writer DSP/Gina24DSP.c gina24_301_dsp.fw +- ./fw_writer ASIC/Gina24ASIC.c gina24_301_asic.fw +- ./fw_writer DSP/Gina24_361DSP.c gina24_361_dsp.fw +- ./fw_writer ASIC/Gina24ASIC_361.c gina24_361_asic.fw +- ./fw_writer DSP/Layla24DSP.c layla24_dsp.fw +- ./fw_writer ASIC/Layla24_1ASIC.c layla24_1_asic.fw +- ./fw_writer ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw +- ./fw_writer ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw +- ./fw_writer DSP/MonaDSP.c mona_301_dsp.fw +- ./fw_writer ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw +- ./fw_writer ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw +- ./fw_writer DSP/Mona361DSP.c mona_361_dsp.fw +- ./fw_writer ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw +- ./fw_writer ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw +- ./fw_writer ASIC/Mona2ASIC.c mona_2_asic.fw +- ./fw_writer DSP/MiaDSP.c mia_dsp.fw +- ./fw_writer DSP/Echo3gDSP.c echo3g_dsp.fw +- ./fw_writer ASIC/3G_ASIC.c 3g_asic.fw +- ./fw_writer DSP/IndigoDSP.c indigo_dsp.fw +- ./fw_writer DSP/IndigoIODSP.c indigo_io_dsp.fw +- ./fw_writer DSP/IndigoIOxDSP.c indigo_iox_dsp.fw +- ./fw_writer DSP/IndigoDJDSP.c indigo_dj_dsp.fw +- ./fw_writer DSP/IndigoDJxDSP.c indigo_djx_dsp.fw ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) DSP/LoaderDSP.c loader_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Darla20DSP.c darla20_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Gina20DSP.c gina20_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Layla20DSP.c layla20_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/LaylaASIC.c layla20_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Darla24DSP.c darla24_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Gina24DSP.c gina24_301_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC.c gina24_301_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Gina24_361DSP.c gina24_361_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC_361.c gina24_361_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Layla24DSP.c layla24_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_1ASIC.c layla24_1_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/MonaDSP.c mona_301_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Mona361DSP.c mona_361_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona2ASIC.c mona_2_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/MiaDSP.c mia_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Echo3gDSP.c echo3g_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/3G_ASIC.c 3g_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDSP.c indigo_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIODSP.c indigo_io_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIOxDSP.c indigo_iox_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJDSP.c indigo_dj_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJxDSP.c indigo_djx_dsp.fw +--- a/emu/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/emu/Makefile.am 2019-06-28 02:01:37.856710042 +0800 +@@ -22,5 +22,14 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) +--- a/maestro3/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/maestro3/Makefile.am 2019-06-28 02:03:13.704828106 +0800 +@@ -17,5 +17,14 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) +--- a/sb16/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/sb16/Makefile.am 2019-06-28 02:04:37.121743871 +0800 +@@ -18,5 +18,14 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) +--- a/wavefront/Makefile.am 2019-06-28 02:07:27.003727160 +0800 ++++ b/wavefront/Makefile.am 2019-06-28 02:07:46.477947626 +0800 +@@ -17,5 +17,14 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) +--- a/ymfpci/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/ymfpci/Makefile.am 2019-06-28 02:09:02.487797826 +0800 +@@ -17,5 +17,14 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index 7f0ba5498df..d0a3d7645b3 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "alsa-firmware-1.2.1"; @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf"; }; + patches = [ (fetchpatch { + url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch"; + sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78"; + }) ]; + + nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ]; + configureFlags = [ "--with-hotplug-dir=$(out)/lib/firmware" ]; From dfbe76a68126d03c3f7eb363d7acbb86335b63d3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 6 Mar 2020 00:08:06 -0500 Subject: [PATCH 93/93] waf: move binary to $out/bin/ Originally this was just the executable, but this breaks nix-shell usage. Instead, just do a normal directory. Fixes #79909 --- pkgs/development/tools/build-managers/waf/default.nix | 2 +- pkgs/development/tools/build-managers/wafHook/setup-hook.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 72ea74c9aad..4c8fa3f234b 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { python waf-light build${wafToolsArg} ''; installPhase = '' - install waf $out + install -D waf $out/bin/waf ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh index 3da86d3201f..38998e8db34 100644 --- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh @@ -3,7 +3,7 @@ wafConfigurePhase() { if ! [ -f "${wafPath:=./waf}" ]; then echo "copying waf to $wafPath..." - cp @waf@ "$wafPath" + cp @waf@/bin/waf "$wafPath" fi if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then