diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-05 08:33:39 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-05 08:33:39 +0200 |
commit | 866c5aa090d8f4c7f6e1b983531b7b8be4d354ac (patch) | |
tree | 0e4eb93b126a8d8fe60413b0fa20176d2791add6 /pkgs/data | |
parent | 95419ade3e8bbe9b0bcfc7d7e6f25c23d5a0b21b (diff) | |
parent | f601ab37c2fb7e5f65989a92df383bcd6942567a (diff) | |
download | nixlib-866c5aa090d8f4c7f6e1b983531b7b8be4d354ac.tar nixlib-866c5aa090d8f4c7f6e1b983531b7b8be4d354ac.tar.gz nixlib-866c5aa090d8f4c7f6e1b983531b7b8be4d354ac.tar.bz2 nixlib-866c5aa090d8f4c7f6e1b983531b7b8be4d354ac.tar.lz nixlib-866c5aa090d8f4c7f6e1b983531b7b8be4d354ac.tar.xz nixlib-866c5aa090d8f4c7f6e1b983531b7b8be4d354ac.tar.zst nixlib-866c5aa090d8f4c7f6e1b983531b7b8be4d354ac.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/recursive/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/themes/obsidian2/default.nix | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 8aab8c0cd721..352d75853093 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.043"; + version = "1.046"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "0y7wg3ssr4j0r8dyxd0i0ji8bjvipzsqf0l6wznl5sfxk41mvjvd"; + sha256 = "1j2rygkcmm2gpial24lks907mxjnhjrvl8z4skl8b43a55fg7mmp"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 46db53e739b3..960d1aef1211 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/e0bc864e0b6edb5e5ce1ec4bfa763a442b343bf5.tar.gz"; - sha256 = "1lmjxam58srrv9cjqajqz4bishx8hy99db3cx83i95qb3qiiiz6m"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/90b24a91103dca4f0df6cb28cecb205a7d7ab650.tar.gz"; + sha256 = "1zfj8c6s9icqg83ycfvd150s4jd07ccbjg2w2mn10rx5ng76mn53"; } diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 452ee0f8897d..25d6218e4bfe 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-obsidian-2"; rev = "v${version}"; - sha256 = "123f6hpz0h5xfmas44xa1ci68w8f3lcjj54jpnrqhsww66c9vs0i"; + sha256 = "0n64cml2h8dw2m2m6j90d515saqapqzjz6xcv4kr544ibv62hn61"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome theme, based upon Adwaita-Maia dark skin"; - homepage = https://github.com/madmaxms/theme-obsidian-2; + homepage = "https://github.com/madmaxms/theme-obsidian-2"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; |