diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-05-03 16:01:49 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-05-03 16:01:49 +0200 |
| commit | 56b560942c7b567b1e3d6c48cce0e5891f4e72e6 (patch) | |
| tree | abce48e2633a2692972c16e46188ed852cd543c5 /pkgs/data | |
| parent | 3567b1390fde8681a0f0b4581f2babbe863ede9a (diff) | |
| parent | b1bd1854d0a7c19311d5f898f5e4780fe48b3fd5 (diff) | |
| download | nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.gz nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.bz2 nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.lz nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.xz nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.zst nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/twemoji-color-font/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/themes/tetra/default.nix | 36 |
3 files changed, 42 insertions, 6 deletions
diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index d7963f6395a..52d11bfd622 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { - name = "twemoji-color-font-${meta.version}"; + pname = "twemoji-color-font"; + version = "12.0.1"; src = fetchFromGitHub { owner = "eosrei"; repo = "twemoji-color-font"; - rev = "v${meta.version}"; - sha256 = "07yawvbdkk15d7ac9dj7drs1rqln9sba1fd6jx885ms7ww2sfm7r"; + rev = "v${version}"; + sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2"; }; nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; @@ -21,7 +22,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - version = "11.2.0"; description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags"; longDescription = '' A color and B&W emoji SVGinOT font built from the Twitter Emoji for diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 3ec29402b1a..11be8acc259 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/179aac2faddbba8921029ca9851ad97bcaa79991.tar.gz"; - sha256 = "17cbapnvpasdpza2r1y7lf4y4b31k094jqsnx89dn8zwp8n862lv"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f0c3944190bf34286e4e80620fede11dd688f68.tar.gz"; + sha256 = "1i4k4wjm6w8hgwia1axwdr3ij0ckxh3ikc1f0nlk8sb0j3yrmxa6"; } diff --git a/pkgs/data/themes/tetra/default.nix b/pkgs/data/themes/tetra/default.nix new file mode 100644 index 00000000000..2a7b6e595c4 --- /dev/null +++ b/pkgs/data/themes/tetra/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, gtk3, sassc }: + +stdenv.mkDerivation rec { + pname = "tetra-gtk-theme"; + version = "201905"; + + src = fetchFromGitHub { + owner = "hrdwrrsk"; + repo = pname; + rev = version; + sha256 = "1j2w8na564f5yjm5am7843hq5qk28h1rq8rcbak4xsygdc3lbsfi"; + }; + + preBuild = '' + # Shut up inkscape's warnings + export HOME="$NIX_BUILD_ROOT" + ''; + + nativeBuildInputs = [ sassc ]; + buildInputs = [ gtk3 ]; + + postPatch = "patchShebangs ."; + + installPhase = '' + mkdir -p $out/share/themes + ./install.sh -d $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme"; + homepage = https://github.com/hrdwrrsk/tetra-gtk-theme; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.linux; + }; +} |