Merge remote-tracking branch 'NixOS/master' into staging

This commit is contained in:
Matthew Bauer
2019-01-27 00:01:13 -05:00
403 changed files with 4759 additions and 3164 deletions
@@ -1,17 +1,14 @@
{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }:
stdenv.mkDerivation rec {
version = "18.09.19";
package-name = "numix-icon-theme-circle";
name = "${package-name}-${version}";
pname = "numix-icon-theme-circle";
version = "19.01.24";
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
repo = pname;
rev = version;
sha256 = "1a1ack4kpngnb3c281pssmp3snn2idcn2c5cv3l38a0dl5g5w8nq";
sha256 = "18asihcv41jlysb2ynbvbk6fn0lnj7ckaz1nyx1w25a7nk413dnm";
};
nativeBuildInputs = [ gtk3 numix-icon-theme ];
@@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }:
stdenv.mkDerivation rec {
name = "${package-name}-${version}";
package-name = "numix-icon-theme-square";
version = "18.09.19";
pname = "numix-icon-theme-square";
version = "19.01.24";
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
repo = pname;
rev = version;
sha256 = "0q5p901qj3gyzgpy5kk9q5sqb13ka5cfg6wvazlfch1k3kaqksz1";
sha256 = "0x3d21snfp4v9ippny1jmf2hw5dcscwrlasxvr5bgxhff1idf81c";
};
nativeBuildInputs = [ gtk3 numix-icon-theme ];