diff options
Diffstat (limited to 'pkgs/data/misc')
-rw-r--r-- | pkgs/data/misc/cacert/default.nix | 11 | ||||
-rwxr-xr-x | pkgs/data/misc/cacert/update.sh | 34 | ||||
-rw-r--r-- | pkgs/data/misc/combinatorial_designs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/conway_polynomials/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/elliptic_curves/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/fedora-backgrounds/default.nix | 23 | ||||
-rw-r--r-- | pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch | 15 | ||||
-rw-r--r-- | pkgs/data/misc/fedora-backgrounds/generic.nix | 42 | ||||
-rw-r--r-- | pkgs/data/misc/graphs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/pari-galdata/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/pari-seadata-small/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/polytopes_db/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/poppler-data/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/tzdata/default.nix | 7 |
15 files changed, 138 insertions, 16 deletions
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index f72431c5a27c..34e0ec132a9f 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -13,12 +13,17 @@ let sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy"; }; + version = "3.57"; + underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation { - name = "nss-cacert-${nss.version}"; + name = "nss-cacert-${version}"; - src = nss.src; + src = fetchurl { + url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz"; + sha256 = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382"; + }; outputs = [ "out" "unbundled" ]; @@ -60,6 +65,8 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; + passthru.updateScript = ./update.sh; + meta = { homepage = "https://curl.haxx.se/docs/caextract.html"; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; diff --git a/pkgs/data/misc/cacert/update.sh b/pkgs/data/misc/cacert/update.sh new file mode 100755 index 000000000000..7bf3d46cb02f --- /dev/null +++ b/pkgs/data/misc/cacert/update.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix common-updater-scripts jq + +# Build both the cacert package and an overriden version where we use the source attribute of NSS. +# Cacert and NSS are both from the same upstream sources. They are decoupled as +# the cacert output only cares about a few infrequently changing files in the +# sources while the NSS source code changes frequently. +# +# By having cacert on a older source revision that produces the same +# certificate output as a newer version we can avoid large amounts of +# unnecessary rebuilds. +# +# As of this writing there are a few magnitudes more packages depending on +# cacert than on nss. + + +set -ex + +BASEDIR="$(dirname "$0")/../../../.." + + +CURRENT_PATH=$(nix-build --no-out-link -A cacert.out) +PATCHED_PATH=$(nix-build --no-out-link -E "with import $BASEDIR {}; (cacert.overrideAttrs (_: { inherit (nss) src version; })).out") + +# Check the hash of the etc subfolder +# We can't check the entire output as that contains the nix-support folder +# which contains the output path itself. +CURRENT_HASH=$(nix-hash "$CURRENT_PATH/etc") +PATCHED_HASH=$(nix-hash "$PATCHED_PATH/etc") + +if [[ "$CURRENT_HASH" != "$PATCHED_HASH" ]]; then + NSS_VERSION=$(nix-instantiate --json --eval -E "with import $BASEDIR {}; nss.version" | jq -r .) + update-source-version cacert "$NSS_VERSION" +fi diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/data/misc/combinatorial_designs/default.nix index 5df7343f3be7..a14e13749589 100644 --- a/pkgs/data/misc/combinatorial_designs/default.nix +++ b/pkgs/data/misc/combinatorial_designs/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { ''; license = licenses.publicDomain; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix index f51d2293a7ef..d6413439dede 100644 --- a/pkgs/data/misc/conway_polynomials/default.nix +++ b/pkgs/data/misc/conway_polynomials/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { description = "Contains a small database of Conway polynomials"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix index 49b8736b0846..9b296487670d 100644 --- a/pkgs/data/misc/elliptic_curves/default.nix +++ b/pkgs/data/misc/elliptic_curves/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/pkgs/data/misc/fedora-backgrounds/default.nix b/pkgs/data/misc/fedora-backgrounds/default.nix new file mode 100644 index 000000000000..31bc28a9f9c1 --- /dev/null +++ b/pkgs/data/misc/fedora-backgrounds/default.nix @@ -0,0 +1,23 @@ +{ callPackage, lib, fetchurl }: + +let + fedoraBackground = callPackage ./generic.nix { }; +in { + f32 = fedoraBackground rec { + version = "32.2.2"; + src = fetchurl { + url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz"; + hash = "sha256-1F75aae7Jj7M2IPn/vWKcUF+O5mZ0Yey7hWuFj/4Fhg="; + }; + }; + + f33 = fedoraBackground rec { + version = "33.0.7"; + src = fetchurl { + url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz"; + hash = "sha256-lAn5diEYebCo2ZJCOn9rD87rOasUU0qnSOr0EnZKW4o="; + }; + # Fix broken symlinks in the Xfce background directory. + patches = [ ./f33-fix-xfce-path.patch ]; + }; +} diff --git a/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch b/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch new file mode 100644 index 000000000000..eabdacddaa53 --- /dev/null +++ b/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch @@ -0,0 +1,15 @@ +diff --git a/default/Makefile b/default/Makefile +index ec8095a..9391f8f 100644 +--- a/default/Makefile ++++ b/default/Makefile +@@ -48,8 +48,8 @@ install: + + #~ XFCE background + $(MKDIR) $(XFCE_BG_DIR) +- $(LN_S) ../default/$(WP_NAME)-02-day.png \ ++ $(LN_S) ../../backgrounds/$(WP_NAME)/default/$(WP_NAME)-02-day.png \ + $(XFCE_BG_DIR)/$(WP_NAME).png + for tod in 01-dawn 03-dusk 04-night; do \ +- $(LN_S) ../default/$(WP_NAME)-$${tod}.png $(XFCE_BG_DIR)/$(WP_NAME)-$${tod}.png; \ ++ $(LN_S) ../../backgrounds/$(WP_NAME)/default/$(WP_NAME)-$${tod}.png $(XFCE_BG_DIR)/$(WP_NAME)-$${tod}.png; \ + done; diff --git a/pkgs/data/misc/fedora-backgrounds/generic.nix b/pkgs/data/misc/fedora-backgrounds/generic.nix new file mode 100644 index 000000000000..25043c34e5d9 --- /dev/null +++ b/pkgs/data/misc/fedora-backgrounds/generic.nix @@ -0,0 +1,42 @@ +{ stdenv +, coreutils +}: + +{ version +, src +, patches ? [ ] +}: + +stdenv.mkDerivation { + inherit patches src version; + + pname = "fedora${stdenv.lib.versions.major version}-backgrounds"; + + dontBuild = true; + + postPatch = '' + for f in default/Makefile extras/Makefile; do + substituteInPlace $f \ + --replace "usr/share" "share" \ + --replace "/usr/bin/" "" \ + --replace "/bin/" "" + done + + for f in $(find . -name '*.xml'); do + substituteInPlace $f \ + --replace "/usr/share" "$out/share" + done; + ''; + + installFlags = [ + "DESTDIR=$(out)" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/fedoradesign/backgrounds"; + description = "A set of default and supplemental wallpapers for Fedora"; + license = licenses.cc-by-sa-40; + platforms = platforms.unix; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix index 14551c6a4a47..bf7f8d4fd0e8 100644 --- a/pkgs/data/misc/graphs/default.nix +++ b/pkgs/data/misc/graphs/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "A database of graphs"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index c9950d9fcd11..3c9a531ab62f 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/197a82b352062bfeeefd4b62bfec19dd51a3728d.tar.gz"; - sha256 = "11c9a67j421vf6a7vvh280gsmssf49rxqnamdp1n9iljkhlfh5z1"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/59ba02b3424684458764210fa9e32ca08e516db2.tar.gz"; + sha256 = "0m4scz6b7xg7kisy6zlnw258pkfksmzzppw9gp0g6rdl0cxly239"; } diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix index b07be5a0c050..644a50a8ddeb 100644 --- a/pkgs/data/misc/pari-galdata/default.nix +++ b/pkgs/data/misc/pari-galdata/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix index 01ffd6db64fb..a9c9a62839ce 100644 --- a/pkgs/data/misc/pari-seadata-small/default.nix +++ b/pkgs/data/misc/pari-seadata-small/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/data/misc/polytopes_db/default.nix index 8fec9a854260..95ca8af82a7b 100644 --- a/pkgs/data/misc/polytopes_db/default.nix +++ b/pkgs/data/misc/polytopes_db/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Reflexive polytopes database"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index c06e63d3e692..717c948f7437 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, cmake, ninja }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.9"; + name = "poppler-data-0.4.10"; src = fetchurl { url = "https://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z"; + sha256 = "0c3vjs3p7rjc4yfacnhd865r27czmzwcr4j2z4jldi68dvvcwbvf"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 367ee06390cd..5065e3718cb2 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2019c"; + version = "2020c"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr"; + sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn"; + sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs"; }) ]; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "MANDIR=$(man)/share/man" "AWK=awk" "CFLAGS=-DHAVE_LINK=0" + "CFLAGS+=-DZIC_BLOAT_DEFAULT=\\\"fat\\\"" "cc=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ]; |