diff options
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/fira-code/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix | 26 | ||||
-rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/osinfo-db/default.nix | 4 |
4 files changed, 15 insertions, 23 deletions
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 191e52c427a7..b0b58b0ebfcc 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "1.205"; + version = "1.206"; in fetchzip { name = "fira-code-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0h8b89d1n3y56k7x9zrwm9fic09ccg1mc7g1258g152m5g6z6zms"; + sha256 = "0074d8q4m802f5yms8yxdx4rdz5xnpgv1w5hs330zg2p9ksicgzy"; meta = with stdenv.lib; { homepage = https://github.com/tonsky/FiraCode; diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix index cb68c30a4a2c..f8df39c95652 100644 --- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix +++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "ultimate-oldschool-pc-font-pack-${version}"; +let version = "1.0"; +in +fetchzip rec { + name = "ultimate-oldschool-pc-font-pack-${version}"; + url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip"; + sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y"; - src = fetchurl { - url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip"; - sha256 = "7666cf23176e34ea03a218b5c1500f4ad729d97150ab7bdb7cf2adf4c99a9a7a"; - }; - - buildInputs = [ unzip ]; - - dontBuild = true; - - sourceRoot = "."; - - installPhase = '' + postFetch= '' mkdir -p $out/share/fonts/truetype - cp 'Px437 (TrueType - DOS charset)'/*.ttf $out/share/fonts/truetype - cp 'PxPlus (TrueType - extended charset)'/*.ttf $out/share/fonts/truetype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; meta = with stdenv.lib; { diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 3c837feb6be5..3126269a6e7a 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/b16aa9c85633ea49e19aee5e1678d082ce953a17.tar.gz"; - sha256 = "185p6112b35s2vgbswrmy5lwf09q27gzkpcfla6dbddmbk948d38"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3715ae81be1a8e0c6a1cb5902c054b6cedfb7f41.tar.gz"; + sha256 = "05bsk99d4k2nq8dfiagpby0cllx19crzn2rh29v26p0irzagrqfb"; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 93ee6d38c7c3..0a5f7b313065 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180903"; + name = "osinfo-db-20180920"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0xkxqyn2b03d4rd91f5rw3xar5vnv2n8l5pp8sm3hqm1wm5z5my9"; + sha256 = "19jbzf1g523bkckli043q21hgbfv0043b5ib4zjiz8x98h7ngiac"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; |