diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-16 22:55:06 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-16 22:55:06 +0100 |
| commit | aead6e12f96a76a2c1c6b64ba81b18d647e6e3d0 (patch) | |
| tree | aff35e8cfa837fd92319e23951493431b3d2dacc /pkgs/data/misc | |
| parent | 4027966602c1d3bfac7091e390c2cf678115d59f (diff) | |
| parent | eceb2b06a1bd012a938697718c5f3b7b6fd9249a (diff) | |
| download | nixpkgs-aead6e12f96a76a2c1c6b64ba81b18d647e6e3d0.tar nixpkgs-aead6e12f96a76a2c1c6b64ba81b18d647e6e3d0.tar.gz nixpkgs-aead6e12f96a76a2c1c6b64ba81b18d647e6e3d0.tar.bz2 nixpkgs-aead6e12f96a76a2c1c6b64ba81b18d647e6e3d0.tar.lz nixpkgs-aead6e12f96a76a2c1c6b64ba81b18d647e6e3d0.tar.xz nixpkgs-aead6e12f96a76a2c1c6b64ba81b18d647e6e3d0.tar.zst nixpkgs-aead6e12f96a76a2c1c6b64ba81b18d647e6e3d0.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/nixos-artwork/wallpapers.nix | 9 | ||||
| -rw-r--r-- | pkgs/data/misc/osinfo-db/default.nix | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 893ad997c11..d141dba0795 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/56099dd4eb61f963da8edefdd19fd6a2e4371d95.tar.gz"; - sha256 = "1byz5rp1n682bcm7wcdm6jxabgq1nx660bf51g11fyni1b5fr9ax"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/7882a52a634fbc2da03adc9616aa83b27b06d7a2.tar.gz"; + sha256 = "1gw480w1d1117l8hbp7rh1jmjjqx11pzb3995m5wi2q9mvi645x2"; } diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 648b4f1dd96..50f874baa4a 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -11,6 +11,15 @@ let installPhase = '' mkdir -p $out/share/artwork/gnome ln -s $src $out/share/artwork/gnome/${src.name} + + # KDE + mkdir -p $out/share/wallpapers/${name}/contents/images + ln -s $src $out/share/wallpapers/${name}/contents/images/${src.name} + cat >>$out/share/wallpapers/${name}/metadata.desktop <<_EOF +[Desktop Entry] +Name=${name} +X-KDE-PluginInfo-Name=${name} +_EOF ''; meta = with stdenv.lib; { diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index b4de04780bd..893707395ae 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-20181101"; + name = "osinfo-db-20181203"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "1n9xq5nspfgsdqifh23ypsc85n5xl6cdbwdlacp0sa8rhkmfdvd7"; + sha256 = "1wimbj3hqp3ni91l7drj24i7z7xxfdpn6svf1szk9qd93cxc65q2"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; |