diff options
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/ddccontrol-db/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/fedora-backgrounds/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch | 13 | ||||
| -rw-r--r-- | pkgs/data/misc/graphs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/hackage/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/data/misc/hackage/pin.json | 6 | ||||
| -rw-r--r-- | pkgs/data/misc/mobile-broadband-provider-info/default.nix | 13 |
7 files changed, 49 insertions, 12 deletions
diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 2212b158c8ad..d79fc73d61bf 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20201221"; + version = "20210505"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "1sryyjjad835mwc7a2avbij6myln8b824kjdr78gc9hh3p16929b"; + sha256 = "sha256-k0Bcf1I/g2sFnX3y4qyWG7Z3W7K6YeZ9trUFSJ4NhSo="; }; preConfigure = '' diff --git a/pkgs/data/misc/fedora-backgrounds/default.nix b/pkgs/data/misc/fedora-backgrounds/default.nix index 31bc28a9f9c1..3089e721a7c9 100644 --- a/pkgs/data/misc/fedora-backgrounds/default.nix +++ b/pkgs/data/misc/fedora-backgrounds/default.nix @@ -20,4 +20,15 @@ in { # Fix broken symlinks in the Xfce background directory. patches = [ ./f33-fix-xfce-path.patch ]; }; + + f34 = fedoraBackground rec { + version = "34.0.1"; + src = fetchurl { + url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz"; + hash = "sha256-0gotgQ4N0yE8WZbsu7B3jmUIZrycbqjEMxZl01JcJj4="; + }; + # Fix broken symlinks in the Xfce background directory. + patches = [ ./f34-fix-xfce-path.patch ]; + }; + } diff --git a/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch b/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch new file mode 100644 index 000000000000..847927667133 --- /dev/null +++ b/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch @@ -0,0 +1,13 @@ +diff --git a/default/Makefile b/default/Makefile +index 172d5d9..540a1c0 100644 +--- a/default/Makefile ++++ b/default/Makefile +@@ -1,7 +1,7 @@ + WP_NAME=f34 + WP_BIGNAME=F34 + WP_DIR=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME) +-WP_DIR_LN=/usr/share/backgrounds/$(WP_NAME) ++WP_DIR_LN=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME) + GNOME_BG_DIR=$(DESTDIR)/usr/share/gnome-background-properties + KDE_BG_DIR=$(DESTDIR)/usr/share/wallpapers + MATE_BG_DIR=$(DESTDIR)/usr/share/mate-background-properties diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix index 19438d835665..93a0d75aaf69 100644 --- a/pkgs/data/misc/graphs/default.nix +++ b/pkgs/data/misc/graphs/default.nix @@ -7,9 +7,7 @@ stdenv.mkDerivation rec { version = "20210214"; src = fetchurl { - url = "https://mirrors.mit.edu/sage/spkg/upstream/${pname}/${pname}-${version}.tar.bz2"; - # TODO: switch to the url below once Sage 9.3 is released - # url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; + url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; sha256 = "sha256-ByN8DZhTYRUFw4n9e7klAMh0P1YxurtND0Xf2DMvN0E="; }; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 429470f2bf36..e559281303d7 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,10 @@ +# Hackage database snapshot, used by maintainers/scripts/regenerate-hackage-packages.sh +# and callHackage { fetchurl }: - +let + pin = builtins.fromJSON (builtins.readFile ./pin.json); +in fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/1aad60ed9679a7597f3fc3515a0fe26fdb896e55.tar.gz"; - sha256 = "0a7lm1ki8rz7m13x4zxlr1nkd93227xgmxbhvsmrj9fa4nc5bvyy"; + inherit (pin) url sha256; + passthru.updateScript = ../../../../maintainers/scripts/haskell/update-hackage.sh; } diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json new file mode 100644 index 000000000000..43c45c95cd6b --- /dev/null +++ b/pkgs/data/misc/hackage/pin.json @@ -0,0 +1,6 @@ +{ + "commit": "2295bd36e0d36af6e862dfdb7b0694fba2e7cb58", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2295bd36e0d36af6e862dfdb7b0694fba2e7cb58.tar.gz", + "sha256": "1bzqy6kbw0i1ryg3ia5spg6m62zkc46xhhn0h76pfq7mfmm3fqf8", + "msg": "Update from Hackage at 2021-05-12T11:46:04Z" +} diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index f487edba9815..49755dbd8ad6 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,16 +1,21 @@ -{ lib, stdenv, fetchurl, gnome3 }: +{ lib, stdenv, fetchurl, gnome, libxslt }: stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; - version = "20190116"; + version = "20201225"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic"; + sha256 = "1g9x2i4xjm2sagaha07n9psacbylrwfrmfqkp17gjwhpyi6w0zqd"; }; + nativeBuildInputs = [ + # fixes configure: error: xsltproc not found + libxslt + ]; + passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; |
