public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-12-18 09:22:17 +01:00
parent 0023e1d0de 982b5ee26f
commit 826ab7026e
638 changed files with 16450 additions and 12592 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/fonts/ibm-plex/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "1.2.1";
version = "1.2.3";
in fetchzip rec {
name = "ibm-plex-${version}";
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
@@ -9,7 +9,7 @@ in fetchzip rec {
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
sha256 = "1mwlw39nbqrk08crvgm77l98yyyabwhcgsng89c9s67gq4mlxmxa";
sha256 = "16vmby2svr4q0lvsnrpxzmhkb6yv84x2jg6jccaj7x9vq56b4adg";
meta = with lib; {
description = "IBM Plex Typeface";
pkgs/data/fonts/powerline-fonts/default.nix
+3 -3
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchzip}:
fetchzip {
name = "powerline-fonts-2017-05-25";
name = "powerline-fonts-2018-11-11";
url = https://github.com/powerline/fonts/archive/fe396ef6f6b9b315f30af7d7229ff21f67a66e12.zip;
url = https://github.com/powerline/fonts/archive/e80e3eba9091dac0655a0a77472e10f53e754bb0.zip;
postFetch = ''
mkdir -p $out/share/fonts/opentype
@@ -22,7 +22,7 @@ fetchzip {
unzip -j $downloadedFile '*/PSF/*.psf.gz' -d $out/share/fonts/psf
'';
sha256 = "07yjbwri7nnnnynps86sz0dlivwqw7gfw045v63q969nab9dw388";
sha256 = "0irifak86gn7hawzgxcy53s22y215mxc2kjncv37h7q44jsqdqww";
meta = with stdenv.lib; {
homepage = https://github.com/powerline/fonts;
pkgs/data/fonts/unifont/default.nix
+4 -4
View File
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "unifont-${version}";
version = "11.0.02";
version = "11.0.03";
ttf = fetchurl {
url = "mirror://gnu/unifont/${name}/${name}.ttf";
sha256 = "0l8p07m566131xdinv1pcfc578jpvn72n6dhqmgivp8myai2xkzx";
sha256 = "1fqlf3kczh1y7vhpcdcs1i9043idg5x9jisfqfd99sikvcbw7w75";
};
pcf = fetchurl {
url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
sha256 = "1hcl71fjchngcb2b4mwl4hhx886faaniv86x2xgk8850766qpnmy";
sha256 = "0wqcmvkqdww60hqh245whzh4mx3frrx2712lay826f9h5s4ywz6g";
};
nativeBuildInputs = [ mkfontscale mkfontdir ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "16ni07cfw38s7cj8bdsfi7fa1qahm3k90cmm4gn40qvz35i17x15";
outputHash = "006jbla4zfwccyy84sm4ck869sq5az5s5cfkcmdgj7ah3rz4d7dn";
meta = with stdenv.lib; {
description = "Unicode font for Base Multilingual Plane";
pkgs/data/icons/bibata-cursors/default.nix
+41
View File
@@ -0,0 +1,41 @@
{ fetchFromGitHub, gnome-themes-extra, inkscape, stdenv, xcursorgen }:
stdenv.mkDerivation rec {
name = "bibata-cursors-${version}";
version = "0.4.1";
src = fetchFromGitHub {
owner = "KaizIqbal";
repo = "Bibata_Cursor";
rev = "v${version}";
sha256 = "14gvpjp4gv0m59qr8wls7xs5yjx5llldyzack5kg5cg2mzk2nsml";
};
postPatch = ''
patchShebangs .
substituteInPlace build.sh --replace "gksu " ""
'';
nativeBuildInputs = [
gnome-themes-extra
inkscape
xcursorgen
];
buildPhase = ''
HOME="$NIX_BUILD_ROOT" ./build.sh
'';
installPhase = ''
install -dm 0755 $out/share/icons
cp -pr Bibata_* $out/share/icons/
'';
meta = with stdenv.lib; {
description = "Material Based Cursor";
homepage = https://github.com/KaizIqbal/Bibata_Cursor;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ rawkode ];
};
}
pkgs/data/icons/papirus-icon-theme/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "papirus-icon-theme-${version}";
version = "20181007";
version = "20181120";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = "papirus-icon-theme";
rev = version;
sha256 = "1hv526k0ykq2yj9f6bcl711sgdxwx5y0yqjf5acpvcmx9pm58vz5";
sha256 = "1v0vb7l948gxyz37vzh01jqmb8d3w3hxw85vly08ra1ldixaczc5";
};
nativeBuildInputs = [ gtk3 ];
pkgs/data/icons/zafiro-icons/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "zafiro-icons";
version = "0.7.3";
version = "0.7.7";
src = fetchFromGitHub {
owner = "zayronxio";
repo = pname;
rev = "v${version}";
sha256 = "02q3wcklmqdy4ycyly7477q98y3mkgnpr7c78jqxvy2yr486wwyx";
sha256 = "0471gf4s32dhcm3667l1bnam04jk4miw3c6s557vix59rih1y71p";
};
nativeBuildInputs = [ gtk3 ];
pkgs/data/misc/hackage/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/56099dd4eb61f963da8edefdd19fd6a2e4371d95.tar.gz";
sha256 = "1byz5rp1n682bcm7wcdm6jxabgq1nx660bf51g11fyni1b5fr9ax";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/7882a52a634fbc2da03adc9616aa83b27b06d7a2.tar.gz";
sha256 = "1gw480w1d1117l8hbp7rh1jmjjqx11pzb3995m5wi2q9mvi645x2";
}
pkgs/data/misc/nixos-artwork/wallpapers.nix
+9
View File
@@ -11,6 +11,15 @@ let
installPhase = ''
mkdir -p $out/share/artwork/gnome
ln -s $src $out/share/artwork/gnome/${src.name}
# KDE
mkdir -p $out/share/wallpapers/${name}/contents/images
ln -s $src $out/share/wallpapers/${name}/contents/images/${src.name}
cat >>$out/share/wallpapers/${name}/metadata.desktop <<_EOF
[Desktop Entry]
Name=${name}
X-KDE-PluginInfo-Name=${name}
_EOF
'';
meta = with stdenv.lib; {
pkgs/data/misc/osinfo-db/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
stdenv.mkDerivation rec {
name = "osinfo-db-20181101";
name = "osinfo-db-20181203";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
sha256 = "1n9xq5nspfgsdqifh23ypsc85n5xl6cdbwdlacp0sa8rhkmfdvd7";
sha256 = "1wimbj3hqp3ni91l7drj24i7z7xxfdpn6svf1szk9qd93cxc65q2";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
pkgs/data/themes/ant-theme/default.nix
+39
View File
@@ -0,0 +1,39 @@
{ stdenv, fetchurl, gtk-engine-murrine }:
stdenv.mkDerivation rec {
pname = "ant-theme";
version = "1.2.0";
src = fetchurl {
url = "https://github.com/EliverLara/Ant/releases/download/v${version}/Ant.tar";
sha256 = "15751pnb94g2wi6y932l3d7ksaz18402zbzp3l7ryy0lqwjnqvkj";
};
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes/Ant
cp -a * $out/share/themes/Ant
rm -r $out/share/themes/Ant/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
runHook postInstall
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1fzy7bq5v9fzjpfxplvk0nwjgamcva83462gkz01lhr1mipb92h1";
meta = with stdenv.lib; {
description = "A flat and light theme with a modern look";
homepage = https://github.com/EliverLara/Ant;
license = licenses.gpl3;
platforms = platforms.all;
maintainers = [
maintainers.pbogdan
];
};
}
pkgs/data/themes/plata/default.nix
+80
View File
@@ -0,0 +1,80 @@
{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel
, sassc, inkscape, libxml2, gnome2, gdk_pixbuf, librsvg, gtk-engine-murrine
, cinnamonSupport ? true
, gnomeFlashbackSupport ? true
, gnomeShellSupport ? true
, mateSupport ? true
, openboxSupport ? true
, xfceSupport ? true
, gtkNextSupport ? false
, plankSupport ? false
, telegramSupport ? false
, tweetdeckSupport ? false
, selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500)
, accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300)
, suggestionColor ? null # Secondary color for 'suggested' buttons (Default: #673AB7 = DPurple500)
, destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500)
}:
stdenv.mkDerivation rec {
name = "plata-theme-${version}";
version = "0.4.9";
src = fetchFromGitLab {
owner = "tista500";
repo = "plata-theme";
rev = version;
sha256 = "0kj04nj265rgkbbhzhz9f7q6z5yr1dxmcrnq1b5ldha3xqrq2pv9";
};
preferLocalBuild = true;
nativeBuildInputs = [
autoreconfHook
pkgconfig
parallel
sassc
inkscape
libxml2
gnome2.glib.dev
];
buildInputs = [
gdk_pixbuf
librsvg
];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
postPatch = "patchShebangs .";
configureFlags =
let
inherit (stdenv.lib) enableFeature optional;
withOptional = value: feat: optional (value != null) "--with-${feat}=${value}";
in [
"--enable-parallel"
(enableFeature cinnamonSupport "cinnamon")
(enableFeature gnomeFlashbackSupport "flashback")
(enableFeature gnomeShellSupport "gnome")
(enableFeature mateSupport "mate")
(enableFeature openboxSupport "openbox")
(enableFeature xfceSupport "xfce")
(enableFeature gtkNextSupport "gtk_next")
(enableFeature plankSupport "plank")
(enableFeature telegramSupport "telegram")
(enableFeature tweetdeckSupport "tweetdeck")
]
++ (withOptional selectionColor "selection_color")
++ (withOptional accentColor "accent_color")
++ (withOptional suggestionColor "suggestion_color")
++ (withOptional destructionColor "destruction_color");
meta = with stdenv.lib; {
description = "A Gtk+ theme based on Material Design Refresh";
homepage = https://gitlab.com/tista500/plata-theme;
license = with licenses; [ gpl2 cc-by-sa-40 ];
platforms = platforms.linux;
maintainers = [ maintainers.tadfisher ];
};
}