ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging

Browse Source
This commit is contained in:
Graham Christensen 2017-12-12 20:06:36 -05:00
commit 105d9519c1
No known key found for this signature in database
GPG Key ID: ACA1C1D120C83D5C
45 changed files with 814 additions and 657 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -205,6 +205,7 @@
elijahcaine = "Elijah Caine <elijahcainemv@gmail.com>"; elijahcaine = "Elijah Caine <elijahcainemv@gmail.com>";
elitak = "Eric Litak <elitak@gmail.com>"; elitak = "Eric Litak <elitak@gmail.com>";
ellis = "Ellis Whitehead <nixos@ellisw.net>"; ellis = "Ellis Whitehead <nixos@ellisw.net>";
enzime = "Michael Hoang <enzime@users.noreply.github.com>";
eperuffo = "Emanuele Peruffo <info@emanueleperuffo.com>"; eperuffo = "Emanuele Peruffo <info@emanueleperuffo.com>";
epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>"; epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
eqyiel = "Ruben Maher <r@rkm.id.au>"; eqyiel = "Ruben Maher <r@rkm.id.au>";

19
nixos/modules/installer/netboot/netboot.nix
View File

@ -18,17 +18,17 @@ with lib;
}; };
config = { config = rec {
boot.loader.grub.version = 2;
# Don't build the GRUB menu builder script, since we don't need it # Don't build the GRUB menu builder script, since we don't need it
# here and it causes a cyclic dependency. # here and it causes a cyclic dependency.
boot.loader.grub.enable = false; boot.loader.grub.enable = false;
# !!! Hack - attributes expected by other modules. # !!! Hack - attributes expected by other modules.
system.boot.loader.kernelFile = "bzImage"; environment.systemPackages = [ pkgs.grub2_efi ]
environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; ++ (if pkgs.stdenv.system == "aarch64-linux"
then []
else [ pkgs.grub2 pkgs.syslinux ]);
system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget;
fileSystems."/" = fileSystems."/" =
{ fsType = "tmpfs"; { fsType = "tmpfs";
@ -84,7 +84,12 @@ with lib;
]; ];
}; };
system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" "#!ipxe\nkernel bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}\ninitrd initrd\nboot"; system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" ''
#!ipxe
kernel ${pkgs.stdenv.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
initrd initrd
boot
'';
boot.loader.timeout = 10; boot.loader.timeout = 10;

49
nixos/release.nix
View File

@ -1,6 +1,6 @@
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false , stableBranch ? false
, supportedSystems ? [ "x86_64-linux" ] , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
}: }:
with import ../lib; with import ../lib;
@ -89,6 +89,27 @@ let
}); });
}).config)); }).config));
makeNetboot = config:
let
config_evaled = import lib/eval-config.nix config;
build = config_evaled.config.system.build;
kernelTarget = config_evaled.pkgs.stdenv.platform.kernelTarget;
in
pkgs.symlinkJoin {
name="netboot";
paths=[
build.netbootRamdisk
build.kernel
build.netbootIpxeScript
];
postBuild = ''
mkdir -p $out/nix-support
echo "file ${kernelTarget} $out/${kernelTarget}" >> $out/nix-support/hydra-build-products
echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products
echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products
'';
};
in rec { in rec {
@ -103,28 +124,22 @@ in rec {
# Build the initial ramdisk so Hydra can keep track of its size over time. # Build the initial ramdisk so Hydra can keep track of its size over time.
initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk); initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);
netboot.x86_64-linux = let build = (import lib/eval-config.nix { netboot = {
x86_64-linux = makeNetboot {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./modules/installer/netboot/netboot-minimal.nix ./modules/installer/netboot/netboot-minimal.nix
versionModule versionModule
]; ];
}).config.system.build;
in
pkgs.symlinkJoin {
name="netboot";
paths=[
build.netbootRamdisk
build.kernel
build.netbootIpxeScript
];
postBuild = ''
mkdir -p $out/nix-support
echo "file bzImage $out/bzImage" >> $out/nix-support/hydra-build-products
echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products
echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products
'';
}; };
} // (optionalAttrs (elem "aarch64-linux" supportedSystems) {
aarch64-linux = makeNetboot {
system = "aarch64-linux";
modules = [
./modules/installer/netboot/netboot-minimal.nix
versionModule
];
};});
iso_minimal = forAllSystems (system: makeIso { iso_minimal = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;

4
pkgs/applications/gis/qgis/default.nix
View File

@ -5,7 +5,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qgis-2.18.14"; name = "qgis-2.18.15";
buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://qgis.org/downloads/${name}.tar.bz2"; url = "http://qgis.org/downloads/${name}.tar.bz2";
sha256 = "199nc539kd8fxbfny61s4sv8bvrhlxw59dmvw6m70gnff6mpc8fq"; sha256 = "1jpprkk91s2wwx0iiqlnsngxnn52zs32bad799fjai58nrsh8b7b";
}; };
cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";

2
pkgs/applications/graphics/unigine-valley/default.nix
View File

@ -22,7 +22,7 @@ let
else if stdenv.system == "i686-linux" then else if stdenv.system == "i686-linux" then
"x86" "x86"
else else
abort "Unsupported platform"; throw "Unsupported platform ${stdenv.system}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/applications/misc/googleearth/default.nix
View File

@ -6,7 +6,7 @@ let
arch = arch =
if stdenv.system == "x86_64-linux" then "amd64" if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "i686-linux" then "i386"
else abort "Unsupported architecture"; else throw "Unsupported system ${stdenv.system}";
sha256 = sha256 =
if arch == "amd64" if arch == "amd64"
then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6"

2
pkgs/applications/misc/playonlinux/default.nix
View File

@ -48,7 +48,7 @@ let
ld32 = ld32 =
if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
else abort "Unsupported platform for PlayOnLinux: ${stdenv.system}"; else throw "Unsupported platform for PlayOnLinux: ${stdenv.system}";
ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ]; libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ];

5
pkgs/applications/networking/bittorrentsync/generic.nix
View File

@ -4,8 +4,9 @@ let
arch = { arch = {
"x86_64-linux" = "x64"; "x86_64-linux" = "x64";
"i686-linux" = "i386"; "i686-linux" = "i386";
}.${stdenv.system}; }.${stdenv.system} or throwSystem;
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
throwSystem = throw "Unsupported system: ${stdenv.system}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
"https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz" "https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz"
"http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz" "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"
]; ];
sha256 = sha256s.${stdenv.system}; sha256 = sha256s.${stdenv.system} or throwSystem;
}; };
dontStrip = true; # Don't strip, otherwise patching the rpaths breaks dontStrip = true; # Don't strip, otherwise patching the rpaths breaks

2
pkgs/applications/networking/remote/teamviewer/default.nix
View File

@ -4,7 +4,7 @@ let
ld32 = ld32 =
if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
else abort "Unsupported architecture"; else throw "Unsupported system ${stdenv.system}";
ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);

2
pkgs/applications/networking/resilio-sync/default.nix
View File

@ -4,7 +4,7 @@ let
arch = { arch = {
"x86_64-linux" = "x64"; "x86_64-linux" = "x64";
"i686-linux" = "i386"; "i686-linux" = "i386";
}.${stdenv.system}; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

30
pkgs/applications/networking/syncplay/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, python2Packages }:
python2Packages.buildPythonApplication rec {
name = "syncplay-${version}";
version = "1.5.0";
format = "other";
src = fetchurl {
url = https://github.com/Syncplay/syncplay/archive/v1.5.0.tar.gz;
sha256 = "762e6318588e14aa02b1340baa18510e7de87771c62ca5b44d985b6d1289964d";
};
propagatedBuildInputs = with python2Packages; [ pyside twisted ];
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
postInstall = ''
mkdir -p $out/lib/python2.7/site-packages
mv $out/lib/syncplay/syncplay $out/lib/python2.7/site-packages/
'';
meta = with stdenv.lib; {
homepage = http://syncplay.pl/;
description = "Free software that synchronises media players";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ enzime ];
};
}

6
pkgs/build-support/rust/cargo-vendor.nix
View File

@ -8,13 +8,15 @@ let
x86_64-linux = "1hxlavcxy374yypfamlkygjg662lhll8j434qcvdawkvlidg5ii5"; x86_64-linux = "1hxlavcxy374yypfamlkygjg662lhll8j434qcvdawkvlidg5ii5";
x86_64-darwin = "1jkvhh710gwjnnjx59kaplx2ncfvkx9agfa76rr94sbjqq4igddm"; x86_64-darwin = "1jkvhh710gwjnnjx59kaplx2ncfvkx9agfa76rr94sbjqq4igddm";
}; };
hash = hashes. ${system} or (throw "missing bootstrap hash for platform ${system}"); hash = hashes. ${system} or badSystem;
badSystem = throw "missing bootstrap hash for platform ${system}";
platforms = { platforms = {
x86_64-linux = "x86_64-unknown-linux-musl"; x86_64-linux = "x86_64-unknown-linux-musl";
x86_64-darwin = "x86_64-apple-darwin"; x86_64-darwin = "x86_64-apple-darwin";
}; };
platform = platforms . ${system}; platform = platforms . ${system} or badSystem;
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "cargo-vendor-${version}"; name = "cargo-vendor-${version}";

71
pkgs/desktops/gnome-3/core/empathy/default.nix
View File

@ -4,55 +4,46 @@
, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts , clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control , gcr, libsecret, folks, libpulseaudio, telepathy_mission_control
, telepathy_logger, libnotify, clutter, libsoup, gnutls , telepathy_logger, libnotify, clutter, libsoup, gnutls
, evolution_data_server , evolution_data_server, yelp_xsl
, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info , libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: , bash, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee
, isocodes, enchant, libchamplain, geoclue2, geocode_glib, cheese, libgudev }:
# TODO: enable more features
let
majorVersion = "3.12";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "empathy-${majorVersion}.11"; inherit (import ./src.nix fetchurl) name src;
src = fetchurl { propagatedUserEnvPkgs = [
url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz"; gnome_online_accounts shared_mime_info
sha256 = "11yl8msyf017197fm6h15yw159yjp9i08566l967yashbx7gzr6i"; ];
}; propagatedBuildInputs = [
folks telepathy_logger evolution_data_server telepathy_mission_control
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
gnome_online_accounts shared_mime_info ]; nativeBuildInputs = [
propagatedBuildInputs = [ folks telepathy_logger evolution_data_server pkgconfig libtool intltool itstool file wrapGAppsHook
telepathy_mission_control ]; libxml2 libxslt yelp_xsl
nativeBuildInputs = [ pkgconfig ]; ];
buildInputs = [ gtk3 glib webkitgtk intltool itstool buildInputs = [
libxml2 libxslt icu file makeWrapper gtk3 glib webkitgtk icu gnome_online_accounts
telepathy_glib clutter_gtk clutter-gst cogl telepathy_glib clutter_gtk clutter-gst cogl
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gstreamer gst_all_1.gst-plugins-base
gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf gcr libsecret libpulseaudio gdk_pixbuf
libnotify clutter libsoup gnutls libgee p11_kit libnotify clutter libsoup gnutls libgee p11_kit
libcanberra_gtk3 telepathy_farstream farstream libcanberra_gtk3 telepathy_farstream farstream
gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
file libtool librsvg ]; librsvg
# Spell-checking
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" enchant isocodes
"-I${dbus_libs.dev}/include/dbus-1.0" # Display maps, location awareness, geocode support
"-I${dbus_libs.dev}/lib/dbus-1.0/include" ]; libchamplain geoclue2 geocode_glib
# Cheese webcam support, camera monitoring
preFixup = '' cheese libgudev
for f in $out/bin/* $out/libexec/*; do ];
wrapProgram $f \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Empathy; homepage = https://wiki.gnome.org/Apps/Empathy;
description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
# TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; license = [ licenses.gpl2 ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

10
pkgs/desktops/gnome-3/core/empathy/src.nix Normal file
View File

@ -0,0 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "empathy-3.12.14";
src = fetchurl {
url = mirror://gnome/sources/empathy/3.12/empathy-3.12.14.tar.xz;
sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3";
};
}

5
pkgs/desktops/gnome-3/default.nix
View File

@ -74,10 +74,7 @@ let
dconf = callPackage ./core/dconf { }; dconf = callPackage ./core/dconf { };
dconf-editor = callPackage ./core/dconf-editor { }; dconf-editor = callPackage ./core/dconf-editor { };
# empathy = callPackage ./core/empathy { empathy = callPackage ./core/empathy { };
# webkitgtk = webkitgtk24x-gtk3;
# clutter-gst = pkgs.clutter-gst;
# };
epiphany = callPackage ./core/epiphany { }; epiphany = callPackage ./core/epiphany { };

2
pkgs/development/compilers/jetbrains-jdk/default.nix
View File

@ -16,7 +16,7 @@ let drv = stdenv.mkDerivation rec {
sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md"; sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md";
} }
else else
abort "unsupported system: ${stdenv.system}"; throw "unsupported system: ${stdenv.system}";
nativeBuildInputs = [ file ]; nativeBuildInputs = [ file ];

2
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -44,7 +44,7 @@ assert stdenv.system == "i686-linux"
assert swingSupport -> xorg != null; assert swingSupport -> xorg != null;
let let
abortArch = abort "jdk requires i686-linux, x86_64-linux, aarch64-linux or armv7l-linux"; abortArch = throw "Unsupported system: ${stdenv.system}";
/** /**
* The JRE libraries are in directories that depend on the CPU. * The JRE libraries are in directories that depend on the CPU.

6
pkgs/development/coq-modules/QuickChick/default.nix
View File

@ -15,9 +15,9 @@ let param =
}; };
"8.7" = { "8.7" = {
version = "20171102"; version = "20171212";
rev = "ddf746809c211fa7edfdbfe459d5a7e1cca47a44"; rev = "195e550a1cf0810497734356437a1720ebb6d744";
sha256 = "0jg3x0w8p088b8369qx492hjpq09f9h2i0li6ph3pny6hdkpdzsi"; sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1";
}; };
}."${coq.coq-version}" }."${coq.coq-version}"

2
pkgs/development/libraries/bootil/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
platform = platform =
if stdenv.isLinux then "linux" if stdenv.isLinux then "linux"
else if stdenv.isDarwin then "macosx" else if stdenv.isDarwin then "macosx"
else abort "unrecognized platform"; else throw "unrecognized system ${stdenv.system}";
buildInputs = [ premake4 ]; buildInputs = [ premake4 ];

2
pkgs/development/libraries/kde-frameworks/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.40/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/frameworks/5.41/ -A '*.tar.xz' )

608
pkgs/development/libraries/kde-frameworks/srcs.nix
View File

@ -3,611 +3,611 @@
{ {
attica = { attica = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/attica-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/attica-5.41.0.tar.xz";
sha256 = "1ng76yhljl1ny0wvb7yckiivwqn3llmhk0h4j82zag5965q906iz"; sha256 = "1l97qhf053z7grl8d77p9zajdvaw3zicllwna9p2vyzbb6n6qyq7";
name = "attica-5.40.0.tar.xz"; name = "attica-5.41.0.tar.xz";
}; };
}; };
baloo = { baloo = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/baloo-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/baloo-5.41.0.tar.xz";
sha256 = "09hqw8xl34galpiv6rwnq2rrbdp6z9nkx9j71jf87ia22sclz55a"; sha256 = "1kl4xs09r21bi11b5dzjkmc8igh5iv8nvq0gxd00n7qjghpxa399";
name = "baloo-5.40.0.tar.xz"; name = "baloo-5.41.0.tar.xz";
}; };
}; };
bluez-qt = { bluez-qt = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/bluez-qt-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/bluez-qt-5.41.0.tar.xz";
sha256 = "0js212bi7h09bcbd2lr7ic10fy3z09w3v0d0r5210p989qd42a5a"; sha256 = "08wlsmr12n3whqr65zm3l9hmzbaca2jkkhb1wwq5ilqm3gvxxz0n";
name = "bluez-qt-5.40.0.tar.xz"; name = "bluez-qt-5.41.0.tar.xz";
}; };
}; };
breeze-icons = { breeze-icons = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/breeze-icons-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/breeze-icons-5.41.0.tar.xz";
sha256 = "1gdpv6w9a6bhr0dgaldi9pj24a2qvz1ax4jya8i4ck7dl9cgkq96"; sha256 = "1k06ms48cnnwnlrh9wdabsms581jy70nz5narwg1zpzb6clf9p4w";
name = "breeze-icons-5.40.0.tar.xz"; name = "breeze-icons-5.41.0.tar.xz";
}; };
}; };
extra-cmake-modules = { extra-cmake-modules = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/extra-cmake-modules-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/extra-cmake-modules-5.41.0.tar.xz";
sha256 = "02k3dr4w12l9rdgl3l1v3d8zhaf51km4w3p1c3sy8x24r24qir43"; sha256 = "0rwz2rdyxr424z0mra29p8i6gf0b1402ifi94qrq7y4z1fa61bxs";
name = "extra-cmake-modules-5.40.0.tar.xz"; name = "extra-cmake-modules-5.41.0.tar.xz";
}; };
}; };
frameworkintegration = { frameworkintegration = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/frameworkintegration-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/frameworkintegration-5.41.0.tar.xz";
sha256 = "1r480hx18irycaygbxbxsgf1qrk6cdj0ccfi4rqcygxkv52gcxxj"; sha256 = "1k67hkzc2jw5im7vc8j64fqsxz5m8fnlq696hm5dh4fbclyckh5s";
name = "frameworkintegration-5.40.0.tar.xz"; name = "frameworkintegration-5.41.0.tar.xz";
}; };
}; };
kactivities = { kactivities = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kactivities-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kactivities-5.41.0.tar.xz";
sha256 = "0c6dgmzs6l33kr4a7aivs8ijf6yw616pz5gmh7sdjw2ny4gxdzab"; sha256 = "1zxwmizq48kk6pd9y350gzszqi87wjbqni8z4mxa1kmw9lq01xlc";
name = "kactivities-5.40.0.tar.xz"; name = "kactivities-5.41.0.tar.xz";
}; };
}; };
kactivities-stats = { kactivities-stats = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kactivities-stats-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kactivities-stats-5.41.0.tar.xz";
sha256 = "0cdnq2nh3p7baxcag0f1sid5mrmmidfpsd77bb9s0xj11jvs95bx"; sha256 = "1nm34ln222x6mm4zpmvn8prqk9fr3jxyppn18kwlv0nfw16qmppq";
name = "kactivities-stats-5.40.0.tar.xz"; name = "kactivities-stats-5.41.0.tar.xz";
}; };
}; };
kapidox = { kapidox = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kapidox-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kapidox-5.41.0.tar.xz";
sha256 = "1wvnbmxjxmrm0z1digbfbf5ssf6klzdmzf5lbw7ilf5mkah1bdpy"; sha256 = "0jdphs536ymaj5f9gh5ycfgq1d41sas6bx4dzzjg13y26w6afyy6";
name = "kapidox-5.40.0.tar.xz"; name = "kapidox-5.41.0.tar.xz";
}; };
}; };
karchive = { karchive = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/karchive-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/karchive-5.41.0.tar.xz";
sha256 = "1cbvv6rdrnag2vjbrzdg59csmqi247d594xan7r319qb76ai860y"; sha256 = "0hd7jy9517m53ijvprl9ci97kjx7nd42ga33af71kqx5x030zi23";
name = "karchive-5.40.0.tar.xz"; name = "karchive-5.41.0.tar.xz";
}; };
}; };
kauth = { kauth = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kauth-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kauth-5.41.0.tar.xz";
sha256 = "072wjhvscyyh2q61knxm8ipqr9r01dzhqd8dihp6c5zmbbpz29ss"; sha256 = "1hkaf83p3xwcwkhlfbrdbg7b7nhw0gh0yw4lv8y3vpryn7pcd32l";
name = "kauth-5.40.0.tar.xz"; name = "kauth-5.41.0.tar.xz";
}; };
}; };
kbookmarks = { kbookmarks = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kbookmarks-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kbookmarks-5.41.0.tar.xz";
sha256 = "1i28pic968llggh24hn84kiq9nhdcv3pn4hbhb0lqb4chrmm322i"; sha256 = "173rf85msrp1awmf2zsxwv6jjfkz7yc2pbh4jq0hfcgnqk46s9v0";
name = "kbookmarks-5.40.0.tar.xz"; name = "kbookmarks-5.41.0.tar.xz";
}; };
}; };
kcmutils = { kcmutils = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kcmutils-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kcmutils-5.41.0.tar.xz";
sha256 = "1pjvjidv9nx8kg5wvkmxanp9y6ins9f43cn933q6g9gczy2hfcbl"; sha256 = "165b5hk0cv769kk9dqqggc6ji6gzln8zns5k6rv12rz825aysnhs";
name = "kcmutils-5.40.0.tar.xz"; name = "kcmutils-5.41.0.tar.xz";
}; };
}; };
kcodecs = { kcodecs = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kcodecs-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kcodecs-5.41.0.tar.xz";
sha256 = "0zq9d5006zhp0v31ydc7q0i117l6f8b04l5jgqcl719q1a2hk1x4"; sha256 = "0y96mbp9j083kwkqxk0qgrjyhylp8f7f0ngcqcvhh8s6sgpb8xq9";
name = "kcodecs-5.40.0.tar.xz"; name = "kcodecs-5.41.0.tar.xz";
}; };
}; };
kcompletion = { kcompletion = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kcompletion-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kcompletion-5.41.0.tar.xz";
sha256 = "17dzal655xdxdsifk2dmgyj2hja03pcvdqvzpsyq259qbm42cal4"; sha256 = "0b6bh5l4s5q8yi6vls11c8b8dpscykh138kydfi925nxkrms7yv3";
name = "kcompletion-5.40.0.tar.xz"; name = "kcompletion-5.41.0.tar.xz";
}; };
}; };
kconfig = { kconfig = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kconfig-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kconfig-5.41.0.tar.xz";
sha256 = "0pr9ammqgbz3gkg6iczp3v9s36cfzzh40kbz2bz29qaxa966b5kb"; sha256 = "1jch9bpqshigwvc2qs46qa0mclr1hdn0sqlkxbl4b2xb5xj28nzn";
name = "kconfig-5.40.0.tar.xz"; name = "kconfig-5.41.0.tar.xz";
}; };
}; };
kconfigwidgets = { kconfigwidgets = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kconfigwidgets-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kconfigwidgets-5.41.0.tar.xz";
sha256 = "0g5xm3fm3d6a63hbdq1xxiv539z15bhrs36ariq93flc4f912pbz"; sha256 = "1lbpjkhxmpah32ig1wlxkr1v1l3fqicnnvj6lhwpk0bxys8cdnd2";
name = "kconfigwidgets-5.40.0.tar.xz"; name = "kconfigwidgets-5.41.0.tar.xz";
}; };
}; };
kcoreaddons = { kcoreaddons = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kcoreaddons-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kcoreaddons-5.41.0.tar.xz";
sha256 = "0n4gvfayaiahvavrx1y3ass6anz30965zm81iczi2749hva9s415"; sha256 = "1f45x4adql708903x4g27x1wbzvbwd809ibiqa5kiijayaqkjxqf";
name = "kcoreaddons-5.40.0.tar.xz"; name = "kcoreaddons-5.41.0.tar.xz";
}; };
}; };
kcrash = { kcrash = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kcrash-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kcrash-5.41.0.tar.xz";
sha256 = "01h41zz3x0m5hc3zm2v0mifzc42akp5bwxwjzaaryl8pcg8v5lln"; sha256 = "1jp06hz33mpcy2y93w4j3yqcvkphigiwq6j89mvgi9h21pahpjvy";
name = "kcrash-5.40.0.tar.xz"; name = "kcrash-5.41.0.tar.xz";
}; };
}; };
kdbusaddons = { kdbusaddons = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kdbusaddons-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kdbusaddons-5.41.0.tar.xz";
sha256 = "09zbdy8lzhq6lvd9j9667r90k6p6a882bxans6am1yxx4y0jd9i4"; sha256 = "02d6zv43vpz5h8si100zlsf5yfgjajsgwldcxblckyjr0qn42xny";
name = "kdbusaddons-5.40.0.tar.xz"; name = "kdbusaddons-5.41.0.tar.xz";
}; };
}; };
kdeclarative = { kdeclarative = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kdeclarative-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kdeclarative-5.41.0.tar.xz";
sha256 = "10yp7g9awv4mdf5zl6ljxplfy50jzmixp45vdqcmcixiq72440d6"; sha256 = "1hxfrz4d7xjm63b9kawhf382gz1xykvdi9q4syhkjfbpyacxfjga";
name = "kdeclarative-5.40.0.tar.xz"; name = "kdeclarative-5.41.0.tar.xz";
}; };
}; };
kded = { kded = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kded-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kded-5.41.0.tar.xz";
sha256 = "0jf4xahsz86hiv50vs9yhwd2g410d5wjds8mdm5hi8085f7dcf84"; sha256 = "10wmj3nb8vn90h1j0s5kfr8iydk7k853gg9v6hxivm92v6zr6l9g";
name = "kded-5.40.0.tar.xz"; name = "kded-5.41.0.tar.xz";
}; };
}; };
kdelibs4support = { kdelibs4support = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/portingAids/kdelibs4support-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/portingAids/kdelibs4support-5.41.0.tar.xz";
sha256 = "1pwmi490hwnijpwjm80zdvbwanlslhnfh8nrlxmiham7ls551mzr"; sha256 = "1mkp3w8h8cyskbfxcwsl72v87376x66n20ig7b3b6ply36578br4";
name = "kdelibs4support-5.40.0.tar.xz"; name = "kdelibs4support-5.41.0.tar.xz";
}; };
}; };
kdesignerplugin = { kdesignerplugin = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kdesignerplugin-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kdesignerplugin-5.41.0.tar.xz";
sha256 = "00wl4d001ix0ql2hzp818cvhyyr52g06b7zz92qhcyi4x1cf2mqd"; sha256 = "1c1pnjgp9nifynwvsyjp7c45j40i111xnmjp89bb1jk9fv9g2f99";
name = "kdesignerplugin-5.40.0.tar.xz"; name = "kdesignerplugin-5.41.0.tar.xz";
}; };
}; };
kdesu = { kdesu = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kdesu-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kdesu-5.41.0.tar.xz";
sha256 = "13dv54c9cw6a2zcn7arrqnda08r3rw2q3nqagrrn013xd3dlrac7"; sha256 = "126m7by50zzkmk0r778xlkqfbfpihwd6d3wzd4hbqkh9km18l1rb";
name = "kdesu-5.40.0.tar.xz"; name = "kdesu-5.41.0.tar.xz";
}; };
}; };
kdewebkit = { kdewebkit = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kdewebkit-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kdewebkit-5.41.0.tar.xz";
sha256 = "1n7cn3yg8ianfk9ymd7hgf1yr2qcck5pg2mcp2bam0zfk4clbcgf"; sha256 = "1rnixlm37x5k4cdwckml2zdmm30k938nklkd7qnbaal230dzvj6d";
name = "kdewebkit-5.40.0.tar.xz"; name = "kdewebkit-5.41.0.tar.xz";
}; };
}; };
kdnssd = { kdnssd = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kdnssd-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kdnssd-5.41.0.tar.xz";
sha256 = "10la98wshran4my7s50w85ifvdibvbw3mb4007x8znz92x1ikdfj"; sha256 = "042dmh50rxvipb5pqz0csb3y7cvzc2ga2a5qcvd1vw84ii1mmjbh";
name = "kdnssd-5.40.0.tar.xz"; name = "kdnssd-5.41.0.tar.xz";
}; };
}; };
kdoctools = { kdoctools = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kdoctools-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kdoctools-5.41.0.tar.xz";
sha256 = "1zzgnqkysdvqc7dkb37gcmxfhwik0bkmd23c4y2av00ra6nzymim"; sha256 = "06v63br6m5nhvsdsynhb7i825yrry94s7zrk20k0xw4yahpvkjcs";
name = "kdoctools-5.40.0.tar.xz"; name = "kdoctools-5.41.0.tar.xz";
}; };
}; };
kemoticons = { kemoticons = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kemoticons-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kemoticons-5.41.0.tar.xz";
sha256 = "1jqifvqbj441jif79j5jqrpksyajarill01v625l30kvd584042c"; sha256 = "1lj6c6k8dh2rgj1128ms2xv7dk1v9li5rcy2djqfynqdrvg5iy3g";
name = "kemoticons-5.40.0.tar.xz"; name = "kemoticons-5.41.0.tar.xz";
}; };
}; };
kfilemetadata = { kfilemetadata = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kfilemetadata-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kfilemetadata-5.41.0.tar.xz";
sha256 = "1yivydc32y4q6kd1myv529lhcs66j0y388g7qv4zjz4plv6kyxvb"; sha256 = "0y9ya18bqa8sfi2c10y2q0dkwdry0wfq5s2sb53q0fh2fph7hjvi";
name = "kfilemetadata-5.40.0.tar.xz"; name = "kfilemetadata-5.41.0.tar.xz";
}; };
}; };
kglobalaccel = { kglobalaccel = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kglobalaccel-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kglobalaccel-5.41.0.tar.xz";
sha256 = "1qslksbln3yhhzal88b04zyi4iibffv687gbsm07i4f68pyp0sgn"; sha256 = "0i8aw0jbsh26asjmhs0lax1yv9qalpr82cd8m0nbyqn2s3f4jyaf";
name = "kglobalaccel-5.40.0.tar.xz"; name = "kglobalaccel-5.41.0.tar.xz";
}; };
}; };
kguiaddons = { kguiaddons = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kguiaddons-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kguiaddons-5.41.0.tar.xz";
sha256 = "02hln4pafph1zny4jnmblydc4wnx66pjj4g6dqxafz6hpvdmncp1"; sha256 = "0cva0qy946srqay9nmh97mjv7kf2lr51nipx9qx2jd21d8cvz8p1";
name = "kguiaddons-5.40.0.tar.xz"; name = "kguiaddons-5.41.0.tar.xz";
}; };
}; };
khtml = { khtml = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/portingAids/khtml-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/portingAids/khtml-5.41.0.tar.xz";
sha256 = "0v73ia4dgpx5d7h3lpl54cy7p3qavgahj5h2x5vah7fb2gysy7z0"; sha256 = "0gbs63d7izb8kaf4k8ssp2lkcps9fqk32czjpmzx3fq1gnaczry3";
name = "khtml-5.40.0.tar.xz"; name = "khtml-5.41.0.tar.xz";
}; };
}; };
ki18n = { ki18n = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/ki18n-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/ki18n-5.41.0.tar.xz";
sha256 = "1nv89yi0f2wnb3lc929zfl6bjwznm2q3p449rp3yzp43lx00sym9"; sha256 = "12ylqsi7lsxvdcg9a1p9hkd6lpcj971k77zly6vpb4yb3s6z0jqd";
name = "ki18n-5.40.0.tar.xz"; name = "ki18n-5.41.0.tar.xz";
}; };
}; };
kiconthemes = { kiconthemes = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kiconthemes-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kiconthemes-5.41.0.tar.xz";
sha256 = "0i6yjx5fvpbh4hd15wbm69v2qqgxbyfhn1cqp7w7ghgb262b90vx"; sha256 = "1ywg7b3vy3p7vmd055a72hmpnwp0l0yvf6cnb6nvmpnp3pm737g1";
name = "kiconthemes-5.40.0.tar.xz"; name = "kiconthemes-5.41.0.tar.xz";
}; };
}; };
kidletime = { kidletime = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kidletime-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kidletime-5.41.0.tar.xz";
sha256 = "0q6s73vpasfvzxis5br01k2xl8hnxymq8i1k8l60i8b1v46abr99"; sha256 = "0k4q8ssqfbgfqvjq1rpills16nz4fi92mc754644by3s0czh409w";
name = "kidletime-5.40.0.tar.xz"; name = "kidletime-5.41.0.tar.xz";
}; };
}; };
kimageformats = { kimageformats = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kimageformats-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kimageformats-5.41.0.tar.xz";
sha256 = "1ld47qkb26gzwvr6bmqa16p4rwf3avi4fm15rpmmxjlbc9pm9n51"; sha256 = "11df264s3n192pggdmql2pklnflc8fn9v8zrjpn38f99hs46bq8s";
name = "kimageformats-5.40.0.tar.xz"; name = "kimageformats-5.41.0.tar.xz";
}; };
}; };
kinit = { kinit = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kinit-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kinit-5.41.0.tar.xz";
sha256 = "1296dr1iln5g55j75fb1l5b8c1lj32lsccb82qvpaf57h22fp5ya"; sha256 = "05jqsnj33gwxp4lc81378kb58idnmcmn84smy3hkqwlakisnwgy9";
name = "kinit-5.40.0.tar.xz"; name = "kinit-5.41.0.tar.xz";
}; };
}; };
kio = { kio = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kio-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kio-5.41.0.tar.xz";
sha256 = "16rqmh0mdncyyq2vidfpyml94n7vmz7rx71v53salpwr3cihpsih"; sha256 = "17k4pfbhkv1inx5c3wqm388c02cdf3wnqgnhky271v7gb5ww5i4h";
name = "kio-5.40.0.tar.xz"; name = "kio-5.41.0.tar.xz";
}; };
}; };
kirigami2 = { kirigami2 = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kirigami2-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kirigami2-5.41.0.tar.xz";
sha256 = "0a22cwxfrkp0hd5isisaz9bnx2sjixi2cm9l35yvbzdnlmm6qjrb"; sha256 = "04l7b86fs7s80dfrznc2c0zh6phpgirwsinykrzfqg792gmbvx2h";
name = "kirigami2-5.40.0.tar.xz"; name = "kirigami2-5.41.0.tar.xz";
}; };
}; };
kitemmodels = { kitemmodels = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kitemmodels-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kitemmodels-5.41.0.tar.xz";
sha256 = "0ij5q0g0cq793znslb7sz6qcrmcdlcx706an8ciznidlwayh9fx9"; sha256 = "13kngcj8ifnhbp0jsrjwhw49my8pnw493g11y11cw17hw7sqg55k";
name = "kitemmodels-5.40.0.tar.xz"; name = "kitemmodels-5.41.0.tar.xz";
}; };
}; };
kitemviews = { kitemviews = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kitemviews-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kitemviews-5.41.0.tar.xz";
sha256 = "0347nx4n5sr0dz2zjzdp7s1ca5gnmcr9d881raj50knsgcwgb3m3"; sha256 = "0147pm5p03w1b71mrr5rssmh2n80q54ghfpbjpq3spjdkjg1f26f";
name = "kitemviews-5.40.0.tar.xz"; name = "kitemviews-5.41.0.tar.xz";
}; };
}; };
kjobwidgets = { kjobwidgets = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kjobwidgets-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kjobwidgets-5.41.0.tar.xz";
sha256 = "0m2bfa397mzifgxvpw8hpks95yx5krak0285qk14innr21n62qnk"; sha256 = "1fbdk6l8rbnyqn0cz2dm9cagn7x89zpy3wczj1cdvnc7k7wg75qv";
name = "kjobwidgets-5.40.0.tar.xz"; name = "kjobwidgets-5.41.0.tar.xz";
}; };
}; };
kjs = { kjs = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/portingAids/kjs-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/portingAids/kjs-5.41.0.tar.xz";
sha256 = "0nkddm9zjjnsmky71112n8ik6f0am52dmhlarcym2i08zy05chdm"; sha256 = "1a263cng8i304yh66iq45hwpgnl8ng6wvjrsl11hhqmyv07h2kk0";
name = "kjs-5.40.0.tar.xz"; name = "kjs-5.41.0.tar.xz";
}; };
}; };
kjsembed = { kjsembed = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/portingAids/kjsembed-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/portingAids/kjsembed-5.41.0.tar.xz";
sha256 = "0fc3454almq5llhwmkhrwpcl2m1nfjyyhvpnmm879yhrbjf7vnid"; sha256 = "1vxbh5rd9rdj3m7sag48c4cns443j479mlfbwxgnpm92z67ka7x7";
name = "kjsembed-5.40.0.tar.xz"; name = "kjsembed-5.41.0.tar.xz";
}; };
}; };
kmediaplayer = { kmediaplayer = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/portingAids/kmediaplayer-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/portingAids/kmediaplayer-5.41.0.tar.xz";
sha256 = "13pykc6zvcv6p0k6m9cqf1fx93jb39ilgn1zlvkws7s1jq4ifkpl"; sha256 = "03420i82p984w6iqdiam2xam7b9khh76pll4ffn0c5k4wf1ba2z4";
name = "kmediaplayer-5.40.0.tar.xz"; name = "kmediaplayer-5.41.0.tar.xz";
}; };
}; };
knewstuff = { knewstuff = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/knewstuff-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/knewstuff-5.41.0.tar.xz";
sha256 = "0i4ybzx165js2pl85k8si1waywn4yp47gj16szdx7snlrzvhmq3i"; sha256 = "0j9qgswiacv7yj8c28q343falaglh5zc4wwcflwy1zvrp59bjcz4";
name = "knewstuff-5.40.0.tar.xz"; name = "knewstuff-5.41.0.tar.xz";
}; };
}; };
knotifications = { knotifications = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/knotifications-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/knotifications-5.41.0.tar.xz";
sha256 = "013r52a6wl9ayp42mvzrq7s8r5mx73bk1j56zxk3yz45xv6gsm0v"; sha256 = "1dsiigmzmhmg3x6y5nf2i9zq3hc4nca2gg2dvl0bz1lm438ddy84";
name = "knotifications-5.40.0.tar.xz"; name = "knotifications-5.41.0.tar.xz";
}; };
}; };
knotifyconfig = { knotifyconfig = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/knotifyconfig-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/knotifyconfig-5.41.0.tar.xz";
sha256 = "1c89k1qnbqyq7d9dsccd9645cq7n6vfyn10sh9f7zraqybi75k3k"; sha256 = "0hrdjh76php34wkcswnh5rfnkajf0g9n8mpqsdj4djxja39vi6vs";
name = "knotifyconfig-5.40.0.tar.xz"; name = "knotifyconfig-5.41.0.tar.xz";
}; };
}; };
kpackage = { kpackage = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kpackage-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kpackage-5.41.0.tar.xz";
sha256 = "17hhj8x5r3cpb6cx32f1chg6mklxvcwgmw16c3h2sh4p6bgmibmq"; sha256 = "1663sshy52my9qbrj8ny1a6sipl94l2paxss4k5977fyyax15zdm";
name = "kpackage-5.40.0.tar.xz"; name = "kpackage-5.41.0.tar.xz";
}; };
}; };
kparts = { kparts = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kparts-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kparts-5.41.0.tar.xz";
sha256 = "1vvmgsqwgics6q86c413wx2yk9mgwvj4wm3fk6my0pi3l166djrl"; sha256 = "09ddh7n8jj8zisdm90lbmc4xk4axsibhx1cjbpaigzcfcvnj1b71";
name = "kparts-5.40.0.tar.xz"; name = "kparts-5.41.0.tar.xz";
}; };
}; };
kpeople = { kpeople = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kpeople-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kpeople-5.41.0.tar.xz";
sha256 = "1yfs0k3pwcgkzyf0x568jmmjb5gb757c7qdwmz7g0s3gdnhm1mbr"; sha256 = "1k72br66mnvkripzdq2wcchlrg6p7mxfqa0rbq0rq3q7npw1zzw5";
name = "kpeople-5.40.0.tar.xz"; name = "kpeople-5.41.0.tar.xz";
}; };
}; };
kplotting = { kplotting = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kplotting-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kplotting-5.41.0.tar.xz";
sha256 = "1hnnvxvz74s7ir5bgqrvd0iv6fl7d18rqi6yjxy5j8b0f8bgrp7i"; sha256 = "197n2m3q9b588j56m30i12z55nbymbj4wgpgrkbsci7162jjjj1z";
name = "kplotting-5.40.0.tar.xz"; name = "kplotting-5.41.0.tar.xz";
}; };
}; };
kpty = { kpty = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kpty-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kpty-5.41.0.tar.xz";
sha256 = "1r5lddjhr6g3gzwfmcs7mkc585mz4j6ngnn2m5mlgz2cf8bgf277"; sha256 = "04xg5pn65nvk1bdh6bfznbsmlra6gzph72i7m28h9idnz143lr12";
name = "kpty-5.40.0.tar.xz"; name = "kpty-5.41.0.tar.xz";
}; };
}; };
kross = { kross = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/portingAids/kross-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/portingAids/kross-5.41.0.tar.xz";
sha256 = "1y89sksha028rxdf534kc3ljnccm2zy111lfnb36vq22wzi7198p"; sha256 = "0xsfgwb3ihgby6r6wycxnqkd9d7zrj6w3h9bxw8n4asjfri7lgwi";
name = "kross-5.40.0.tar.xz"; name = "kross-5.41.0.tar.xz";
}; };
}; };
krunner = { krunner = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/krunner-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/krunner-5.41.0.tar.xz";
sha256 = "19g02k7g2i92fv68gssyqrc1gwlhh924glmzhswp52rkwz4rqf2c"; sha256 = "0vyxijs0vnpa19z7avd1438q1c7s4ka17hbsdq2r0jza3iwkfx83";
name = "krunner-5.40.0.tar.xz"; name = "krunner-5.41.0.tar.xz";
}; };
}; };
kservice = { kservice = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kservice-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kservice-5.41.0.tar.xz";
sha256 = "0dpd7zpw6x4iqb27a13aazbk9rgbngrdkxz76pq4x32ynzrzzhzc"; sha256 = "0k3ch3vbdy9rm82d9n6mf6ir3qm7l2fddp98jy4jmsr0qynqn50q";
name = "kservice-5.40.0.tar.xz"; name = "kservice-5.41.0.tar.xz";
}; };
}; };
ktexteditor = { ktexteditor = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/ktexteditor-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/ktexteditor-5.41.0.tar.xz";
sha256 = "0xlhxgsj1cyvxrhj4d0ydcns1p18x51igh9bda66rp5p3wx8xm5n"; sha256 = "1idvldchfbnvimvcrizigmmam62q7rpam06xprcizywyxq53yw7z";
name = "ktexteditor-5.40.0.tar.xz"; name = "ktexteditor-5.41.0.tar.xz";
}; };
}; };
ktextwidgets = { ktextwidgets = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/ktextwidgets-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/ktextwidgets-5.41.0.tar.xz";
sha256 = "0dm2nka8vyazz10hi55d1imi49ip2lfns1dimwnwbi15j3a14m6r"; sha256 = "0m6n4v0njvcaky87f0ga47iwq12hsvghadj8pngjrksankvaj23n";
name = "ktextwidgets-5.40.0.tar.xz"; name = "ktextwidgets-5.41.0.tar.xz";
}; };
}; };
kunitconversion = { kunitconversion = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kunitconversion-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kunitconversion-5.41.0.tar.xz";
sha256 = "1qp0jcds7khbdxbi025ngz62xbw0k35psy204yz95wrmg302hvnw"; sha256 = "1kn6lw58b9w6f38mra2hizbnik64ka3gvgqk1xqp0mspqmr498rw";
name = "kunitconversion-5.40.0.tar.xz"; name = "kunitconversion-5.41.0.tar.xz";
}; };
}; };
kwallet = { kwallet = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kwallet-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kwallet-5.41.0.tar.xz";
sha256 = "0lyx3vdql9n2bwr37wjk6l0k9n2si16gx74vmn1f4r7vqyhij8nd"; sha256 = "1gdzfp3gbr5qp821pkhaj6v8zg3q21xz6j11frjww8fn5nmp3v3l";
name = "kwallet-5.40.0.tar.xz"; name = "kwallet-5.41.0.tar.xz";
}; };
}; };
kwayland = { kwayland = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kwayland-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kwayland-5.41.0.tar.xz";
sha256 = "00x4df45d80p1nvb0pjbg4y2vmcsghy9hnsr6mwyrhbkdrqdwkid"; sha256 = "1dw2g6wwj7hhxlgzrjqk39ywpzh6ijwfjnzqjp6s8s5274fvjqbn";
name = "kwayland-5.40.0.tar.xz"; name = "kwayland-5.41.0.tar.xz";
}; };
}; };
kwidgetsaddons = { kwidgetsaddons = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kwidgetsaddons-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kwidgetsaddons-5.41.0.tar.xz";
sha256 = "16h65q1ibmwc5rmwf9jixxrawcd3jvrb5z4z2pcmh8242n1hyhk8"; sha256 = "15fm7gni22wb64pski3fn5myrn9z22h077hzzcc34c3af21yh5s5";
name = "kwidgetsaddons-5.40.0.tar.xz"; name = "kwidgetsaddons-5.41.0.tar.xz";
}; };
}; };
kwindowsystem = { kwindowsystem = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kwindowsystem-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kwindowsystem-5.41.0.tar.xz";
sha256 = "0cw062m9phy7z5yg75yg7qwg2lpz8270mwbmmwcbw9bl6qqkbwzz"; sha256 = "0x4jz9qkvxs5dlzk860f8vhlczgxg6di614y8ji6afra760nk17l";
name = "kwindowsystem-5.40.0.tar.xz"; name = "kwindowsystem-5.41.0.tar.xz";
}; };
}; };
kxmlgui = { kxmlgui = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kxmlgui-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kxmlgui-5.41.0.tar.xz";
sha256 = "07a7h9l0qwsnlwkh7pf50wmq21939mwynplm2zzzv3hkhfj89v6v"; sha256 = "0cgwx3lhnn982gvl2yv5272bs3il05ssfpjlkgmqgnrnz2qxlhlr";
name = "kxmlgui-5.40.0.tar.xz"; name = "kxmlgui-5.41.0.tar.xz";
}; };
}; };
kxmlrpcclient = { kxmlrpcclient = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/kxmlrpcclient-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/kxmlrpcclient-5.41.0.tar.xz";
sha256 = "01zbgnqf2sfjgmx8nn6ljzpvqjg777j2yh2jm55rc4yh15qvvn0l"; sha256 = "0y7n6xk18a6zci36ka426h7ar8r7kkr80jn47mc6jw3qdk4nvri7";
name = "kxmlrpcclient-5.40.0.tar.xz"; name = "kxmlrpcclient-5.41.0.tar.xz";
}; };
}; };
modemmanager-qt = { modemmanager-qt = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/modemmanager-qt-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/modemmanager-qt-5.41.0.tar.xz";
sha256 = "0i0jpcy4c8zak9vv5jzcp4m78vk8mcv27dqi464jh9vaz9z7znfj"; sha256 = "1bp9mllzgvqr3dsjg9a81yv487whf26vfxiyim8hr42b9j8v8wj0";
name = "modemmanager-qt-5.40.0.tar.xz"; name = "modemmanager-qt-5.41.0.tar.xz";
}; };
}; };
networkmanager-qt = { networkmanager-qt = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/networkmanager-qt-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/networkmanager-qt-5.41.0.tar.xz";
sha256 = "178rm4c3304fn2h1jbfvf9zji8kkvnzkmnpnk0nkjh9dyqa80jvp"; sha256 = "0vdrbfwamk5p6mm0i05bxvmrlqxm9c5d373pn7qrm0kzs916xhlv";
name = "networkmanager-qt-5.40.0.tar.xz"; name = "networkmanager-qt-5.41.0.tar.xz";
}; };
}; };
oxygen-icons5 = { oxygen-icons5 = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/oxygen-icons5-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/oxygen-icons5-5.41.0.tar.xz";
sha256 = "057v69r3rvrw2qjqmb93k0m29ssgifb4sgm8xbfqx17b5iqms9f3"; sha256 = "1zpcjfzw4pv73ms8pc1w4fpvxcbpasl2av0g4y6sj7rshzdgrj31";
name = "oxygen-icons5-5.40.0.tar.xz"; name = "oxygen-icons5-5.41.0.tar.xz";
}; };
}; };
plasma-framework = { plasma-framework = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/plasma-framework-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/plasma-framework-5.41.0.tar.xz";
sha256 = "1mjgy3116pdzvmw43yqhrqz74nyw200yhnnynxk569krgymvalvg"; sha256 = "1risn810pyncfpn01xiqsb5j8pwsnmx60lfajnx7qygny6b69pl4";
name = "plasma-framework-5.40.0.tar.xz"; name = "plasma-framework-5.41.0.tar.xz";
}; };
}; };
prison = { prison = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/prison-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/prison-5.41.0.tar.xz";
sha256 = "18drqs6j1dx76224hlrp3xmk1hxq6q8638wpf5vmn6vqw8q304vw"; sha256 = "0q3r1a3047yxhsd3qfwzwsw261zrfdmsklnyq5d2ayflchcj5vxi";
name = "prison-5.40.0.tar.xz"; name = "prison-5.41.0.tar.xz";
}; };
}; };
qqc2-desktop-style = { qqc2-desktop-style = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/qqc2-desktop-style-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/qqc2-desktop-style-5.41.0.tar.xz";
sha256 = "0jpdnsq8yf58p4a7qsgvn3pp7ms7q1pgy4rwrlviyjdrlfc1pv49"; sha256 = "166cjfaly8fzzchq8pk2s7f5mm63cwmayw3qc0p7amy5d0nykm0w";
name = "qqc2-desktop-style-5.40.0.tar.xz"; name = "qqc2-desktop-style-5.41.0.tar.xz";
}; };
}; };
solid = { solid = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/solid-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/solid-5.41.0.tar.xz";
sha256 = "1kj2rs771hyrbbn8qykbrj5fvdv8g7niajbrf6mydbdvqc96zj8x"; sha256 = "0i2qxps26rg2x1576m35k4kj018i9jpsnlayzsk4fcj44kvsq9z3";
name = "solid-5.40.0.tar.xz"; name = "solid-5.41.0.tar.xz";
}; };
}; };
sonnet = { sonnet = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/sonnet-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/sonnet-5.41.0.tar.xz";
sha256 = "1a947kgnx5dp7lv63dwzzlxm331c6h0cycv1lcdfcskan1wsmwk8"; sha256 = "1jhpl0ajqlln88fmzbwjxn0illbas4s0hbzwd3w56s9wg8j18s76";
name = "sonnet-5.40.0.tar.xz"; name = "sonnet-5.41.0.tar.xz";
}; };
}; };
syntax-highlighting = { syntax-highlighting = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/syntax-highlighting-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/syntax-highlighting-5.41.0.tar.xz";
sha256 = "0xc06nd95q1mqw41pwrgh798jp9p994qylncabimxbcis39x138l"; sha256 = "0hmcb9f162hyvfb0mfkm69avgrbl146l7lyfzb93z1hk6f2gpxqc";
name = "syntax-highlighting-5.40.0.tar.xz"; name = "syntax-highlighting-5.41.0.tar.xz";
}; };
}; };
threadweaver = { threadweaver = {
version = "5.40.0"; version = "5.41.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.40/threadweaver-5.40.0.tar.xz"; url = "${mirror}/stable/frameworks/5.41/threadweaver-5.41.0.tar.xz";
sha256 = "0in3cp75n6nxlc38fr2pycfgh4k0azi70cnyzc8glyf3f2rw8d9g"; sha256 = "08nlskhdds13wplv4lwy4xshimkhl8jvzkz1h1qks6wggbwxf11m";
name = "threadweaver-5.40.0.tar.xz"; name = "threadweaver-5.41.0.tar.xz";
}; };
}; };
} }

4
pkgs/development/libraries/qt-5/5.9/default.nix
View File

@ -6,9 +6,9 @@ Before a major version update, make a copy of this directory. (We like to
keep the old version around for a short time after major updates.) Add a keep the old version around for a short time after major updates.) Add a
top-level attribute to `top-level/all-packages.nix`. top-level attribute to `top-level/all-packages.nix`.
1. Update the URL in `maintainers/scripts/generate-qt.sh`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run 2. From the top of the Nixpkgs tree, run
`./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
3. Update `qtCompatVersion` below if the minor version number changes. 3. Update `qtCompatVersion` below if the minor version number changes.
4. Check that the new packages build correctly. 4. Check that the new packages build correctly.
5. Commit the changes and open a pull request. 5. Commit the changes and open a pull request.

2
pkgs/development/libraries/qt-5/5.9/fetch.sh
View File

@ -1,2 +1,2 @@
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \ WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/ \
-A '*.tar.xz' ) -A '*.tar.xz' )

115
pkgs/development/libraries/qt-5/5.9/qtbase.patch
View File

@ -101,7 +101,7 @@ index bb5083c925..da8e2cb386 100644
# We are generating cmake files. Most developers of Qt are not aware of cmake, # We are generating cmake files. Most developers of Qt are not aware of cmake,
# so we require automatic tests to be available. The only module which should # so we require automatic tests to be available. The only module which should
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 17da8b979e..d648ab4058 100644 index 55c74aad66..0bbc8718eb 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
@ -261,10 +261,10 @@ index 17da8b979e..d648ab4058 100644
set_target_properties(Qt5::${Plugin} PROPERTIES set_target_properties(Qt5::${Plugin} PROPERTIES
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location} \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 395ac34001..a0e5c68b7e 100644 index e645ba5803..a0e5c68b7e 100644
--- a/mkspecs/features/mac/default_post.prf --- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf
@@ -24,165 +24,3 @@ qt { @@ -24,166 +24,3 @@ qt {
} }
} }
} }
@ -427,17 +427,18 @@ index 395ac34001..a0e5c68b7e 100644
-} -}
- -
-cache(QMAKE_XCODE_DEVELOPER_PATH, stash) -cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
-cache(QMAKE_XCODE_VERSION, stash) -!isEmpty(QMAKE_XCODE_VERSION): \
- cache(QMAKE_XCODE_VERSION, stash)
- -
-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
index e21e749ee9..3b01424e67 100644 index 44636f2288..61ed486a76 100644
--- a/mkspecs/features/mac/default_pre.prf --- a/mkspecs/features/mac/default_pre.prf
+++ b/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf
@@ -1,51 +1,2 @@ @@ -1,56 +1,3 @@
CONFIG = asset_catalogs rez $$CONFIG CONFIG = asset_catalogs rez $$CONFIG
load(default_pre) load(default_pre)
-
-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
- # Get path of Xcode's Developer directory - # Get path of Xcode's Developer directory
- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") - QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null")
@ -447,18 +448,23 @@ index e21e749ee9..3b01424e67 100644
- # Make sure Xcode path is valid - # Make sure Xcode path is valid
- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ - !exists($$QMAKE_XCODE_DEVELOPER_PATH): \
- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") - error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
-
- # Make sure Xcode is set up properly
- isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
-} -}
- -
-isEmpty(QMAKE_XCODE_VERSION) { -isEmpty(QMAKE_XCODEBUILD_PATH): \
- # Extract Xcode version using xcodebuild - QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null")
- xcode_version = $$system("/usr/bin/xcodebuild -version") -
- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -!isEmpty(QMAKE_XCODEBUILD_PATH) {
- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") - # Make sure Xcode is set up properly
- unset(xcode_version) - !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \
- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.")
-
- isEmpty(QMAKE_XCODE_VERSION) {
- # Extract Xcode version using xcodebuild
- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version")
- QMAKE_XCODE_VERSION = $$member(xcode_version, 1)
- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")
- unset(xcode_version)
- }
-} -}
- -
-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { -isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) {
@ -487,11 +493,11 @@ index e21e749ee9..3b01424e67 100644
-# at build time, depending on the current Xcode SDK and configuration. -# at build time, depending on the current Xcode SDK and configuration.
-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 68ab7e4053..e69de29bb2 100644 index 3f6dc076ca..8b13789179 100644
--- a/mkspecs/features/mac/sdk.prf --- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf
@@ -1,49 +0,0 @@ @@ -1,58 +1 @@
-
-isEmpty(QMAKE_MAC_SDK): \ -isEmpty(QMAKE_MAC_SDK): \
- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
- -
@ -500,13 +506,22 @@ index 68ab7e4053..e69de29bb2 100644
- -
-defineReplace(xcodeSDKInfo) { -defineReplace(xcodeSDKInfo) {
- info = $$1 - info = $$1
- equals(info, "Path"): \
- info = --show-sdk-path
- equals(info, "PlatformPath"): \
- info = --show-sdk-platform-path
- equals(info, "SDKVersion"): \
- info = --show-sdk-version
- sdk = $$2 - sdk = $$2
- isEmpty(sdk): \ - isEmpty(sdk): \
- sdk = $$QMAKE_MAC_SDK - sdk = $$QMAKE_MAC_SDK
- -
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { - isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null") - QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null")
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'") - # --show-sdk-platform-path won't work for Command Line Tools; this is fine
- # only used by the XCTest backend to testlib
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \
- error("Could not resolve SDK $$info for \'$$sdk\'")
- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) - cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
- } - }
- -
@ -581,10 +596,10 @@ index d49f4c49c1..097dcd7d39 100644
target.path = $$instbase/$$TARGETPATH target.path = $$instbase/$$TARGETPATH
INSTALLS += target INSTALLS += target
diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
index cb84ae0da8..45e16f4302 100644 index 883f8ca215..81db8eb2d4 100644
--- a/mkspecs/features/qt_app.prf --- a/mkspecs/features/qt_app.prf
+++ b/mkspecs/features/qt_app.prf +++ b/mkspecs/features/qt_app.prf
@@ -29,7 +29,7 @@ host_build:force_bootstrap { @@ -33,7 +33,7 @@ host_build:force_bootstrap {
target.path = $$[QT_HOST_BINS] target.path = $$[QT_HOST_BINS]
} else { } else {
!build_pass:qtConfig(debug_and_release): CONFIG += release !build_pass:qtConfig(debug_and_release): CONFIG += release
@ -607,7 +622,7 @@ index 1848f00e90..2af93675c5 100644
+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
} }
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index 1e138730b3..b7ba74dc3f 100644 index fb96d1b6a0..508ed17d30 100644
--- a/mkspecs/features/qt_common.prf --- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf
@@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) { @@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) {
@ -661,20 +676,32 @@ index 72dde61a40..f891a2baed 100644
INSTALLS += inst_qch_docs INSTALLS += inst_qch_docs
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
index 0a008374e5..5e7cd92f6f 100644 index 668669e4cd..30f7fbac41 100644
--- a/mkspecs/features/qt_example_installs.prf --- a/mkspecs/features/qt_example_installs.prf
+++ b/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf
@@ -73,7 +73,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) @@ -77,13 +77,13 @@ for(extra, extras): \
$$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ # Just for Qt Creator
$$DBUS_ADAPTORS $$DBUS_INTERFACES OTHER_FILES += $$sourcefiles
addInstallFiles(sources.files, $$sourcefiles)
- sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase
+ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase
INSTALLS += sources
check_examples { -sourcefiles += \
- $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \
- $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
- $$DBUS_ADAPTORS $$DBUS_INTERFACES
-addInstallFiles(sources.files, $$sourcefiles)
-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase
-INSTALLS += sources
+ sourcefiles += \
+ $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \
+ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
+ $$DBUS_ADAPTORS $$DBUS_INTERFACES
+ addInstallFiles(sources.files, $$sourcefiles)
+ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase
+ INSTALLS += sources
check_examples {
srcfiles = $$sources.files
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index c00fdb73f8..5789cd0c06 100644 index 1903e509c8..ae7b585989 100644
--- a/mkspecs/features/qt_functions.prf --- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf
@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@ -836,7 +863,7 @@ index 706304cf34..546420f6ad 100644
set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF !!ENDIF
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 39e7c71a9c..dced1f2811 100644 index cba279c184..5ae3fd62e5 100644
--- a/src/corelib/kernel/qcoreapplication.cpp --- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPaths() @@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPaths()
@ -856,7 +883,7 @@ index 39e7c71a9c..dced1f2811 100644
if (!libPathEnv.isEmpty()) { if (!libPathEnv.isEmpty()) {
QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp
index 1714c9802f..fd2ebb1336 100644 index 4fdc2e36ac..d3ec222543 100644
--- a/src/corelib/tools/qtimezoneprivate_tz.cpp --- a/src/corelib/tools/qtimezoneprivate_tz.cpp
+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp
@@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; @@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
@ -872,7 +899,7 @@ index 1714c9802f..fd2ebb1336 100644
if (!QFile::exists(path)) if (!QFile::exists(path))
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
@@ -643,12 +647,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) @@ -645,12 +649,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
if (!tzif.open(QIODevice::ReadOnly)) if (!tzif.open(QIODevice::ReadOnly))
return; return;
} else { } else {
@ -967,7 +994,7 @@ index 1da00813ce..0bf877afcb 100644
return false; return false;
} }
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
index cf08a15f96..2310488298 100644 index 9a24938284..74962b4ae2 100644
--- a/src/network/kernel/qhostinfo_unix.cpp --- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp
@@ -102,7 +102,7 @@ static bool resolveLibraryInternal() @@ -102,7 +102,7 @@ static bool resolveLibraryInternal()
@ -1024,7 +1051,7 @@ index 341d3bccf2..3368234c26 100644
scanThread->interfaceName = QString::fromNSString(ifName); scanThread->interfaceName = QString::fromNSString(ifName);
scanThread->start(); scanThread->start();
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index ca9f7af127..a337ad73bf 100644 index b5a0a5bbeb..6c20305f4d 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() @@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations()
@ -1042,7 +1069,7 @@ index ca9f7af127..a337ad73bf 100644
QString TableGenerator::findComposeFile() QString TableGenerator::findComposeFile()
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 59b76370ae..b91139ded9 100644 index 5cd4beb4f0..84919e6d6a 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm --- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -320,7 +320,7 @@ static void qt_closePopups() @@ -320,7 +320,7 @@ static void qt_closePopups()
@ -1055,7 +1082,7 @@ index 59b76370ae..b91139ded9 100644
#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
index 7640a711a9..ef9a14d38b 100644 index e2e573f0e1..1c8289f81e 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
@@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) @@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName)
@ -1074,11 +1101,11 @@ index 7640a711a9..ef9a14d38b 100644
#endif #endif
} }
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index d257ab1242..75853af4e4 100644 index 7c62c2e2b3..fefa40e0f6 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp --- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) @@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
#if defined(XCB_USE_XLIB) && QT_CONFIG(library) #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
static bool function_ptrs_not_initialized = true; static bool function_ptrs_not_initialized = true;
if (function_ptrs_not_initialized) { if (function_ptrs_not_initialized) {
- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); - QLibrary xcursorLib(QLatin1String("Xcursor"), 1);

312
pkgs/development/libraries/qt-5/5.9/srcs.nix
View File

@ -3,275 +3,275 @@
{ {
qt3d = { qt3d = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz";
sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg"; sha256 = "0gr7wvd3p8i2frj9nkfxffxapwqx6i4wh171ymvcsg2qy0r534lp";
name = "qt3d-opensource-src-5.9.1.tar.xz"; name = "qt3d-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtactiveqt = { qtactiveqt = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtactiveqt-opensource-src-5.9.3.tar.xz";
sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg"; sha256 = "16aka3y7a6mhs0yfm7vbq8v5gbh2ifmk4v2hl04iacindq9f5v2r";
name = "qtactiveqt-opensource-src-5.9.1.tar.xz"; name = "qtactiveqt-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtandroidextras = { qtandroidextras = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtandroidextras-opensource-src-5.9.3.tar.xz";
sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj"; sha256 = "0f653qmzvr3rjjgipjbcxvp5wq9fbaz1b4bvj7g868s2d9gpqp9n";
name = "qtandroidextras-opensource-src-5.9.1.tar.xz"; name = "qtandroidextras-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtbase = { qtbase = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz";
sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw"; sha256 = "10lrkarvs7dpx9rlj7sjcc0pzi42098x8nqnhmydr4bnbq048z4y";
name = "qtbase-opensource-src-5.9.1.tar.xz"; name = "qtbase-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtcanvas3d = { qtcanvas3d = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcanvas3d-opensource-src-5.9.3.tar.xz";
sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb"; sha256 = "1g0a606fgal4x17ly0qrj05pb0k8riwh7nj4g3jip05g8iwb2f2y";
name = "qtcanvas3d-opensource-src-5.9.1.tar.xz"; name = "qtcanvas3d-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtcharts = { qtcharts = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz";
sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k"; sha256 = "1sb99ncmh84bz0xzq55chgic7jk61awnfvi7ld4gq5ap3nl865zc";
name = "qtcharts-opensource-src-5.9.1.tar.xz"; name = "qtcharts-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtconnectivity = { qtconnectivity = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz";
sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0"; sha256 = "0j86rspn4xgwq1ddc1mpq1kq0ib2c0ag6rsn9ly2xs4iimp1x2g2";
name = "qtconnectivity-opensource-src-5.9.1.tar.xz"; name = "qtconnectivity-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtdatavis3d = { qtdatavis3d = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz";
sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13"; sha256 = "0s636ix44akrjx47gv9qj2ac02q8clnwj3acfr28p6pagm46k7vh";
name = "qtdatavis3d-opensource-src-5.9.1.tar.xz"; name = "qtdatavis3d-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtdeclarative = { qtdeclarative = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz";
sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj"; sha256 = "01wlk17zf47yzx7cc3cp617gj70yadllj2rsfk78879c0v96cpsh";
name = "qtdeclarative-opensource-src-5.9.1.tar.xz"; name = "qtdeclarative-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtdoc = { qtdoc = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdoc-opensource-src-5.9.3.tar.xz";
sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x"; sha256 = "0aki592arm3r08y9cq8863jp9zzkvgx7sc48426n30m6q9valsg5";
name = "qtdoc-opensource-src-5.9.1.tar.xz"; name = "qtdoc-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtgamepad = { qtgamepad = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgamepad-opensource-src-5.9.3.tar.xz";
sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi"; sha256 = "14vari5cq10a0z02559l2m1v78g7ygnyqf1ilkmy2f0kr36wm7y6";
name = "qtgamepad-opensource-src-5.9.1.tar.xz"; name = "qtgamepad-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtgraphicaleffects = { qtgraphicaleffects = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz";
sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz"; sha256 = "1nghl39sqsjamjn6pfmxmgga6z9vwzv2zbgc92amrfxxr2dh42vr";
name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; name = "qtgraphicaleffects-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtimageformats = { qtimageformats = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz";
sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr"; sha256 = "1p95wzm46j49c5br45g0pmlz3n3fl93j1ipzmnpmq9y2pbfhkcyl";
name = "qtimageformats-opensource-src-5.9.1.tar.xz"; name = "qtimageformats-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtlocation = { qtlocation = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz";
sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b"; sha256 = "1qacqz6l7zljqszblhgzg5y1v4mgki59k45ag7yc2iw7vrf45zc0";
name = "qtlocation-opensource-src-5.9.1.tar.xz"; name = "qtlocation-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtmacextras = { qtmacextras = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmacextras-opensource-src-5.9.3.tar.xz";
sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11"; sha256 = "0piv3q49vhpjxafdicizcw13am49h0ybfhb37vai0x1wbrlvhdiy";
name = "qtmacextras-opensource-src-5.9.1.tar.xz"; name = "qtmacextras-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtmultimedia = { qtmultimedia = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz";
sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4"; sha256 = "19iqh8xpspzlmpzh05bx5rchlslbfy2pp00xv52496yf9b95i5g7";
name = "qtmultimedia-opensource-src-5.9.1.tar.xz"; name = "qtmultimedia-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtnetworkauth = { qtnetworkauth = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz";
sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra"; sha256 = "0fdz5q47xbiij3mi5lzhvxpq4jp9fm929v9kyvcyadz86mp3f8nz";
name = "qtnetworkauth-opensource-src-5.9.1.tar.xz"; name = "qtnetworkauth-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtpurchasing = { qtpurchasing = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtpurchasing-opensource-src-5.9.3.tar.xz";
sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss"; sha256 = "00yfdd00frgf7fs9s0vyn1c6c4abxgld5rfgkzms3y6n6lcphs0j";
name = "qtpurchasing-opensource-src-5.9.1.tar.xz"; name = "qtpurchasing-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtquickcontrols = { qtquickcontrols = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz";
sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj"; sha256 = "09p2q3max4xrlw5svbhn11y9cgrvcjsj88xw4c0kq91cgnyyw3ih";
name = "qtquickcontrols-opensource-src-5.9.1.tar.xz"; name = "qtquickcontrols-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtquickcontrols2 = { qtquickcontrols2 = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz";
sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0"; sha256 = "0hq888qq8q7dglpyzif64pplqjxfrqjpkvbcx0ycq35darls5ai1";
name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz"; name = "qtquickcontrols2-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtremoteobjects = { qtremoteobjects = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtremoteobjects-opensource-src-5.9.3.tar.xz";
sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0"; sha256 = "0z6qd381r6a7gdrsknlkkbhq9mmdqi040kfrvgm6mfa69336f4dk";
name = "qtremoteobjects-opensource-src-5.9.1.tar.xz"; name = "qtremoteobjects-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtscript = { qtscript = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz";
sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp"; sha256 = "0rjm6nph1nssfpknp4i682bvk7363y4a2f74060vcm7ib2pzl2xq";
name = "qtscript-opensource-src-5.9.1.tar.xz"; name = "qtscript-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtscxml = { qtscxml = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz";
sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0"; sha256 = "06x8hs3p7bfgnl6b2fjld4s41acw1rbnxbcgkprgw2fxxnl1zxfq";
name = "qtscxml-opensource-src-5.9.1.tar.xz"; name = "qtscxml-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtsensors = { qtsensors = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz";
sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was"; sha256 = "1hfsih5iy4fi6mnpw2shf1lzx9hxcdc1arspad1mark17l5s4pmr";
name = "qtsensors-opensource-src-5.9.1.tar.xz"; name = "qtsensors-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtserialbus = { qtserialbus = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz";
sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa"; sha256 = "0f39qh05mp54frpn5sy9k5vfw5zb2gg72qaqz81mwlck2xg78qpg";
name = "qtserialbus-opensource-src-5.9.1.tar.xz"; name = "qtserialbus-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtserialport = { qtserialport = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz";
sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1"; sha256 = "1pxb679cx77vk39ik7j0k91a57wqa63d4g4riw3r2gpcay8kxpac";
name = "qtserialport-opensource-src-5.9.1.tar.xz"; name = "qtserialport-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtspeech = { qtspeech = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz";
sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c"; sha256 = "1c4rpf3by620fx8lrvmc38r60cikqczqh2rfcm7ixz3x8cj60lh1";
name = "qtspeech-opensource-src-5.9.1.tar.xz"; name = "qtspeech-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtsvg = { qtsvg = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz";
sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr"; sha256 = "1wjx9ymk2h19l9kk76jh87bnhhj955f9a93akvwwzfwg1jk2hrnz";
name = "qtsvg-opensource-src-5.9.1.tar.xz"; name = "qtsvg-opensource-src-5.9.3.tar.xz";
}; };
}; };
qttools = { qttools = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz";
sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4"; sha256 = "1zw4j8ymwcpn7dx1dlbxpmx5lfp26rag7pysap1xry9m7vg3hb24";
name = "qttools-opensource-src-5.9.1.tar.xz"; name = "qttools-opensource-src-5.9.3.tar.xz";
}; };
}; };
qttranslations = { qttranslations = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz";
sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja"; sha256 = "1ncvj1qlcgrm0zqdlq2bkb0hc8dyisz8m7bszxyx4kyxg7n5gb20";
name = "qttranslations-opensource-src-5.9.1.tar.xz"; name = "qttranslations-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtvirtualkeyboard = { qtvirtualkeyboard = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz";
sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b"; sha256 = "1zrj4pjy98dskzycjswbkm4m2j6k1j4150h0w7vdrw1681s3ycdr";
name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; name = "qtvirtualkeyboard-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtwayland = { qtwayland = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz";
sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g"; sha256 = "0vazcmpqdka3llmyg7m99lw0ngrydmw74p9nd04544xdn128r3ih";
name = "qtwayland-opensource-src-5.9.1.tar.xz"; name = "qtwayland-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtwebchannel = { qtwebchannel = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz";
sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0"; sha256 = "0n438mk01sh2bbqakc1m3s65qqmi75m4n4hymad8wcgijfr9a9v3";
name = "qtwebchannel-opensource-src-5.9.1.tar.xz"; name = "qtwebchannel-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtwebengine = { qtwebengine = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz";
sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn"; sha256 = "0dqxawc9vfffz6ygdn5mdpl79rrqfx18jy2d1w81q9w7zm113bj5";
name = "qtwebengine-opensource-src-5.9.1.tar.xz"; name = "qtwebengine-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtwebkit = { qtwebkit = {
@ -291,43 +291,43 @@
}; };
}; };
qtwebsockets = { qtwebsockets = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz";
sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1"; sha256 = "1phic630ah85ajxp6iqrw9bpg0y8s88y45ygkc1wcasmbgzrs1nf";
name = "qtwebsockets-opensource-src-5.9.1.tar.xz"; name = "qtwebsockets-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtwebview = { qtwebview = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz";
sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn"; sha256 = "1i99fy86gydpfsfc4my5d9vxjywfrzbqxk66cb3yf2ac57j66mpf";
name = "qtwebview-opensource-src-5.9.1.tar.xz"; name = "qtwebview-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtwinextras = { qtwinextras = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwinextras-opensource-src-5.9.3.tar.xz";
sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s"; sha256 = "1lj4qa51ymhpvk0bdp6xf6b3n1k39kihns5lvp6xq1w2mljn6phl";
name = "qtwinextras-opensource-src-5.9.1.tar.xz"; name = "qtwinextras-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtx11extras = { qtx11extras = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz";
sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6"; sha256 = "1gpjgca4xvyy0r743kh2ys128r14fh6j8bdphnmmi5v2pf6bzq74";
name = "qtx11extras-opensource-src-5.9.1.tar.xz"; name = "qtx11extras-opensource-src-5.9.3.tar.xz";
}; };
}; };
qtxmlpatterns = { qtxmlpatterns = {
version = "5.9.1"; version = "5.9.3";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz"; url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz";
sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m"; sha256 = "1fphhqr3v3vzjp2vbv16bc1vs879wn7aqlabgcpkhqx92ak6d76g";
name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz"; name = "qtxmlpatterns-opensource-src-5.9.3.tar.xz";
}; };
}; };
} }

4
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -3,7 +3,7 @@
src, patches, version, qtCompatVersion, src, patches, version, qtCompatVersion,
coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
ruby, ruby, which,
# darwin support # darwin support
darwin, libiconv, libcxx, darwin, libiconv, libcxx,
@ -84,7 +84,7 @@ stdenv.mkDerivation {
++ lib.optional (postgresql != null) postgresql; ++ lib.optional (postgresql != null) postgresql;
nativeBuildInputs = nativeBuildInputs =
[ bison flex gperf lndir perl pkgconfig python2 ] [ bison flex gperf lndir perl pkgconfig python2 which ]
++ lib.optional (!stdenv.isDarwin) patchelf; ++ lib.optional (!stdenv.isDarwin) patchelf;
propagatedNativeBuildInputs = [ lndir ]; propagatedNativeBuildInputs = [ lndir ];

24
pkgs/development/libraries/taglib/default.nix
View File

@ -1,24 +1,30 @@
{stdenv, fetchurl, zlib, cmake}: {stdenv, fetchurl, zlib, cmake}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "taglib-1.10"; name = "taglib-1.11.1";
src = fetchurl { src = fetchurl {
url = "http://taglib.github.io/releases/${name}.tar.gz"; url = "http://taglib.org/releases/${name}.tar.gz";
sha256 = "1alv6vp72p0x9i9yscmz2a71anjwqy53y9pbcbqxvc1c0i82vhr4"; sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn";
}; };
cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON"; cmakeFlags = [ "-DWITH_ASF=ON" "-DWITH_MP4=ON" ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
meta = { meta = with stdenv.lib; {
homepage = http://developer.kde.org/~wheeler/taglib.html; homepage = http://taglib.org/;
repositories.git = git://github.com/taglib/taglib.git; repositories.git = git://github.com/taglib/taglib.git;
shortDescription = "A library for reading and editing audio file metadata.";
description = "A library for reading and editing the meta-data of several popular audio formats"; description = ''
TagLib is a library for reading and editing the meta-data of several
popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3
files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC,
Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files.
'';
license = with licenses; [ lgpl3 mpl11 ];
inherit (cmake.meta) platforms; inherit (cmake.meta) platforms;
maintainers = [ ]; maintainers = with maintainers; [ ttuegel ];
}; };
} }

43
pkgs/development/python-modules/dateparser/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, isPy3k
, nose
, nose-parameterized
, mock
, glibcLocales
, six
, jdatetime
, pyyaml
, dateutil
, umalqurra
, pytz
, tzlocal
, regex
, ruamel_yaml }:
buildPythonPackage rec {
pname = "dateparser";
version = "0.6.0";
src = fetchFromGitHub {
owner = "scrapinghub";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "0q2vyzvlj46r6pr0s6m1a0md1cpg9nv1n3xw286l4x2cc7fj2g3y";
};
# Upstream Issue: https://github.com/scrapinghub/dateparser/issues/364
disabled = isPy3k;
checkInputs = [ nose nose-parameterized mock glibcLocales ];
preCheck =''
# skip because of missing convertdate module, which is an extra requirement
rm tests/test_jalali.py
'';
propagatedBuildInputs = [ six jdatetime pyyaml dateutil
umalqurra pytz tzlocal regex ruamel_yaml ];
meta = with stdenv.lib;{
description = "Date parsing library designed to parse dates from HTML pages";
homepage = https://github.com/scrapinghub/dateparser;
license = licenses.bsd3;
};
}

2
pkgs/development/tools/misc/iozone/default.nix
View File

@ -9,7 +9,7 @@ let
"macosx" "macosx"
else if stdenv.system == "aarch64-linux" then else if stdenv.system == "aarch64-linux" then
"linux-arm" "linux-arm"
else abort "Platform ${stdenv.system} not yet supported."; else throw "Platform ${stdenv.system} not yet supported.";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/development/tools/misc/saleae-logic/default.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7"; sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7";
} }
else else
abort "Saleae Logic software requires i686-linux or x86_64-linux"; throw "Saleae Logic software requires i686-linux or x86_64-linux";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "saleae-logic"; name = "saleae-logic";

2
pkgs/games/nethack/default.nix
View File

@ -3,7 +3,7 @@
let let
platform = platform =
if lib.elem stdenv.system lib.platforms.unix then "unix" if lib.elem stdenv.system lib.platforms.unix then "unix"
else abort "Unknown platform for NetHack"; else throw "Unknown platform for NetHack: ${stdenv.system}";
unixHint = unixHint =
if stdenv.isLinux then "linux" if stdenv.isLinux then "linux"
else if stdenv.isDarwin then "macosx10.10" else if stdenv.isDarwin then "macosx10.10"

2
pkgs/games/steam/default.nix
View File

@ -6,7 +6,7 @@ let
self = rec { self = rec {
steamArch = if pkgs.stdenv.system == "x86_64-linux" then "amd64" steamArch = if pkgs.stdenv.system == "x86_64-linux" then "amd64"
else if pkgs.stdenv.system == "i686-linux" then "i386" else if pkgs.stdenv.system == "i686-linux" then "i386"
else abort "Unsupported platform"; else throw "Unsupported platform: ${pkgs.stdenv.system}";
steam-runtime = callPackage ./runtime.nix { }; steam-runtime = callPackage ./runtime.nix { };
steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };

2
pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
View File

@ -9,7 +9,7 @@
let arch = let arch =
if stdenv.system == "x86_64-linux" then "64" if stdenv.system == "x86_64-linux" then "64"
else if stdenv.system == "i686-linux" then "32" else if stdenv.system == "i686-linux" then "32"
else abort "Unsupported architecture"; else throw "Unsupported system ${stdenv.system}";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "cnijfilter-${version}"; name = "cnijfilter-${version}";

2
pkgs/misc/cups/drivers/kyocera/default.nix
View File

@ -4,7 +4,7 @@ let
platform = platform =
if stdenv.system == "x86_64-linux" then "64bit" if stdenv.system == "x86_64-linux" then "64bit"
else if stdenv.system == "i686-linux" then "32bit" else if stdenv.system == "i686-linux" then "32bit"
else abort "Unsupported platform"; else throw "Unsupported system: ${stdenv.system}";
libPath = lib.makeLibraryPath [ cups ]; libPath = lib.makeLibraryPath [ cups ];
in in

2
pkgs/misc/drivers/sundtek/default.nix
View File

@ -9,7 +9,7 @@ let
if isx86_64 then "64bit" if isx86_64 then "64bit"
else else
if isi686 then "32bit" if isi686 then "32bit"
else abort "${system} not considered in build derivation. Might still be supported."; else throw "${system} not considered in build derivation. Might still be supported.";
in in
stdenv.mkDerivation { stdenv.mkDerivation {

5
pkgs/misc/vscode-extensions/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, lib, fetchurl, callPackage, vscode-utils }: { stdenv, lib, fetchurl, callPackage, vscode-utils }:
let let
inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension; inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension
extensionFromVscodeMarketplace;
in in
# #
# Unless there is a good reason not to, we attemp to use the same name as the # Unless there is a good reason not to, we attemp to use the same name as the
@ -24,4 +25,6 @@ rec {
}; };
ms-vscode.cpptools = callPackage ./cpptools {}; ms-vscode.cpptools = callPackage ./cpptools {};
ms-python.python = callPackage ./python {};
} }

41
pkgs/misc/vscode-extensions/python/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ stdenv, lib, vscode-utils
, pythonUseFixed ? false, python # When `true`, the python default setting will be fixed to specified.
# Use version from `PATH` for default setting otherwise.
# Defaults to `false` as we expect it to be project specific most of the time.
, ctagsUseFixed ? true, ctags # When `true`, the ctags default setting will be fixed to specified.
# Use version from `PATH` for default setting otherwise.
# Defaults to `true` as usually not defined on a per projet basis.
}:
assert pythonUseFixed -> null != python;
assert ctagsUseFixed -> null != ctags;
let
pythonDefaultsTo = if pythonUseFixed then "${python}/bin/python" else "python";
ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags";
in
vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "python";
publisher = "ms-python";
version = "0.8.0";
sha256 = "0i7s93l5g5lyi6vn77zh3ipj0p267y17fayv6vjrxc2igrs27ik6";
};
postPatch = ''
# Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`.
substituteInPlace "./package.json" \
--replace "\"default\": \"python\"" "\"default\": \"${pythonDefaultsTo}\""
# Patch `packages.json` so that nix's *ctags* is used as default value for `python.workspaceSymbols.ctagsPath`.
substituteInPlace "./package.json" \
--replace "\"default\": \"ctags\"" "\"default\": \"${ctagsDefaultsTo}\""
'';
meta = with lib; {
license = licenses.mit;
maintainer = [ maintainers.jraygauthier ];
};
}

6
pkgs/misc/vscode-extensions/vscode-utils.nix
View File

@ -70,12 +70,14 @@ let
mktplcRef = ext; mktplcRef = ext;
}); });
extensionFromVscodeMarketplace = mktplcExtRefToExtDrv;
extensionsFromVscodeMarketplace = mktplcExtRefList: extensionsFromVscodeMarketplace = mktplcExtRefList:
builtins.map mktplcExtRefToExtDrv mktplcExtRefList; builtins.map extensionFromVscodeMarketplace mktplcExtRefList;
in in
{ {
inherit fetchVsixFromVscodeMarketplace buildVscodeExtension inherit fetchVsixFromVscodeMarketplace buildVscodeExtension
buildVscodeMarketplaceExtension extensionsFromVscodeMarketplace; buildVscodeMarketplaceExtension extensionFromVscodeMarketplace
extensionsFromVscodeMarketplace;
} }

2
pkgs/os-specific/linux/broadcom-sta/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}"; url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}";
sha256 = hashes."${stdenv.system}"; sha256 = hashes.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
}; };
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];

2
pkgs/os-specific/linux/prl-tools/default.nix
View File

@ -10,7 +10,7 @@ let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version;
xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer)); xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer));
x64 = if stdenv.system == "x86_64-linux" then true x64 = if stdenv.system == "x86_64-linux" then true
else if stdenv.system == "i686-linux" then false else if stdenv.system == "i686-linux" then false
else abort "Parallels Tools for Linux only support {x86-64,i686}-linux targets"; else throw "Parallels Tools for Linux only support {x86-64,i686}-linux targets";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "${prl_major}.2.1-41615"; version = "${prl_major}.2.1-41615";

17
pkgs/stdenv/generic/check-meta.nix
View File

@ -125,11 +125,18 @@ let
''; '';
throwEvalHelp = { reason , errormsg ? "" }: handleEvalIssue = { reason , errormsg ? "" }:
throw ('' let
Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate. msg = ''
Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate.
'' + (builtins.getAttr reason remediation) attrs;
handler = if config ? "handleEvalIssue"
then config.handleEvalIssue reason
else throw;
in handler msg;
'' + ((builtins.getAttr reason remediation) attrs));
metaTypes = with lib.types; rec { metaTypes = with lib.types; rec {
# These keys are documented # These keys are documented
@ -192,7 +199,7 @@ let
validityCondition = validityCondition =
let v = checkValidity attrs; let v = checkValidity attrs;
in if !v.valid in if !v.valid
then throwEvalHelp (removeAttrs v ["valid"]) then handleEvalIssue (removeAttrs v ["valid"])
else true; else true;
in in

5
pkgs/tools/misc/mprime/default.nix
View File

@ -5,12 +5,13 @@ let
if stdenv.system == "x86_64-linux" then "linux64" if stdenv.system == "x86_64-linux" then "linux64"
else if stdenv.system == "i686-linux" then "linux" else if stdenv.system == "i686-linux" then "linux"
else if stdenv.system == "x86_64-darwin" then "macosx64" else if stdenv.system == "x86_64-darwin" then "macosx64"
else abort "Unsupported platform"; else throwSystem;
throwSystem = throw "Unsupported system: ${stdenv.system}";
gwnum = gwnum =
if stdenv.system == "x86_64-linux" then "make64" if stdenv.system == "x86_64-linux" then "make64"
else if stdenv.system == "i686-linux" then "makefile" else if stdenv.system == "i686-linux" then "makefile"
else if stdenv.system == "x86_64-darwin" then "makemac" else if stdenv.system == "x86_64-darwin" then "makemac"
else abort "Unsupported platform"; else throwSystem;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

5
pkgs/tools/networking/logmein-hamachi/default.nix
View File

@ -8,11 +8,12 @@ let
arch = arch =
if stdenv.system == "x86_64-linux" then "x64" if stdenv.system == "x86_64-linux" then "x64"
else if stdenv.system == "i686-linux" then "x86" else if stdenv.system == "i686-linux" then "x86"
else abort "Unsupported architecture"; else throwSystem;
throwSystem = throw "Unsupported system: ${stdenv.system}";
sha256 = sha256 =
if stdenv.system == "x86_64-linux" then "011xg1frhjavv6zj1y3da0yh7rl6v1ax6xy2g8fk3sry9bi2p4j3" if stdenv.system == "x86_64-linux" then "011xg1frhjavv6zj1y3da0yh7rl6v1ax6xy2g8fk3sry9bi2p4j3"
else if stdenv.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62" else if stdenv.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62"
else abort "Unsupported architecture"; else throwSystem;
libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

4
pkgs/top-level/all-packages.nix
View File

@ -14640,7 +14640,7 @@ with pkgs;
emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; emacs25WithPackages = emacs25PackagesNg.emacsWithPackages;
emacsWithPackages = emacsPackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages;
# inherit (gnome3) empathy; inherit (gnome3) empathy;
enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };
@ -16909,6 +16909,8 @@ with pkgs;
symlinks = callPackage ../tools/system/symlinks { }; symlinks = callPackage ../tools/system/symlinks { };
syncplay = callPackage ../applications/networking/syncplay { };
syncthing = callPackage ../applications/networking/syncthing { }; syncthing = callPackage ../applications/networking/syncthing { };
syncthing012 = callPackage ../applications/networking/syncthing012 { }; syncthing012 = callPackage ../applications/networking/syncthing012 { };

34
pkgs/top-level/python-packages.nix
View File

@ -4348,33 +4348,7 @@ in {
daphne = callPackage ../development/python-modules/daphne { }; daphne = callPackage ../development/python-modules/daphne { };
dateparser = buildPythonPackage rec { dateparser = callPackage ../development/python-modules/dateparser { };
name = "dateparser-${version}";
version = "0.3.2-pre-2016-01-21"; # Fix assert year 2016 == 2015
src = pkgs.fetchgit {
url = "https://github.com/scrapinghub/dateparser.git";
rev = "d20a63f1d1cee5b4bd19c9f745774cfa9f219549";
sha256 = "0na7b4hvf7vykrk48482gxiq5xny67rvs8ilamxcxw3y9gfgdjfd";
};
# Does not seem to work on Python 3 because of relative import.
# Upstream Travis configuration is wrong and tests only 2.7
disabled = isPy3k;
LC_ALL = "en_US.UTF-8";
buildInputs = with self; [ nose nose-parameterized mock pkgs.glibcLocales ];
propagatedBuildInputs = with self; [ six jdatetime pyyaml dateutil umalqurra pytz ];
meta = {
description = "Date parsing library designed to parse dates from HTML pages";
homepage = https://pypi.python.org/pypi/dateparser;
license = licenses.bsd3;
broken = true;
};
};
# Actual name of package # Actual name of package
python-dateutil = callPackage ../development/python-modules/dateutil { }; python-dateutil = callPackage ../development/python-modules/dateutil { };
@ -17521,9 +17495,6 @@ in {
name = "ruamel.yaml-${version}"; name = "ruamel.yaml-${version}";
version = "0.13.7"; version = "0.13.7";
# needs ruamel_ordereddict for python2 support
disabled = !isPy3k;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/r/ruamel.yaml/${name}.tar.gz"; url = "mirror://pypi/r/ruamel.yaml/${name}.tar.gz";
sha256 = "1vca2552k0kmhr9msg1bbfdvp3p9im17x1a6npaw221vlgg15z7h"; sha256 = "1vca2552k0kmhr9msg1bbfdvp3p9im17x1a6npaw221vlgg15z7h";
@ -17532,7 +17503,8 @@ in {
# Tests cannot load the module to test # Tests cannot load the module to test
doCheck = false; doCheck = false;
propagatedBuildInputs = with self; [ ruamel_base typing ]; propagatedBuildInputs = with self; [ ruamel_base typing ] ++
(optional (!isPy3k) self.ruamel_ordereddict);
meta = { meta = {
description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";