diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
| commit | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (patch) | |
| tree | c3b5c34b1c533f5c231dc6707e96795fb3a9a138 /nixpkgs/pkgs/data | |
| parent | 44e04ea2730f8e3b863b81b0056babe233c244f6 (diff) | |
| parent | 1036dc664169b32613ec11b58cc1740c7511a340 (diff) | |
| download | nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.gz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.bz2 nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.lz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.xz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.zst nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.zip | |
Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'
Diffstat (limited to 'nixpkgs/pkgs/data')
8 files changed, 14 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/data/fonts/input-fonts/default.nix b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix index 94c580c30df0..4910ef21f9ab 100644 --- a/nixpkgs/pkgs/data/fonts/input-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = requireFile { name = "Input-Font.zip"; - url = "http://input.fontbureau.com/download/"; + url = "https://input.fontbureau.com/download/"; sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq"; }; diff --git a/nixpkgs/pkgs/data/fonts/migmix/default.nix b/nixpkgs/pkgs/data/fonts/migmix/default.nix index 9507819fe497..228952aaa56d 100644 --- a/nixpkgs/pkgs/data/fonts/migmix/default.nix +++ b/nixpkgs/pkgs/data/fonts/migmix/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' find $srcs -name '*.ttf' -exec install -m644 -Dt $out/share/fonts/truetype/migmix {} \; diff --git a/nixpkgs/pkgs/data/fonts/migu/default.nix b/nixpkgs/pkgs/data/fonts/migu/default.nix index 57fbf1a830fc..193e98d01a4b 100644 --- a/nixpkgs/pkgs/data/fonts/migu/default.nix +++ b/nixpkgs/pkgs/data/fonts/migu/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' find $srcs -name '*.ttf' | xargs install -m644 --target $out/share/fonts/truetype/migu -D diff --git a/nixpkgs/pkgs/data/fonts/poly/default.nix b/nixpkgs/pkgs/data/fonts/poly/default.nix index d291d50e8364..24155f2ea546 100644 --- a/nixpkgs/pkgs/data/fonts/poly/default.nix +++ b/nixpkgs/pkgs/data/fonts/poly/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/fonts/opentype diff --git a/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix b/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix index 41f704e750c5..1c35d3deef91 100644 --- a/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "adapta-backgrounds-${version}"; - version = "0.5.2.3"; + pname = "adapta-backgrounds"; + version = "0.5.3.1"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-backgrounds"; rev = version; - sha256 = "0n0ggcxinja81lasmpviqq3l4jiwb05bs8r5aah1im2zvls1g007"; + sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ meson ninja pkgconfig glib ]; meta = with stdenv.lib; { description = "Wallpaper collection for adapta-project"; - homepage = https://github.com/adapta-project/adapta-backgrounds; + homepage = "https://github.com/adapta-project/adapta-backgrounds"; license = with licenses; [ gpl2 cc-by-sa-40 ]; platforms = platforms.all; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix b/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix index 50f874baa4ae..3983869a4528 100644 --- a/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/nixpkgs/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -6,7 +6,7 @@ let stdenv.mkDerivation { inherit name src; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/artwork/gnome diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index cc71e0026324..9728b2f96c48 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { name = "docbook-sgml-3.1"; - unpackPhase = "true"; + dontUnpack = true; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index dc7ebf5959da..78b99081504d 100644 --- a/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/nixpkgs/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { name = "docbook-sgml-4.1"; - unpackPhase = "true"; + dontUnpack = true; nativeBuildInputs = [ unzip ]; |