From b45b49a197ffe45028c02660409fde1e6a864354 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 4 Feb 2019 01:53:30 -0600 Subject: iosevka-bin: 2.0.2 -> 2.1.0 https://github.com/be5invis/Iosevka/releases/tag/v2.1.0 --- pkgs/data/fonts/iosevka/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 529a727d6c0f..4adb0928d4fa 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "2.0.2"; + version = "2.1.0"; in fetchzip rec { name = "iosevka-bin-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka ''; - sha256 = "0jr9d02dk4zbq3kyhpfs6gyynwss60210pc1dfxn0qbw3j9ch2l4"; + sha256 = "0hx91pdkiw0qvkkl7qnl78p5afldcmn18l5m1iclldnvrghrxizz"; meta = with stdenv.lib; { homepage = https://be5invis.github.io/Iosevka/; -- cgit 1.4.1 From b84ca8131aabdfbe7d361219fc22174119704a4d Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sun, 10 Feb 2019 13:38:12 -0200 Subject: greybird: 3.22.9 -> 3.22.10 --- pkgs/data/themes/greybird/default.nix | 38 ++++++++++++++++++++++++++++++++++ pkgs/misc/themes/greybird/default.nix | 39 ----------------------------------- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 40 insertions(+), 41 deletions(-) create mode 100644 pkgs/data/themes/greybird/default.nix delete mode 100644 pkgs/misc/themes/greybird/default.nix (limited to 'pkgs/data') diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix new file mode 100644 index 000000000000..02c8d2b64901 --- /dev/null +++ b/pkgs/data/themes/greybird/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "greybird"; + version = "3.22.10"; + + src = fetchFromGitHub { + owner = "shimmerproject"; + repo = pname; + rev = "v${version}"; + sha256 = "1g1mnzxqwlbymq8npd2j294f8dzf9fw9nicd4pajmscg2vk71da9"; + }; + + nativeBuildInputs = [ + autoreconfHook + which + sassc + glib + libxml2 + ]; + + buildInputs = [ + gdk_pixbuf + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + meta = with stdenv.lib; { + description = "Grey and blue theme from the Shimmer Project for GTK+-based environments"; + homepage = https://github.com/shimmerproject/Greybird; + license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix deleted file mode 100644 index 8cc1a6415fbe..000000000000 --- a/pkgs/misc/themes/greybird/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "greybird"; - version = "3.22.9"; - - src = fetchFromGitHub { - owner = "shimmerproject"; - repo = "${pname}"; - rev = "v${version}"; - sha256 = "0mixs47v0jvqpmfsv0k0d0l24y4w35krah8mgnwamr0b8spmazz3"; - }; - - nativeBuildInputs = [ - autoreconfHook - which - sassc - glib - libxml2 - ]; - - buildInputs = [ - gdk_pixbuf - librsvg - ]; - - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; - - meta = with stdenv.lib; { - description = "Grey and blue theme from the Shimmer Project for GTK+-based environments"; - homepage = https://github.com/shimmerproject/Greybird; - license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b51babe1c9ca..49d6a2d48e37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15592,6 +15592,8 @@ in go-font = callPackage ../data/fonts/go-font { }; + greybird = callPackage ../data/themes/greybird { }; + gyre-fonts = callPackage ../data/fonts/gyre {}; hack-font = callPackage ../data/fonts/hack { }; @@ -22453,8 +22455,6 @@ in binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; - greybird = callPackage ../misc/themes/greybird { }; - guetzli = callPackage ../applications/graphics/guetzli { }; gummi = callPackage ../applications/misc/gummi { }; -- cgit 1.4.1 From 692b978df49b38808a0eda3a9290698f21a9ede3 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sun, 10 Feb 2019 23:05:24 -0200 Subject: zuki-themes: 3.28-3 -> 3.30-1 --- pkgs/data/themes/zuki/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/misc/themes/zuki/default.nix | 30 ------------------------------ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 pkgs/data/themes/zuki/default.nix delete mode 100644 pkgs/misc/themes/zuki/default.nix (limited to 'pkgs/data') diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix new file mode 100644 index 000000000000..5e4e439f2afd --- /dev/null +++ b/pkgs/data/themes/zuki/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "zuki-themes"; + version = "3.30-1"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = pname; + rev = "v${version}"; + sha256 = "0d7i0jhjiarqnwkc1k505bw8r9bvbwk3x8yzqmc3vnwcd7mr3m9x"; + }; + + buildInputs = [ gdk_pixbuf librsvg ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + install -dm 755 $out/share/themes + cp -a Zuki* $out/share/themes/ + ''; + + meta = with stdenv.lib; { + description = "Themes for GTK3, gnome-shell and more"; + homepage = https://github.com/lassekongo83/zuki-themes; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix deleted file mode 100644 index 2c293ecbc4ac..000000000000 --- a/pkgs/misc/themes/zuki/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }: - -stdenv.mkDerivation rec { - name = "zuki-themes-${version}"; - version = "3.28-3"; - - src = fetchFromGitHub { - owner = "lassekongo83"; - repo = "zuki-themes"; - rev = "v${version}"; - sha256 = "0sgp41fpd8lyyb0v82y41v3hmb0ayv3zqqrv0m3ln0dzkr7ym9g7"; - }; - - buildInputs = [ gdk_pixbuf librsvg ]; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - installPhase = '' - install -dm 755 $out/share/themes - cp -a Zuki* $out/share/themes/ - ''; - - meta = with stdenv.lib; { - description = "Themes for GTK3, gnome-shell and more"; - homepage = https://github.com/lassekongo83/zuki-themes; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98131dc032f9..3feae1858d07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16004,6 +16004,8 @@ in zilla-slab = callPackage ../data/fonts/zilla-slab { }; + zuki-themes = callPackage ../data/themes/zuki { }; + ### APPLICATIONS @@ -23275,8 +23277,6 @@ in zk-shell = callPackage ../applications/misc/zk-shell { }; - zuki-themes = callPackage ../misc/themes/zuki { }; - tora = libsForQt5.callPackage ../development/tools/tora {}; xulrunner = firefox-unwrapped; -- cgit 1.4.1 From 017a7a1df2e68160ea0c631608a086a94d254332 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 7 Feb 2019 09:32:42 -0600 Subject: agave: 008 -> 009 --- pkgs/data/fonts/agave/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index 6aabf4f485da..eb18f620a2ad 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "agave-${version}"; - version = "008"; + pname = "agave"; + version = "009"; src = fetchurl { - url = "https://github.com/agarick/agave/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0g50mqpffn4dq761vibaf8dwfkbcl5da1cc89qz6pq35ircipbns"; + url = "https://github.com/agarick/agave/releases/download/v${version}/agave-r.ttf"; + sha256 = "05766gp2glm1p2vknk1nncxigq28hg8s58kjwsbn8zpwy8ivywpk"; }; sourceRoot = "."; + unpackPhase = ":"; dontBuild = true; installPhase = '' mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype + cp $src $out/share/fonts/truetype/ ''; meta = with stdenv.lib; { -- cgit 1.4.1