diff options
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/misc/shared-desktop-ontologies/default.nix | 9 | ||||
-rw-r--r-- | pkgs/data/misc/tzdata/default.nix | 7 | ||||
-rw-r--r-- | pkgs/data/themes/kde2/default.nix | 1 | ||||
-rw-r--r-- | pkgs/data/themes/qtcurve/default.nix | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 7e628567b6ea5..d3dfadeb5b361 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "shared-desktop-ontologies-0.11.0"; - + src = fetchurl { url = "mirror://sourceforge/oscaf/${name}.tar.bz2"; sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2"; }; - - buildInputs = [ cmake ]; - + + nativeBuildInputs = [ cmake ]; + meta = with stdenv.lib; { homepage = "http://oscaf.sourceforge.net/"; description = "Ontologies necessary for the Nepomuk semantic desktop"; @@ -23,4 +23,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sander ]; }; } - diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 5065e3718cb26..fa7100501adf7 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 = "2020c"; + version = "2020f"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q"; + sha256 = "10b8cr55x6ji14n3kqkn3avj1s9b79b8gszh81fxrrisij8k248j"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs"; + sha256 = "1i998crd9fxdfhv4jd241j1arx0ng7j7cvczpmj4y5j5fwmfmvng"; }) ]; @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.iana.org/time-zones"; description = "Database of current and historical time zones"; + changelog = "https://github.com/eggert/tz/blob/${version}/NEWS"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix index 7e33d371ebeb7..04986b7dcc5b4 100644 --- a/pkgs/data/themes/kde2/default.nix +++ b/pkgs/data/themes/kde2/default.nix @@ -15,7 +15,6 @@ mkDerivation rec { }; outputs = [ "out" "dev" ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index cd5cb4170b8cc..a65a24dc0b675 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -17,8 +17,6 @@ mkDerivation rec { sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo="; }; - enableParallelBuilding = true; - patches = [ # Remove unnecessary constexpr, this is not allowed in C++14 (fetchpatch { |