diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-18 11:36:32 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-18 11:36:32 -0700 |
| commit | 2ac70270e87f19194440044a456a520341ec5dbc (patch) | |
| tree | 69870efcecb0eca5653978dded78cb571e77c157 /pkgs/data | |
| parent | 5ec252e7ca23e1248d90a00863b042ae8daa9bfa (diff) | |
| parent | 31a27c44c8b2e6321f0ac4534c035d62faca8211 (diff) | |
| download | nixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar nixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar.gz nixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar.bz2 nixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar.lz nixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar.xz nixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar.zst nixlib-2ac70270e87f19194440044a456a520341ec5dbc.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/fira-code/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/geolite-legacy/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/misc/sound-theme-freedesktop/default.nix | 22 |
3 files changed, 27 insertions, 5 deletions
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 9855738d6d6d..1ed63f7ac9e9 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fira-code-${version}"; - version = "0.5"; + version = "0.6"; src = fetchurl { url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode-Regular.otf"; - sha256 = "1y2jz1v7m0q73rz9vblxgaqkgh9wpp4fp7dq21hdyfhxkk3ss6xk"; + sha256 = "1blalxnmrxqlm5i74jhm8j29n0zsnmqi3gppxa9szjzv4x2k5s0a"; }; phases = [ "installPhase" ]; diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 6dccfa69638a..9cc52fa1fe1a 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-08-11"; + version = "2015-08-17"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -27,10 +27,10 @@ stdenv.mkDerivation { "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "1h4wpqs16a1w16znbr2h15b16p5y43vp6qhj0bc7krq5qa484y2k"; + "0g9i1dyvh2389q8mp6wg2xg3lm9wmh5md1cvy698pzi1y6j9wka3"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "09qiy2grxnakapvz5xjw3ivbxc0id6srqyd46p68mcy7gwrggcv7"; + "0hfiiqffw8z10lzk1l2iaqlbgi39xk3j3mrlrzxvrsj4s08zdrks"; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix new file mode 100644 index 000000000000..a43a94a0d7c9 --- /dev/null +++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, intltool }: + +let version = "0.8"; in +stdenv.mkDerivation rec { + name = "sound-theme-freedesktop-${version}"; + + src = fetchurl { + sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb"; + url = "https://people.freedesktop.org/~mccann/dist/${name}.tar.bz2"; + }; + + nativeBuildInputs = [ intltool ]; + + meta = with stdenv.lib; { + inherit version; + description = "Freedesktop reference sound theme"; + homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec; + # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS: + license = with licenses; [ cc-by-30 cc-by-sa-25 gpl2 gpl2Plus ]; + maintainers = with maintainers; [ nckx ]; + }; +} |