public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123279 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Jonathan Ringer
2021-05-22 18:46:35 -07:00
committed by GitHub
parent c9fd31e591 11a9ac00fc
commit d9de79194a
711 changed files with 8099 additions and 3803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/apr/default.nix
+5 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
name = "apr-1.7.0";
@@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED";
nativeBuildInputs =
# Update libtool for macOS 11 support
lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ autoreconfHook ];
enableParallelBuilding = true;
meta = with lib; {
pkgs/development/libraries/catch/default.nix
+9 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec {
pname = "catch";
@@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DUSE_CPP14=ON" ];
patches = [
# https://github.com/catchorg/Catch2/pull/2151
(fetchpatch {
url = "https://github.com/catchorg/Catch2/commit/bb6d08323f23a39eb65dd86671e68f4f5d3f2d6c.patch";
sha256 = "1vhbzx84nrhhf9zlbl6h5zmg3r5w5v833ihlswsysb9wp2i4isc5";
})
];
doCheck = true;
checkTarget = "test";
pkgs/development/libraries/fontconfig/default.nix
+5
View File
@@ -61,6 +61,11 @@ stdenv.mkDerivation rec {
url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/409b37c62780728755c908991c912a6b16f2389c.patch";
sha256 = "zJFh37QErSAINPGFkFVJyhYRP27BuIN7PIgoDl/PIwI=";
})
# Combination of
# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/88
# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/131
./macos-atomics.h
];
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
pkgs/development/libraries/fontconfig/macos-atomics.h
+39
View File
@@ -0,0 +1,39 @@
--- a/src/fcatomic.h 2020-11-27 13:23:44.000000000 +0900
+++ b/src/fcatomic.h 2020-11-27 13:24:43.000000000 +0900
@@ -70,24 +70,25 @@
#elif !defined(FC_NO_MT) && defined(__APPLE__)
#include <libkern/OSAtomic.h>
-#ifdef __MAC_OS_X_MIN_REQUIRED
#include <AvailabilityMacros.h>
-#elif defined(__IPHONE_OS_MIN_REQUIRED)
-#include <Availability.h>
-#endif
typedef int fc_atomic_int_t;
#define fc_atomic_int_add(AI, V) (OSAtomicAdd32Barrier ((V), &(AI)) - (V))
-#define fc_atomic_ptr_get(P) (OSMemoryBarrier (), (void *) *(P))
-#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100)
-#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
-#else
-#if __ppc64__ || __x86_64__
-#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
+#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 20100)
+
+#if SIZEOF_VOID_P == 8
+#define fc_atomic_ptr_get(P) OSAtomicAdd64Barrier (0, (int64_t*)(P))
+#elif SIZEOF_VOID_P == 4
+#define fc_atomic_ptr_get(P) OSAtomicAdd32Barrier (0, (int32_t*)(P))
#else
-#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P))
+#error "SIZEOF_VOID_P not 4 or 8 (assumes CHAR_BIT is 8)"
#endif
+
+#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
+
+#else
+#error "Your macOS / iOS targets are too old"
#endif
#elif !defined(FC_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES)
pkgs/development/libraries/gcr/default.nix
-2
View File
@@ -74,8 +74,6 @@ stdenv.mkDerivation rec {
doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
enableParallelBuilding = true;
preFixup = ''
wrapProgram "$out/bin/gcr-viewer" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
pkgs/development/libraries/glib/default.nix
+3 -2
View File
@@ -45,15 +45,16 @@ in
stdenv.mkDerivation rec {
pname = "glib";
version = "2.68.1";
version = "2.68.2";
src = fetchurl {
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-JBZUuWvTa4iqoSgU78SEO1eOVdR0QBA3J5Waw0aUQzM=";
sha256 = "sha256-7Md5ipzANOq9/X8kbm3UYc2/EXX8wumGfMfae3MJ4Ps=";
};
patches = optionals stdenv.isDarwin [
./darwin-compilation.patch
./link-with-coreservices.patch
] ++ optionals stdenv.hostPlatform.isMusl [
./quark_init_on_demand.patch
./gobject_init_on_demand.patch
pkgs/development/libraries/glib/link-with-coreservices.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/meson.build.orig 2020-11-25 13:47:38.499149252 +0900
+++ b/meson.build 2020-11-25 13:48:47.098444800 +0900
@@ -742,7 +742,7 @@
if glib_have_carbon
glib_conf.set('HAVE_CARBON', true)
- osx_ldflags += '-Wl,-framework,Carbon'
+ osx_ldflags += ['-Wl,-framework,Carbon', '-Wl,-framework,CoreServices']
glib_have_os_x_9_or_later = objcc.compiles('''#include <AvailabilityMacros.h>
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
#error Compiling for minimum OS X version before 10.9
pkgs/development/libraries/glibc/common.nix
+3 -4
View File
@@ -32,7 +32,7 @@
, python3Minimal
}:
{ name
{ pname
, withLinuxHeaders ? false
, profilingLibraries ? false
, withGd ? false
@@ -50,7 +50,7 @@ assert withLinuxHeaders -> linuxHeaders != null;
assert withGd -> gd != null && libpng != null;
stdenv.mkDerivation ({
inherit version;
version = version + patchSuffix;
linuxHeaders = if withLinuxHeaders then linuxHeaders else null;
inherit (stdenv) is64bit;
@@ -187,14 +187,13 @@ stdenv.mkDerivation ({
# bootstrap.
BASH_SHELL = "/bin/sh";
# Used by libgcc, elf-header, and others to determine ABI
passthru = { inherit version; };
}
// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) //
{
name = name + "-${version}${patchSuffix}";
src = fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
inherit sha256;
pkgs/development/libraries/glibc/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ let
in
callPackage ./common.nix { inherit stdenv; } {
name = "glibc" + lib.optionalString withGd "-gd";
pname = "glibc" + lib.optionalString withGd "-gd";
inherit withLinuxHeaders profilingLibraries withGd;
pkgs/development/libraries/glibc/info.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ callPackage, texinfo, perl }:
callPackage ./common.nix {} {
name = "glibc-info";
pname = "glibc-info";
outputs = [ "out" ];
pkgs/development/libraries/glibc/locales.nix
+1 -1
View File
@@ -11,7 +11,7 @@
}:
callPackage ./common.nix { inherit stdenv; } {
name = "glibc-locales";
pname = "glibc-locales";
builder = ./locales-builder.sh;
pkgs/development/libraries/glibmm/default.nix
-2
View File
@@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
]);
propagatedBuildInputs = [ glib libsigcxx ];
enableParallelBuilding = true;
doCheck = false; # fails. one test needs the net, another /etc/fstab
passthru = {
pkgs/development/libraries/gmp/6.x.nix
+1 -1
View File
@@ -46,7 +46,7 @@ let self = stdenv.mkDerivation rec {
# to build a .dll on windows, we need --disable-static + --enable-shared
# see https://gmplib.org/manual/Notes-for-Particular-Systems.html
++ optional (!withStatic && stdenv.hostPlatform.isWindows) "--disable-static --enable-shared"
;
++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "--disable-assembly";
doCheck = true; # not cross;
pkgs/development/libraries/gsl/default.nix
+4
View File
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1a460zj9xmbgvcymkdhqh313c4l29mn9cffbi5vf33x3qygk70mp";
};
preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''
MACOSX_DEPLOYMENT_TARGET=10.16
'' else null;
# do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html)
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma";
pkgs/development/libraries/gtk/2.x.nix
+4
View File
@@ -61,6 +61,10 @@ stdenv.mkDerivation rec {
++ optionals cupsSupport [ cups ]
++ optionals stdenv.isDarwin [ AppKit Cocoa ];
preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''
MACOSX_DEPLOYMENT_TARGET=10.16
'' else null;
configureFlags = [
"--with-gdktarget=${gdktarget}"
"--with-xinput=yes"
pkgs/development/libraries/gtkmm/3.x.nix
-2
View File
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
enableParallelBuilding = true;
# https://bugzilla.gnome.org/show_bug.cgi?id=764521
doCheck = false;
pkgs/development/libraries/kde-frameworks/fetch.sh
+1 -1
View File
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.80/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.81/ -A '*.tar.xz' )
pkgs/development/libraries/kde-frameworks/srcs.nix
+332 -332
View File
@@ -4,667 +4,667 @@
{
attica = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/attica-5.80.0.tar.xz";
sha256 = "0wffjjrk6rka25kgfq05j9fzxawysimpzi8jj3sw3kfz05mqdap3";
name = "attica-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/attica-5.81.0.tar.xz";
sha256 = "0x1ga3y0kmr2ybgvsmns7imd0agfd5bfc2lf0010ks5s1v50whqr";
name = "attica-5.81.0.tar.xz";
};
};
baloo = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/baloo-5.80.0.tar.xz";
sha256 = "0wdm03x1zm31nivf04qxih6gg18c97diff7ddaqqbz8c7jlhppzc";
name = "baloo-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/baloo-5.81.0.tar.xz";
sha256 = "0mnm282mc1yph9x08fkrycb22gsah4km8r7yk3kz20vnrs0wgljy";
name = "baloo-5.81.0.tar.xz";
};
};
bluez-qt = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/bluez-qt-5.80.0.tar.xz";
sha256 = "08g56gnh0gkh7n92wqama9lbqk6pfdby9xbh8f2vgmnkzy07zrwn";
name = "bluez-qt-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/bluez-qt-5.81.0.tar.xz";
sha256 = "13wy3nzbq26616s7pa0sx0jrq81v3bvf6a6dlmp1zzycvbk06jp3";
name = "bluez-qt-5.81.0.tar.xz";
};
};
breeze-icons = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/breeze-icons-5.80.0.tar.xz";
sha256 = "11353lgy2fh1d2fgbhg20fapsjzrpsxlf5zilrfkw8y0my690rm2";
name = "breeze-icons-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/breeze-icons-5.81.0.tar.xz";
sha256 = "1844jyair0kjflfq98cakis7xfgbdn7an383f02hp4072kjg127g";
name = "breeze-icons-5.81.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/extra-cmake-modules-5.80.0.tar.xz";
sha256 = "0r3gr6qrgljiq7bsks54xc68x9pf7i2gm9pgjq5kslw5ys0gsw13";
name = "extra-cmake-modules-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/extra-cmake-modules-5.81.0.tar.xz";
sha256 = "10svwghxf5vhbfwz7lza7xid2n1mj6r1n1amv6c616q68fwf8msz";
name = "extra-cmake-modules-5.81.0.tar.xz";
};
};
frameworkintegration = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/frameworkintegration-5.80.0.tar.xz";
sha256 = "0sk9p4wk4hsr5sg0z24rc7fxrsdbxcpm5fw66v30lhncrlf9c7c7";
name = "frameworkintegration-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/frameworkintegration-5.81.0.tar.xz";
sha256 = "0vcbm0364zwkyp33nvcl42px6i9hgnp4wl3lg913qvxv1f7pd61v";
name = "frameworkintegration-5.81.0.tar.xz";
};
};
kactivities = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kactivities-5.80.0.tar.xz";
sha256 = "14im60ig074axryhgz3qw1zjqhfai1gg0hq88spabvz22r5f340s";
name = "kactivities-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kactivities-5.81.0.tar.xz";
sha256 = "0sskfpc8yfic2s8hvzf7cjk92pxd0idd0xl0azrjnn28ci5kvzvq";
name = "kactivities-5.81.0.tar.xz";
};
};
kactivities-stats = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kactivities-stats-5.80.0.tar.xz";
sha256 = "1w3khp8p2a1v85s5hay3s0nznjsajaavrjx4iw2cxssxnzlvg2fn";
name = "kactivities-stats-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kactivities-stats-5.81.0.tar.xz";
sha256 = "0839g6y101qr5mr98ynfm74f554lxx7srnwm3anh7nj6zrlyxrq2";
name = "kactivities-stats-5.81.0.tar.xz";
};
};
kapidox = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kapidox-5.80.0.tar.xz";
sha256 = "010jigqkw3rs04irf942cwgd9wvi7j9b5lisdcrc3w65a19q053z";
name = "kapidox-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kapidox-5.81.0.tar.xz";
sha256 = "1wq4py1djmcnqf51l52cij43qw44n5fafz00qslxjb0rdakrvzs2";
name = "kapidox-5.81.0.tar.xz";
};
};
karchive = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/karchive-5.80.0.tar.xz";
sha256 = "1xaxbhbx562ybd9rqna1bh3bpbyxh02c9x9xyisw84akiibqvq7w";
name = "karchive-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/karchive-5.81.0.tar.xz";
sha256 = "1flnylyglc2jdb9lfk3dl56wzxdliaaqpg2rzrlclzj14lz3l9hy";
name = "karchive-5.81.0.tar.xz";
};
};
kauth = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kauth-5.80.0.tar.xz";
sha256 = "1pcnk34b912hhhpx606ajvz9hcz6xr37g7bl002zkar9fzh7vw16";
name = "kauth-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kauth-5.81.0.tar.xz";
sha256 = "1gf93wk95x1fmi4w3ybkj7acwrv7rlz9nw7f1n4nd1w3w7pn403y";
name = "kauth-5.81.0.tar.xz";
};
};
kbookmarks = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kbookmarks-5.80.0.tar.xz";
sha256 = "11imylvhw3pc46qiqz72q8rwa9igvgvd9gdchiivcrg4494k502q";
name = "kbookmarks-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kbookmarks-5.81.0.tar.xz";
sha256 = "0bqgl3vhr5lngajxz7v4l325kcyylj3d1qznaa946dcbsn2wrgzm";
name = "kbookmarks-5.81.0.tar.xz";
};
};
kcalendarcore = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kcalendarcore-5.80.0.tar.xz";
sha256 = "1z8js2b5zb862ngwsdd2hwi6wqhkvkhsx5akbn7f1gmjs0pfrkg5";
name = "kcalendarcore-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kcalendarcore-5.81.0.tar.xz";
sha256 = "0a8m8l94cni1fv38sa9wa1mx1m7bnd7qb66wrjrhdd57cfrjij5s";
name = "kcalendarcore-5.81.0.tar.xz";
};
};
kcmutils = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kcmutils-5.80.0.tar.xz";
sha256 = "0ncyffl60wv5awbfazknqpysaji11xxrpicabfl0mzmwcnlb34wc";
name = "kcmutils-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kcmutils-5.81.0.tar.xz";
sha256 = "15q2wvnz8s1g508jbssszzfcgssamdsp7s1vply1677ga8pcspmj";
name = "kcmutils-5.81.0.tar.xz";
};
};
kcodecs = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kcodecs-5.80.0.tar.xz";
sha256 = "06l8c3jwx5z43cyv7vl6yfs91a7zmy0j089x826nn2a7jr678mjg";
name = "kcodecs-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kcodecs-5.81.0.tar.xz";
sha256 = "0r757k1rbz1bjk7mc0b2m0ybixai4qfidrs5wvbci971lfsaz4j3";
name = "kcodecs-5.81.0.tar.xz";
};
};
kcompletion = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kcompletion-5.80.0.tar.xz";
sha256 = "14v0d1w01lric532vks9akh7v7z7nf9hgpf866qyhmb236k52hpg";
name = "kcompletion-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kcompletion-5.81.0.tar.xz";
sha256 = "15bw6g4ag1s0s3x6390r05i299kl279jrfajna9fxgq3fbjigb7p";
name = "kcompletion-5.81.0.tar.xz";
};
};
kconfig = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kconfig-5.80.0.tar.xz";
sha256 = "1chrvpfr72bdgv6fdgrkbfbiz76jgvzsncxsc6gjvkvcdag48016";
name = "kconfig-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kconfig-5.81.0.tar.xz";
sha256 = "13xfy3mhi73na4mv0a8l75ba5c8ddnkkdssmsnxp5kj084w9xpqx";
name = "kconfig-5.81.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kconfigwidgets-5.80.0.tar.xz";
sha256 = "12rc3l91h2snkxni70brdp8f21g19c0gabpxy7ssv614ci0fz7j7";
name = "kconfigwidgets-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kconfigwidgets-5.81.0.tar.xz";
sha256 = "1v7xxn6cd17z71cpdyw2qzfqw4vkzy96wwr1zn9dylnvl8mh4xg0";
name = "kconfigwidgets-5.81.0.tar.xz";
};
};
kcontacts = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kcontacts-5.80.0.tar.xz";
sha256 = "173vpxncdr9mwpksizflvipsf18pnwn500b2xzpkaaz5w84vk1yk";
name = "kcontacts-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kcontacts-5.81.0.tar.xz";
sha256 = "15wkspgxqj6zh2pr3f7xqcahihbhf45qnqay1v56ry3vl42gncg4";
name = "kcontacts-5.81.0.tar.xz";
};
};
kcoreaddons = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kcoreaddons-5.80.0.tar.xz";
sha256 = "1l9ydyvbmn2ih07jsy12snxavss7cyxyig0n65sz6gwbcxqr5qzc";
name = "kcoreaddons-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kcoreaddons-5.81.0.tar.xz";
sha256 = "1nzyijd8753p9n9fqfb14q30jid2k1j7cvwjqv99l5fxhwbcn35c";
name = "kcoreaddons-5.81.0.tar.xz";
};
};
kcrash = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kcrash-5.80.0.tar.xz";
sha256 = "1c2b8i9qay0mdr0i16jp2167vb18r792dd88nz0in77lzccfk8v4";
name = "kcrash-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kcrash-5.81.0.tar.xz";
sha256 = "1irw9blm1xsn26mcyaimd8xnygkdpaqh9m8gpf5gpn2s19iz4f81";
name = "kcrash-5.81.0.tar.xz";
};
};
kdav = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kdav-5.80.0.tar.xz";
sha256 = "1cab4pppqyfqm53dhp5lm4ghijbhym77ndb0pr6crvi70kz4s101";
name = "kdav-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kdav-5.81.0.tar.xz";
sha256 = "0cxiif5pb8frz0dpqx0f9j7g29iaspx13alwzvzavbmi0bwzs00b";
name = "kdav-5.81.0.tar.xz";
};
};
kdbusaddons = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kdbusaddons-5.80.0.tar.xz";
sha256 = "1w0vpjzi37z8jaq97p9bxjdl8x4288idm4vvpzxs8lc9hwcl74hl";
name = "kdbusaddons-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kdbusaddons-5.81.0.tar.xz";
sha256 = "0gbrmgpd8x16zapbqbyh2ipbvysz3z07qk1fc0cmx5x84x1j7xa9";
name = "kdbusaddons-5.81.0.tar.xz";
};
};
kdeclarative = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kdeclarative-5.80.0.tar.xz";
sha256 = "0gcx6pqyc0izw2cdvdcscxxl4wvksb74kjiq5zimjd2z8wrblmdz";
name = "kdeclarative-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kdeclarative-5.81.0.tar.xz";
sha256 = "0s6kal2ppw0vskv7baxvbqfip4hzh8s3399c1j7rahdw67nf9k3x";
name = "kdeclarative-5.81.0.tar.xz";
};
};
kded = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kded-5.80.0.tar.xz";
sha256 = "0skk3zf3b6rlbvdq0fyd8swfrx3fqmppqxrglh6n5imcv5jxwms1";
name = "kded-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kded-5.81.0.tar.xz";
sha256 = "1100jrccadj50blq5wmr83wdc3ry46rn86y28dfy4h97cvn1nfsi";
name = "kded-5.81.0.tar.xz";
};
};
kdelibs4support = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/portingAids/kdelibs4support-5.80.0.tar.xz";
sha256 = "01bd188iss14qmzm55dmsgdcs9wnwbdj0kh371achp9zqg55iqj3";
name = "kdelibs4support-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/portingAids/kdelibs4support-5.81.0.tar.xz";
sha256 = "1ck3i46k8sjkqgnaygy5pjqbw1np35sc6nhgxxcm7q84q3cdj536";
name = "kdelibs4support-5.81.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/portingAids/kdesignerplugin-5.80.0.tar.xz";
sha256 = "1d79qg3y7ndrh6yd9sygyz5yd5ig6gp8k71mw96xijdhlf5nxqs3";
name = "kdesignerplugin-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/portingAids/kdesignerplugin-5.81.0.tar.xz";
sha256 = "1rgnj6bns9dnn0g53xk374knc69ajpprjhyb50ffr0dn7cfcs1s3";
name = "kdesignerplugin-5.81.0.tar.xz";
};
};
kdesu = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kdesu-5.80.0.tar.xz";
sha256 = "1ksad8wcnjcrb8h73klrs2601482a32x3ycpr17k9fsi8mkylicd";
name = "kdesu-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kdesu-5.81.0.tar.xz";
sha256 = "176531kcvpmb4sklrqpvx4msna1radd2ki410700yvk0l2v4l2yy";
name = "kdesu-5.81.0.tar.xz";
};
};
kdewebkit = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/portingAids/kdewebkit-5.80.0.tar.xz";
sha256 = "11q6x9w2majzh6wva4b824dxrpz53xpb3vfsi65pwh199fhfyzci";
name = "kdewebkit-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/portingAids/kdewebkit-5.81.0.tar.xz";
sha256 = "022dpmw8r5wkb3pr87fycrybv9j5k2wy8d39rilhjvkqk8s65277";
name = "kdewebkit-5.81.0.tar.xz";
};
};
kdnssd = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kdnssd-5.80.0.tar.xz";
sha256 = "0k8lk3h65ar07l54cmxhpakz1why9vbm5wg58nh16x69dkdhr8dg";
name = "kdnssd-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kdnssd-5.81.0.tar.xz";
sha256 = "1hl49w55r57abnnwdf4hvyjk7566zbqa24bai3zsq24a4nnm6vii";
name = "kdnssd-5.81.0.tar.xz";
};
};
kdoctools = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kdoctools-5.80.0.tar.xz";
sha256 = "10xcq0pk1sqw293f2kw52sjj6dgphv17fdax4w0yy1hjch711bhy";
name = "kdoctools-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kdoctools-5.81.0.tar.xz";
sha256 = "11qayqx47h4h1y2yqzbm8bysdd7xwb2qjmkk59jxpih7xbmpg1ir";
name = "kdoctools-5.81.0.tar.xz";
};
};
kemoticons = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kemoticons-5.80.0.tar.xz";
sha256 = "0jg5z6dbfprkypj35prlixgc93x65nn7zcw2fmxcqvshrnqzz2hb";
name = "kemoticons-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kemoticons-5.81.0.tar.xz";
sha256 = "17zv96cfmqg9fxrgm91pn8xwp4f03644g2203c3s7iq3bh8ig3gc";
name = "kemoticons-5.81.0.tar.xz";
};
};
kfilemetadata = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kfilemetadata-5.80.0.tar.xz";
sha256 = "02k0yyksyl5nn373l25m6ybxhpdyrz8g0mr16zmk12pdxh24vkbm";
name = "kfilemetadata-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kfilemetadata-5.81.0.tar.xz";
sha256 = "0cba7lsjk563ql0hw2rcjxn2khadx1rz7hx4agjb40145f7x931i";
name = "kfilemetadata-5.81.0.tar.xz";
};
};
kglobalaccel = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kglobalaccel-5.80.0.tar.xz";
sha256 = "015x173b57vdd16mmd4asz6l6bxw94k1hbkxr09v5cb463cspw1n";
name = "kglobalaccel-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kglobalaccel-5.81.0.tar.xz";
sha256 = "0adqlfmpfsbbfjiljvbyi4f4blx77qp18anx7npkwh5gjn32hczz";
name = "kglobalaccel-5.81.0.tar.xz";
};
};
kguiaddons = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kguiaddons-5.80.0.tar.xz";
sha256 = "1iadzp794q9qhs1kcvfp2g2w6rv2ifqcb3n8sv460fhv4qrg4qz5";
name = "kguiaddons-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kguiaddons-5.81.0.tar.xz";
sha256 = "1q9yrbbsjh98xl3k4yss5h39fd8nz8y5v9sd7vqjmy49mqsyxxz3";
name = "kguiaddons-5.81.0.tar.xz";
};
};
kholidays = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kholidays-5.80.0.tar.xz";
sha256 = "1knmsz1rzhz5a56q9s0i4747633dq9bhs4j8j6rnk49ccl5hz72z";
name = "kholidays-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kholidays-5.81.0.tar.xz";
sha256 = "1pcqzwpmyl6jp9w4xvlgj81iyzbazz2kd07g82cjybz0z3jcxs2c";
name = "kholidays-5.81.0.tar.xz";
};
};
khtml = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/portingAids/khtml-5.80.0.tar.xz";
sha256 = "188j1ssw9qlylqgj06iy2r2jbibzshxcxh9qbn1bgz6d2dq2c6mx";
name = "khtml-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/portingAids/khtml-5.81.0.tar.xz";
sha256 = "0ag23xwl2f9hiwxnwxvwiz3xr07dxpin49li3q98vqq1qzaj1ngp";
name = "khtml-5.81.0.tar.xz";
};
};
ki18n = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/ki18n-5.80.0.tar.xz";
sha256 = "0yksjrcq5zip17kq1r97z2145qzzz6k48vz71y6195f7wvbpjfl8";
name = "ki18n-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/ki18n-5.81.0.tar.xz";
sha256 = "12m7ddyzw80y9y5gqyr7jgdyc5a0fmxa8zzsd41l7418i2sdajrc";
name = "ki18n-5.81.0.tar.xz";
};
};
kiconthemes = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kiconthemes-5.80.0.tar.xz";
sha256 = "133nv4zgqg6pkkvh1nyqcra847vgn3ai6w0xvynbgrmq7wvdrwlj";
name = "kiconthemes-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kiconthemes-5.81.0.tar.xz";
sha256 = "053a7zdig796zc3rnwdlkscylg6wldn1dk0dxqzn14cb8vkbwizw";
name = "kiconthemes-5.81.0.tar.xz";
};
};
kidletime = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kidletime-5.80.0.tar.xz";
sha256 = "1yjjhpkql8s7b4ddzirpyq5p0yicpsbkgbq15257k60xs66qgf83";
name = "kidletime-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kidletime-5.81.0.tar.xz";
sha256 = "12zrd9k27hx8ncywd9ahhbcv5xrn7rrw82pcvdkjmyniz0nazrqv";
name = "kidletime-5.81.0.tar.xz";
};
};
kimageformats = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kimageformats-5.80.0.tar.xz";
sha256 = "0q3i6jkx6kahgdzfycygki50f22zjbspx3f9ibg2ak74hcan8r8x";
name = "kimageformats-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kimageformats-5.81.0.tar.xz";
sha256 = "0kl68dy1v4p403f52y7igv2w3wq6q2pb7n0r7fbnwz2113bs0cm3";
name = "kimageformats-5.81.0.tar.xz";
};
};
kinit = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kinit-5.80.0.tar.xz";
sha256 = "101lvky2j6bxk3q36040kczchc21d5rb664ddxd89pl2n0f6s9fz";
name = "kinit-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kinit-5.81.0.tar.xz";
sha256 = "1wv8qyv4mayi80vczf47mdxxa6km4v7r2kz2j483w53nck5hjz4j";
name = "kinit-5.81.0.tar.xz";
};
};
kio = {
version = "5.80.1";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kio-5.80.1.tar.xz";
sha256 = "0a2srmj8w80f2m8s359747xx0wg2gf8nd75ysv9f9y92l1hwwwfr";
name = "kio-5.80.1.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kio-5.81.0.tar.xz";
sha256 = "0zn0xh07hajcj3h1v5246a167ffm113k8j36p2xn7lbq368sway6";
name = "kio-5.81.0.tar.xz";
};
};
kirigami2 = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kirigami2-5.80.0.tar.xz";
sha256 = "0wljcyr0g4i5nsc6szy9yd976l180lxfjjzhz24py7czlrpzg3i2";
name = "kirigami2-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kirigami2-5.81.0.tar.xz";
sha256 = "1bcc2mfb2s4w67q9q35k04mc9154dx1x03vqzclh9ipzdvyjqmyn";
name = "kirigami2-5.81.0.tar.xz";
};
};
kitemmodels = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kitemmodels-5.80.0.tar.xz";
sha256 = "1bvghm4accgf273aacjng86rxiazmk05pbrnqkldda9958dqv54k";
name = "kitemmodels-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kitemmodels-5.81.0.tar.xz";
sha256 = "0vs75q08x9yi1953rihk3y234wcsjawdxb3g5xb597f961y634w0";
name = "kitemmodels-5.81.0.tar.xz";
};
};
kitemviews = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kitemviews-5.80.0.tar.xz";
sha256 = "1j9m4qcmy83dj3k3v4y4skl5lgb8n3z4x9pa1f0rjpwwg4qsa0lp";
name = "kitemviews-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kitemviews-5.81.0.tar.xz";
sha256 = "0nmhc675bmilqah9fwwzy4p8rksib90cv8iihxd5c9d9snykk01n";
name = "kitemviews-5.81.0.tar.xz";
};
};
kjobwidgets = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kjobwidgets-5.80.0.tar.xz";
sha256 = "1yy5n9jnj1sdh51n3n1bqzmaml44799kiqdpp3b7mq55fmj9najp";
name = "kjobwidgets-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kjobwidgets-5.81.0.tar.xz";
sha256 = "1gl8ia858jbmj2i9wp4x0mw27p42xm6mg84nj1a8yvvvbazs3hpa";
name = "kjobwidgets-5.81.0.tar.xz";
};
};
kjs = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/portingAids/kjs-5.80.0.tar.xz";
sha256 = "1v3jiywzzi20c0pd67pgnwwnz0vg209a0wzzdhrpiz5v7qgji1ij";
name = "kjs-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/portingAids/kjs-5.81.0.tar.xz";
sha256 = "049aplmp1nlxshwaw0lfhfr09aazxh4vazvb78429gs84j8ir9xr";
name = "kjs-5.81.0.tar.xz";
};
};
kjsembed = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/portingAids/kjsembed-5.80.0.tar.xz";
sha256 = "083gp9ks7yha90vnk0z4bkb9i4rphz90di8m8z19xgn575a6li57";
name = "kjsembed-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/portingAids/kjsembed-5.81.0.tar.xz";
sha256 = "0zkazfcrmd0gklzda0hbb4mc493ihsd3dafnmyj6cmgk4lz2w3q9";
name = "kjsembed-5.81.0.tar.xz";
};
};
kmediaplayer = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/portingAids/kmediaplayer-5.80.0.tar.xz";
sha256 = "0a16rzyjy7j5pn66ahpj3kxpp5c2zmjxg3cmrm14gcm6gzysv56b";
name = "kmediaplayer-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/portingAids/kmediaplayer-5.81.0.tar.xz";
sha256 = "0z1ji717kwq84i6b2ay9wjhgc4vdkgn1jvwpzgpc1hqs9zly278b";
name = "kmediaplayer-5.81.0.tar.xz";
};
};
knewstuff = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/knewstuff-5.80.0.tar.xz";
sha256 = "0pbk4j823zs2xikgdhaxqilb5b6f0a8k8hylq1vyhkwlzvvp9s6z";
name = "knewstuff-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/knewstuff-5.81.0.tar.xz";
sha256 = "0wmf86nndnxs1850bjzbwaag6kjdabz0si7b0p1r6hnwm2km9bnk";
name = "knewstuff-5.81.0.tar.xz";
};
};
knotifications = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/knotifications-5.80.0.tar.xz";
sha256 = "1sfn61vhdqg3mxfvb802wx0l0k59b312fbh6w9bqv0b8z0a9jz2s";
name = "knotifications-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/knotifications-5.81.0.tar.xz";
sha256 = "04yfrhd098asr45swslnfkzxkb9892izvyam5rf0h93pw78ggmqs";
name = "knotifications-5.81.0.tar.xz";
};
};
knotifyconfig = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/knotifyconfig-5.80.0.tar.xz";
sha256 = "0b41ppif2qp7lkqmb7nv1r68hvavdl1lcgs4w50v2c0k4fflwizx";
name = "knotifyconfig-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/knotifyconfig-5.81.0.tar.xz";
sha256 = "0xrd9771g1x0s796pw6wkhl9jj9607pffmlxrj171c8n8hdfyjbs";
name = "knotifyconfig-5.81.0.tar.xz";
};
};
kpackage = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kpackage-5.80.0.tar.xz";
sha256 = "104qwyai3ivdw0jqgn6m59bajy07snas51rp75xgvb65hpllv2ch";
name = "kpackage-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kpackage-5.81.0.tar.xz";
sha256 = "1r1yv5y2swll38l88w559d8q0n4xizwgjp4qd8bh0vvsn24l65ka";
name = "kpackage-5.81.0.tar.xz";
};
};
kparts = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kparts-5.80.0.tar.xz";
sha256 = "1fkfjazr7bwh5nniylh403qp0g4bgiv01ckv4djf46gjf7qn9d4y";
name = "kparts-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kparts-5.81.0.tar.xz";
sha256 = "1gjqmwg5pjj41vwfsdffvr1gfbkbm12f77rlyfn9gg4z6bjdx47b";
name = "kparts-5.81.0.tar.xz";
};
};
kpeople = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kpeople-5.80.0.tar.xz";
sha256 = "1cn9jqiah3j0qi7sg1j9c10yq97pcisvxhm9jjzzzxna39zz16cw";
name = "kpeople-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kpeople-5.81.0.tar.xz";
sha256 = "1a63s8c946wrivqs8n680jpmcys8iafyy9j3isl4z5n88df2nnih";
name = "kpeople-5.81.0.tar.xz";
};
};
kplotting = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kplotting-5.80.0.tar.xz";
sha256 = "073icgz0cgg7wis3rf1hlsmxklp9vk8swgihfdlks1jds90s4nxw";
name = "kplotting-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kplotting-5.81.0.tar.xz";
sha256 = "1s368amqfqjmr99bz4xc0xfm2sf29s99z3zpwbx2lbjvqh3p5yyb";
name = "kplotting-5.81.0.tar.xz";
};
};
kpty = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kpty-5.80.0.tar.xz";
sha256 = "13blnrzni3n9p3xnn2kyd6g2hlpvvg0aqagknk64kchbvdkd5l4k";
name = "kpty-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kpty-5.81.0.tar.xz";
sha256 = "0la3jpkki1hskxg12nf3r59fw7r9q8n3sc7wcdik9r9c9rhlyjpk";
name = "kpty-5.81.0.tar.xz";
};
};
kquickcharts = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kquickcharts-5.80.0.tar.xz";
sha256 = "0kf72i9pkifcwg9njn296fw4d9gy3rc43g17128axj6a5jrd4bln";
name = "kquickcharts-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kquickcharts-5.81.0.tar.xz";
sha256 = "00w2m0pwilldip873w97l9hvgm6gfy1aj6blyzcxn7x1688lv1jz";
name = "kquickcharts-5.81.0.tar.xz";
};
};
kross = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/portingAids/kross-5.80.0.tar.xz";
sha256 = "06dyqmhxbr9ykca1bskkgxmsd86jpxnk4adygcw1j84xsl6jiki9";
name = "kross-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/portingAids/kross-5.81.0.tar.xz";
sha256 = "02jsyarn7ihv547b3vv5xwjm1bs58x5lhdnb74v02cwsgb82wlm3";
name = "kross-5.81.0.tar.xz";
};
};
krunner = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/krunner-5.80.0.tar.xz";
sha256 = "0bid6h0wmvmxfz664hmfhs4zp35mlk3n1p553rspfs55wh2f9xpw";
name = "krunner-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/krunner-5.81.0.tar.xz";
sha256 = "1yf04qw82hmz8g9hddyalh73b2dxk492n8g856d5m6ccq89c7ga5";
name = "krunner-5.81.0.tar.xz";
};
};
kservice = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kservice-5.80.0.tar.xz";
sha256 = "06bk46l3qg7dh57zsg9vwx8vq31ikjmbmy4nqn65mq786yiz4s78";
name = "kservice-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kservice-5.81.0.tar.xz";
sha256 = "1kb6wz8d879b57hpfi4ybpc9d3r67b205xdjmp3bhz21894haszc";
name = "kservice-5.81.0.tar.xz";
};
};
ktexteditor = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/ktexteditor-5.80.0.tar.xz";
sha256 = "0g073m18bpzhxdwzhqcyclsclwi91cqsjqq3fjz1hy56ird6b0d0";
name = "ktexteditor-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/ktexteditor-5.81.0.tar.xz";
sha256 = "1pbxkkqzk4l8n9am5r6w2s1smqwwcc2wagy9in0k80gbyszp9rvm";
name = "ktexteditor-5.81.0.tar.xz";
};
};
ktextwidgets = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/ktextwidgets-5.80.0.tar.xz";
sha256 = "1292knr3wblbk5j3qfzr1lqyiaa09pkhvkmh3jnlb0jvhc8xvmg8";
name = "ktextwidgets-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/ktextwidgets-5.81.0.tar.xz";
sha256 = "04mn22xmhkxqb138b9wf6jxz39dfp8rigdg3pzr5llx6gmrln9y8";
name = "ktextwidgets-5.81.0.tar.xz";
};
};
kunitconversion = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kunitconversion-5.80.0.tar.xz";
sha256 = "1hckj3k3jjsc4y89zvi5l9h6px6ns9kdqjrfkxbax459wha55b4l";
name = "kunitconversion-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kunitconversion-5.81.0.tar.xz";
sha256 = "1g9i253f3qjpcmfiy12zmbi41gld9fxy89d742b44xc88fhj3z1y";
name = "kunitconversion-5.81.0.tar.xz";
};
};
kwallet = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kwallet-5.80.0.tar.xz";
sha256 = "1pwrxhjxxdx7hl4456dk4x8z36ddw932cv08010fmz9m4w0yvjg1";
name = "kwallet-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kwallet-5.81.0.tar.xz";
sha256 = "1i05j20847bb9b7348f85fln6spqnkp3c9ysr7yvnm8wfyzrd1gz";
name = "kwallet-5.81.0.tar.xz";
};
};
kwayland = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kwayland-5.80.0.tar.xz";
sha256 = "1avr7ckyhw158wi5mlknzkcphn8vlf8dpb96gyizvsvg8b4gffs0";
name = "kwayland-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kwayland-5.81.0.tar.xz";
sha256 = "1a23zcf6aax1fyq4d6y88flyap8wwkbwnq4vkbybpbnxnkbwl8ny";
name = "kwayland-5.81.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kwidgetsaddons-5.80.0.tar.xz";
sha256 = "1wgwl08cxwzcd0nikvp2ph2dbj5fij6a5l65p9amvi6ladbgv6qs";
name = "kwidgetsaddons-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kwidgetsaddons-5.81.0.tar.xz";
sha256 = "0hmnlda1hgk6zwx6wnjzqc0b2awv835736sjyczrxcfaxlkfj99g";
name = "kwidgetsaddons-5.81.0.tar.xz";
};
};
kwindowsystem = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kwindowsystem-5.80.0.tar.xz";
sha256 = "1ch44w27ilh994if3icskyqg6nhnbd5j430jxfj6fzfia9vvclmk";
name = "kwindowsystem-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kwindowsystem-5.81.0.tar.xz";
sha256 = "11ma5vhq8z570danzq9vdwwcq5n6drsm9m3rpvc1vd3kn2mslls7";
name = "kwindowsystem-5.81.0.tar.xz";
};
};
kxmlgui = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/kxmlgui-5.80.0.tar.xz";
sha256 = "17dpcv2igkg1pk238bd396mn83nqp325sscx7qsf8cbj15dp7bw1";
name = "kxmlgui-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/kxmlgui-5.81.0.tar.xz";
sha256 = "1l3a9qzc1x1ai2g1g551w05n2jxshxr03rcy0n8m8lbf518288yv";
name = "kxmlgui-5.81.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/portingAids/kxmlrpcclient-5.80.0.tar.xz";
sha256 = "0aas26kjxsbgrrrazjvsvjqdr9993v2hyxci62mfpi7xsp5js4h4";
name = "kxmlrpcclient-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/portingAids/kxmlrpcclient-5.81.0.tar.xz";
sha256 = "15q3w6wdn5ynhyv5244irq51qbm66bl7799zfs964c0y6dmmm3hg";
name = "kxmlrpcclient-5.81.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/modemmanager-qt-5.80.0.tar.xz";
sha256 = "1q14hx2228xhlggw14r9mhmnn2q3qvy3nc9hq5ynb9mwldns6nl6";
name = "modemmanager-qt-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/modemmanager-qt-5.81.0.tar.xz";
sha256 = "01rr4j09xqsja7h699yk58xif7qrlbszd0mim4cncy7pkgwn43h6";
name = "modemmanager-qt-5.81.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/networkmanager-qt-5.80.0.tar.xz";
sha256 = "1wdzn2n4m7nz6skjc37p70zaq42ighk5f1wg1hjx3yf3rlpprnp0";
name = "networkmanager-qt-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/networkmanager-qt-5.81.0.tar.xz";
sha256 = "1j26ja4r6ry7134yh8i6rkf6dy6kapnrjap9476mr78ig0d6r2if";
name = "networkmanager-qt-5.81.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/oxygen-icons5-5.80.0.tar.xz";
sha256 = "0kmq993vd6011qny949z13lli4qymprk616kl1628dazniapka9m";
name = "oxygen-icons5-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/oxygen-icons5-5.81.0.tar.xz";
sha256 = "1s0gvicrfw6dl164cccj05rfhp627mqa9ml0j4dvgvknnrgip6hz";
name = "oxygen-icons5-5.81.0.tar.xz";
};
};
plasma-framework = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/plasma-framework-5.80.0.tar.xz";
sha256 = "1nckb1801fy64hvm127r5fz14vgw81szw7w7miilqh6651v0zbyk";
name = "plasma-framework-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/plasma-framework-5.81.0.tar.xz";
sha256 = "0g36a632kafsvhamk33w46cafg1gyir3kkx12fkhyqll2vlpn0v7";
name = "plasma-framework-5.81.0.tar.xz";
};
};
prison = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/prison-5.80.0.tar.xz";
sha256 = "1fcsvww08f7ihxq6x84jd2klp29m8hrbzp7rxqi7x9ghxxgysbpz";
name = "prison-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/prison-5.81.0.tar.xz";
sha256 = "1mrrwhg98br4r9g7lj6gn3w1z2gfh9kr7ycispssjalyp6bdf4yg";
name = "prison-5.81.0.tar.xz";
};
};
purpose = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/purpose-5.80.0.tar.xz";
sha256 = "107xmhbjcw5mk068484gwqrzl2gkgy495737f4vj5q22m9rpal5d";
name = "purpose-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/purpose-5.81.0.tar.xz";
sha256 = "0188wxxy6rg6sm722db02nzhmlv3c540zs2qh6h9fbbf1k4h82jf";
name = "purpose-5.81.0.tar.xz";
};
};
qqc2-desktop-style = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/qqc2-desktop-style-5.80.0.tar.xz";
sha256 = "14dy7n6m9vdq6v7h3r0w71vw86yxyza40wyxp0hhj44nb63fvczg";
name = "qqc2-desktop-style-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/qqc2-desktop-style-5.81.0.tar.xz";
sha256 = "1ac4jc6yi6fwndyivc11brlaz3sncxyxzwrfdak8gg579z67zjx5";
name = "qqc2-desktop-style-5.81.0.tar.xz";
};
};
solid = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/solid-5.80.0.tar.xz";
sha256 = "023zk7la6ycd7h2j62z7b409w94sq2r9k0c020ywry6psjydqkx5";
name = "solid-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/solid-5.81.0.tar.xz";
sha256 = "0w144jdhspjgqpv0xyxr6l6bnh2bazn9jfbw5iim8fj4q5dyr6c1";
name = "solid-5.81.0.tar.xz";
};
};
sonnet = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/sonnet-5.80.0.tar.xz";
sha256 = "13kqdfy6bgmqjfw82d2zh0bq4r53awa1f1cbshci6inwdslyvlmh";
name = "sonnet-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/sonnet-5.81.0.tar.xz";
sha256 = "0kin6xngk4bxxn7y06q1pm0vk5s66gh6riv58l051px27m6lwz2a";
name = "sonnet-5.81.0.tar.xz";
};
};
syndication = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/syndication-5.80.0.tar.xz";
sha256 = "1j22yx2i2qxck6gy4jypjvmar4y93j5nmrmf7fkjx7z8hwxjgwhh";
name = "syndication-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/syndication-5.81.0.tar.xz";
sha256 = "1fxdhnd8kl0q13434vbkmjan9dakhn9bdrad9d4vd3x11c77ggkn";
name = "syndication-5.81.0.tar.xz";
};
};
syntax-highlighting = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/syntax-highlighting-5.80.0.tar.xz";
sha256 = "060jnfri24rzkryyvxadpr3yn5xn0856j01ba5l38w0khs8mix4i";
name = "syntax-highlighting-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/syntax-highlighting-5.81.0.tar.xz";
sha256 = "0paazw8y8kdvwg2waa45az5qgyxi2w5nkfbjg84v1is7yhb065yb";
name = "syntax-highlighting-5.81.0.tar.xz";
};
};
threadweaver = {
version = "5.80.0";
version = "5.81.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.80/threadweaver-5.80.0.tar.xz";
sha256 = "1j5m8gfjpi9cajhja77lhkrl3shq618wpza1k27azvi7r6jj4dva";
name = "threadweaver-5.80.0.tar.xz";
url = "${mirror}/stable/frameworks/5.81/threadweaver-5.81.0.tar.xz";
sha256 = "03mz4zibvmriaa9qxvqsnp3ahjnhylzjj80w5c6nc4jjywmi89af";
name = "threadweaver-5.81.0.tar.xz";
};
};
}
pkgs/development/libraries/libevent/default.nix
+4
View File
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "1fq30imk8zd26x8066di3kpc5zyfc5z6frr3zll685zcx4dxxrlj";
};
preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
MACOSX_DEPLOYMENT_TARGET=10.16
'';
# libevent_openssl is moved into its own output, so that openssl isn't present
# in the default closure.
outputs = [ "out" "dev" ]
pkgs/development/libraries/libical/default.nix
+2 -2
View File
@@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "libical";
version = "3.0.9";
version = "3.0.10";
outputs = [ "out" "dev" ]; # "devdoc" ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "libical";
repo = "libical";
rev = "v${version}";
sha256 = "sha256-efdiGktLGITaQ6VinnfYG52fMhO0Av+JKROt2kTvS1U=";
sha256 = "sha256-fLmEJlkZLYLcKZqZwitf8rH261QDPTJZf/+/+FMsGIg=";
};
nativeBuildInputs = [
pkgs/development/libraries/libidn2/default.nix
+6 -4
View File
@@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, libiconv, libunistring, help2man, buildPackages }:
{ fetchurl, lib, stdenv, libiconv, libunistring, help2man, texinfo, buildPackages }:
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -9,18 +9,20 @@ with lib;
stdenv.mkDerivation rec {
pname = "libidn2";
version = "2.3.0";
version = "2.3.1";
src = fetchurl {
url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz";
sha256 = "1ddqr80kmz4l8g3r3gf7bmf2v29fgivlc2bgxfiscjg2sarivjz1";
sha256 = "sha256-ivaElDg2uLU5ZdX1tnFO8TwmyR6qNs59JC49IfXUDy0=";
};
outputs = [ "bin" "dev" "out" "info" "devdoc" ];
patches = optional stdenv.isDarwin ./fix-error-darwin.patch;
nativeBuildInputs = optional stdenv.isDarwin help2man;
# The above patch causes the documentation to be regenerated, so the
# documentation tools are required.
nativeBuildInputs = optionals stdenv.isDarwin [ help2man texinfo ];
buildInputs = [ libunistring ] ++ optional stdenv.isDarwin libiconv;
depsBuildBuild = [ buildPackages.stdenv.cc ];
pkgs/development/libraries/libsoup/default.nix
+9 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome, libsysprof-capture
{ stdenv, lib, fetchurl, fetchpatch, glib, libxml2, meson, ninja, pkg-config, gnome, libsysprof-capture
, gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
, libpsl, python3, brotli
}:
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p";
};
patches = [
(fetchpatch {
# https://gitlab.gnome.org/GNOME/libsoup/-/issues/222
url = "https://gitlab.gnome.org/GNOME/libsoup/commit/b5e4f15a09d197b6a9b4b2d78b33779f27d828af.patch";
sha256 = "1hqk8lqzc200hi0nwbwq9qm6f03z296cnd79d4ql30683s80xqws";
})
];
postPatch = ''
patchShebangs libsoup/
'';
pkgs/development/libraries/libxml2/default.nix
+8 -26
View File
@@ -1,18 +1,18 @@
{ stdenv, lib, fetchurl, fetchpatch
{ stdenv, lib, fetchurl
, zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs
, pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform
, icuSupport ? false, icu ? null
, enableShared ? stdenv.hostPlatform.libc != "msvcrt"
, enableStatic ? !enableShared,
, enableStatic ? !enableShared
}:
stdenv.mkDerivation rec {
pname = "libxml2";
version = "2.9.10";
version = "2.9.12";
src = fetchurl {
url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
sha256 = "07xynh8hcxb2yb1fs051xrgszjvj37wnxvxgsj10rzmqzy9y3zma";
sha256 = "14hxwzmf5xqppx77z7i0ni9lpzg1a84dqpf8j8l1fvy570g6imn8";
};
patches = [
# Upstream bugs:
@@ -27,28 +27,6 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/pull/63174
# https://github.com/NixOS/nixpkgs/pull/72342
./utf8-xmlErrorFuncHandler.patch
(fetchpatch {
name = "CVE-2019-20388.patch";
url = "https://gitlab.gnome.org/GNOME/libxml2/commit/6088a74bcf7d0c42e24cff4594d804e1d3c9fbca.patch";
sha256 = "070s7al2r2k92320h9cdfc2097jy4kk04d0disc98ddc165r80jl";
})
(fetchpatch {
name = "CVE-2020-7595.patch";
url = "https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch";
sha256 = "0klvaxkzakkpyq0m44l9xrpn5kwaii194sqsivfm6zhnb9hhl15l";
})
(fetchpatch {
name = "CVE-2020-24977.patch";
url = "https://gitlab.gnome.org/GNOME/libxml2/commit/50f06b3efb638efb0abd95dc62dca05ae67882c2.patch";
sha256 = "093f1ic5qfiq8nk9mc6b8p1qcs8m9hir3ardr6r5il4zi2dnjrj4";
})
# Fix compatibility with Python 3.9.
# https://gitlab.gnome.org/GNOME/libxml2/-/issues/149
(fetchpatch {
name = "python39.patch";
url = "https://gitlab.gnome.org/nwellnhof/libxml2/-/commit/e4fb36841800038c289997432ca547c9bfef9db1.patch";
sha256 = "0h3vpy9fg3339b14qa64640ypp65z3hrrrmpjl8qm72srkp24ci5";
})
];
outputs = [ "bin" "dev" "out" "man" "doc" ]
@@ -75,6 +53,10 @@ stdenv.mkDerivation rec {
(lib.withFeatureAs pythonSupport "python" python)
];
preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
MACOSX_DEPLOYMENT_TARGET=10.16
'';
enableParallelBuilding = true;
# disable test that's problematic with newer pythons: see
pkgs/development/libraries/libxslt/default.nix
+7 -2
View File
@@ -1,4 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python3, libgcrypt
{ lib, stdenv, fetchurl
, pkg-config
, libxml2, findXMLCatalogs, gettext, python3, libgcrypt
, cryptoSupport ? false
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
}:
@@ -14,6 +16,10 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py";
nativeBuildInputs = [
pkg-config
];
buildInputs = [ libxml2.dev ]
++ lib.optional stdenv.isDarwin gettext
++ lib.optionals pythonSupport [ libxml2.py python3 ]
@@ -22,7 +28,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ findXMLCatalogs ];
configureFlags = [
"--with-libxml-prefix=${libxml2.dev}"
"--without-debug"
"--without-mem-debug"
"--without-debugger"
pkgs/development/libraries/lmdb/default.nix
+1 -1
View File
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so";
doCheck = true;
checkPhase = "make test";
checkTarget = "test";
postInstall = ''
moveToOutput bin "$bin"
pkgs/development/libraries/lyra/default.nix
-2
View File
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja ];
enableParallelBuilding = true;
postPatch = "sed -i s#/usr#$out#g meson.build";
postInstall = ''
pkgs/development/libraries/mesa/default.nix
-1
View File
@@ -145,7 +145,6 @@ self = stdenv.mkDerivation {
] ++ optional stdenv.isLinux libdrm
++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
enableParallelBuilding = true;
doCheck = false;
postInstall = ''
pkgs/development/libraries/openbsm/default.nix
+4
View File
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
patches = lib.optional stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ];
preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
MACOSX_DEPLOYMENT_TARGET=10.16
'';
configureFlags = [ "ac_cv_file__usr_include_mach_audit_triggers_defs=no" ];
meta = {
pkgs/development/libraries/openldap/default.nix
+4
View File
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
"CC=${stdenv.cc.targetPrefix}cc"
];
preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
MACOSX_DEPLOYMENT_TARGET=10.16
'';
configureFlags = [
"--enable-overlays"
"--disable-dependency-tracking" # speeds up one-time build
pkgs/development/libraries/openssl/default.nix
+1
View File
@@ -69,6 +69,7 @@ let
armv6l-linux = "./Configure linux-armv4 -march=armv6";
armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
x86_64-darwin = "./Configure darwin64-x86_64-cc";
aarch64-darwin = "./Configure darwin64-arm64-cc";
x86_64-linux = "./Configure linux-x86_64";
x86_64-solaris = "./Configure solaris64-x86_64-gcc";
}.${stdenv.hostPlatform.system} or (
pkgs/development/libraries/pcre/default.nix
+2 -1
View File
@@ -23,7 +23,8 @@ in stdenv.mkDerivation {
outputs = [ "bin" "dev" "out" "doc" "man" ];
configureFlags = optional (!stdenv.hostPlatform.isRiscV) "--enable-jit" ++ [
# Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51
configureFlags = optional (!stdenv.hostPlatform.isRiscV && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit" ++ [
"--enable-unicode-properties"
"--disable-cpp"
]
pkgs/development/libraries/pcre2/default.nix
+2 -1
View File
@@ -8,10 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "0p3699msps07p40g9426lvxa3b41rg7k2fn7qxl2jm0kh4kkkvx9";
};
# Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51
configureFlags = [
"--enable-pcre2-16"
"--enable-pcre2-32"
] ++ lib.optional (!stdenv.hostPlatform.isRiscV) "--enable-jit";
] ++ lib.optional (!stdenv.hostPlatform.isRiscV && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit";
outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
pkgs/development/libraries/poppler/default.nix
+75 -41
View File
@@ -1,44 +1,77 @@
{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkg-config, libiconv, libintl
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
{ stdenv
, lib
, fetchurl
, fetchpatch
, cmake
, ninja
, pkg-config
, libiconv
, libintl
, zlib
, curl
, cairo
, freetype
, fontconfig
, lcms
, libjpeg
, openjpeg
, withData ? true, poppler_data
, qt5Support ? false, qtbase ? null
, introspectionSupport ? false, gobject-introspection ? null
, utils ? false, nss ? null
, minimal ? false, suffix ? "glib"
, minimal ? false
, suffix ? "glib"
, inkscape
, cups-filters
, texlive
, scribusUnstable
}:
let
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in
stdenv.mkDerivation (rec {
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";
version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "sha256-XBR1nJmJHm5HKs7W1fD/Haz4XYDNkCbTZcVcZT7feSw=";
};
version = "21.05.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
outputs = [ "out" "dev" ];
buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data;
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "sha256-2v1Te2gPrRIVvED8U9HzjoRJ18GFvGDVqJ4dJskNvYw=";
};
nativeBuildInputs = [
cmake
ninja
pkg-config
];
buildInputs = [
libiconv
libintl
] ++ lib.optional withData [
poppler_data
];
# TODO: reduce propagation to necessary libs
propagatedBuildInputs = with lib;
[ zlib freetype fontconfig libjpeg openjpeg ]
++ optionals (!minimal) [ cairo lcms curl ]
++ optional qt5Support qtbase
++ optional utils nss
++ optional introspectionSupport gobject-introspection;
nativeBuildInputs = [ cmake ninja pkg-config ];
# Workaround #54606
preConfigure = lib.optionalString stdenv.isDarwin ''
sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
'';
dontWrapQtApps = true;
propagatedBuildInputs = [
zlib
freetype
fontconfig
libjpeg
openjpeg
] ++ lib.optionals (!minimal) [
cairo
lcms
curl
] ++ lib.optionals qt5Support [
qtbase
] ++ lib.optionals utils [
nss
] ++ lib.optionals introspectionSupport [
gobject-introspection
];
cmakeFlags = [
(mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS"
@@ -49,6 +82,20 @@ stdenv.mkDerivation (rec {
(mkFlag qt5Support "QT5")
];
dontWrapQtApps = true;
# Workaround #54606
preConfigure = lib.optionalString stdenv.isDarwin ''
sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
'';
passthru = {
tests = {
# These depend on internal poppler code that frequently changes.
inherit inkscape cups-filters texlive scribusUnstable;
};
};
meta = with lib; {
homepage = "https://poppler.freedesktop.org/";
description = "A PDF rendering library";
@@ -59,21 +106,8 @@ stdenv.mkDerivation (rec {
installed separately.
'';
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members;
};
} // lib.optionalAttrs stdenv.isDarwin {
patches = [
# Fix build due to improperly used volatile in poppler-glib.
# https://gitlab.freedesktop.org/poppler/poppler/merge_requests/836
(fetchpatch {
url = "https://gitlab.freedesktop.org/poppler/poppler/commit/47de887d7658cfd68df44b3acf710971054f957b.patch";
sha256 = "uvYibBn2fOEqdotxK0Wpf8KhGYZXrpHdmS4jjlRNCj8=";
})
(fetchpatch {
url = "https://gitlab.freedesktop.org/poppler/poppler/commit/bdd110b45a38e8a4f80f522892e4c4a9e432abd5.patch";
sha256 = "WDUYXX6v5zk7tusz7DGBP58yFzgEvoBlNSLbfk7+QTc=";
})
];
})
}
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch
+40 -14
View File
@@ -1,6 +1,6 @@
From 8bdbddc2e5fef1553b1ba0297d3c03b38e9b947b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 18 Sep 2019 05:39:39 -0500
From 9ffbcc5e362d17aea3e3d67e43cd3cd993e987eb Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Mon, 12 Apr 2021 20:05:25 +0200
Subject: [PATCH 03/12] qtbase-mkspecs
---
@@ -12,13 +12,13 @@ Subject: [PATCH 03/12] qtbase-mkspecs
mkspecs/features/qt_build_paths.prf | 4 +-
mkspecs/features/qt_docs.prf | 10 +--
mkspecs/features/qt_example_installs.prf | 2 +-
mkspecs/features/qt_functions.prf | 2 +-
mkspecs/features/qt_functions.prf | 27 ++++---
mkspecs/features/qt_installs.prf | 22 ++---
mkspecs/features/qt_plugin.prf | 2 +-
11 files changed, 39 insertions(+), 142 deletions(-)
11 files changed, 53 insertions(+), 153 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 00da9bd33f..bd166fbfea 100644
index 02e5775983..3782949d32 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -21,7 +21,7 @@ load(cmake_functions)
@@ -96,7 +96,7 @@ index 00da9bd33f..bd166fbfea 100644
INSTALLS += cmake_qt5_plugin_file
return()
@@ -333,7 +308,7 @@ exists($$cmake_macros_file.input) {
@@ -334,7 +309,7 @@ exists($$cmake_macros_file.input) {
cmake_qt5_module_files.files += $$cmake_macros_file.output
}
@@ -370,18 +370,44 @@ index 43b58817fe..e635b8f67a 100644
check_examples {
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 1903e509c8..ae7b585989 100644
index 1903e509c8..1dc117a388 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@@ -69,19 +69,22 @@ defineTest(qtHaveModule) {
defineTest(qtPrepareTool) {
cmd = $$eval(QT_TOOL.$${2}.binary)
isEmpty(cmd) {
- cmd = $$[QT_HOST_BINS]/$$2
+ cmd = $$system("command -v $$2")
exists($${cmd}.pl) {
$${1}_EXE = $${cmd}.pl
cmd = perl -w $$system_path($${cmd}.pl)
- exists($${cmd}.pl) {
- $${1}_EXE = $${cmd}.pl
- cmd = perl -w $$system_path($${cmd}.pl)
- } else: contains(QMAKE_HOST.os, Windows) {
- $${1}_EXE = $${cmd}.exe
- cmd = $$system_path($${cmd}.exe)
- } else:contains(QMAKE_HOST.os, Darwin) {
- BUNDLENAME = $${cmd}.app/Contents/MacOS/$$2
- exists($$BUNDLENAME) {
- cmd = $$BUNDLENAME
+ cmd = $$system("command -v $${2}")
+ isEmpty(cmd) {
+ cmd = $$system("command -v $${2}.pl")
+ !isEmpty(cmd) {
+ $${1}_EXE = $$cmd
+ cmd = perl -w $$system_path($${cmd})
+ } else: contains(QMAKE_HOST.os, Windows) {
+ cmd = $$system("command -v $${2}.exe")
+ $${1}_EXE = $$cmd
+ } else: contains(QMAKE_HOST.os, Darwin) {
+ cmd = $$system("command -v $${2}.app")
+ !isEmpty(cmd) {
+ cmd = $${cmd}/Contents/MacOS/$${2}
+ $${1}_EXE = $$cmd
+ }
}
- $${1}_EXE = $$cmd
} else {
$${1}_EXE = $$cmd
}
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
index 1ebca17366..b784441da0 100644
--- a/mkspecs/features/qt_installs.prf
@@ -461,5 +487,5 @@ index 40528a65e2..903f795284 100644
TARGET = $$qt5LibraryTarget($$TARGET)
--
2.23.GIT
2.29.3
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch
+38 -12
View File
@@ -1,6 +1,6 @@
From 1cb5581d7f20bf87ac8d67a7295447a78a1d9645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Sat, 4 Apr 2020 00:25:52 +0200
From 87c81a31d65862a2f32fdc575cfb47b7a46bfae7 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Mon, 12 Apr 2021 20:05:25 +0200
Subject: [PATCH 03/10] qtbase-mkspecs
---
@@ -12,10 +12,10 @@ Subject: [PATCH 03/10] qtbase-mkspecs
mkspecs/features/qt_build_paths.prf | 4 +-
mkspecs/features/qt_docs.prf | 10 +--
mkspecs/features/qt_example_installs.prf | 2 +-
mkspecs/features/qt_functions.prf | 2 +-
mkspecs/features/qt_functions.prf | 27 ++++---
mkspecs/features/qt_installs.prf | 22 ++---
mkspecs/features/qt_plugin.prf | 2 +-
11 files changed, 38 insertions(+), 141 deletions(-)
11 files changed, 52 insertions(+), 152 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 0e71fd0015..ba071d9a70 100644
@@ -369,18 +369,44 @@ index 72b47bce27..d59e949e78 100644
check_examples {
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 7777e615bd..abeb03a663 100644
index 7777e615bd..b0c6880a74 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -87,7 +87,7 @@ defineTest(qtHaveModule) {
@@ -87,19 +87,22 @@ defineTest(qtHaveModule) {
defineTest(qtPrepareTool) {
cmd = $$eval(QT_TOOL.$${2}.binary)
isEmpty(cmd) {
- cmd = $$[QT_HOST_BINS]/$$2
+ cmd = $$system("command -v $$2")
exists($${cmd}.pl) {
$${1}_EXE = $${cmd}.pl
cmd = perl -w $$system_path($${cmd}.pl)
- exists($${cmd}.pl) {
- $${1}_EXE = $${cmd}.pl
- cmd = perl -w $$system_path($${cmd}.pl)
- } else: contains(QMAKE_HOST.os, Windows) {
- $${1}_EXE = $${cmd}.exe
- cmd = $$system_path($${cmd}.exe)
- } else:contains(QMAKE_HOST.os, Darwin) {
- BUNDLENAME = $${cmd}.app/Contents/MacOS/$$2
- exists($$BUNDLENAME) {
- cmd = $$BUNDLENAME
+ cmd = $$system("command -v $${2}")
+ isEmpty(cmd) {
+ cmd = $$system("command -v $${2}.pl")
+ !isEmpty(cmd) {
+ $${1}_EXE = $$cmd
+ cmd = perl -w $$system_path($${cmd})
+ } else: contains(QMAKE_HOST.os, Windows) {
+ cmd = $$system("command -v $${2}.exe")
+ $${1}_EXE = $$cmd
+ } else: contains(QMAKE_HOST.os, Darwin) {
+ cmd = $$system("command -v $${2}.app")
+ !isEmpty(cmd) {
+ cmd = $${cmd}/Contents/MacOS/$${2}
+ $${1}_EXE = $$cmd
+ }
}
- $${1}_EXE = $$cmd
} else {
$${1}_EXE = $$cmd
}
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
index 1ebca17366..a8f958eae8 100644
--- a/mkspecs/features/qt_installs.prf
@@ -460,5 +486,5 @@ index 573d717eea..024c624cb6 100644
qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX
--
2.25.1
2.29.3
pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch
+43 -17
View File
@@ -1,6 +1,6 @@
From 82771c437957b3684ce296997d795432756aa8b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Sat, 4 Apr 2020 00:25:52 +0200
From 03a5a7eab673d18d00c9b5eb8c7d5b790079e8ff Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Mon, 12 Apr 2021 20:20:46 +0200
Subject: [PATCH 03/11] qtbase-mkspecs
---
@@ -12,10 +12,10 @@ Subject: [PATCH 03/11] qtbase-mkspecs
mkspecs/features/qt_build_paths.prf | 4 +-
mkspecs/features/qt_docs.prf | 10 +--
mkspecs/features/qt_example_installs.prf | 2 +-
mkspecs/features/qt_functions.prf | 2 +-
mkspecs/features/qt_functions.prf | 27 ++++---
mkspecs/features/qt_installs.prf | 22 ++---
mkspecs/features/qt_plugin.prf | 2 +-
11 files changed, 38 insertions(+), 141 deletions(-)
11 files changed, 52 insertions(+), 152 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 24ed125f12..f0666a1986 100644
@@ -105,7 +105,7 @@ index 24ed125f12..f0666a1986 100644
# 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
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 309798a767..b6c3ab8609 100644
index db18dbece6..8246f37931 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -2,30 +2,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
@@ -200,7 +200,7 @@ index 309798a767..b6c3ab8609 100644
!!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
!!ENDIF
@@ -499,25 +455,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -491,25 +447,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
!!IF isEmpty(CMAKE_DEBUG_TYPE)
!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -226,7 +226,7 @@ index 309798a767..b6c3ab8609 100644
_populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE})
!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
endif()
@@ -536,25 +480,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -528,25 +472,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
!!IF isEmpty(CMAKE_RELEASE_TYPE)
!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -252,7 +252,7 @@ index 309798a767..b6c3ab8609 100644
_populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE})
!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
endif()
@@ -581,11 +513,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -573,11 +505,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
IsDebugAndRelease)
set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
@@ -265,7 +265,7 @@ index 309798a767..b6c3ab8609 100644
set_target_properties(Qt5::${Plugin} PROPERTIES
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
index c0b50416c9..cabe39b22e 100644
index 3d6cd9b3db..ca8b0b2701 100644
--- a/mkspecs/features/qml_module.prf
+++ b/mkspecs/features/qml_module.prf
@@ -51,7 +51,7 @@ builtin_resources {
@@ -369,18 +369,44 @@ index 15b373ba40..5c373fe1d5 100644
check_examples {
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 7777e615bd..abeb03a663 100644
index 7777e615bd..b0c6880a74 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -87,7 +87,7 @@ defineTest(qtHaveModule) {
@@ -87,19 +87,22 @@ defineTest(qtHaveModule) {
defineTest(qtPrepareTool) {
cmd = $$eval(QT_TOOL.$${2}.binary)
isEmpty(cmd) {
- cmd = $$[QT_HOST_BINS]/$$2
+ cmd = $$system("command -v $$2")
exists($${cmd}.pl) {
$${1}_EXE = $${cmd}.pl
cmd = perl -w $$system_path($${cmd}.pl)
- exists($${cmd}.pl) {
- $${1}_EXE = $${cmd}.pl
- cmd = perl -w $$system_path($${cmd}.pl)
- } else: contains(QMAKE_HOST.os, Windows) {
- $${1}_EXE = $${cmd}.exe
- cmd = $$system_path($${cmd}.exe)
- } else:contains(QMAKE_HOST.os, Darwin) {
- BUNDLENAME = $${cmd}.app/Contents/MacOS/$$2
- exists($$BUNDLENAME) {
- cmd = $$BUNDLENAME
+ cmd = $$system("command -v $${2}")
+ isEmpty(cmd) {
+ cmd = $$system("command -v $${2}.pl")
+ !isEmpty(cmd) {
+ $${1}_EXE = $$cmd
+ cmd = perl -w $$system_path($${cmd})
+ } else: contains(QMAKE_HOST.os, Windows) {
+ cmd = $$system("command -v $${2}.exe")
+ $${1}_EXE = $$cmd
+ } else: contains(QMAKE_HOST.os, Darwin) {
+ cmd = $$system("command -v $${2}.app")
+ !isEmpty(cmd) {
+ cmd = $${cmd}/Contents/MacOS/$${2}
+ $${1}_EXE = $$cmd
+ }
}
- $${1}_EXE = $$cmd
} else {
$${1}_EXE = $$cmd
}
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
index 1ebca17366..a8f958eae8 100644
--- a/mkspecs/features/qt_installs.prf
@@ -460,5 +486,5 @@ index 573d717eea..024c624cb6 100644
qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX
--
2.25.4
2.29.3
pkgs/development/libraries/qt-5/modules/qtcharts.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtcharts";
pname = "qtcharts";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }:
qtModule {
name = "qtconnectivity";
pname = "qtconnectivity";
qtInputs = [ qtbase qtdeclarative ];
buildInputs = lib.optional stdenv.isLinux bluez;
outputs = [ "out" "dev" "bin" ];
pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
+1 -1
View File
@@ -3,7 +3,7 @@
with lib;
qtModule {
name = "qtdeclarative";
pname = "qtdeclarative";
qtInputs = [ qtbase qtsvg ];
nativeBuildInputs = [ python3 ];
outputs = [ "out" "dev" "bin" ];
pkgs/development/libraries/qt-5/modules/qtdoc.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtdeclarative }:
qtModule {
name = "qtdoc";
pname = "qtdoc";
qtInputs = [ qtdeclarative ];
outputs = [ "out" ];
}
pkgs/development/libraries/qt-5/modules/qtgamepad.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative, pkg-config }:
qtModule {
name = "qtgamepad";
pname = "qtgamepad";
qtInputs = [ qtbase qtdeclarative ];
buildInputs = [ ];
nativeBuildInputs = [ pkg-config ];
pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtdeclarative }:
qtModule {
name = "qtgraphicaleffects";
pname = "qtgraphicaleffects";
qtInputs = [ qtdeclarative ];
outputs = [ "out" "dev" ];
}
pkgs/development/libraries/qt-5/modules/qtimageformats.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtbase, libtiff }:
qtModule {
name = "qtimageformats";
pname = "qtimageformats";
qtInputs = [ qtbase ];
propagatedBuildInputs = [ libtiff ];
}
pkgs/development/libraries/qt-5/modules/qtlocation.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, qtModule, qtbase, qtmultimedia }:
qtModule {
name = "qtlocation";
pname = "qtlocation";
qtInputs = [ qtbase qtmultimedia ];
outputs = [ "bin" "out" "dev" ];
qmakeFlags = lib.optional stdenv.isDarwin [
pkgs/development/libraries/qt-5/modules/qtmacextras.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, qtModule, qtbase }:
qtModule {
name = "qtmacextras";
pname = "qtmacextras";
qtInputs = [ qtbase ];
meta = with lib; {
maintainers = with maintainers; [ periklis ];
pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
+1 -1
View File
@@ -5,7 +5,7 @@
with lib;
qtModule {
name = "qtmultimedia";
pname = "qtmultimedia";
qtInputs = [ qtbase qtdeclarative ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gstreamer gst-plugins-base libpulseaudio ]
pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ qtModule, qtbase }:
qtModule {
name = "qtnetworkauth";
pname = "qtnetworkauth";
qtInputs = [ qtbase ];
}
pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ qtModule, qtdeclarative }:
qtModule {
name = "qtquickcontrols";
pname = "qtquickcontrols";
qtInputs = [ qtdeclarative ];
}
pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtdeclarative }:
qtModule {
name = "qtquickcontrols2";
pname = "qtquickcontrols2";
qtInputs = [ qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
pkgs/development/libraries/qt-5/modules/qtscript.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ qtModule, qtbase, qttools }:
qtModule {
name = "qtscript";
pname = "qtscript";
qtInputs = [ qtbase qttools ];
}
pkgs/development/libraries/qt-5/modules/qtscxml.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtscxml";
pname = "qtscxml";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
pkgs/development/libraries/qt-5/modules/qtsensors.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtsensors";
pname = "qtsensors";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
pkgs/development/libraries/qt-5/modules/qtserialbus.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ qtModule, qtbase, qtserialport }:
qtModule {
name = "qtserialbus";
pname = "qtserialbus";
qtInputs = [ qtbase qtserialport ];
}
pkgs/development/libraries/qt-5/modules/qtserialport.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let inherit (lib) getLib optional; in
qtModule {
name = "qtserialport";
pname = "qtserialport";
qtInputs = [ qtbase ];
NIX_CFLAGS_COMPILE =
optional stdenv.isLinux
pkgs/development/libraries/qt-5/modules/qtspeech.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule }:
qtModule {
name = "qtspeech";
pname = "qtspeech";
qtInputs = [ ];
outputs = [ "out" "dev" ];
}
pkgs/development/libraries/qt-5/modules/qtsvg.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtbase }:
qtModule {
name = "qtsvg";
pname = "qtsvg";
qtInputs = [ qtbase ];
outputs = [ "out" "dev" "bin" ];
}
pkgs/development/libraries/qt-5/modules/qttools.nix
+1 -1
View File
@@ -3,7 +3,7 @@
with lib;
qtModule {
name = "qttools";
pname = "qttools";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
pkgs/development/libraries/qt-5/modules/qttranslations.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ qtModule, qttools }:
qtModule {
name = "qttranslations";
pname = "qttranslations";
qtInputs = [ qttools ];
}
pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ qtModule, qtbase, qtdeclarative, qtsvg, hunspell }:
qtModule {
name = "qtvirtualkeyboard";
pname = "qtvirtualkeyboard";
qtInputs = [ qtbase qtdeclarative qtsvg hunspell ];
}
pkgs/development/libraries/qt-5/modules/qtwayland.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }:
qtModule {
name = "qtwayland";
pname = "qtwayland";
qtInputs = [ qtbase qtquickcontrols ];
buildInputs = [ wayland ];
nativeBuildInputs = [ pkg-config ];
pkgs/development/libraries/qt-5/modules/qtwebchannel.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtwebchannel";
pname = "qtwebchannel";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+1 -9
View File
@@ -25,18 +25,10 @@
with lib;
qtModule {
name = "qtwebengine";
pname = "qtwebengine";
qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
nativeBuildInputs = [
bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs
# qmake looks for syncqt instead of syncqt.pl and fails with a cryptic
# error if it can't find it. syncqt.pl also has a /usr/bin/env shebang, so
# it can't be directly used in a sandboxed build environment.
(writeScriptBin "syncqt" ''
#!${stdenv.shell}
exec ${perl}/bin/perl ${qtbase.dev}/bin/syncqt.pl "$@"
'')
] ++ optional stdenv.isDarwin xcbuild;
doCheck = true;
outputs = [ "bin" "dev" "out" ];
pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ qtModule, qtbase, qtwebsockets }:
qtModule {
name = "qtwebglplugin";
pname = "qtwebglplugin";
qtInputs = [ qtbase qtwebsockets ];
}
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+1 -1
View File
@@ -22,7 +22,7 @@ let
usingAnnulenWebkitFork = lib.versionAtLeast qtbase.version "5.11.0";
in
qtModule {
name = "qtwebkit";
pname = "qtwebkit";
qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ]
++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia
++ optional usingAnnulenWebkitFork qtwebchannel;
pkgs/development/libraries/qt-5/modules/qtwebsockets.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtwebsockets";
pname = "qtwebsockets";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
pkgs/development/libraries/qt-5/modules/qtwebview.nix
+1 -1
View File
@@ -3,7 +3,7 @@
with lib;
qtModule {
name = "qtwebview";
pname = "qtwebview";
qtInputs = [ qtdeclarative qtwebengine ];
buildInputs = optional (stdenv.isDarwin) [
darwin.apple_sdk.frameworks.CoreFoundation
pkgs/development/libraries/qt-5/modules/qtx11extras.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ qtModule, qtbase }:
qtModule {
name = "qtx11extras";
pname = "qtx11extras";
qtInputs = [ qtbase ];
}
pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtxmlpatterns";
pname = "qtxmlpatterns";
qtInputs = [ qtbase qtdeclarative ];
devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ];
}
pkgs/development/libraries/qt-5/qtModule.nix
+1 -1
View File
@@ -7,7 +7,7 @@ let inherit (lib) licenses maintainers platforms; in
args:
let
pname = args.name;
inherit (args) pname;
version = args.version or srcs.${pname}.version;
src = args.src or srcs.${pname}.src;
in
pkgs/development/libraries/spdk/default.nix
-2
View File
@@ -55,8 +55,6 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.
enableParallelBuilding = true;
meta = with lib; {
description = "Set of libraries for fast user-mode storage";
homepage = "https://spdk.io/";
pkgs/development/libraries/wasilibc/default.nix
+2 -1
View File
@@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, lib }:
stdenv.mkDerivation {
name = "wasilibc-20190712";
pname = "wasilibc";
version = "20190712";
src = fetchFromGitHub {
owner = "CraneStation";
repo = "wasi-libc";
pkgs/development/libraries/wayland/default.nix
+6
View File
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, substituteAll
, meson
, pkg-config
@@ -37,6 +38,11 @@ stdenv.mkDerivation rec {
};
patches = [
# Picked from upstream 'main' branch for Darwin support.
(fetchpatch {
url = "https://gitlab.freedesktop.org/wayland/wayland/-/commit/f452e41264387dee4fd737cbf1af58b34b53941b.patch";
sha256 = "00mk32a01vgn31sm3wk4p8mfwvqv3xv02rxvdj1ygnzgb1ac62r7";
})
(substituteAll {
src = ./0001-add-placeholder-for-nm.patch;
nm = "${stdenv.cc.targetPrefix}nm";
pkgs/development/libraries/zlib/default.nix
+2 -2
View File
@@ -37,8 +37,8 @@ stdenv.mkDerivation (rec {
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace configure \
--replace '/usr/bin/libtool' 'ar' \
--replace 'AR="libtool"' 'AR="ar"' \
--replace '/usr/bin/libtool' '${stdenv.cc.targetPrefix}ar' \
--replace 'AR="libtool"' 'AR="${stdenv.cc.targetPrefix}ar"' \
--replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
'';