diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-11 00:20:39 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-11 00:20:39 +0000 |
commit | bc7a5b525c5983e79746d1e49a190d5b4b6ed938 (patch) | |
tree | ce567b3d370d937bb2e938d611b35167bad0d0e3 /pkgs/data | |
parent | 3e9022e45f38518807dc17872d631337bd43b716 (diff) | |
parent | 2327ed0f403c2cf4db990d94030ffd4027600f86 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/icons/tango-icon-theme/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/cacert/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/ddccontrol-db/default.nix | 3 | ||||
-rw-r--r-- | pkgs/data/misc/iana-etc/default.nix | 5 | ||||
-rw-r--r-- | pkgs/data/misc/media-player-info/default.nix | 45 | ||||
-rw-r--r-- | pkgs/data/misc/tzdata/default.nix | 6 |
6 files changed, 32 insertions, 35 deletions
diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 9e6b0666a1189..18676018eff46 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./rsvg-convert.patch ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ iconnamingutils imagemagick librsvg ]; propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; # still missing parent icon themes: cristalsvg diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 0ed4f95f8cf0b..a4739edea12fb 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -20,7 +20,7 @@ let blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.80"; + srcVersion = "3.83"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -35,7 +35,7 @@ let src = if nssOverride != null then nssOverride.src else fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz"; - sha256 = "sha256-wL8f0sfimmsCswliK6r8RD7skMiTS7FV2ku5iYh4S2o="; + sha256 = "sha256-qyPqZ/lkCQuLc8gKZ0CCVxw25fTrqSBXrGSMnB3vASg="; }; dontBuild = true; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index efec5c73ba2ef..3d91a4e7e727f 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -21,11 +21,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake intltool ]; buildInputs = [ libtool - intltool ]; meta = with lib; { diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 6f90669b81921..19331f458def2 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -2,10 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "iana-etc"; - version = "20220520"; + version = "20220915"; + src = fetchzip { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "sha256-LSrfNb4fUJEGSPJ+StlAbTE9LbOPDrRJLKTDSkuyoZQ="; + sha256 = "sha256-gBaM5YEK2XA42S7ELwjQChie/wYgo6n8dt2WEg3Pdns="; }; installPhase = '' diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 56e4ace41f4de..652298d1656dd 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -1,31 +1,28 @@ { lib, stdenv, fetchurl, pkg-config, python3, udev, systemd }: -let - name = "media-player-info-24"; -in +stdenv.mkDerivation rec { + pname = "media-player-info"; + version = "24"; - stdenv.mkDerivation { - inherit name; + src = fetchurl { + url = "https://www.freedesktop.org/software/media-player-info/${pname}-${version}.tar.gz"; + sha256 = "0d0i7av8v369hzvlynwlrbickv1brlzsmiky80lrjgjh1gdldkz6"; + }; - src = fetchurl { - url = "https://www.freedesktop.org/software/media-player-info/${name}.tar.gz"; - sha256 = "0d0i7av8v369hzvlynwlrbickv1brlzsmiky80lrjgjh1gdldkz6"; - }; + buildInputs = [ udev systemd ]; + nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = [ udev systemd ]; - nativeBuildInputs = [ pkg-config python3 ]; + postPatch = '' + patchShebangs ./tools + ''; - postPatch = '' - patchShebangs ./tools - ''; + configureFlags = [ "--with-udevdir=${placeholder "out"}/lib/udev" ]; - configureFlags = [ "--with-udevdir=${placeholder "out"}/lib/udev" ]; - - meta = with lib; { - description = "A repository of data files describing media player capabilities"; - homepage = "https://www.freedesktop.org/wiki/Software/media-player-info/"; - license = licenses.bsd3; - maintainers = with maintainers; [ ttuegel ]; - platforms = with platforms; linux; - }; - } + meta = with lib; { + description = "A repository of data files describing media player capabilities"; + homepage = "https://www.freedesktop.org/wiki/Software/media-player-info/"; + license = licenses.bsd3; + maintainers = with maintainers; [ ttuegel ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 1a6cba44ef875..41004243a5571 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 = "2022c"; + version = "2022d"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - hash = "sha256-aXT040i/IyMnS1bf+edQAkfjFZ6qS0hd+gzWbnXBS/4="; + hash = "sha256-bs2+4n+kPc+knz1P2Lsd/vVMkNoavNgsmrzy3E8yHeA="; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - hash = "sha256-Pnzh82IMwEgZB8fgdNaZEHkyhb/+DKMx7xptGuPqkMw="; + hash = "sha256-1kS6D5OImTdOqMtVTjX7SvoPe9e3FsYXd80AUAuHWeA="; }) ]; |