diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-30 08:57:28 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-30 08:57:28 +0100 |
| commit | d14baf7747b0d8e17c0a13db673b28f13e06a349 (patch) | |
| tree | 4cb1f7bf418da1a2a246b50d64fd149a8c7a2793 /pkgs/data | |
| parent | 0c1c18ca4416baa46c940960aa5e619873a2318e (diff) | |
| parent | ceb3f864a30b5d2bd345064e0a8ed784793b9540 (diff) | |
| download | nixpkgs-d14baf7747b0d8e17c0a13db673b28f13e06a349.tar nixpkgs-d14baf7747b0d8e17c0a13db673b28f13e06a349.tar.gz nixpkgs-d14baf7747b0d8e17c0a13db673b28f13e06a349.tar.bz2 nixpkgs-d14baf7747b0d8e17c0a13db673b28f13e06a349.tar.lz nixpkgs-d14baf7747b0d8e17c0a13db673b28f13e06a349.tar.xz nixpkgs-d14baf7747b0d8e17c0a13db673b28f13e06a349.tar.zst nixpkgs-d14baf7747b0d8e17c0a13db673b28f13e06a349.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/input-fonts/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/icons/zafiro-icons/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 68322bd5482..c3d3bf4aa6a 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "input-fonts"; - version = "2017-08-10"; # date of the download and checksum + version = "2019-11-25"; # date of the download and checksum src = requireFile { name = "Input-Font.zip"; url = "https://input.fontbureau.com/download/"; - sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq"; + sha256 = "10rax2a7vzidcs7kyfg5lv5bwp9i7kvjpdcsd10p0517syijkp3b"; }; nativeBuildInputs = [ unzip ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0k7xqkgqldd110ch9s144ilh762q777qcjvg3plmrb9s6xiaqvvd"; + outputHash = "15sdhqqqd4jgk80fw7ncx49avi9cxbdgyrvnrfya0066x4q4r6lv"; meta = with stdenv.lib; { description = "Fonts for Code, from Font Bureau"; diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index 0b28a02ba4d..c3670a6f58c 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zafiro-icons"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "zayronxio"; repo = pname; - rev = "v${version}"; - sha256 = "0zmnhih4gz8bidyzf1wimy85z7zx9i29mv1zirmykpqj819g7mx9"; + rev = "${version}"; + sha256 = "0gy3c0jkj1icnwcs23b6km9cj9cccv8y5z1w11nfdv91cq3mdhmb"; }; nativeBuildInputs = [ gtk3 ]; |