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

Merge branch 'staging' into rust-cross

Browse Source
This commit is contained in:
John Ericson 2019-04-01 00:46:13 -04:00
commit 716503d063
146 changed files with 2981 additions and 2391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/systems/default.nix
View File

@ -35,6 +35,7 @@ rec {
else if final.isAndroid then "bionic"
else if final.isLinux /* default */ then "glibc"
else if final.isAvr then "avrlibc"
else if final.isNetBSD then "nblibc"
# TODO(@Ericson2314) think more about other operating systems
else "native/impure";
extensions = {

2
lib/systems/doubles.nix
View File

@ -47,5 +47,5 @@ in rec {
unix = filterDoubles predicates.isUnix;
windows = filterDoubles predicates.isWindows;
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux"];
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"];
}

7
lib/systems/examples.nix
View File

@ -212,4 +212,11 @@ rec {
libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
platform = {};
};
# BSDs
amd64-netbsd = {
config = "x86_64-unknown-netbsd";
libc = "nblibc";
};
}

2
nixos/doc/manual/installation/installing.xml
View File

@ -54,7 +54,7 @@
<para>
To manually configure the network on the graphical installer, first disable
network-manager with <command>systemctl stop network-manager</command>.
network-manager with <command>systemctl stop NetworkManager</command>.
</para>
<para>

7
nixos/doc/manual/release-notes/rl-1909.xml
View File

@ -72,6 +72,13 @@
accordingly.
</para>
</listitem>
<listitem>
<para>
The NetworkManager systemd unit was renamed back from network-manager.service to
NetworkManager.service for better compatibility with other applications expecting this name.
The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
</para>
</listitem>
</itemizedlist>
</section>

2
nixos/modules/config/system-path.nix
View File

@ -7,7 +7,7 @@ with lib;
let
requiredPackages = map lib.lowPrio
requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg)
[ config.nix.package
pkgs.acl
pkgs.attr

8
nixos/modules/services/networking/networkmanager.nix
View File

@ -466,7 +466,7 @@ in {
systemd.packages = cfg.packages;
systemd.services."network-manager" = {
systemd.services."NetworkManager" = {
wantedBy = [ "network.target" ];
restartTriggers = [ configFile ];
@ -478,9 +478,9 @@ in {
};
systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
wantedBy = [ "network-manager.service" ];
before = [ "network-manager.service" ];
partOf = [ "network-manager.service" ];
wantedBy = [ "NetworkManager.service" ];
before = [ "NetworkManager.service" ];
partOf = [ "NetworkManager.service" ];
script = concatStrings (mapAttrsToList (n: d: ''
mkdir -p "/run/NetworkManager/hostsdirs/${n}"
chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}"

4
pkgs/applications/audio/fluidsynth/default.nix
View File

@ -11,8 +11,8 @@ let
sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
};
"2" = {
fluidsynthVersion = "2.0.3";
sha256 = "00f6bhw4ddrinb5flvg5y53rcvnf4km23a6nbvnswmpq13568v78";
fluidsynthVersion = "2.0.4";
sha256 = "1v2vji02fbrjgypwb4fw2r90hnfwfbfh3d24j8vjwlbqxhxp16s0";
};
};
in

4
pkgs/applications/editors/kdevelop5/kdev-php.nix
View File

@ -12,10 +12,6 @@ stdenv.mkDerivation rec {
sha256 = "0yjn7y7al2xs8g0mrjvcym8gbjy4wmiv7lsljcrasjd7ymag1wgs";
};
cmakeFlags = [
"-DBUILD_TESTING=OFF"
];
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ];

1
pkgs/applications/editors/kdevelop5/kdev-python.nix
View File

@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
};
cmakeFlags = [
"-DBUILD_TESTING=OFF"
"-DPYTHON_EXECUTABLE=${python}/bin/python"
];

1
pkgs/applications/graphics/seg3d/default.nix
View File

@ -23,7 +23,6 @@ stdenv.mkDerivation {
"-DBUILD_BIOMESH3D=1"
"-DWITH_TETGEN=1"
"-DBUILD_TYPE=Release"
"-DBUILD_TESTING=0"
"-DWITH_WXWIDGETS=ON"
"-DITK_DIR=${itk}/lib/InsightToolkit"
"-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a"

6
pkgs/applications/kde/minuet.nix
View File

@ -2,17 +2,17 @@
, lib, extra-cmake-modules, gettext, python
, drumstick, fluidsynth
, kcoreaddons, kcrash, kdoctools
, qtquickcontrols2, qtsvg, qttools
, qtquickcontrols2, qtsvg, qttools, qtdeclarative
}:
mkDerivation {
name = "minuet";
meta = with lib; {
license = with licenses; [ lgpl21 gpl3 ];
maintainers = with maintainers; [ peterhoeg ];
maintainers = with maintainers; [ peterhoeg HaoZeke ];
};
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ];
propagatedBuildInputs = [
drumstick fluidsynth

4
pkgs/applications/misc/synapse/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee
, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobject-introspection
, keybinder3, json-glib, zeitgeist, vala, hicolor-icon-theme, gobject-introspection
}:
let
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [
pkgconfig gettext vala_0_38
pkgconfig gettext vala
# For setup hook
gobject-introspection
];

9
pkgs/applications/networking/browsers/w3m/default.nix
View File

@ -25,13 +25,14 @@ let
'';
};
in stdenv.mkDerivation rec {
name = "w3m-0.5.3+git20180125";
pname = "w3m";
version = "0.5.3+git20190105";
src = fetchFromGitHub {
owner = "tats";
repo = "w3m";
rev = "v0.5.3+git20180125";
sha256 = "0dafdfx1yhrvhbqzslkcapj09dvf64m2jadz3wl2icni0k4msq90";
repo = pname;
rev = "v${version}";
sha256 = "1fbg2p8qh2gvi3g4iz4q6vc0k70pf248r4yndi5lcn2m3mzvjx0i";
};
NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl";

5
pkgs/applications/networking/weather/meteo/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib
, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook, hicolor-icon-theme }:
, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook
, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "meteo";
@ -25,8 +26,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
clutter
clutter-gtk
geocode-glib
gtk3
hicolor-icon-theme

4
pkgs/applications/science/biology/ants/default.nix
View File

@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ itk vtk ];
cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE"
# as cmake otherwise tries to download test data:
"-DBUILD_TESTING=FALSE" ];
cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];
enableParallelBuilding = true;

3
pkgs/applications/science/biology/mni_autoreg/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libminc ];
propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
# testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc
postFixup = ''
@ -33,4 +33,3 @@ stdenv.mkDerivation rec {
license = licenses.free;
};
}

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
version = "2.19.2";
version = "2.21.0";
svn = subversionClient.override { perlBindings = perlSupport; };
in
@ -29,7 +29,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "1scbggzghkzzfqg4ky3qh7h9w87c3zya4ls5disz7dbx56is7sgw";
sha256 = "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc";
};
outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";

7
pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
View File

@ -3,9 +3,10 @@ and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
node names).
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 26a2342bea..ceccd67ebb 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -122,7 +122,7 @@
@@ -132,7 +132,7 @@ HTML_REPO = ../../git-htmldocs
MAKEINFO = makeinfo
INSTALL_INFO = install-info
@ -14,7 +15,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile
DBLATEX = dblatex
ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty
@@ -240,7 +240,7 @@
@@ -250,7 +250,7 @@ man1: $(DOC_MAN1)
man5: $(DOC_MAN5)
man7: $(DOC_MAN7)
@ -23,7 +24,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile
pdf: user-manual.pdf
@@ -256,10 +256,9 @@
@@ -266,10 +266,9 @@ install-man: man
install-info: info
$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)

6
pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
View File

@ -1,7 +1,8 @@
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 1afe9fc858..05dd7c3a90 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'.
@@ -215,8 +215,7 @@ a password is obtained using 'git-credential'.
specify a full pathname of a sendmail-like program instead;
the program must support the `-i` option. Default value can
be specified by the `sendemail.smtpServer` configuration
@ -12,9 +13,10 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
--smtp-server-port=<port>::
diff --git a/git-send-email.perl b/git-send-email.perl
index 8eb63b5a2f..74a61d8213 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -944,8 +944,7 @@ if (defined $reply_to) {
@@ -956,8 +956,7 @@ sub expand_one_alias {
}
if (!defined $smtp_server) {

107
pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
View File

@ -1,94 +1,23 @@
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index e1d917fd27..e90f8e1414 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -15,87 +15,11 @@
fi
export TEXTDOMAINDIR
-# First decide what scheme to use...
-GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "$GIT_GETTEXT_POISON"
-then
- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
-elif test -n "@@USE_GETTEXT_SCHEME@@"
-then
- GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
-elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
-then
- : no probing necessary
@@ -26,7 +26,7 @@ then
elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
then
: no probing necessary
-elif type gettext.sh >/dev/null 2>&1
-then
- # GNU libintl's gettext.sh
- GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
-elif test "$(gettext -h 2>&1)" = "-h"
-then
- # gettext binary exists but no gettext.sh. likely to be a gettext
- # binary on a Solaris or something that is not GNU libintl and
- # lack eval_gettext.
- GIT_INTERNAL_GETTEXT_SH_SCHEME=gettext_without_eval_gettext
-fi
-export GIT_INTERNAL_GETTEXT_SH_SCHEME
-
-# ... and then follow that decision.
-case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
-gnu)
- # Use libintl's gettext.sh, or fall back to English if we can't.
+elif type @gettext@/bin/gettext.sh >/dev/null 2>&1
then
# GNU libintl's gettext.sh
GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
@@ -43,7 +43,8 @@ export GIT_INTERNAL_GETTEXT_SH_SCHEME
case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
gnu)
# Use libintl's gettext.sh, or fall back to English if we can't.
- . gettext.sh
- ;;
-gettext_without_eval_gettext)
- # Solaris has a gettext(1) but no eval_gettext(1)
- eval_gettext () {
- gettext "$1" | (
- export PATH $(git sh-i18n--envsubst --variables "$1");
- git sh-i18n--envsubst "$1"
- )
- }
-
- eval_ngettext () {
- ngettext "$1" "$2" "$3" | (
- export PATH $(git sh-i18n--envsubst --variables "$2");
- git sh-i18n--envsubst "$2"
- )
- }
- ;;
-poison)
- # Emit garbage so that tests that incorrectly rely on translatable
- # strings will fail.
- gettext () {
- printf "%s" "# GETTEXT POISON #"
- }
-
- eval_gettext () {
- printf "%s" "# GETTEXT POISON #"
- }
-
- eval_ngettext () {
- printf "%s" "# GETTEXT POISON #"
- }
- ;;
-*)
- gettext () {
- printf "%s" "$1"
- }
-
- eval_gettext () {
- printf "%s" "$1" | (
- export PATH $(git sh-i18n--envsubst --variables "$1");
- git sh-i18n--envsubst "$1"
- )
- }
+# GNU gettext
+export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
+export PATH=@gettext@/bin:$PATH
- eval_ngettext () {
- (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
- export PATH $(git sh-i18n--envsubst --variables "$2");
- git sh-i18n--envsubst "$2"
- )
- }
- ;;
-esac
+ . @gettext@/bin/gettext.sh
# Git-specific wrapper functions
gettextln () {
+ export PATH=@gettext@/bin:$PATH
;;
gettext_without_eval_gettext)
# Solaris has a gettext(1) but no eval_gettext(1)

7
pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
View File

@ -1,12 +1,13 @@
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8665b0a9b6..8bb892b1af 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -923,7 +923,7 @@
@@ -1227,7 +1227,7 @@ elif test -n "$GIT_TEST_INSTALLED"
then
GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) ||
error "Cannot run git from $GIT_TEST_INSTALLED."
- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH
- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH
+ PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH
GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
else # normal case, use ../bin-wrappers only unless $with_dashes:
git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"
if test -n "$no_bin_wrappers"

6
pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
View File

@ -1,8 +1,8 @@
diff --git a/connect.c b/connect.c
index c3a014c5b..fbca3262b 100644
index 4813f005ab..b3f12f3268 100644
--- a/connect.c
+++ b/connect.c
@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
@@ -1183,7 +1183,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
ssh = getenv("GIT_SSH");
if (!ssh)
@ -12,7 +12,7 @@ index c3a014c5b..fbca3262b 100644
}
diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
index 480a6b30d..781720424 100644
index 480a6b30d0..7817204241 100644
--- a/git-gui/lib/remote_add.tcl
+++ b/git-gui/lib/remote_add.tcl
@@ -139,7 +139,7 @@ method _add {} {

4
pkgs/applications/video/mpv/default.nix
View File

@ -1,7 +1,7 @@
{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg_4
, freefont_ttf, freetype, libass, libpthreadstubs, mujs
, lua, libuchardet, libiconv ? null, darwin
, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin
, waylandSupport ? stdenv.isLinux
, wayland ? null
@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
ffmpeg_4 freetype libass libpthreadstubs
luaEnv libuchardet mujs
luaEnv libuchardet mujs nv-codec-headers
] ++ optional alsaSupport alsaLib
++ optional archiveSupport libarchive
++ optional bluraySupport libbluray

4
pkgs/build-support/bintools-wrapper/default.nix
View File

@ -53,6 +53,7 @@ let
/**/ if libc == null then null
else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*"
else if targetPlatform.libc == "bionic" then "/system/bin/linker"
else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so"
else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2"
else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2"
# ARM with a wildcard, which can be "" or "-armhf".
@ -188,7 +189,7 @@ stdenv.mkDerivation {
else if targetPlatform.isSparc then "sparc"
else if targetPlatform.isAvr then "avr"
else if targetPlatform.isAlpha then "alpha"
else throw "unknown emulation for platform: " + targetPlatform.config;
else throw "unknown emulation for platform: ${targetPlatform.config}";
in targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
strictDeps = true;
@ -327,6 +328,7 @@ stdenv.mkDerivation {
{ description =
stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_
+ " (wrapper script)";
priority = 10;
} // optionalAttrs useMacosReexportHack {
platforms = stdenv.lib.platforms.darwin;
};

4
pkgs/build-support/cc-wrapper/default.nix
View File

@ -291,6 +291,10 @@ stdenv.mkDerivation {
hardening_unsupported_flags+=" stackprotector pic"
''
+ optionalString targetPlatform.isNetBSD ''
hardening_unsupported_flags+=" stackprotector fortify"
''
+ optionalString (targetPlatform.libc == "newlib") ''
hardening_unsupported_flags+=" stackprotector fortify pie pic"
''

4
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
View File

@ -30,6 +30,10 @@ wrapGAppsHook() {
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
fi
if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then
gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
fi
for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
eval local dummy="\$$v"
gappsWrapperArgs+=(--prefix $v : "$dummy")

12
pkgs/desktops/deepin/default.nix
View File

@ -1,19 +1,13 @@
{ pkgs, makeScope, libsForQt5, go_1_11 }:
{ pkgs, makeScope, libsForQt5 }:
let
packages = self: with self; {
updateScript = callPackage ./update.nix { };
dbus-factory = callPackage ./dbus-factory { };
dde-api = callPackage ./dde-api {
# XXX: the build is finding references to Go when compiled with go v1.12
go = go_1_11;
};
dde-api = callPackage ./dde-api { };
dde-calendar = callPackage ./dde-calendar { };
dde-daemon = callPackage ./dde-daemon {
# XXX: the build is finding references to Go when compiled with go v1.12
go = go_1_11;
};
dde-daemon = callPackage ./dde-daemon { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { };
deepin-desktop-base = callPackage ./deepin-desktop-base { };

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

@ -54,7 +54,7 @@ lib.makeScope pkgs.newScope (self: with self; {
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
gnome3 = self // { recurseForDerivations = false; };
vala = pkgs.vala_0_42;
vala = pkgs.vala_0_44;
gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; };
# ISO installer

4
pkgs/desktops/plasma-5/breeze-gtk.nix
View File

@ -1,10 +1,10 @@
{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, }:
{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, sassc, python3, breeze-qt5 }:
let inherit (lib) getLib; in
mkDerivation {
name = "breeze-gtk";
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules sassc python3 python3.pkgs.pycairo breeze-qt5 ];
buildInputs = [ qtbase ];
postPatch = ''
sed -i cmake/FindGTKEngine.cmake \

2
pkgs/desktops/plasma-5/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.5/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.3/ -A '*.tar.xz' )

143
pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
View File

@ -9,12 +9,12 @@ index 69d30705..52e91028 100644
-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
+background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
index cb75aeca..247db953 100644
index 6a1a2121..f03fd349 100644
--- a/startkde/CMakeLists.txt
+++ b/startkde/CMakeLists.txt
@@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig)
add_subdirectory(ksyncdbusenv)
@@ -4,11 +4,6 @@ add_subdirectory(ksyncdbusenv)
add_subdirectory(waitforname)
add_subdirectory(kcheckrunning)
-#FIXME: reconsider, looks fishy
-if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
@ -36,7 +36,7 @@ index 493218ea..d507aa55 100644
+ return system( NIXPKGS_KDOSTARTUPCONFIG5 );
}
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 714a9bf1..9733c612 100644
index b68f0c68..a18efd96 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -1,22 +1,31 @@
@ -81,7 +81,7 @@ index 714a9bf1..9733c612 100644
fi
# Boot sequence:
@@ -33,61 +42,142 @@ fi
@@ -33,62 +42,134 @@ fi
#
# * Then ksmserver is started which takes control of the rest of the startup sequence
@ -185,6 +185,7 @@ index 714a9bf1..9733c612 100644
-ksplashrc KSplash Theme Breeze
+ksplashrc KSplash Theme org.kde.breeze.desktop
ksplashrc KSplash Engine KSplashQML
kdeglobals KScreen ScaleFactor ''
kdeglobals KScreen ScreenScaleFactors ''
kcmfonts General forceFontDPI 0
+kcmfonts General dontChangeAASettings true
@ -253,7 +254,7 @@ index 714a9bf1..9733c612 100644
#Do not sync any of this section with the wayland versions as there scale factors are
#sent properly over wl_output
@@ -99,26 +180,33 @@ fi
@@ -104,26 +185,33 @@ fi
#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
export QT_AUTO_SCREEN_SCALE_FACTOR=0
@ -300,7 +301,7 @@ index 714a9bf1..9733c612 100644
Xft.dpi: $kcmfonts_general_forcefontdpi
EOF
fi
@@ -127,11 +215,11 @@ dl=$DESKTOP_LOCKED
@@ -132,11 +220,11 @@ dl=$DESKTOP_LOCKED
unset DESKTOP_LOCKED # Don't want it in the environment
ksplash_pid=
@ -314,7 +315,7 @@ index 714a9bf1..9733c612 100644
;;
None)
;;
@@ -140,69 +228,6 @@ if test -z "$dl"; then
@@ -145,27 +233,6 @@ if test -z "$dl"; then
esac
fi
@ -338,53 +339,11 @@ index 714a9bf1..9733c612 100644
- test -r "$file" && . "$file" || true
- done
-done
-
-# Activate the kde font directories.
-#
-# There are 4 directories that may be used for supplying fonts for KDE.
-#
-# There are two system directories. These belong to the administrator.
-# There are two user directories, where the user may add her own fonts.
-#
-# The 'override' versions are for fonts that should come first in the list,
-# i.e. if you have a font in your 'override' directory, it will be used in
-# preference to any other.
-#
-# The preference order looks like this:
-# user override, system override, X, user, system
-#
-# Where X is the original font database that was set up before this script
-# runs.
-
-usr_odir=$HOME/.fonts/kde-override
-usr_fdir=$HOME/.fonts
-
-if test -n "$KDEDIRS"; then
- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
- sys_odir=$kdedirs_first/share/fonts/override
- sys_fdir=$kdedirs_first/share/fonts
-else
- sys_odir=$KDEDIR/share/fonts/override
- sys_fdir=$KDEDIR/share/fonts
-fi
-
-# We run mkfontdir on the user's font dirs (if we have permission) to pick
-# up any new fonts they may have installed. If mkfontdir fails, we still
-# add the user's dirs to the font path, as they might simply have been made
-# read-only by the administrator, for whatever reason.
-
-test -d "$sys_odir" && xset +fp "$sys_odir"
-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
-
-# Ask X11 to rebuild its font list.
-xset fp rehash
-
# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
# from some users that they're confused and don't know what to do. This is
# especially necessary on slow machines, where starting KDE takes one or two
@@ -257,44 +282,65 @@ export XDG_DATA_DIRS
@@ -221,44 +288,65 @@ export XDG_DATA_DIRS
#
KDE_FULL_SESSION=true
export KDE_FULL_SESSION
@ -463,7 +422,7 @@ index 714a9bf1..9733c612 100644
# finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -306,12 +352,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
@@ -270,12 +358,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
# We only check for 255 which means that the ksmserver process could not be
# started, any problems thereafter, e.g. ksmserver failing to initialize,
# will remain undetected.
@ -483,7 +442,7 @@ index 714a9bf1..9733c612 100644
if test $? -eq 255; then
# Startup error
echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2
@@ -322,36 +372,36 @@ fi
@@ -286,36 +378,36 @@ fi
#Anything after here is logout
#It is not called after shutdown/restart
@ -534,7 +493,7 @@ index 714a9bf1..9733c612 100644
echo 'startkde: Done.' 1>&2
diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
index de98541c..39c0b521 100644
index 1fe41c59..39c0b521 100644
--- a/startkde/startplasma.cmake
+++ b/startkde/startplasma.cmake
@@ -1,6 +1,6 @@
@ -582,62 +541,14 @@ index de98541c..39c0b521 100644
;;
None)
;;
@@ -50,48 +48,6 @@ fi
#In wayland we want Plasma to use Qt's scaling
export PLASMA_USE_QT_SCALING=1
-# Activate the kde font directories.
-#
-# There are 4 directories that may be used for supplying fonts for KDE.
-#
-# There are two system directories. These belong to the administrator.
-# There are two user directories, where the user may add her own fonts.
-#
-# The 'override' versions are for fonts that should come first in the list,
-# i.e. if you have a font in your 'override' directory, it will be used in
-# preference to any other.
-#
-# The preference order looks like this:
-# user override, system override, X, user, system
-#
-# Where X is the original font database that was set up before this script
-# runs.
-
-usr_odir=$HOME/.fonts/kde-override
-usr_fdir=$HOME/.fonts
-
-if test -n "$KDEDIRS"; then
- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
- sys_odir=$kdedirs_first/share/fonts/override
- sys_fdir=$kdedirs_first/share/fonts
-else
- sys_odir=$KDEDIR/share/fonts/override
- sys_fdir=$KDEDIR/share/fonts
-fi
-
-# We run mkfontdir on the user's font dirs (if we have permission) to pick
-# up any new fonts they may have installed. If mkfontdir fails, we still
-# add the user's dirs to the font path, as they might simply have been made
-# read-only by the administrator, for whatever reason.
-
-test -d "$sys_odir" && xset +fp "$sys_odir"
-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
-
-# Ask X11 to rebuild its font list.
-xset fp rehash
-
# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
# from some users that they're confused and don't know what to do. This is
# especially necessary on slow machines, where starting KDE takes one or two
@@ -100,22 +56,13 @@ xset fp rehash
@@ -58,23 +56,13 @@ export PLASMA_USE_QT_SCALING=1
# If the user has overwritten fonts, the cursor font may be different now
# so don't move this up.
#
-xsetroot -cursor_name left_ptr
-
-# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
-usr_fdir=$HOME/.fonts
-if test -n "$GS_LIB" ; then
- GS_LIB=$usr_fdir:$GS_LIB
- export GS_LIB
@ -657,7 +568,7 @@ index de98541c..39c0b521 100644
# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
@@ -131,16 +78,15 @@ fi
@@ -90,16 +78,15 @@ fi
# We set LD_BIND_NOW to increase the efficiency of kdeinit.
# kdeinit unsets this variable before loading applications.
@ -676,7 +587,7 @@ index de98541c..39c0b521 100644
# finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -166,19 +112,19 @@ fi
@@ -125,19 +112,19 @@ fi
#Anything after here is logout
#It is not called after shutdown/restart
@ -704,7 +615,7 @@ index de98541c..39c0b521 100644
done
break
fi
@@ -187,15 +133,17 @@ fi
@@ -146,15 +133,17 @@ fi
echo 'startplasma: Shutting down...' 1>&2
# just in case
@ -727,7 +638,7 @@ index de98541c..39c0b521 100644
echo 'startplasma: Done.' 1>&2
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
index dd9e304d..12132f9e 100644
index dcb473a4..48dbf465 100644
--- a/startkde/startplasmacompositor.cmake
+++ b/startkde/startplasmacompositor.cmake
@@ -1,118 +1,174 @@
@ -940,18 +851,18 @@ index dd9e304d..12132f9e 100644
#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output
export QT_AUTO_SCREEN_SCALE_FACTOR=0
-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
- @EXPORT_XCURSOR_PATH@
+XCURSOR_PATH=~/.icons
+IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
+for xdgDir in "${xdgDirs[@]}"; do
+ XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons"
+done
+export XCURSOR_PATH
+
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
- @EXPORT_XCURSOR_PATH@
-
- # TODO: is kapplymousetheme a core app?
+# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then
#kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
- if test $? -eq 10; then
@ -1036,7 +947,7 @@ index dd9e304d..12132f9e 100644
: # ok
else
echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2
@@ -212,26 +228,47 @@ export KDE_FULL_SESSION
@@ -212,7 +228,7 @@ export KDE_FULL_SESSION
KDE_SESSION_VERSION=5
export KDE_SESSION_VERSION
@ -1045,7 +956,9 @@ index dd9e304d..12132f9e 100644
export KDE_SESSION_UID
XDG_CURRENT_DESKTOP=KDE
export XDG_CURRENT_DESKTOP
@@ -221,20 +237,41 @@ export XDG_CURRENT_DESKTOP
XDG_SESSION_TYPE=wayland
export XDG_SESSION_TYPE
+# Source scripts found in <config locations>/plasma-workspace/env/*.sh
+# (where <config locations> correspond to the system and user's configuration

360
pkgs/desktops/plasma-5/srcs.nix
View File

@ -3,363 +3,363 @@
{
bluedevil = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/bluedevil-5.14.5.tar.xz";
sha256 = "1khqw11apvcf5g5m9z111rvk4scxh3z3yhcpwqws1h0s5c5lr7z7";
name = "bluedevil-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/bluedevil-5.15.3.tar.xz";
sha256 = "1vdij1ydrwj51nsf3ysmql3wy3y7ayipzrqgxwa52r9n49zckva0";
name = "bluedevil-5.15.3.tar.xz";
};
};
breeze = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/breeze-5.14.5.tar.xz";
sha256 = "15hphz2mm2m3j0a0hwj7m65rggyaxdxy08yqs73bg3yg67n6x3p7";
name = "breeze-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/breeze-5.15.3.tar.xz";
sha256 = "0l7yngc32af7gdi8p68c8267bbzhfvpynqclq3il4fvaxc6vbq2b";
name = "breeze-5.15.3.tar.xz";
};
};
breeze-grub = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/breeze-grub-5.14.5.tar.xz";
sha256 = "0bkaaxfl1ds58qcdrxswaacir7wcc65a960lwdkmpdl16g9f4gix";
name = "breeze-grub-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/breeze-grub-5.15.3.tar.xz";
sha256 = "0ccx8yfxhc5r3kv7snv80wpz7h5a9l762iz1cx5sfjpmmq2jhi64";
name = "breeze-grub-5.15.3.tar.xz";
};
};
breeze-gtk = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/breeze-gtk-5.14.5.tar.xz";
sha256 = "0bysq83xbqmhb4wld51zd6lllr66b8w7pinizc99k8z1yz5jdb0m";
name = "breeze-gtk-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/breeze-gtk-5.15.3.tar.xz";
sha256 = "1rg323fyq0q07k00xi63csi0f3bwzi1cbm6srshqih0cnfgq69j4";
name = "breeze-gtk-5.15.3.tar.xz";
};
};
breeze-plymouth = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/breeze-plymouth-5.14.5.tar.xz";
sha256 = "1rbdpz9vlami7217v3dk8ljz0fgjz9zi1l0gwkhslayz5sybld96";
name = "breeze-plymouth-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/breeze-plymouth-5.15.3.tar.xz";
sha256 = "0f654kys4xw2c84iblz2q2x53z4mb2javgngb1dr3jkafysr0h37";
name = "breeze-plymouth-5.15.3.tar.xz";
};
};
discover = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/discover-5.14.5.tar.xz";
sha256 = "0gxhl2cv5yz3jw8fp8g8idi1k5hlhnvwbnvvg0dgnlzz6jb1s8dd";
name = "discover-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/discover-5.15.3.tar.xz";
sha256 = "1b6mc81xr4wl29bjw95jm8k72j3hhn1ps8a5dvzanbslfx31hf1b";
name = "discover-5.15.3.tar.xz";
};
};
drkonqi = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/drkonqi-5.14.5.tar.xz";
sha256 = "0xgym368f9r21wjh9fpv16m90dcj87g9p5df850fnn2k5n8x38z8";
name = "drkonqi-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/drkonqi-5.15.3.tar.xz";
sha256 = "0y4bkrv7bx69hm4kbbd2jfjnccj99686s0k5lm4ldv3wvf66k4sx";
name = "drkonqi-5.15.3.tar.xz";
};
};
kactivitymanagerd = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kactivitymanagerd-5.14.5.tar.xz";
sha256 = "0zms9npis0rklnbz93c69h4yg7dkrmfkzvzsfvkg90w37ap3vyl7";
name = "kactivitymanagerd-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kactivitymanagerd-5.15.3.tar.xz";
sha256 = "1lz3mm0bli2w8xwr3n06ss7qqzm4clvs3d9hfydyf7xq03mszrym";
name = "kactivitymanagerd-5.15.3.tar.xz";
};
};
kde-cli-tools = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kde-cli-tools-5.14.5.tar.xz";
sha256 = "01mrnjqla4q07cnb1p51nq2pvj9vaamic3dsyj3b7hqky9fna9ln";
name = "kde-cli-tools-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kde-cli-tools-5.15.3.tar.xz";
sha256 = "1praysa894m67kwy4xaqh354c0shwfyyrqf4n9wrfwwrchdw6ypg";
name = "kde-cli-tools-5.15.3.tar.xz";
};
};
kdecoration = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kdecoration-5.14.5.tar.xz";
sha256 = "115pli0qpa8lx0jasg1886fcg7gb2kk8v6k8r8l8c820l97sq7in";
name = "kdecoration-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kdecoration-5.15.3.tar.xz";
sha256 = "1ymp6szphpnfvdnhg8n1wan76z1s5xw68xsmwm21zrjf8lmrwkdh";
name = "kdecoration-5.15.3.tar.xz";
};
};
kde-gtk-config = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kde-gtk-config-5.14.5.tar.xz";
sha256 = "12467wkjh2nmcf6r7n8qin1rryd39g0dg7gn43sdg6vdwpyl2kdm";
name = "kde-gtk-config-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kde-gtk-config-5.15.3.tar.xz";
sha256 = "1ysw26sfx2wyd79bkknvvcmg5s4b154iyds9c6wp8brmcn6ng3s8";
name = "kde-gtk-config-5.15.3.tar.xz";
};
};
kdeplasma-addons = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kdeplasma-addons-5.14.5.tar.xz";
sha256 = "18sph3719d9pq2j5k7swiv9xbrpj659a3q66zvhz3dmh11y73f0m";
name = "kdeplasma-addons-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kdeplasma-addons-5.15.3.tar.xz";
sha256 = "071wnwxgywg6bqqgwmjyswai3k0n4c15lq8mspcy92kym3msqkrn";
name = "kdeplasma-addons-5.15.3.tar.xz";
};
};
kgamma5 = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kgamma5-5.14.5.tar.xz";
sha256 = "17smrdwyalknb3f6ckqs7kglfpqwajbiyd212wlsmqbva4by0fy0";
name = "kgamma5-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kgamma5-5.15.3.tar.xz";
sha256 = "12cnrnmr2wp14afg6x438gm502514pk61mfr26cypvcd6azpc2my";
name = "kgamma5-5.15.3.tar.xz";
};
};
khotkeys = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/khotkeys-5.14.5.tar.xz";
sha256 = "0572jpgbhacx4gy40m594rbnxy3zaq5w3lcrfd8i2750ljswcq24";
name = "khotkeys-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/khotkeys-5.15.3.tar.xz";
sha256 = "0gnkdl6kki8xph3787bacggapm4vbakj39y9kcjqvqrqxifp1ml5";
name = "khotkeys-5.15.3.tar.xz";
};
};
kinfocenter = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kinfocenter-5.14.5.tar.xz";
sha256 = "1z1i9g923cbdni5gfa6dpv46z1p2v40rfcvhy7i9h5nf49aw2rnc";
name = "kinfocenter-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kinfocenter-5.15.3.tar.xz";
sha256 = "0rhhrsp0fmgfsmrfv468l4xinyfyghf6921s1581sgg5fk9qhrwr";
name = "kinfocenter-5.15.3.tar.xz";
};
};
kmenuedit = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kmenuedit-5.14.5.tar.xz";
sha256 = "1aa4a35s5h44fc88hmmfdpzy26zc47h9n448cd4vbm4bm411551d";
name = "kmenuedit-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kmenuedit-5.15.3.tar.xz";
sha256 = "1s7bhpxiapmx496f3y3klmc9i2347fs25yhd2brg92jziw73jpab";
name = "kmenuedit-5.15.3.tar.xz";
};
};
kscreen = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kscreen-5.14.5.tar.xz";
sha256 = "1nb1ysgcx49galbf16mxbawybfik92bpr9vbwgg5ycsdx1f9q8yi";
name = "kscreen-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kscreen-5.15.3.tar.xz";
sha256 = "1izq1anl0r9ysmsdnc2ny7cx73xc190qbad59nrnlqcxrsplb68f";
name = "kscreen-5.15.3.tar.xz";
};
};
kscreenlocker = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kscreenlocker-5.14.5.tar.xz";
sha256 = "16amr7pz0k6w5vkk1dwn2qi3s1mln0jypwmjazqq2lbwimn8k56m";
name = "kscreenlocker-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kscreenlocker-5.15.3.tar.xz";
sha256 = "0bglpgibrc8l6yi24pj4kja33mc02clgi1vbdvw1qpp65ixhpzna";
name = "kscreenlocker-5.15.3.tar.xz";
};
};
ksshaskpass = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/ksshaskpass-5.14.5.tar.xz";
sha256 = "0skr247k4ky7lpbdwlmkrnr3mj1pa6pxl96pyxwsw7za784qg6dj";
name = "ksshaskpass-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/ksshaskpass-5.15.3.tar.xz";
sha256 = "1zrjc74srb4jp8sw6pi0ik2i4yxffvgv037d50yk1fif1xyvnf9s";
name = "ksshaskpass-5.15.3.tar.xz";
};
};
ksysguard = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/ksysguard-5.14.5.tar.xz";
sha256 = "0ybxh6ll080rkrrr4b5ydl06x8zi97702661cajvbv00lhq4vp8b";
name = "ksysguard-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/ksysguard-5.15.3.tar.xz";
sha256 = "1nxgadymq45yn92cs08gfmv5krc2ylwgbn5qcc2aq6ryrrhrw89q";
name = "ksysguard-5.15.3.tar.xz";
};
};
kwallet-pam = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kwallet-pam-5.14.5.tar.xz";
sha256 = "1mkjjc88kqf5x313nifla9pzrgzqm4v92150dbs1f89bsn673pk8";
name = "kwallet-pam-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kwallet-pam-5.15.3.tar.xz";
sha256 = "1w3vf92k3k2084cflv4fwav16czc4vqg62gi8x1alri38ziyb793";
name = "kwallet-pam-5.15.3.tar.xz";
};
};
kwayland-integration = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kwayland-integration-5.14.5.tar.xz";
sha256 = "0rd0xhb53iixv9i8x0gh3rr1082lj7zdymsqdmi7sfgb66g8c03l";
name = "kwayland-integration-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kwayland-integration-5.15.3.tar.xz";
sha256 = "0grb9fnk7pfgwzj3c9d11zl1j9jy9k6d4pw2n2fdrs02g3yg603h";
name = "kwayland-integration-5.15.3.tar.xz";
};
};
kwin = {
version = "5.14.5";
version = "5.15.3.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kwin-5.14.5.tar.xz";
sha256 = "0ifdlnzw3ydrbidzk256vks66d1rxyilhqi09csygx17jqk7szj4";
name = "kwin-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kwin-5.15.3.2.tar.xz";
sha256 = "0iri6993zsxmrm7qnf76py7ihc27x9y741ar7g9fry8c8knmqyrw";
name = "kwin-5.15.3.2.tar.xz";
};
};
kwrited = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/kwrited-5.14.5.tar.xz";
sha256 = "0115qscr8a54h7h8w4xw4fjzp7qipyw3d3jswhii7axnzp6q6qnh";
name = "kwrited-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/kwrited-5.15.3.tar.xz";
sha256 = "0xhdmnfkpr35sks7k66s5cbq220yrmbn8ixcsdqwsgpji2sx4g7v";
name = "kwrited-5.15.3.tar.xz";
};
};
libkscreen = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/libkscreen-5.14.5.tar.xz";
sha256 = "1vyaml5ap9siw9idiny92li2bykd0nwjsmwmg0c7ad912j4g1s7y";
name = "libkscreen-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/libkscreen-5.15.3.tar.xz";
sha256 = "0fzfk8ga5qinsmag61l29cf92r7qm4nlb8hrhddyff7d7c7kr3vj";
name = "libkscreen-5.15.3.tar.xz";
};
};
libksysguard = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/libksysguard-5.14.5.tar.xz";
sha256 = "11nz0g7dqvpvgsv0a7sai445vgfsfi25plj7jb1i46n7zf8i8mya";
name = "libksysguard-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/libksysguard-5.15.3.tar.xz";
sha256 = "05cfb51xcmxb8k2k14n2i5ysj47aism9yq7lk2rw216bsdp2mqnj";
name = "libksysguard-5.15.3.tar.xz";
};
};
milou = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/milou-5.14.5.tar.xz";
sha256 = "1776441mhmwcvrzmdqg531md79azbkbhng51kyq6i9cvkhxyf583";
name = "milou-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/milou-5.15.3.tar.xz";
sha256 = "1prq9mdrysz8ckf7n6sjfn3qc87135nj69v2jcayn9irb0k8wz01";
name = "milou-5.15.3.tar.xz";
};
};
oxygen = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/oxygen-5.14.5.tar.xz";
sha256 = "0h70k7af69zdky0g6napd1kdnvbxhnw3nrwr9jqv1fq5762xnkk8";
name = "oxygen-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/oxygen-5.15.3.tar.xz";
sha256 = "0a069imvw0khkbcih8zvx0i0ks99jkwis6p73n4846qz544f3dvb";
name = "oxygen-5.15.3.tar.xz";
};
};
plasma-browser-integration = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/plasma-browser-integration-5.14.5.tar.xz";
sha256 = "1260h5sh0gkbkhcj17ss0n0y48i1pxh3f4p5dcbgbz775g1dhi2s";
name = "plasma-browser-integration-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/plasma-browser-integration-5.15.3.tar.xz";
sha256 = "1mhaa5z63gyd8j7zplmyicnibqsv1xhd9mxip6clhj5bfk8q9jar";
name = "plasma-browser-integration-5.15.3.tar.xz";
};
};
plasma-desktop = {
version = "5.14.5";
version = "5.15.3.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/plasma-desktop-5.14.5.tar.xz";
sha256 = "0pr07p36jrpvkk4fp14fb4minnwj5gnmvdg9jf7bi8sjjz6jpnnl";
name = "plasma-desktop-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/plasma-desktop-5.15.3.2.tar.xz";
sha256 = "12pz0bin3j2f98k88nwmb271lr6v6w3l28li0iri2x8pk144vr91";
name = "plasma-desktop-5.15.3.2.tar.xz";
};
};
plasma-integration = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/plasma-integration-5.14.5.tar.xz";
sha256 = "15nhrliri4cjx712f1rxbq2f87lj4wxsqgbhw9p02z12h3n9z3ds";
name = "plasma-integration-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/plasma-integration-5.15.3.tar.xz";
sha256 = "08qw2ibl0j2nhsplc3b117vdc00bd2gn1q48nx0xy349bf64m735";
name = "plasma-integration-5.15.3.tar.xz";
};
};
plasma-nm = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/plasma-nm-5.14.5.tar.xz";
sha256 = "1hf98c9llcff0h2w4l45nw0vysxvnanf7hczhj93z4562qrafxm2";
name = "plasma-nm-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/plasma-nm-5.15.3.tar.xz";
sha256 = "1l9wh4hs2v0b9hdagcgl67z0w4amffakxczwy0nwymqzv0mxgqvz";
name = "plasma-nm-5.15.3.tar.xz";
};
};
plasma-pa = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/plasma-pa-5.14.5.tar.xz";
sha256 = "0z74qg7m4y1ifzni1877hiil3rn6ad3x4fvgv4bib4jhg7ckaiqg";
name = "plasma-pa-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/plasma-pa-5.15.3.tar.xz";
sha256 = "1lkhidd5b4mjn23mxcp2vfmxf7dwbk7y14svc4wy6xc1xg1pc125";
name = "plasma-pa-5.15.3.tar.xz";
};
};
plasma-sdk = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/plasma-sdk-5.14.5.tar.xz";
sha256 = "0v90nk6yhrapdszh8sd3m0wffkjgnrhdy1sz1vl9s0ab5sdpmxr1";
name = "plasma-sdk-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/plasma-sdk-5.15.3.tar.xz";
sha256 = "1qzh0yy4zql7a50ql9ghhvlfxjnbckflbgbzdyd7i9x3ml7s5saw";
name = "plasma-sdk-5.15.3.tar.xz";
};
};
plasma-tests = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/plasma-tests-5.14.5.tar.xz";
sha256 = "03h889xn6i067d1sdymn6fgj8xik3pa75lljl8kj3vl6bks24jyh";
name = "plasma-tests-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/plasma-tests-5.15.3.tar.xz";
sha256 = "1z5vhw1dy1qks6w161yamn2fawrgkggv9mvvgpmljmy07qpafgkg";
name = "plasma-tests-5.15.3.tar.xz";
};
};
plasma-vault = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/plasma-vault-5.14.5.tar.xz";
sha256 = "17r44n0mkcwc2fkjf397ks8xv82m59gvnawbj9713c5l31ln5mi3";
name = "plasma-vault-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/plasma-vault-5.15.3.tar.xz";
sha256 = "1my9dnqz11frn07fk505pfi2nkf2d642jfgjklh5zfngjxy589jy";
name = "plasma-vault-5.15.3.tar.xz";
};
};
plasma-workspace = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/plasma-workspace-5.14.5.tar.xz";
sha256 = "14d3wnsm4bi1izx5qlpk0mnqmxwx18bqypa3wwmhn1535kfz8glh";
name = "plasma-workspace-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-5.15.3.tar.xz";
sha256 = "08irdg8divr45z53kr6b1mv4s2jakmq3r79g7df6ja9rb6py5f59";
name = "plasma-workspace-5.15.3.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/plasma-workspace-wallpapers-5.14.5.tar.xz";
sha256 = "17q0685i4267ihlrii3b8764ak458kzs0inqfcj9x25m338xz19q";
name = "plasma-workspace-wallpapers-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-wallpapers-5.15.3.tar.xz";
sha256 = "0xgssv66ksljv8xkj20v2x1bppkyn8z17wa3hynwlcqxh2g4afq4";
name = "plasma-workspace-wallpapers-5.15.3.tar.xz";
};
};
plymouth-kcm = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/plymouth-kcm-5.14.5.tar.xz";
sha256 = "1cwmkprhc4496x4a38l2x7hnifnp4daw8g1gic0ik2sm0a6xn77k";
name = "plymouth-kcm-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/plymouth-kcm-5.15.3.tar.xz";
sha256 = "0fbr9nf263pc9inakhp901r58mlsm1jgw0xqp9fj08c9lj25z190";
name = "plymouth-kcm-5.15.3.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.14.5";
version = "1-5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/polkit-kde-agent-1-5.14.5.tar.xz";
sha256 = "1lzw4zq2ysnva5g1v85k9k6yck30wfgcy0sn1ncxy183vm36b2ag";
name = "polkit-kde-agent-1-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/polkit-kde-agent-1-5.15.3.tar.xz";
sha256 = "07gl57h9zmagbw7v2sfksbcbqrfdhr8isfmpcw10rc4k2awlsysy";
name = "polkit-kde-agent-1-5.15.3.tar.xz";
};
};
powerdevil = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/powerdevil-5.14.5.tar.xz";
sha256 = "0rdrj6k7bb1cisz1g8akxxn68c8rj0zddim1afvcq1iqr727wqj5";
name = "powerdevil-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/powerdevil-5.15.3.tar.xz";
sha256 = "1f7ik3lh30irqzf0pgy59kkrsn4fkl8xwam1bikfm34bwzrsxb14";
name = "powerdevil-5.15.3.tar.xz";
};
};
sddm-kcm = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/sddm-kcm-5.14.5.tar.xz";
sha256 = "0aix2grc2h2w8qxcbdwxhvq09ispblnisl017bvb19apkvs0w8m1";
name = "sddm-kcm-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/sddm-kcm-5.15.3.tar.xz";
sha256 = "1mvp8p1k9csmn6h6iyk29yj1j4b4dfyd6j4v0v2ha1vdfjwjlsh2";
name = "sddm-kcm-5.15.3.tar.xz";
};
};
systemsettings = {
version = "5.14.5";
version = "5.15.3.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/systemsettings-5.14.5.tar.xz";
sha256 = "1q1ih74vkdhss64ayc3qmbrw4hhvfl3axlkhh63rky09qn83x9zw";
name = "systemsettings-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/systemsettings-5.15.3.2.tar.xz";
sha256 = "0bqhff2s2qyz1x8nhrphnkyja0mhr7msf58cwdkscsl6lyamn2a2";
name = "systemsettings-5.15.3.2.tar.xz";
};
};
user-manager = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/user-manager-5.14.5.tar.xz";
sha256 = "0aw2s029547rzx3xg9nib5w30d25978fpv7xyshxmp3z8rmzgcjv";
name = "user-manager-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/user-manager-5.15.3.tar.xz";
sha256 = "18acg3xjcdhcwk3irsf1hgkwma9mn6msl6qwmf0slz1lydlrljs4";
name = "user-manager-5.15.3.tar.xz";
};
};
xdg-desktop-portal-kde = {
version = "5.14.5";
version = "5.15.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.14.5/xdg-desktop-portal-kde-5.14.5.tar.xz";
sha256 = "0h6hdk9fkf98jfjaza773k37369ayvwmwrgxn6al2pma6n07vddq";
name = "xdg-desktop-portal-kde-5.14.5.tar.xz";
url = "${mirror}/stable/plasma/5.15.3/xdg-desktop-portal-kde-5.15.3.tar.xz";
sha256 = "10cmy4j54nkwrgibxdpx6d30g596ikvb1dqqmp1gvmzr570gmbi7";
name = "xdg-desktop-portal-kde-5.15.3.tar.xz";
};
};
}

4
pkgs/development/compilers/gcc/7/default.nix
View File

@ -48,6 +48,9 @@ let version = "7.4.0";
./riscv-no-relax.patch
]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optionals targetPlatform.isNetBSD [
../libstdc++-netbsd-ctypes.patch
]
++ optional noSysDirs ../no-sys-dirs.patch
++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
@ -302,6 +305,7 @@ stdenv.mkDerivation ({
"--disable-gnu-indirect-function"
]
++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
++ optional targetPlatform.isNetBSD "--disable-libcilkrts"
;
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;

141
pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch Normal file
View File

@ -0,0 +1,141 @@
diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
index ff3ec893974..21eccf9fde1 100644
--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
+++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
@@ -38,40 +38,46 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// @brief Base class for ctype.
struct ctype_base
{
- // Non-standard typedefs.
- typedef const unsigned char* __to_type;
// NB: Offsets into ctype<char>::_M_table force a particular size
// on the mask type. Because of this, we don't use an enum.
- typedef unsigned char mask;
#ifndef _CTYPE_U
- static const mask upper = _U;
- static const mask lower = _L;
- static const mask alpha = _U | _L;
- static const mask digit = _N;
- static const mask xdigit = _N | _X;
- static const mask space = _S;
- static const mask print = _P | _U | _L | _N | _B;
- static const mask graph = _P | _U | _L | _N;
- static const mask cntrl = _C;
- static const mask punct = _P;
- static const mask alnum = _U | _L | _N;
+ // Non-standard typedefs.
+ typedef const unsigned char* __to_type;
+
+ typedef unsigned char mask;
+
+ static const mask upper = _U;
+ static const mask lower = _L;
+ static const mask alpha = _U | _L;
+ static const mask digit = _N;
+ static const mask xdigit = _N | _X;
+ static const mask space = _S;
+ static const mask print = _P | _U | _L | _N | _B;
+ static const mask graph = _P | _U | _L | _N;
+ static const mask cntrl = _C;
+ static const mask punct = _P;
+ static const mask alnum = _U | _L | _N;
#else
- static const mask upper = _CTYPE_U;
- static const mask lower = _CTYPE_L;
- static const mask alpha = _CTYPE_U | _CTYPE_L;
- static const mask digit = _CTYPE_N;
- static const mask xdigit = _CTYPE_N | _CTYPE_X;
- static const mask space = _CTYPE_S;
- static const mask print = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B;
- static const mask graph = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N;
- static const mask cntrl = _CTYPE_C;
- static const mask punct = _CTYPE_P;
- static const mask alnum = _CTYPE_U | _CTYPE_L | _CTYPE_N;
+ typedef const unsigned short* __to_type;
+
+ typedef unsigned short mask;
+
+ static const mask upper = _CTYPE_U;
+ static const mask lower = _CTYPE_L;
+ static const mask alpha = _CTYPE_A;
+ static const mask digit = _CTYPE_D;
+ static const mask xdigit = _CTYPE_X;
+ static const mask space = _CTYPE_S;
+ static const mask print = _CTYPE_R;
+ static const mask graph = _CTYPE_G;
+ static const mask cntrl = _CTYPE_C;
+ static const mask punct = _CTYPE_P;
+ static const mask alnum = _CTYPE_A | _CTYPE_D;
#endif
#if __cplusplus >= 201103L
- static const mask blank = space;
+ static const mask blank = space;
#endif
};
diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc
index ed3b7cd0d6a..33358e8f5d8 100644
--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc
+++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc
@@ -38,11 +38,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Information as gleaned from /usr/include/ctype.h
- extern "C" const u_int8_t _C_ctype_[];
-
const ctype_base::mask*
ctype<char>::classic_table() throw()
- { return _C_ctype_ + 1; }
+ { return _C_ctype_tab_ + 1; }
ctype<char>::ctype(__c_locale, const mask* __table, bool __del,
size_t __refs)
@@ -69,14 +67,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
char
ctype<char>::do_toupper(char __c) const
- { return ::toupper((int) __c); }
+ { return ::toupper((int)(unsigned char) __c); }
const char*
ctype<char>::do_toupper(char* __low, const char* __high) const
{
while (__low < __high)
{
- *__low = ::toupper((int) *__low);
+ *__low = ::toupper((int)(unsigned char) *__low);
++__low;
}
return __high;
@@ -84,14 +82,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
char
ctype<char>::do_tolower(char __c) const
- { return ::tolower((int) __c); }
+ { return ::tolower((int)(unsigned char) __c); }
const char*
ctype<char>::do_tolower(char* __low, const char* __high) const
{
while (__low < __high)
{
- *__low = ::tolower((int) *__low);
+ *__low = ::tolower((int)(unsigned char) *__low);
++__low;
}
return __high;
diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h
index ace1120fba2..3234ce17c70 100644
--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h
+++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h
@@ -48,7 +48,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
is(const char* __low, const char* __high, mask* __vec) const
{
while (__low < __high)
- *__vec++ = _M_table[*__low++];
+ *__vec++ = _M_table[(unsigned char)*__low++];
return __high;
}

14
pkgs/development/compilers/go/1.11.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
, mailcap, runtimeShell
, buildPackages, pkgsTargetTarget
@ -30,13 +30,11 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.11.5";
version = "1.11.6";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
sha256 = "0d45057rc0bngq0nja847cagxji42qmlywr68f0dkg51im8nyr9y";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "0cz1sdhxf9283p1p4jxb020pym0ncd0qlfh36r3hkv6bbm1a2vd9";
};
# perl is used for testing go vet
@ -126,7 +124,7 @@ stdenv.mkDerivation rec {
patches = [
./remove-tools-1.11.patch
./ssl-cert-file-1.9.patch
./ssl-cert-file-1.12.1.patch
./remove-test-pie.patch
./creds-test.patch
./go-1.9-skip-flaky-19608.patch

5
pkgs/development/compilers/go/1.12.nix
View File

@ -30,11 +30,11 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.12";
version = "1.12.1";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "1wl8kq21fbzmv4plnaza5acz8dhbaaq6smjzk3r6cf3l6qrkvi09";
sha256 = "12l12mmgqvy3nbscy7sz83qj4m6iz5a322aq9sk45f7l9ml2gq8b";
};
# perl is used for testing go vet
@ -128,6 +128,7 @@ stdenv.mkDerivation rec {
patches = [
./remove-tools-1.11.patch
./ssl-cert-file-1.12.1.patch
./remove-test-pie.patch
./creds-test.patch
./go-1.9-skip-flaky-19608.patch

59
pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch Normal file
View File

@ -0,0 +1,59 @@
diff -Naur a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
--- a/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:33:55.920232337 -0700
+++ b/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:34:53.323180897 -0700
@@ -270,11 +270,20 @@
import "C"
import (
"errors"
+ "io/ioutil"
+ "os"
"unsafe"
)
func loadSystemRoots() (*CertPool, error) {
roots := NewCertPool()
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
+ return roots, nil
+ }
+ }
var data C.CFDataRef = 0
var untrustedData C.CFDataRef = 0
diff -Naur a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
--- a/src/crypto/x509/root_darwin.go 2019-03-15 11:33:55.920232337 -0700
+++ b/src/crypto/x509/root_darwin.go 2019-03-15 11:36:21.205123541 -0700
@@ -92,6 +92,14 @@
verifyCh = make(chan rootCandidate)
)
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
+ return roots, nil
+ }
+ }
+
// Using 4 goroutines to pipe into verify-cert seems to be
// about the best we can do. The verify-cert binary seems to
// just RPC to another server with coarse locking anyway, so
diff -Naur a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
--- a/src/crypto/x509/root_unix.go 2019-03-15 11:33:55.920232337 -0700
+++ b/src/crypto/x509/root_unix.go 2019-03-15 11:37:15.737326340 -0700
@@ -38,6 +38,13 @@
func loadSystemRoots() (*CertPool, error) {
roots := NewCertPool()
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
+ return roots, nil
+ }
+ }
files := certFiles
if f := os.Getenv(certFileEnv); f != "" {

1
pkgs/development/compilers/llvm/5/llvm.nix
View File

@ -131,6 +131,7 @@ in stdenv.mkDerivation (rec {
passthru.src = src;
requiredSystemFeatures = [ "big-parallel" ];
meta = {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;

3
pkgs/development/compilers/llvm/6/llvm.nix
View File

@ -14,9 +14,6 @@
, debugVersion ? false
, enableManpages ? false
, enableSharedLibraries ? true
# Mesa requires AMDGPU target
# BPF is used by bcc
, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" "BPF" ]
}:
let

16
pkgs/development/compilers/rust/bootstrap.nix
View File

@ -3,16 +3,16 @@
let
# Note: the version MUST be one version prior to the version we're
# building
version = "1.31.1";
version = "1.32.0";
# fetch hashes by running `print-hashes.sh 1.31.1`
# fetch hashes by running `print-hashes.sh 1.32.0`
hashes = {
i686-unknown-linux-gnu = "1e77e5e8c745320faad9ce6f319a77b4a2e75d972eb68a195acd081ad910ab6d";
x86_64-unknown-linux-gnu = "a64685535d0c457f49a8712a096a5c21564cd66fd2f7da739487f028192ebe3c";
armv7-unknown-linux-gnueabihf = "11c717b781a7af5bdc829894139f8f45d4c12a061f7f9e39481f21426a04eb21";
aarch64-unknown-linux-gnu = "29a7c6eb536fefd0ca459e48dfaea006aa8bff8a87aa82a9b7d483487033632a";
i686-apple-darwin = "46566dc25fcbd8badc9950b8c9f9b0faeca065b5a09cd96258e4f4b10d686aed";
x86_64-apple-darwin = "8398b1b303bdf0e7605d08b87070a514a4f588797c6fb3593718cb9cec233ad6";
i686-unknown-linux-gnu = "4ce3a6a656669fa86606074b43fadeac7465ef48394249407e21106ed714c8db";
x86_64-unknown-linux-gnu = "e024698320d76b74daf0e6e71be3681a1e7923122e3ebd03673fcac3ecc23810";
armv7-unknown-linux-gnueabihf = "d7b69f60689d2905d8d3c2829b0f1cd0f86265a255ff88ea0deb601aebac6428";
aarch64-unknown-linux-gnu = "60def40961728212da4b3a9767d5a2ddb748400e150a5f8a6d5aa0e1b8ba1cee";
i686-apple-darwin = "76cc1280f6b61bf7cf1fddd5202cc236db7573ee05f39fc8cd12ddda8f39a7c3";
x86_64-apple-darwin = "f0dfba507192f9b5c330b5984ba71d57d434475f3d62bd44a39201e36fa76304";
};
platform =

32
pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
index 0f60b5b3e..9b08415e7 100644
index 86ecb10edf..626be0a52d 100644
--- a/src/libstd/net/tcp.rs
+++ b/src/libstd/net/tcp.rs
@@ -962,6 +962,7 @@ mod tests {
@@ -955,6 +955,7 @@ mod tests {
}
}
@ -10,7 +10,7 @@ index 0f60b5b3e..9b08415e7 100644
#[test]
fn listen_localhost() {
let socket_addr = next_test_ip4();
@@ -1020,6 +1021,7 @@ mod tests {
@@ -1013,6 +1014,7 @@ mod tests {
})
}
@ -18,7 +18,7 @@ index 0f60b5b3e..9b08415e7 100644
#[test]
fn read_eof() {
each_ip(&mut |addr| {
@@ -1039,6 +1041,7 @@ mod tests {
@@ -1032,6 +1034,7 @@ mod tests {
})
}
@ -26,7 +26,7 @@ index 0f60b5b3e..9b08415e7 100644
#[test]
fn write_close() {
each_ip(&mut |addr| {
@@ -1065,6 +1068,7 @@ mod tests {
@@ -1058,6 +1061,7 @@ mod tests {
})
}
@ -34,7 +34,7 @@ index 0f60b5b3e..9b08415e7 100644
#[test]
fn multiple_connect_serial() {
each_ip(&mut |addr| {
@@ -1087,6 +1091,7 @@ mod tests {
@@ -1080,6 +1084,7 @@ mod tests {
})
}
@ -42,7 +42,7 @@ index 0f60b5b3e..9b08415e7 100644
#[test]
fn multiple_connect_interleaved_greedy_schedule() {
const MAX: usize = 10;
@@ -1123,6 +1128,7 @@ mod tests {
@@ -1116,6 +1121,7 @@ mod tests {
}
#[test]
@ -50,7 +50,7 @@ index 0f60b5b3e..9b08415e7 100644
fn multiple_connect_interleaved_lazy_schedule() {
const MAX: usize = 10;
each_ip(&mut |addr| {
@@ -1401,6 +1407,7 @@ mod tests {
@@ -1394,6 +1400,7 @@ mod tests {
}
#[test]
@ -58,7 +58,7 @@ index 0f60b5b3e..9b08415e7 100644
fn clone_while_reading() {
each_ip(&mut |addr| {
let accept = t!(TcpListener::bind(&addr));
@@ -1421,7 +1422,10 @@ mod tests {
@@ -1504,7 +1511,10 @@ mod tests {
// FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
// no longer has rounding errors.
@ -70,7 +70,7 @@ index 0f60b5b3e..9b08415e7 100644
#[test]
fn timeouts() {
let addr = next_test_ip4();
@@ -1596,6 +1603,7 @@ mod tests {
@@ -1591,6 +1601,7 @@ mod tests {
drop(listener);
}
@ -78,7 +78,7 @@ index 0f60b5b3e..9b08415e7 100644
#[test]
fn nodelay() {
let addr = next_test_ip4();
@@ -1610,6 +1618,7 @@ mod tests {
@@ -1605,6 +1616,7 @@ mod tests {
assert_eq!(false, t!(stream.nodelay()));
}
@ -86,7 +86,7 @@ index 0f60b5b3e..9b08415e7 100644
#[test]
fn ttl() {
let ttl = 100;
@@ -1647,6 +1656,7 @@ mod tests {
@@ -1642,6 +1654,7 @@ mod tests {
}
}
@ -94,11 +94,3 @@ index 0f60b5b3e..9b08415e7 100644
#[test]
fn peek() {
each_ip(&mut |addr| {
@@ -1679,6 +1689,7 @@ mod tests {
}
#[test]
+ #[cfg_attr(any(target_os = "linux", target_os = "macos"), ignore)]
fn connect_timeout_unroutable() {
// this IP is unroutable, so connections should always time out,
// provided the network is reachable to begin with.

4
pkgs/development/compilers/rust/rustc.nix
View File

@ -17,11 +17,11 @@ let
llvmShared = llvm_7.override { enableSharedLibraries = true; };
in stdenv.mkDerivation rec {
pname = "rustc";
version = "1.32.0";
version = "1.33.0";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
sha256 = "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac";
sha256 = "152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as";
};
__darwinAllowLocalNetworking = true;

38
pkgs/development/compilers/vala/default.nix
View File

@ -30,12 +30,20 @@ let
};
# NOTE: the openembedded-core project doesn't have a patch for 0.40.12
# or 0.42.4 just yet; we've fixed the single merge conflict in the
# patches below and checked them in here.
# We've fixed the single merge conflict in the following patch.
# 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch
# 0.42.4: https://github.com/openembedded/openembedded-core/raw/dfbbff39cfd413510abbd60930232a9c6b35d765/meta/recipes-devtools/vala/vala/disable-graphviz.patch
"0.40" = ./disable-graphviz-0.40.12.patch;
"0.42" = ./disable-graphviz-0.42.4.patch;
"0.42" = fp {
commit = "f2b4f9ec6f44dced7f88df849cca68961419eeb8";
sha256 = "112qhdzix0d7lfpfcam1cxprzmfzpwypb1226m5ma1vq9qy0sn7g";
};
# NOTE: the openembedded-core project doesn't have a patch for 0.44.1
# We've reverted the addition of the "--disable-valadoc" option
# and then applied the following patch.
# 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch
"0.44" = ./disable-graphviz-0.44.1.patch;
}.${major} or (throw "no graphviz patch for this version of vala");
@ -88,15 +96,15 @@ let
homepage = https://wiki.gnome.org/Projects/Vala;
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ];
maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg worldofpeace ];
};
});
in rec {
vala_0_36 = generic {
major = "0.36";
minor = "17";
sha256 = "1f6qg40zd6jzhbwr3dy4fb66k4qs1xlk2whdyqh64zxxjw0k9pv7";
minor = "18";
sha256 = "0csb9skgy663y05kl813dsarzjbfcdsmx5fvz13p8gas3hycciq9";
};
vala_0_38 = generic {
@ -108,15 +116,21 @@ in rec {
vala_0_40 = generic {
major = "0.40";
minor = "12";
sha256 = "1nhk45w5iwg97q3cfybn0i4qz5w9qvk423ndpg6mq6cnna076snx";
minor = "14";
sha256 = "0llid9b9cgjcrcclc0pw2skkssb7br7b2clq9cql3p14dl94gki0";
};
vala_0_42 = generic {
major = "0.42";
minor = "4";
sha256 = "07jgkx812y7wq4cswwfsf1f4k3lq9hcjra45682bdi8a11nr0a5m";
minor = "6";
sha256 = "14024gvs23q323fmd62hqd8jiypaxbjjvamyd782ixbhxmpz8x1p";
};
vala = vala_0_42;
vala_0_44 = generic {
major = "0.44";
minor = "1";
sha256 = "1qiglkgymws6a3m8xz1v8b3na165ywx2dbipp3bdg134bi0w3a4n";
};
vala = vala_0_44;
}

208
pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch
View File

@ -1,208 +0,0 @@
diff --git i/configure.ac w/configure.ac
index 730c72d7b..af8198637 100644
--- i/configure.ac
+++ w/configure.ac
@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
-AC_MSG_CHECKING([for CGRAPH])
-cgraph_tmp_LIBADD="$LIBADD"
-cgraph_tmp_CFLAGS="$CFLAGS"
-LIBADD="$LIBADD $LIBGVC_LIBS"
-CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
-AC_RUN_IFELSE(
- [AC_LANG_SOURCE([
- #include <gvc.h>
-
- int main(void) {
- #ifdef WITH_CGRAPH
- return 0;
- #else
- return -1;
- #endif
- }
- ])], [
- AC_MSG_RESULT([yes])
- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
- have_cgraph=yes
- ], [
- AC_MSG_RESULT([no])
- have_cgraph=no
- ]
-)
-LIBADD="$cgraph_tmp_LIBADD"
-CFLAGS="$cgraph_tmp_CFLAGS"
+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
+if test x$enable_graphviz = xyes; then
+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
+ AC_MSG_CHECKING([for CGRAPH])
+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
+ cgraph_tmp_LIBADD="$LIBADD"
+ cgraph_tmp_CFLAGS="$CFLAGS"
+ LIBADD="$LIBADD $LIBGVC_LIBS"
+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
+ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([
+ #include <gvc.h>
+ int main(void) {
+ #ifdef WITH_CGRAPH
+ return 0;
+ #else
+ return -1;
+ #endif
+ }
+ ])], [
+ AC_MSG_RESULT([yes])
+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
+ have_cgraph=yes
+ ], [
+ AC_MSG_RESULT([no])
+ have_cgraph=no
+ ]
+ )
+ LIBADD="$cgraph_tmp_LIBADD"
+ CFLAGS="$cgraph_tmp_CFLAGS"
+fi
+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
AC_PATH_PROG([XSLTPROC], [xsltproc], :)
diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am
index f3f790e76..3c5dc4c80 100644
--- i/libvaladoc/Makefile.am
+++ w/libvaladoc/Makefile.am
@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \
content/tablerow.vala \
content/taglet.vala \
content/text.vala \
- charts/chart.vala \
- charts/chartfactory.vala \
- charts/hierarchychart.vala \
- charts/simplechartfactory.vala \
parser/manyrule.vala \
parser/oneofrule.vala \
parser/optionalrule.vala \
@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \
highlighter/codetoken.vala \
highlighter/highlighter.vala \
html/basicdoclet.vala \
- html/htmlchartfactory.vala \
html/linkhelper.vala \
html/cssclassresolver.vala \
html/htmlmarkupwriter.vala \
html/htmlrenderer.vala \
$(NULL)
+if ENABLE_GRAPHVIZ
+libvaladoc_la_VALASOURCES += \
+ charts/chart.vala \
+ charts/chartfactory.vala \
+ charts/hierarchychart.vala \
+ charts/simplechartfactory.vala \
+ html/htmlchartfactory.vala \
+ $(NULL)
+
+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
+endif
+
libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
libvaladoc.vala.stamp \
$(libvaladoc_la_VALASOURCES:.vala=.c) \
@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
--library valadoc \
--vapi valadoc@PACKAGE_SUFFIX@.vapi \
--vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
- --vapidir $(top_srcdir)/vapi --pkg libgvc \
--vapidir $(top_srcdir)/gee --pkg gee \
--vapidir $(top_srcdir)/vala --pkg vala \
--vapidir $(top_srcdir)/ccode --pkg ccode \
--vapidir $(top_srcdir)/codegen --pkg codegen \
+ $(LIBGVC_PKG) \
--pkg config \
$(filter %.vala %.c,$^)
touch $@
@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
cp $< $@
+if !ENABLE_GRAPHVIZ
+ sed -i "s/libgvc //g" $@
+endif
vapidir = $(datadir)/vala/vapi
dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
cp $< $@
+if !ENABLE_GRAPHVIZ
+ sed -i "s/libgvc//g" $@
+endif
EXTRA_DIST = \
$(libvaladoc_la_VALASOURCES) \
diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala
index 192e488cd..ec0960222 100644
--- i/libvaladoc/html/basicdoclet.vala
+++ w/libvaladoc/html/basicdoclet.vala
@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
protected HtmlRenderer _renderer;
protected Html.MarkupWriter writer;
protected Html.CssClassResolver cssresolver;
+#if HAVE_GRAPHVIZ
protected Charts.Factory image_factory;
+#else
+ protected void* image_factory;
+#endif
protected ErrorReporter reporter;
protected string package_list_link = "../index.html";
@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
this.linker = new LinkHelper ();
_renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
+#if HAVE_GRAPHVIZ
this.image_factory = new SimpleChartFactory (settings, linker);
+#endif
}
@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
}
protected void write_image_block (Api.Node element) {
+#if HAVE_GRAPHVIZ
if (element is Class || element is Interface || element is Struct) {
unowned string format = (settings.use_svg_images ? "svg" : "png");
var chart = new Charts.Hierarchy (image_factory, element);
@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
this.get_img_path_html (element, format)});
writer.add_usemap (chart);
}
+#endif
}
public void write_namespace_content (Namespace node, Api.Node? parent) {
diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala
index 5aa4afdea..e79b0b8f5 100644
--- i/libvaladoc/html/htmlmarkupwriter.vala
+++ w/libvaladoc/html/htmlmarkupwriter.vala
@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
}
}
+#if HAVE_GRAPHVIZ
public unowned MarkupWriter add_usemap (Charts.Chart chart) {
string? buf = (string?) chart.write_buffer ("cmapx");
if (buf != null) {
raw_text ("\n");
raw_text ((!) buf);
}
+#else
+ public unowned MarkupWriter add_usemap (void* chart) {
+#endif
return this;
}

261
pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch Normal file
View File

@ -0,0 +1,261 @@
diff --git a/Makefile.am b/Makefile.am
index f70234759..b3d6c3833 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,19 +13,9 @@ SUBDIRS = \
doc \
gobject-introspection \
vapigen \
- $(NULL)
-
-if ENABLE_VALADOC
-SUBDIRS += \
libvaladoc \
valadoc \
$(NULL)
-endif
-
-DISTCHECK_CONFIGURE_FLAGS = \
- --enable-valadoc \
- --enable-unversioned \
- $(NULL)
if ENABLE_UNVERSIONED
aclocaldir = $(datadir)/aclocal
diff --git a/configure.ac b/configure.ac
index 16ebd1f81..cf23db4b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,10 +156,11 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
-AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
-if test x$enable_valadoc = xyes; then
+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
+if test x$enable_graphviz = xyes; then
PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
AC_MSG_CHECKING([for CGRAPH])
+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
cgraph_tmp_LIBADD="$LIBADD"
cgraph_tmp_CFLAGS="$CFLAGS"
LIBADD="$LIBADD $LIBGVC_LIBS"
@@ -186,8 +187,8 @@ if test x$enable_valadoc = xyes; then
LIBADD="$cgraph_tmp_LIBADD"
CFLAGS="$cgraph_tmp_CFLAGS"
fi
+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
-AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
AC_PATH_PROG([XSLTPROC], [xsltproc], :)
AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d2684a0e0..b343c7c10 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,16 +6,11 @@ SUBDIRS = \
dist_man_MANS = \
valac.1 \
+ valadoc.1 \
vala-gen-introspect.1 \
vapigen.1 \
$(NULL)
-if ENABLE_VALADOC
-dist_man_MANS += \
- valadoc.1 \
- $(NULL)
-endif
-
EXTRA_DIST = \
valac.h2m \
valadoc.h2m \
@@ -24,11 +19,7 @@ EXTRA_DIST = \
$(NULL)
if HAVE_HELP2MAN
-if ENABLE_VALADOC
manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1
-else
-manpages: valac.1 vala-gen-introspect.1 vapigen.1
-endif
@rm $^
$(MAKE) $(AM_MAKEFLAGS) $^
@@ -37,13 +28,11 @@ valac.1:
--include $(srcdir)/valac.h2m \
--libtool --no-info \
--output=$@
-if ENABLE_VALADOC
valadoc.1:
$(HELP2MAN) $(top_builddir)/valadoc/valadoc \
--include $(srcdir)/valadoc.h2m \
--libtool --no-info \
--output=$@
-endif
vala-gen-introspect.1:
$(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \
--include $(srcdir)/vala-gen-introspect.h2m \
@@ -60,15 +49,12 @@ endif
if ENABLE_UNVERSIONED
install-data-hook:
cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1
-if ENABLE_VALADOC
cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1
-endif
cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1
cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1
endif
-if ENABLE_VALADOC
COMMON_VALADOCFLAGS = \
--force \
--verbose \
@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen
@touch $@
internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc
-endif
clean-local:
rm -rf $(builddir)/internal-apis
diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
index 7456fb836..107338e91 100644
--- a/libvaladoc/Makefile.am
+++ b/libvaladoc/Makefile.am
@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \
content/tablerow.vala \
content/taglet.vala \
content/text.vala \
- charts/chart.vala \
- charts/chartfactory.vala \
- charts/hierarchychart.vala \
- charts/simplechartfactory.vala \
parser/manyrule.vala \
parser/oneofrule.vala \
parser/optionalrule.vala \
@@ -149,13 +145,24 @@ libvaladoc_la_VALASOURCES = \
highlighter/codetoken.vala \
highlighter/highlighter.vala \
html/basicdoclet.vala \
- html/htmlchartfactory.vala \
html/linkhelper.vala \
html/cssclassresolver.vala \
html/htmlmarkupwriter.vala \
html/htmlrenderer.vala \
$(NULL)
+if ENABLE_GRAPHVIZ
+libvaladoc_la_VALASOURCES += \
+ charts/chart.vala \
+ charts/chartfactory.vala \
+ charts/hierarchychart.vala \
+ charts/simplechartfactory.vala \
+ html/htmlchartfactory.vala \
+ $(NULL)
+
+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
+endif
+
libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
libvaladoc.vala.stamp \
$(libvaladoc_la_VALASOURCES:.vala=.c) \
@@ -175,11 +182,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
--library valadoc \
--vapi valadoc@PACKAGE_SUFFIX@.vapi \
--vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
- --vapidir $(top_srcdir)/vapi --pkg libgvc \
--vapidir $(top_srcdir)/gee --pkg gee \
--vapidir $(top_srcdir)/vala --pkg vala \
--vapidir $(top_srcdir)/ccode --pkg ccode \
--vapidir $(top_srcdir)/codegen --pkg codegen \
+ $(LIBGVC_PKG) \
--pkg config \
$(filter %.vala %.c,$^)
touch $@
@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
cp $< $@
+if !ENABLE_GRAPHVIZ
+ sed -i "s/libgvc //g" $@
+endif
vapidir = $(datadir)/vala/vapi
dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
cp $< $@
+if !ENABLE_GRAPHVIZ
+ sed -i "s/libgvc//g" $@
+endif
EXTRA_DIST = \
$(libvaladoc_la_VALASOURCES) \
diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
index 46578c28f..f6ce7097c 100644
--- a/libvaladoc/html/basicdoclet.vala
+++ b/libvaladoc/html/basicdoclet.vala
@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
protected HtmlRenderer _renderer;
protected Html.MarkupWriter writer;
protected Html.CssClassResolver cssresolver;
+#if HAVE_GRAPHVIZ
protected Charts.Factory image_factory;
+#else
+ protected void* image_factory;
+#endif
protected ErrorReporter reporter;
protected string package_list_link = "../index.html";
@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
this.linker = new LinkHelper ();
_renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
+#if HAVE_GRAPHVIZ
this.image_factory = new SimpleChartFactory (settings, linker);
+#endif
}
@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
}
protected void write_image_block (Api.Node element) {
+#if HAVE_GRAPHVIZ
if (element is Class || element is Interface || element is Struct) {
unowned string format = (settings.use_svg_images ? "svg" : "png");
var chart = new Charts.Hierarchy (image_factory, element);
@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
this.get_img_path_html (element, format)});
writer.add_usemap (chart);
}
+#endif
}
public void write_namespace_content (Namespace node, Api.Node? parent) {
diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
index 5aa4afdea..e79b0b8f5 100644
--- a/libvaladoc/html/htmlmarkupwriter.vala
+++ b/libvaladoc/html/htmlmarkupwriter.vala
@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
}
}
+#if HAVE_GRAPHVIZ
public unowned MarkupWriter add_usemap (Charts.Chart chart) {
string? buf = (string?) chart.write_buffer ("cmapx");
if (buf != null) {
raw_text ("\n");
raw_text ((!) buf);
}
+#else
+ public unowned MarkupWriter add_usemap (void* chart) {
+#endif
return this;
}

14
pkgs/development/interpreters/python/cpython/2.7/default.nix
View File

@ -79,20 +79,6 @@ let
sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
})
# "`type_getattro()` calls `tp_descr_get(self, obj, type)` without actually owning a reference to "self".
# In very rare cases, this can cause a segmentation fault if "self" is deleted by the descriptor."
# https://github.com/python/cpython/pull/6118
(fetchpatch {
name = "type_getattro.patch";
url = "file://${./type_getattro.patch}";
sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd";
})
(fetchpatch {
name = "CVE-2018-1000802.patch";
url = "https://github.com/python/cpython/pull/8985.patch";
sha256 = "1c8nq2c9sjqa8ipl62hiandg6a7lzrwwfhi3ky6jd3pxgyalrh97";
})
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals stdenv.isLinux [

62
pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch
View File

@ -1,62 +0,0 @@
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3137,6 +3137,7 @@
PyTypeObject *metatype = Py_TYPE(type);
PyObject *meta_attribute, *attribute;
descrgetfunc meta_get;
+ PyObject* res;
if (!PyUnicode_Check(name)) {
PyErr_Format(PyExc_TypeError,
@@ -3158,6 +3159,7 @@
meta_attribute = _PyType_Lookup(metatype, name);
if (meta_attribute != NULL) {
+ Py_INCREF(meta_attribute);
meta_get = Py_TYPE(meta_attribute)->tp_descr_get;
if (meta_get != NULL && PyDescr_IsData(meta_attribute)) {
@@ -3165,10 +3167,11 @@
* writes. Assume the attribute is not overridden in
* type's tp_dict (and bases): call the descriptor now.
*/
- return meta_get(meta_attribute, (PyObject *)type,
- (PyObject *)metatype);
+ res = meta_get(meta_attribute, (PyObject *)type,
+ (PyObject *)metatype);
+ Py_DECREF(meta_attribute);
+ return res;
}
- Py_INCREF(meta_attribute);
}
/* No data descriptor found on metatype. Look in tp_dict of this
@@ -3176,6 +3179,7 @@
attribute = _PyType_Lookup(type, name);
if (attribute != NULL) {
/* Implement descriptor functionality, if any */
+ Py_INCREF(attribute);
descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get;
Py_XDECREF(meta_attribute);
@@ -3183,11 +3187,12 @@
if (local_get != NULL) {
/* NULL 2nd argument indicates the descriptor was
* found on the target object itself (or a base) */
- return local_get(attribute, (PyObject *)NULL,
- (PyObject *)type);
+ res = local_get(attribute, (PyObject *)NULL,
+ (PyObject *)type);
+ Py_DECREF(attribute);
+ return res;
}
- Py_INCREF(attribute);
return attribute;
}
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2018-03-14-21-42-17.bpo-25750.lxgkQz.rst
@@ -0,0 +1,2 @@
+Fix rare Python crash due to bad refcounting in ``type_getattro()`` if a
+descriptor deletes itself from the class.

8
pkgs/development/interpreters/python/default.nix
View File

@ -50,10 +50,10 @@ in {
sourceVersion = {
major = "2";
minor = "7";
patch = "15";
patch = "16";
suffix = "";
};
sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92";
sha256 = "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj";
inherit (darwin) CF configd;
inherit passthruFun;
};
@ -89,10 +89,10 @@ in {
sourceVersion = {
major = "3";
minor = "7";
patch = "2";
patch = "3";
suffix = "";
};
sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq";
sha256 = "066ka8csjwkycqpgyv424d8hhqhfd7r6svsp4sfcvkylci0baq6s";
inherit (darwin) CF configd;
inherit passthruFun;
};

16
pkgs/development/libraries/SDL/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, config, libGLSupported, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
, openglSupport ? libGLSupported, libGL, libGLU
, alsaSupport ? stdenv.isLinux, alsaLib
, x11Support ? !stdenv.isCygwin, libXext, libICE, libXrandr
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
, libXext, libICE, libXrandr
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio
, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
, cf-private
}:
@ -12,9 +13,6 @@
with stdenv.lib;
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null);
stdenv.mkDerivation rec {
name = "SDL-${version}";
version = "1.2.15";
@ -30,18 +28,18 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
outputBin = "dev"; # sdl-config
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ]
++ optional stdenv.isLinux libcap;
propagatedBuildInputs = [ libiconv ]
++ optionals x11Support [ libXext libICE libXrandr ]
++ optional stdenv.isLinux libcap
++ optionals openglSupport [ libGL libGLU ]
++ optional alsaSupport alsaLib
++ optional pulseaudioSupport libpulseaudio
++ optional stdenv.isDarwin Cocoa;
buildInputs = [ ]
++ optional (!stdenv.hostPlatform.isMinGW) audiofile
++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile
++ optionals stdenv.isDarwin [
AudioUnit CoreAudio CoreServices Kernel OpenGL
# Needed for NSDefaultRunLoopMode symbols.

21
pkgs/development/libraries/SDL2/default.nix
View File

@ -1,12 +1,16 @@
{ stdenv, config, libGLSupported, fetchurl, pkgconfig
, openglSupport ? libGLSupported, libGL
, alsaSupport ? stdenv.isLinux, alsaLib
, x11Support ? !stdenv.isCygwin, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols, libxkbcommon
, dbusSupport ? stdenv.isLinux, dbus
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor
, libXinerama, libXext, libXxf86vm, libXrandr
, waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
, wayland, wayland-protocols, libxkbcommon
, dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, dbus
, udevSupport ? false, udev
, ibusSupport ? false, ibus
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid
, libpulseaudio
, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL
, audiofile, cf-private, libiconv
}:
@ -16,9 +20,6 @@
with stdenv.lib;
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null);
stdenv.mkDerivation rec {
name = "SDL2-${version}";
version = "2.0.9";
@ -44,14 +45,14 @@ stdenv.mkDerivation rec {
++ optionals x11Support [ libX11 xorgproto ];
dlopenBuildInputs = [ ]
++ optional alsaSupport alsaLib
++ optionals alsaSupport [ alsaLib audiofile ]
++ optional dbusSupport dbus
++ optional pulseaudioSupport libpulseaudio
++ optional udevSupport udev
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ];
buildInputs = [ audiofile libiconv ]
buildInputs = [ libiconv ]
++ dlopenBuildInputs
++ optional ibusSupport ibus
++ optionals stdenv.isDarwin [

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

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ ];
#cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" "-DBUILD_TESTING=FALSE" ];
#cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ];
doCheck = false;
# internal_volume_io.h: No such file or directory

4
pkgs/development/libraries/atk/default.nix
View File

@ -4,7 +4,7 @@
let
pname = "atk";
version = "2.30.0";
version = "2.32.0";
in
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0yq25iisnf0rmlg2x5ghzqk9vhf2jramb2khxqghqakz47a90kfx";
sha256 = "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/boehm-gc/default.nix
View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
name = "boehm-gc-${version}";
version = "8.0.2";
version = "8.0.4";
src = fetchurl {
urls = [
"https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
"http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
];
sha256 = "1jsixcpdwy5cgq5s9fi3bdlid9zh46vakymf3nbjffianyss932f";
sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3";
};
buildInputs = [ libatomic_ops ];

3
pkgs/development/libraries/cairo/default.nix
View File

@ -40,6 +40,9 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
pkgconfig
];
buildInputs = [
libiconv
libintl
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

4
pkgs/development/libraries/catch2/default.nix
View File

@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-H.."
"-DBUILD_TESTING=OFF"];
cmakeFlags = [ "-H.." ];
meta = with stdenv.lib; {
description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";

2
pkgs/development/libraries/db/generic.nix
View File

@ -39,6 +39,8 @@ stdenv.mkDerivation (rec {
rm -rf $out/docs
'';
enableParallelBuilding = true;
doCheck = true;
checkPhase = ''

4
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
, x264, x265, xvidcore, zlib, libopus, speex
, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers
, openglSupport ? false, libGLU_combined ? null
# Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@ -161,7 +161,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex
libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers
] ++ optional openglSupport libGLU_combined
++ optional vpxSupport libvpx
++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM

8
pkgs/development/libraries/freetype/default.nix
View File

@ -13,8 +13,8 @@ let
inherit (stdenv.lib) optional optionalString;
in stdenv.mkDerivation rec {
name = "freetype-${version}";
version = "2.9.1";
pname = "freetype";
version = "2.10.0";
meta = with stdenv.lib; {
description = "A font rendering engine";
@ -32,8 +32,8 @@ in stdenv.mkDerivation rec {
};
src = fetchurl {
url = "mirror://savannah/freetype/${name}.tar.bz2";
sha256 = "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv";
url = "mirror://savannah/${pname}/${pname}-${version}.tar.bz2";
sha256 = "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w";
};
propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype

17
pkgs/development/libraries/freetype/enable-subpixel-rendering.patch
View File

@ -1,13 +1,12 @@
Index: freetype-2.7.1/include/freetype/config/ftoption.h
===================================================================
--- freetype-2.7.1.orig/include/freetype/config/ftoption.h
+++ freetype-2.7.1/include/freetype/config/ftoption.h
@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
/* This is done to allow FreeType clients to run unmodified, forcing */
/* them to display normal gray-level anti-aliased glyphs. */
/* */
Index: freetype-2.10.0/include/freetype/config/ftoption.h
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -126,7 +126,7 @@ FT_BEGIN_HEADER
* macro is not defined, FreeType offers alternative LCD rendering
* technology that produces excellent output without LCD filtering.
*/
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
/*************************************************************************/
/**************************************************************************

12
pkgs/development/libraries/freetype/enable-table-validation.patch
View File

@ -1,20 +1,18 @@
Index: freetype-2.7.1/modules.cfg
Index: freetype-2.10.0/modules.cfg
===================================================================
--- freetype-2.7.1.orig/modules.cfg
+++ freetype-2.7.1/modules.cfg
@@ -120,7 +120,7 @@ AUX_MODULES += cache
--- freetype-2.10.0.orig/modules.cfg
+++ freetype-2.10.0/modules.cfg
@@ -120,6 +120,6 @@ AUX_MODULES += cache
# TrueType GX/AAT table validation. Needs ftgxval.c below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid
# Support for streams compressed with gzip (files with suffix .gz).
#
@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
@@ -143,6 +143,6 @@ AUX_MODULES += bzip2
# OpenType table validation. Needs ftotval.c below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid

15
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -4,28 +4,18 @@
let
pname = "gdk-pixbuf";
version = "2.38.0";
version = "2.38.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x";
sha256 = "0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi";
};
patches = [
# TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
# which requires access to shared-mime-info files during runtime.
# For now, we are patching the build script to avoid the dependency.
./no-mime-sniffing.patch
# Move installed tests to a separate output
./installed-tests-path.patch
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/a7d582f75a71320554b881e063a65f4ced679c1c.patch;
sha256 = "0z0w52bh4hcrdllbgrqvh12iqzr7k1pb0wdr9vz2qslg1kjk4j92";
})
];
outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
@ -48,6 +38,7 @@ in stdenv.mkDerivation rec {
"-Djasper=true"
"-Dx11=true"
"-Dgir=${if gobject-introspection != null then "true" else "false"}"
"-Dgio_sniffing=false"
];
postPatch = ''

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

@ -46,7 +46,7 @@ let
'';
binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
version = "2.58.2";
version = "2.58.3";
in
stdenv.mkDerivation rec {
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0jrxfm4gn1qz3y1450z709v74ys2bkjr8yffkgy106kgagb4xcn7";
sha256 = "10blprf5djbwxq8dqmjvcsdc9vqz63rl0ammfbd2b2p8cwbw6hwg";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch
@ -66,26 +66,6 @@ stdenv.mkDerivation rec {
./schema-override-variable.patch
# Require substituteInPlace in postPatch
./fix-gio-launch-desktop-path.patch
# https://gitlab.gnome.org/GNOME/glib/issues/1626
# https://gitlab.gnome.org/GNOME/glib/merge_requests/557
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch;
sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877";
})
# https://gitlab.gnome.org/GNOME/glib/issues/1645
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff;
sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w";
})
# https://gitlab.gnome.org/GNOME/glib/issues/1643
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/glib/commit/c792e5adaa8ae3a45e6ff3ff71168ad8d040a0d4.patch;
sha256 = "022x70qfn5wlv5gz3nlg0bwiwjxcd7l11j3qvbms2y8d1ffh5rfd";
})
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/glib/commit/30ccbc386026cecac6ef3a77d8fa4f3c24ac68d7.patch;
sha256 = "04y3pxgzlx92cppwibx4rlsyvwxb37aq52x2lr6ajfgykv2nzpr3";
})
];
outputs = [ "bin" "out" "dev" "devdoc" ];

2
pkgs/development/libraries/glibc/locales.nix
View File

@ -26,6 +26,8 @@ callPackage ./common.nix { inherit stdenv; } {
''
mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale"
echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED
# Hack to allow building of the locales (needed since glibc-2.12)
sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile
''

1
pkgs/development/libraries/google-gflags/default.nix
View File

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_STATIC_LIBS=ON"
"-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
];
doCheck = false;

16
pkgs/development/libraries/gpgme/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
, file, which, ncurses
, autoreconfHook, fetchpatch
, git
, texinfo
, buildPackages
, qtbase ? null
@ -15,11 +13,11 @@ in
stdenv.mkDerivation rec {
name = "gpgme-${version}";
version = "1.12.0";
version = "1.13.0";
src = fetchurl {
url = "mirror://gnupg/gpgme/${name}.tar.bz2";
sha256 = "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l";
sha256 = "0c6676g0yhfsmy32i1dgwh5cx0ja8vhcqf4k08zad177m53kxcnl";
};
outputs = [ "out" "dev" "info" ];
@ -29,19 +27,11 @@ stdenv.mkDerivation rec {
[ libgpgerror glib libassuan pth ]
++ lib.optional (qtbase != null) qtbase;
nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
nativeBuildInputs = [ file pkgconfig gnupg texinfo ]
++ lib.optionals pythonSupport [ python swig2 which ncurses ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
patches = [
(fetchpatch {
name = "fix-key-expiry.patch";
url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=66376f3e206a1aa791d712fb8577bb3490268f60";
sha256 = "0i777dzcbv4r568l8623ar6y6j44bv46bbxi751qa5mdcihpya02";
})
];
postPatch =''
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
'';

3
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
postInstall = ''
for prog in "$dev/bin/"*; do
wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")"
# We can't use --suffix here due to quoting so we craft the export command by hand
wrapProgram "$prog" --run "export GST_PLUGIN_SYSTEM_PATH=\$GST_PLUGIN_SYSTEM_PATH"$\{GST_PLUGIN_SYSTEM_PATH:+:\}"\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")"
done
'';

9
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -13,14 +13,14 @@ assert cupsSupport -> cups != null;
with stdenv.lib;
let
version = "3.24.5";
version = "3.24.7";
in
stdenv.mkDerivation rec {
name = "gtk+3-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b";
sha256 = "080m925dyhiidlhsxqzx040l4iha2gg38pzbfpnsnjyzl92124jj";
};
outputs = [ "out" "dev" ];
@ -35,11 +35,6 @@ stdenv.mkDerivation rec {
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
})
(fetchpatch {
name = "fix-fribidi-linking.patch";
url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch;
sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr";
})
] ++ optionals stdenv.isDarwin [
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
# let’s drop that dependency in similar way to how other parts of the library do it

1
pkgs/development/libraries/itk/default.nix
View File

@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
};
cmakeFlags = [
"-DBUILD_TESTING=OFF"
"-DBUILD_EXAMPLES=OFF"
"-DBUILD_SHARED_LIBS=ON"
"-DModule_ITKMINC=ON"

4
pkgs/development/libraries/jasper/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "jasper-${version}";
version = "2.0.14";
version = "2.0.16";
src = fetchFromGitHub {
repo = "jasper";
owner = "mdadams";
rev = "version-${version}";
sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f";
sha256 = "05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6";
};
patches = [

4
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
View File

@ -1,5 +1,5 @@
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index 52b2eb2..a04596c 100644
index 275fd65..a04596c 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -232,34 +232,6 @@
@ -14,7 +14,7 @@ index 52b2eb2..a04596c 100644
-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
-# See http://wiki.debian.org/Multiarch
-# See https://wiki.debian.org/Multiarch
-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
- AND NOT CMAKE_CROSSCOMPILING
- AND NOT DEFINED ENV{FLATPAK_ID})

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

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

4
pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, copyPathsToStore,
extra-cmake-modules,
attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, qtmultimedia, taglib
attr, ebook_tools, exiv2, ffmpeg, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib
}:
mkDerivation {
@ -9,7 +9,7 @@ mkDerivation {
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase qtmultimedia
attr ebook_tools exiv2 ffmpeg karchive kcoreaddons ki18n poppler qtbase qtmultimedia
taglib
];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

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

@ -3,635 +3,635 @@
{
attica = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/attica-5.54.0.tar.xz";
sha256 = "1gr7w0mf3aq5xyl9il3483m9aqgb981vxn02g2khm6dfsr6z2aln";
name = "attica-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/attica-5.56.0.tar.xz";
sha256 = "1ib68yg7dgfyh2kq72abw5bh8h0m85z3hcada3b3axq2xkcfxfmb";
name = "attica-5.56.0.tar.xz";
};
};
baloo = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/baloo-5.54.0.tar.xz";
sha256 = "0wv8zi03plr279v9p923rwkx2kwhbpd6xlzyqi4v14vhcrmapg1c";
name = "baloo-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/baloo-5.56.0.tar.xz";
sha256 = "04hjlhlgw26l2pl4b5jk76xfs7366my71zp1xgiws5aq620bmmcy";
name = "baloo-5.56.0.tar.xz";
};
};
bluez-qt = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/bluez-qt-5.54.0.tar.xz";
sha256 = "1br9496lahzqmzmvdic5835ig18w3g211l1w4qfzpgr50yin9n5v";
name = "bluez-qt-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/bluez-qt-5.56.0.tar.xz";
sha256 = "1phph0rjms8n2qpkh9bk1n1n1cd75znsqj9r8njs1siasm6vi4nm";
name = "bluez-qt-5.56.0.tar.xz";
};
};
breeze-icons = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/breeze-icons-5.54.0.tar.xz";
sha256 = "1g5dppg2iq5bd3r3s8bi8jqnvnh1rm7s3sv51shmaamq5qf0n5jy";
name = "breeze-icons-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/breeze-icons-5.56.0.tar.xz";
sha256 = "0n6gizmzay98q1vi9ac60p0xq9hpaj9q0gcf8vbmvk4m0yzdd63x";
name = "breeze-icons-5.56.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/extra-cmake-modules-5.54.0.tar.xz";
sha256 = "0i3iqwvdqf2wpg8lsbna4vgmb18pnbv2772sg9k6zzhvkwsskdwi";
name = "extra-cmake-modules-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/extra-cmake-modules-5.56.0.tar.xz";
sha256 = "0a5mxk805rlmpgbxwa9qkn515jqpcifsrk8ydxc3anjcsq6ffg4i";
name = "extra-cmake-modules-5.56.0.tar.xz";
};
};
frameworkintegration = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/frameworkintegration-5.54.0.tar.xz";
sha256 = "1rzi3ydw7hjhg4vbsfan7zgaa2a2bmp7mph95h2kidf8x816qv2d";
name = "frameworkintegration-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/frameworkintegration-5.56.0.tar.xz";
sha256 = "1xc0vdvpjzhb6y1pz27c7x36qjjhcf4bll0fm3yljpm956v4d3gf";
name = "frameworkintegration-5.56.0.tar.xz";
};
};
kactivities = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kactivities-5.54.0.tar.xz";
sha256 = "0ipq71g6g7q6yncvbiabwn5kg2280k8ssibbbf6jyh2lg09dmjil";
name = "kactivities-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kactivities-5.56.0.tar.xz";
sha256 = "0l0p966b5rs6xjc61mpzmrkj7qqjvlzi6fwc7lky4z3fr924ssp7";
name = "kactivities-5.56.0.tar.xz";
};
};
kactivities-stats = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kactivities-stats-5.54.0.tar.xz";
sha256 = "1ns7f110a5vwabb33b1lnpa85kk5radf87bxm1gw4gzglsv7747d";
name = "kactivities-stats-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kactivities-stats-5.56.0.tar.xz";
sha256 = "1v3pf9drb22qv7039grx4k7q3a1jxd2a7sf818mxpqyys4fzkl3f";
name = "kactivities-stats-5.56.0.tar.xz";
};
};
kapidox = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kapidox-5.54.0.tar.xz";
sha256 = "0zwjychzcamsky9l67xnw820b9m8r8pi56gsccg023l1rcigz46c";
name = "kapidox-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kapidox-5.56.0.tar.xz";
sha256 = "0rhqqsv4zf13idk426x84jykw6lc74bz7pk606llbmyw4775c7wp";
name = "kapidox-5.56.0.tar.xz";
};
};
karchive = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/karchive-5.54.0.tar.xz";
sha256 = "141xqgdk7g3ky0amblrqr4pab1xvvdim5wvckrgawdkjiy5ana4g";
name = "karchive-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/karchive-5.56.0.tar.xz";
sha256 = "1mnavc5baa4qw90baw5b95760lk61m2rx0vfa3w5d7fid3m6q6i8";
name = "karchive-5.56.0.tar.xz";
};
};
kauth = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kauth-5.54.0.tar.xz";
sha256 = "1ciabazig77rpfksvdlmixj2sa2qnasq13nwvjn3xksnajfm4p2h";
name = "kauth-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kauth-5.56.0.tar.xz";
sha256 = "0gb1yh2na2kfphln7arscv5n7llagkkv2y0zdprdy4michqa3k6b";
name = "kauth-5.56.0.tar.xz";
};
};
kbookmarks = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kbookmarks-5.54.0.tar.xz";
sha256 = "1w4rqnzyars1pxam3nym1qily3ihd2j8cpkq8aha70nbj0dj3ckw";
name = "kbookmarks-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kbookmarks-5.56.0.tar.xz";
sha256 = "0fwmq70ajyjqcva1n2vnf522gwl44aqsi6s9vf8zxsar14vil082";
name = "kbookmarks-5.56.0.tar.xz";
};
};
kcmutils = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kcmutils-5.54.0.tar.xz";
sha256 = "0a5jz9m27nyl1vchp68170j9v5z4csyv43vpnfs09l6wk9ggdcwh";
name = "kcmutils-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kcmutils-5.56.0.tar.xz";
sha256 = "1f1sccwyk6fzqd9ywnhkrsyaklmxi0w0w5jqhp1m4n3l30caixkw";
name = "kcmutils-5.56.0.tar.xz";
};
};
kcodecs = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kcodecs-5.54.0.tar.xz";
sha256 = "1s0ky187fbi34wabpfvdwb1zbblzvk8g83h37ckj9j4rd69mjksc";
name = "kcodecs-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kcodecs-5.56.0.tar.xz";
sha256 = "10lw85im4rd3nfdnw2p48cjwq0d47pa2s9v6vmhzmm3hxbflq8z7";
name = "kcodecs-5.56.0.tar.xz";
};
};
kcompletion = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kcompletion-5.54.0.tar.xz";
sha256 = "0sgg09l97amnng0ddxyjpk535097f87bmn60hjqrmpsqb0n3a460";
name = "kcompletion-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kcompletion-5.56.0.tar.xz";
sha256 = "1yxsrl0f24ps8xsilh2iqnl88yvw39iw2ch0yk7lwwk47jkgvns9";
name = "kcompletion-5.56.0.tar.xz";
};
};
kconfig = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kconfig-5.54.0.tar.xz";
sha256 = "14p4w0m04c8msdwb3mjfzx6w0lcmln65j3rfvqp58nv5n4yh5dp7";
name = "kconfig-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kconfig-5.56.0.tar.xz";
sha256 = "0wii6pn5dq899s1r7p4q5vmm01jk11zwg2ky6760xf8nv8rhg5ra";
name = "kconfig-5.56.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kconfigwidgets-5.54.0.tar.xz";
sha256 = "1l3hh7qgnz7mnn55abv03pq7zal9dgcw5gnhfr747wknd4h90w31";
name = "kconfigwidgets-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kconfigwidgets-5.56.0.tar.xz";
sha256 = "00x5cxgxqza81znzm5rzxzr6scv3s5wbwbhsq61ksmjnlf5wvky5";
name = "kconfigwidgets-5.56.0.tar.xz";
};
};
kcoreaddons = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kcoreaddons-5.54.0.tar.xz";
sha256 = "1n27786js8j8na7kgxirhmswxcz3qkfiqzfabqmmsd0jp4rx1s79";
name = "kcoreaddons-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kcoreaddons-5.56.0.tar.xz";
sha256 = "17kvndaab9l6r79rh0pyjgw4yqh99xfyksc4yxzhhlyl3fgh6hcz";
name = "kcoreaddons-5.56.0.tar.xz";
};
};
kcrash = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kcrash-5.54.0.tar.xz";
sha256 = "0wlrlzwdi9dpxkky9sadmbgw0rjisxhym9hr8gzydd2y8q4cr8a7";
name = "kcrash-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kcrash-5.56.0.tar.xz";
sha256 = "1q5iyqi1qgk5ngc9fdilrc5mjxy2mb0xbdnlx234hn1a44aq47jq";
name = "kcrash-5.56.0.tar.xz";
};
};
kdbusaddons = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kdbusaddons-5.54.0.tar.xz";
sha256 = "1fvlspqc3w3y4p04gnqz6vrfvl93iwckfk16p608fz7yfgdmlzbf";
name = "kdbusaddons-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kdbusaddons-5.56.0.tar.xz";
sha256 = "0wmrcz92k27j0s2iyzd9ldynv4p52x70sxzby2m807ffrs692c5r";
name = "kdbusaddons-5.56.0.tar.xz";
};
};
kdeclarative = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kdeclarative-5.54.0.tar.xz";
sha256 = "0ankjqrlpnj3c9sjnv5p8w279zizkl5ps3i5zw16hg44v6hdmcj0";
name = "kdeclarative-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kdeclarative-5.56.0.tar.xz";
sha256 = "0slhxqzbrj23vw7f017cx3brpqkw3933jj7z8kc2bgfzjypj373r";
name = "kdeclarative-5.56.0.tar.xz";
};
};
kded = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kded-5.54.0.tar.xz";
sha256 = "131hvxpqvkyh1sfb1j19jjzy7fyy6xisvpmx12lw1pvks0cnrqgn";
name = "kded-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kded-5.56.0.tar.xz";
sha256 = "0fdzpsrigjqssqw25gxz5d1i0j8g3hc8xpv4v74mp0pcv9g10apz";
name = "kded-5.56.0.tar.xz";
};
};
kdelibs4support = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/portingAids/kdelibs4support-5.54.0.tar.xz";
sha256 = "02kklfcjsll4pf4rfll7jrr7jpcwd57954ypjjhn3xgr6p0w0hdm";
name = "kdelibs4support-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/portingAids/kdelibs4support-5.56.0.tar.xz";
sha256 = "1yhfnvzgwmnivm99gkq67gnx0ar02j043mq3fg2lgwlrarqi9k7d";
name = "kdelibs4support-5.56.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kdesignerplugin-5.54.0.tar.xz";
sha256 = "0hlywnzd3d6bvhib1xqiqx39m7k8g16wsj102f7awd5gw3xrz8ga";
name = "kdesignerplugin-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kdesignerplugin-5.56.0.tar.xz";
sha256 = "05nqayzafn2zz74lx8zj7hi7knclcip7zbqmpk1g3nriysc39x4v";
name = "kdesignerplugin-5.56.0.tar.xz";
};
};
kdesu = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kdesu-5.54.0.tar.xz";
sha256 = "1qhw1hmq2b6rkyibidmg532llv31vkhmp0a7j2myzi40ydbx1lar";
name = "kdesu-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kdesu-5.56.0.tar.xz";
sha256 = "0fc77rbkd1m7rv4rq56g0fg4vg0siamdm5g788816ig9gn1j76ll";
name = "kdesu-5.56.0.tar.xz";
};
};
kdewebkit = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kdewebkit-5.54.0.tar.xz";
sha256 = "0prl9751a8nv7qhg7fv8qygq0llh71w2p25sldl3zif44340jnhf";
name = "kdewebkit-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kdewebkit-5.56.0.tar.xz";
sha256 = "1c1mxs30182ilxybp0xwaljrjg5y9j1ri79169hn8664xs3wcbc2";
name = "kdewebkit-5.56.0.tar.xz";
};
};
kdnssd = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kdnssd-5.54.0.tar.xz";
sha256 = "00sqx2hyqd9yw4nwdl8kmbzm0v0szgqv4nz0q6bchv3hfbax6zk7";
name = "kdnssd-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kdnssd-5.56.0.tar.xz";
sha256 = "1gskwc8sbj6cicblmrxh7qnh1gap0qivs8k5zf5qs94p1xc864vy";
name = "kdnssd-5.56.0.tar.xz";
};
};
kdoctools = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kdoctools-5.54.0.tar.xz";
sha256 = "0xbmdqlvyw9s2g8kwn1wmvz09pn4vs386ibm1p92wdnpspp5did6";
name = "kdoctools-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kdoctools-5.56.0.tar.xz";
sha256 = "01y06rf1nhw2p8s0j60anr2qvssrqfimddvp2mqqkvx9xkx3py74";
name = "kdoctools-5.56.0.tar.xz";
};
};
kemoticons = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kemoticons-5.54.0.tar.xz";
sha256 = "0ypcffpp0m75qwam386q6pyfbsij16y2vgpkn38li6ypxlxsvx2v";
name = "kemoticons-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kemoticons-5.56.0.tar.xz";
sha256 = "00hbd09gnwyfszdwa9yf5m8wpbbapc4kwhs3qxhbvvmll0jv9vl2";
name = "kemoticons-5.56.0.tar.xz";
};
};
kfilemetadata = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kfilemetadata-5.54.0.tar.xz";
sha256 = "1hl61y15nqr5h5k4jqfz9bjj4gw6wdaiacxaslcwzn0sg4xyavab";
name = "kfilemetadata-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kfilemetadata-5.56.0.tar.xz";
sha256 = "04pmd2f77zxi14l3rhw4dyrh9dafchxqw1xjyv60j97gmm1b9796";
name = "kfilemetadata-5.56.0.tar.xz";
};
};
kglobalaccel = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kglobalaccel-5.54.0.tar.xz";
sha256 = "10gl8prc1n0si52cmiglkz8dx79dylmxrh5mjpmyy5yy16chs1s1";
name = "kglobalaccel-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kglobalaccel-5.56.0.tar.xz";
sha256 = "0pmgvizc2dwrwr7m49125ybcpsc95r9riwxnihf37napyaacd9y3";
name = "kglobalaccel-5.56.0.tar.xz";
};
};
kguiaddons = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kguiaddons-5.54.0.tar.xz";
sha256 = "0lkqxsqdjmc7060pxi5j8gx15kmrb8450cpinzn89nzpdl7rj935";
name = "kguiaddons-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kguiaddons-5.56.0.tar.xz";
sha256 = "0gp2i29y1vws8i3q8s1bhyxksa42l6q55m459yczddcvcw0vd45i";
name = "kguiaddons-5.56.0.tar.xz";
};
};
kholidays = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kholidays-5.54.0.tar.xz";
sha256 = "1xp6mpnhlqkfl3pdaj6nq9sqy30z5wm6gms0ycy33n4ly2s8wb1y";
name = "kholidays-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kholidays-5.56.0.tar.xz";
sha256 = "0lm2ls3a15qbsfhamh2ldzvr62wi9nrhxd83rhyk3ifsgac4mg18";
name = "kholidays-5.56.0.tar.xz";
};
};
khtml = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/portingAids/khtml-5.54.0.tar.xz";
sha256 = "17d8cim4ph7nxc5gkidhxc659yn9a7dqvnrihx9sj1cy01qnc7da";
name = "khtml-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/portingAids/khtml-5.56.0.tar.xz";
sha256 = "1wmcqc4546mqagqpgb97h3yd7nxaq4si2484li5hnw8mglm1qf3x";
name = "khtml-5.56.0.tar.xz";
};
};
ki18n = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/ki18n-5.54.0.tar.xz";
sha256 = "0drbyr2y44h1d88nbgxvp4ix46lin51r8vzhhnjhq2ydqy5za3p3";
name = "ki18n-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/ki18n-5.56.0.tar.xz";
sha256 = "0hdfad9vmyzfni9ln0dc9p26gpjksk754z28v35hww6z9kgbr1dq";
name = "ki18n-5.56.0.tar.xz";
};
};
kiconthemes = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kiconthemes-5.54.0.tar.xz";
sha256 = "0hc3a6ax3yizpbvklxw3pm0r6j0r5jqx2ffbz1980g21lcgshd7g";
name = "kiconthemes-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kiconthemes-5.56.0.tar.xz";
sha256 = "0rdpvbqsb2wqi3glmggilm1mhpy6nc80am5hl4c34269mxd55q8a";
name = "kiconthemes-5.56.0.tar.xz";
};
};
kidletime = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kidletime-5.54.0.tar.xz";
sha256 = "1x0z0ipdizgv6jkklxp6maclx8f6ya2bv1q39hvxxnnmly8q3vjm";
name = "kidletime-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kidletime-5.56.0.tar.xz";
sha256 = "09184bi8fvq34hwkldyibji7r79wd2wvhxk1i4kzkjg177dnaa95";
name = "kidletime-5.56.0.tar.xz";
};
};
kimageformats = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kimageformats-5.54.0.tar.xz";
sha256 = "0xfzpzaqgdncwxvg27qb0ryqi78nbsi0xcsg9cjmgspfx5mlgi15";
name = "kimageformats-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kimageformats-5.56.0.tar.xz";
sha256 = "1cgh32jkg0ybfp8z6qwn7y6yr9mb0fiqly4pb0qc1lcm6awdx3d5";
name = "kimageformats-5.56.0.tar.xz";
};
};
kinit = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kinit-5.54.0.tar.xz";
sha256 = "0pmr6ckysdqpni49i9jgapsk88jfbrnlfybpcp3v51kl2nkwm0i9";
name = "kinit-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kinit-5.56.0.tar.xz";
sha256 = "1ihrannyaj33wsir20qy363vdjafhlsmj45qzl3xkl4rbyl6ngs7";
name = "kinit-5.56.0.tar.xz";
};
};
kio = {
version = "5.54.1";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kio-5.54.1.tar.xz";
sha256 = "11wdsq87w1ddkrm0mpik2qf0c0k897f1rflszfrrwkplfb0z63xp";
name = "kio-5.54.1.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kio-5.56.0.tar.xz";
sha256 = "1m2c3a5isj966snmzs97i9kyhwnbzlwf61lqw5yxck25x7d0pyyn";
name = "kio-5.56.0.tar.xz";
};
};
kirigami2 = {
version = "5.54.0";
version = "5.56.1";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kirigami2-5.54.0.tar.xz";
sha256 = "0iny9br3vpakvv0bmgy0mmw2y10d4kqbahjpfa3726qai4gligp2";
name = "kirigami2-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kirigami2-5.56.1.tar.xz";
sha256 = "0npq65kslwkdsylmv5hgcqsa5i9386dmnx8ig79rlf3409awn2f8";
name = "kirigami2-5.56.1.tar.xz";
};
};
kitemmodels = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kitemmodels-5.54.0.tar.xz";
sha256 = "1s3wv75sbb4kpgz02cbm7smp8h6rk1ixv0gafbvz9514i9g4d760";
name = "kitemmodels-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kitemmodels-5.56.0.tar.xz";
sha256 = "13m1bvhljyc1jb9hdlz5v009kmkz7q0qf06l5zkck5k0fq41rkrg";
name = "kitemmodels-5.56.0.tar.xz";
};
};
kitemviews = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kitemviews-5.54.0.tar.xz";
sha256 = "1cw9i8xik287rvb12alpqsph902nhfmbn4cfjx5gj7k888n8k3mk";
name = "kitemviews-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kitemviews-5.56.0.tar.xz";
sha256 = "1ar492jpyprxvzcgnq0gnbyxlndb3rd0z32drk7xsx19vpk3ch58";
name = "kitemviews-5.56.0.tar.xz";
};
};
kjobwidgets = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kjobwidgets-5.54.0.tar.xz";
sha256 = "0d3jxabjlf2s4p34pzrpfsg4xp9s8qd7dmg50yxl59dijd42xgxq";
name = "kjobwidgets-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kjobwidgets-5.56.0.tar.xz";
sha256 = "1dh4ilry575k6z0glqb60ldjfkwpnkvijdzfyrc22bn84hbh19iy";
name = "kjobwidgets-5.56.0.tar.xz";
};
};
kjs = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/portingAids/kjs-5.54.0.tar.xz";
sha256 = "0bidbvbwbrbwwm0drw6l43vgmsp50c946jjq7pgnq1gf7mhscwcy";
name = "kjs-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/portingAids/kjs-5.56.0.tar.xz";
sha256 = "1b3l76ipf0fr8bvp3f4njimmg5yw9ciwzzgvb34ds65aycplagln";
name = "kjs-5.56.0.tar.xz";
};
};
kjsembed = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/portingAids/kjsembed-5.54.0.tar.xz";
sha256 = "1pjpk8ysrnh78infq99i0wrf78h8h7hbfnr1m7agzffhbqa671z8";
name = "kjsembed-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/portingAids/kjsembed-5.56.0.tar.xz";
sha256 = "0lkfq7099yiwvlycrix3s0dbk860rqfnix5fiw5vmi855is7mpkv";
name = "kjsembed-5.56.0.tar.xz";
};
};
kmediaplayer = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/portingAids/kmediaplayer-5.54.0.tar.xz";
sha256 = "0qalqqkn2yvxgr45l7zm36bcpxwbgn8ngxsvyb5cxfaalwr0mkyf";
name = "kmediaplayer-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/portingAids/kmediaplayer-5.56.0.tar.xz";
sha256 = "0blqbi40l1pk8qf9054ha4a8r7cb4pddbqydsqlsscl4gm8530jh";
name = "kmediaplayer-5.56.0.tar.xz";
};
};
knewstuff = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/knewstuff-5.54.0.tar.xz";
sha256 = "1l3ibadjvaqqjsb1lhkf6jkzy80dk15fgid125bqk4amwsyygnd3";
name = "knewstuff-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/knewstuff-5.56.0.tar.xz";
sha256 = "0r0ia0521vfri7mc6wpg3ihryqj48s3krgmliwbh635rfd3lcj9j";
name = "knewstuff-5.56.0.tar.xz";
};
};
knotifications = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/knotifications-5.54.0.tar.xz";
sha256 = "1agglvwaf0wh3fcs0ww3jxn900ych4dsvbaylrx4qip6girfmiyn";
name = "knotifications-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/knotifications-5.56.0.tar.xz";
sha256 = "05nf2870fq9cwacgyy8iky5v37fq4jrsh4hl9xy9928d19qnmb24";
name = "knotifications-5.56.0.tar.xz";
};
};
knotifyconfig = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/knotifyconfig-5.54.0.tar.xz";
sha256 = "1ibxqi0y43qgjj4nikxwfppmda9xjmz63c5fml8c4w5d9mdag3if";
name = "knotifyconfig-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/knotifyconfig-5.56.0.tar.xz";
sha256 = "0zwq0p779482sxxjg62z1rkpiiyn6b3r47l450dm6hm56vkf7vxl";
name = "knotifyconfig-5.56.0.tar.xz";
};
};
kpackage = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kpackage-5.54.0.tar.xz";
sha256 = "1s1n7r3j7l4kvd85dgssaaz70dd2w8vp34kwg49ak58cdai01vzb";
name = "kpackage-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kpackage-5.56.0.tar.xz";
sha256 = "037r0ldp70q0yafld1ddff1d4wipb5ras88r72qazjcfqfg9rzjr";
name = "kpackage-5.56.0.tar.xz";
};
};
kparts = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kparts-5.54.0.tar.xz";
sha256 = "0y2dr286hb2w4r7ifq39vd7ajsalqyh9d91dm19b2rpgdmvgxai6";
name = "kparts-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kparts-5.56.0.tar.xz";
sha256 = "1vj5ard5ff0wzpjqzrkd2kb31dkjly1cf4ww1ljrrwi7qgzxgw0z";
name = "kparts-5.56.0.tar.xz";
};
};
kpeople = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kpeople-5.54.0.tar.xz";
sha256 = "0sl8wcj7w9vgczcv8mfvjlnghidyadbh1qsiv0pj63ywl7xgr1hx";
name = "kpeople-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kpeople-5.56.0.tar.xz";
sha256 = "0h456kjhx4ylbkiv3706g8ccdq55aamrhj5rgiql2gaw3d5dbrkr";
name = "kpeople-5.56.0.tar.xz";
};
};
kplotting = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kplotting-5.54.0.tar.xz";
sha256 = "02mab80jyfgdj8xwbwkm181cc5vpsmbn561242q7ayjgxdiszzw9";
name = "kplotting-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kplotting-5.56.0.tar.xz";
sha256 = "1hrk3iv77s46lcs6c5mfiyzr80vpg9261mlixc3qwps0mww43r1r";
name = "kplotting-5.56.0.tar.xz";
};
};
kpty = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kpty-5.54.0.tar.xz";
sha256 = "04sj612x15311yk2jmr3ak430syp5p59w559670sd18ih99mf8m3";
name = "kpty-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kpty-5.56.0.tar.xz";
sha256 = "1dzp4a6rz6hsp1y8m5l73i8v2a3bpwkv4rrypkd00051ajcch47k";
name = "kpty-5.56.0.tar.xz";
};
};
kross = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/portingAids/kross-5.54.0.tar.xz";
sha256 = "18ij9339khskla4r0afl0n6x4pd157y1l5bk2ldb9anpck3p71kd";
name = "kross-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/portingAids/kross-5.56.0.tar.xz";
sha256 = "0ry6fpl0rb8z5r08bzh6kj14mp7l94calvdk3vrnc89cpm5gxymv";
name = "kross-5.56.0.tar.xz";
};
};
krunner = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/krunner-5.54.0.tar.xz";
sha256 = "06y592v32926wq9iaypryj0173ca05vv0p5rrs4n77kwhkl0zq0v";
name = "krunner-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/krunner-5.56.0.tar.xz";
sha256 = "1gs0fr78zbhxl8c08zj4s98zshc42zxzwv7p9l7rmq8h21spc8ga";
name = "krunner-5.56.0.tar.xz";
};
};
kservice = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kservice-5.54.0.tar.xz";
sha256 = "10qmrqyfjhf5nzjailgmb86nq62ffrmiddk3880mh49fwxs4l3qx";
name = "kservice-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kservice-5.56.0.tar.xz";
sha256 = "1hsc8pagigwspyv9ipl3l2b9mf8amfksk8a2k3iic9nw1hmpxinv";
name = "kservice-5.56.0.tar.xz";
};
};
ktexteditor = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/ktexteditor-5.54.0.tar.xz";
sha256 = "12yywvv82lmqmx89j1qxj45an49vx34brifxs9rpy3nxyh9c3vzy";
name = "ktexteditor-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/ktexteditor-5.56.0.tar.xz";
sha256 = "1a2r97v3xwh61q688jvwkk99bphfd0v0ldqms5d73q3m6w1x122c";
name = "ktexteditor-5.56.0.tar.xz";
};
};
ktextwidgets = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/ktextwidgets-5.54.0.tar.xz";
sha256 = "154j3an7x787l44hw1fmksm3h6kziyaw4l61zw9mas24z3d86hl5";
name = "ktextwidgets-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/ktextwidgets-5.56.0.tar.xz";
sha256 = "1km19z577y29di8zp6amlccqdavxk4f4sg1dblj6gp64zkw9dbqp";
name = "ktextwidgets-5.56.0.tar.xz";
};
};
kunitconversion = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kunitconversion-5.54.0.tar.xz";
sha256 = "0lxrydnjlilfm92aqrpd76dk8yfprgnb7nr66dwmbdmqz7znbl8h";
name = "kunitconversion-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kunitconversion-5.56.0.tar.xz";
sha256 = "1kf5dc6p77mkx2i23ppfs0k3laybmx5vqq7aq1bxnkxj1ws75144";
name = "kunitconversion-5.56.0.tar.xz";
};
};
kwallet = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kwallet-5.54.0.tar.xz";
sha256 = "0hyipka97g2djk43x8pqbjvrgswsp8kph6za0s5dl4napfikq8k2";
name = "kwallet-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kwallet-5.56.0.tar.xz";
sha256 = "02i6xkq9ki6sybjvcxkznf5v8b34pqxysg9pi5v4z6jkw2jpr5fj";
name = "kwallet-5.56.0.tar.xz";
};
};
kwayland = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kwayland-5.54.0.tar.xz";
sha256 = "0y1710l68qlf37zy26nyn25r50a00mrm5cnwgfs9f40s749amigf";
name = "kwayland-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kwayland-5.56.0.tar.xz";
sha256 = "1779in51z63sv6607xd7y30wprs9vs8nnqa28fxg1q4nicwnvrxv";
name = "kwayland-5.56.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kwidgetsaddons-5.54.0.tar.xz";
sha256 = "01qxklhigfazhma0f6m1fkcbh9waxpvzpz6y2jlflvgbw2db82gh";
name = "kwidgetsaddons-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kwidgetsaddons-5.56.0.tar.xz";
sha256 = "0flmw1wfzs49dmmlbbimizjwj09wp4qwr9znxn3h5yfn0mxfc1lv";
name = "kwidgetsaddons-5.56.0.tar.xz";
};
};
kwindowsystem = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kwindowsystem-5.54.0.tar.xz";
sha256 = "1n9h4gg5ih29avvcpplqfy7nq58xx6jv6a04m1wkjr1rzn4dyfnb";
name = "kwindowsystem-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kwindowsystem-5.56.0.tar.xz";
sha256 = "0dk9ymlpdpvra2zm1f2rcx2dwnn9qc49n2y7p6iw094fwk5rzczc";
name = "kwindowsystem-5.56.0.tar.xz";
};
};
kxmlgui = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kxmlgui-5.54.0.tar.xz";
sha256 = "01napbq81mcp9ngyl26an52l6ndsgrhzhy2mfd8jrbil2sbrcxq7";
name = "kxmlgui-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kxmlgui-5.56.0.tar.xz";
sha256 = "1ipa0qnkh6gs3f6ygvb7cf0yv1m89m3cdl1z23br4fn14d5mxbrl";
name = "kxmlgui-5.56.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/kxmlrpcclient-5.54.0.tar.xz";
sha256 = "199syc5wl8myc4vcvbnw4a8mlfkb2gcmgs57p8w7akp7mz6l75y6";
name = "kxmlrpcclient-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/kxmlrpcclient-5.56.0.tar.xz";
sha256 = "1bjnpl4521gv35zghaanz6v5bap2b9n2kz7b0rif1bf6iak018ql";
name = "kxmlrpcclient-5.56.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/modemmanager-qt-5.54.0.tar.xz";
sha256 = "0n54gh83b6d42azv40km7j223qb2f4f9ng23xvvawzc7l2ksm350";
name = "modemmanager-qt-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/modemmanager-qt-5.56.0.tar.xz";
sha256 = "1xwx6yybij8nlaqfpz76pindfxshcyg9p21nqm6ddpgyzh74klbc";
name = "modemmanager-qt-5.56.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/networkmanager-qt-5.54.0.tar.xz";
sha256 = "0bh5li6r7r3nws5zj0hp4iy4xhiyh7rszzwpp6ag93vz5g5fsl9y";
name = "networkmanager-qt-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/networkmanager-qt-5.56.0.tar.xz";
sha256 = "0p0b3rq7s1yzy6zspd6xnzjc0hza9d7fixm8pw369kn5k3pi5lk1";
name = "networkmanager-qt-5.56.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/oxygen-icons5-5.54.0.tar.xz";
sha256 = "1sdd8ygkyl4d1mwrachcf0ahpikkby3xhdyz212xj9qmhmsgwa46";
name = "oxygen-icons5-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/oxygen-icons5-5.56.0.tar.xz";
sha256 = "17cjcfmc8vywh8n2ck0s3b0i88ilamdah0gipicn7vj65l4wc1qb";
name = "oxygen-icons5-5.56.0.tar.xz";
};
};
plasma-framework = {
version = "5.54.0";
version = "5.56.1";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/plasma-framework-5.54.0.tar.xz";
sha256 = "1933i8irn76ilz3nychbnhy1bsc39iscn3qrab0lwmshfmw8c4zj";
name = "plasma-framework-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/plasma-framework-5.56.1.tar.xz";
sha256 = "0wn7q2cfrgzcprzgqj1d4calc0mmrrn615698fish7x9s1n7ag6w";
name = "plasma-framework-5.56.1.tar.xz";
};
};
prison = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/prison-5.54.0.tar.xz";
sha256 = "1z7gymk4hkwaa0ni1454ndvpm2lwqyyfbih38h0lfb8lrswnv3kb";
name = "prison-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/prison-5.56.0.tar.xz";
sha256 = "05hy6fz05snpgjz6bnm3qcr7smg65a0m6rdmyv7avrpbs4qpbghx";
name = "prison-5.56.0.tar.xz";
};
};
purpose = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/purpose-5.54.0.tar.xz";
sha256 = "07rz8bqwvlz5g914q4vxdcdmrja5hxa29iazxz8nr171xnpg9x0w";
name = "purpose-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/purpose-5.56.0.tar.xz";
sha256 = "0rvywfkhqbmd39g950mpnn35i3kg7j63ylvdy2px2d71am6acal8";
name = "purpose-5.56.0.tar.xz";
};
};
qqc2-desktop-style = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/qqc2-desktop-style-5.54.0.tar.xz";
sha256 = "1shw3c6cr5xanzyl5zv3isyhvzi20zn3xf7m963z1qn8ypaz1by8";
name = "qqc2-desktop-style-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/qqc2-desktop-style-5.56.0.tar.xz";
sha256 = "08afy1gsy0lvpzqmv5azzfiy5x9lvffsf6qvzxxab4v5ch8fn00b";
name = "qqc2-desktop-style-5.56.0.tar.xz";
};
};
solid = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/solid-5.54.0.tar.xz";
sha256 = "0hmh9hndfs1ikaja07ddag7jr8804q4g6p74rhqsrfk2sjz0pmr9";
name = "solid-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/solid-5.56.0.tar.xz";
sha256 = "17kfwj0y41pkd0kxj2fj9m9qs7bq05vka9ngfr022lfwdhs907c4";
name = "solid-5.56.0.tar.xz";
};
};
sonnet = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/sonnet-5.54.0.tar.xz";
sha256 = "0ccz0gbypzdndaxrfkjhry90jjdh5a56pm4j41z835q96w6piclz";
name = "sonnet-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/sonnet-5.56.0.tar.xz";
sha256 = "0r8bsf7a9rjvv4jirycwf3xvkqa9iax23p93m301x82hdvmkjr9w";
name = "sonnet-5.56.0.tar.xz";
};
};
syndication = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/syndication-5.54.0.tar.xz";
sha256 = "0zj8nv0hj5sf79v3clg2bqhs3m8hi1pzjar1cq6hkxprymw0hzx8";
name = "syndication-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/syndication-5.56.0.tar.xz";
sha256 = "0wnrhfp5b4wgmigqh39c0f2qfblgmc3x6018b4wcayfs8gb4m1q9";
name = "syndication-5.56.0.tar.xz";
};
};
syntax-highlighting = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/syntax-highlighting-5.54.0.tar.xz";
sha256 = "022mpkbgc458qcn25pn3a3m2dzy6lq23r7fqbgp22jr6xalfi5hl";
name = "syntax-highlighting-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/syntax-highlighting-5.56.0.tar.xz";
sha256 = "0gl0v1bscqd6xhl3644wix8ix04lax0h1zzr1v65704c4qp87h8l";
name = "syntax-highlighting-5.56.0.tar.xz";
};
};
threadweaver = {
version = "5.54.0";
version = "5.56.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.54/threadweaver-5.54.0.tar.xz";
sha256 = "011k2pm0wr60sxnydicnchnarx4r6qja0w6iih3jfkw733qm6bxp";
name = "threadweaver-5.54.0.tar.xz";
url = "${mirror}/stable/frameworks/5.56/threadweaver-5.56.0.tar.xz";
sha256 = "1gyvj0v1zhfk8shi31pivvf5rwxkgv9bjmy2vippk2vxvkh0qc5x";
name = "threadweaver-5.56.0.tar.xz";
};
};
}

8
pkgs/development/libraries/kerberos/krb5.nix
View File

@ -14,12 +14,12 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "${type}krb5-${version}";
majorVersion = "1.15";
version = "${majorVersion}.2";
majorVersion = "1.17";
version = "${majorVersion}";
src = fetchurl {
url = "${meta.homepage}dist/krb5/${majorVersion}/krb5-${version}.tar.gz";
sha256 = "0zn8s7anb10hw3nzwjz7vg10fgmmgvwnibn2zrn3nppjxn9f6f8n";
url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz";
sha256 = "1xc1ly09697b7g2vngvx76szjqy9769kpgn27lnp1r9xln224vjs";
};
outputs = [ "out" "dev" ];

15
pkgs/development/libraries/libarchive/default.nix
View File

@ -17,6 +17,21 @@ stdenv.mkDerivation rec {
sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms";
};
patches = [
(fetchpatch {
# details: https://github.com/libarchive/libarchive/pull/1105
name = "cve-2018-1000877.diff"; # CVE-2018-1000877..80
url = "https://github.com/libarchive/libarchive/pull/1105.diff";
sha256 = "0mxcawfdy9m40mykzwhkl39a6vnh4ypgy0ipcz74qm4bi72x0gyf";
})
(fetchpatch {
# details: https://github.com/libarchive/libarchive/pull/1120
name = "cve-2019-1000019_cve-2019-1000020.diff";
url = "https://github.com/libarchive/libarchive/pull/1120.diff";
sha256 = "1mgx92v8hm7hw9j34nbfriqfkxshh3cy25rhavr7kl7lz4x5a6g4";
})
];
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [ pkgconfig ];

7
pkgs/development/libraries/libassuan/default.nix
View File

@ -1,11 +1,12 @@
{ fetchurl, stdenv, gettext, pth, libgpgerror }:
stdenv.mkDerivation rec {
name = "libassuan-2.5.2";
pname = "libassuan";
version = "2.5.3";
src = fetchurl {
url = "mirror://gnupg/libassuan/${name}.tar.bz2";
sha256 = "1rw8nw6fx6ppxga6m4cqcp898lnlzf7vn3s5c2lzfxg3fzr1nswq";
url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2";
sha256 = "00p7cpvzf0q3qwcgg51r9d0vbab4qga2xi8wpk2fgd36710b1g4i";
};
outputs = [ "out" "dev" "info" ];

4
pkgs/development/libraries/libatomic_ops/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "libatomic_ops-${version}";
version = "7.6.8";
version = "7.6.10";
src = fetchurl {
urls = [
"http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"
"https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz"
];
sha256 = "0rgni7056gnbn105lln629gwd6s51779yb5ds9s7wxl1vyg2fshx";
sha256 = "1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq";
};
outputs = [ "out" "dev" "doc" ];

10
pkgs/development/libraries/libdbusmenu/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, lib, file
, pkgconfig, intltool
, glib, dbus-glib, json-glib
, gobject-introspection, vala_0_38, gnome-doc-utils
, gobject-introspection, vala, gnome-doc-utils
, gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
with lib;
@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r";
};
nativeBuildInputs = [ pkgconfig intltool ];
nativeBuildInputs = [ vala pkgconfig intltool ];
buildInputs = [
glib dbus-glib json-glib
gobject-introspection vala_0_38 gnome-doc-utils
gobject-introspection gnome-doc-utils
] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
postPatch = ''
@ -49,9 +49,9 @@ stdenv.mkDerivation rec {
doCheck = false; # generates shebangs in check phase, too lazy to fix
installFlags = [
"sysconfdir=\${out}/etc"
"sysconfdir=${placeholder ''out''}/etc"
"localstatedir=\${TMPDIR}"
"typelibdir=\${out}/lib/girepository-1.0"
"typelibdir=${placeholder ''out''}/lib/girepository-1.0"
];
meta = {

9
pkgs/development/libraries/libedit/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
name = "libedit-20180525-3.1";
pname = "libedit";
version = "20190324-3.1";
src = fetchurl {
url = "https://thrysoee.dk/editline/${name}.tar.gz";
sha256 = "05iicng4kag5hxdc7adbyj1gm3qbmvcc33m9cyx5gys0s67yl6y4";
url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz";
sha256 = "1bhvp8xkkgrg89k4ci1k8vjl3nhb6szd4ghy9lp4jrfgq58hz3xc";
};
outputs = [ "out" "dev" ];
@ -17,8 +18,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ ncurses ];
configureFlags = [ "--enable-widec" ];
postInstall = ''
find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \
-e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g'

6
pkgs/development/libraries/libglvnd/default.nix
View File

@ -38,7 +38,11 @@ in stdenv.mkDerivation rec {
url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch";
sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d";
})
];
] ++ stdenv.lib.optional stdenv.isDarwin
(fetchpatch {
url = "https://github.com/NVIDIA/libglvnd/commit/294ccb2f49107432567e116e13efac586580a4cc.patch";
sha256 = "01339wg27cypv93221rhk3885vxbsg8kvbfyia77jmjdcnwrdwm2";
});
outputs = [ "out" "dev" ];
passthru = { inherit driverLink; };

8
pkgs/development/libraries/libgpg-error/default.nix
View File

@ -16,12 +16,12 @@
outputBin = "out";
};
in stdenv.mkDerivation (rec {
name = "libgpg-error-${version}";
version = "1.34";
pname = "libgpg-error";
version = "1.36";
src = fetchurl {
url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
sha256 = "10cc76y7zi6wsdmpy1abf3i0q17bj59q5ysy8cpnpf3ixsfpk006";
url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds";
};
postPatch = ''

4
pkgs/development/libraries/libheif/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }:
stdenv.mkDerivation rec {
version = "1.3.2";
version = "1.4.0";
name = "libheif-${version}";
src = fetchFromGitHub {
owner = "strukturag";
repo = "libheif";
rev = "v${version}";
sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w";
sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

15
pkgs/development/libraries/libhttpseverywhere/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala_0_40
, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }:
{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch
, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection, valadoc }:
let
pname = "libhttpseverywhere";
@ -12,10 +12,17 @@ in stdenv.mkDerivation rec {
sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
};
# Broken with newest Vala https://gitlab.gnome.org/GNOME/libhttpseverywhere/issues/1
nativeBuildInputs = [ vala_0_40 gobject-introspection meson ninja pkgconfig ];
nativeBuildInputs = [ vala gobject-introspection meson ninja pkgconfig ];
buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
# Fixes build with vala >=0.42
patches = [
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch";
sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f";
})
];
mesonFlags = [ "-Denable_valadoc=true" ];
doCheck = true;

31
pkgs/development/libraries/libmbim/default.nix
View File

@ -1,24 +1,35 @@
{ stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }:
{ stdenv, fetchurl, pkgconfig, glib, python3, systemd, libgudev }:
stdenv.mkDerivation rec {
name = "libmbim-1.16.2";
pname = "libmbim";
version = "1.18.0";
src = fetchurl {
url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz";
sha256 = "0qmjvjbgs9m8qsaiq5arikzglgaas9hh1968bi7sy3905kp4yjgb";
url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz";
sha256 = "10mjjy860aakfd3h1yaj9l1jw816amrpwmyqlx37j21xv0l03x3c";
};
outputs = [ "out" "dev" "man" ];
preConfigure = ''
patchShebangs .
'';
configureFlags = [
"--with-udev-base-dir=${placeholder ''out''}/lib/udev"
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib udev libgudev python ];
nativeBuildInputs = [
pkgconfig
python3
];
buildInputs = [
glib
libgudev
systemd
];
doCheck = true;
meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/software/libmbim/;
homepage = https://www.freedesktop.org/wiki/Software/libmbim/;
description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
platforms = platforms.linux;
license = licenses.gpl2;

3
pkgs/development/libraries/libminc/default.nix
View File

@ -22,13 +22,12 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib netcdf nifticlib hdf5 ];
cmakeFlags = [
"-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
"-DLIBMINC_MINC1_SUPPORT=ON"
"-DLIBMINC_BUILD_SHARED_LIBS=ON"
"-DLIBMINC_USE_SYSTEM_NIFTI=ON"
];
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
doCheck = true;
checkPhase = ''
export LD_LIBRARY_PATH="$(pwd)" # see #22060
ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure

31
pkgs/development/libraries/libqmi/default.nix
View File

@ -1,26 +1,35 @@
{ stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }:
{ stdenv, fetchurl, pkgconfig, glib, python3, libgudev, libmbim }:
stdenv.mkDerivation rec {
name = "libqmi-1.20.2";
pname = "libqmi";
version = "1.22.2";
src = fetchurl {
url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz";
sha256 = "0i6aw8jyxv84d5x8lj2g9lb8xxf1dyad8n3q0kw164pyig55jd67";
url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
sha256 = "09w20dsgr16bgbqw5ds7r6j2s6ihwyalh9zpbjhcn7cvm0afbwgi";
};
outputs = [ "out" "dev" "devdoc" ];
preBuild = ''
patchShebangs .
'';
configureFlags = [
"--with-udev-base-dir=${placeholder ''out''}/lib/udev"
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib python libgudev libmbim ];
nativeBuildInputs = [
pkgconfig
python3
];
configureFlags = ["--enable-mbim-qmux" ];
buildInputs = [
glib
libgudev
libmbim
];
doCheck = true;
meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/libqmi/;
homepage = https://www.freedesktop.org/wiki/Software/libqmi/;
description = "Modem protocol helper library";
platforms = platforms.linux;
license = licenses.gpl2;

4
pkgs/development/libraries/libseccomp/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libseccomp-${version}";
version = "2.3.3";
version = "2.4.0";
src = fetchurl {
url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
sha256 = "0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz";
sha256 = "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f";
};
outputs = [ "out" "lib" "dev" "man" ];

6
pkgs/development/libraries/libvdpau/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libvdpau-${version}";
version = "1.1.1";
version = "1.2";
src = fetchurl {
url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2";
sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736";
url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${name}.tar.bz2";
sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06";
};
outputs = [ "out" "dev" ];

1
pkgs/development/libraries/mesa-glu/default.nix
View File

@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
homepage = https://cgit.freedesktop.org/mesa/glu/;
license = stdenv.lib.licenses.sgi-b-20;
platforms = stdenv.lib.platforms.unix;
broken = stdenv.hostPlatform.isAndroid;
};
}

8
pkgs/development/libraries/nghttp2/default.nix
View File

@ -17,12 +17,12 @@ assert enableJemalloc -> jemalloc != null;
let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
name = "nghttp2-${version}";
version = "1.36.0";
pname = "nghttp2";
version = "1.37.0";
src = fetchurl {
url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
sha256 = "1sqwwwhlrbp3wcikf9v07k5j4xvflwy297lq4cg92qj087bk99qn";
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "1bi3aw096kd51abazvv6ilplz6gjbm84yr3mzxklbhysv38y6xl2";
};
outputs = [ "bin" "out" "dev" "lib" ];

84
pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch Normal file
View File

@ -0,0 +1,84 @@
From e5cc8f7c387e3238ebb8239e2555c933a41502c0 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 7 Mar 2019 08:11:32 -0500
Subject: [PATCH] Makefile: use SOURCE_DATE_EPOCH for reproducibility
---
nspr/lib/ds/Makefile.in | 4 ++--
nspr/lib/libc/src/Makefile.in | 4 ++--
nspr/lib/prstreams/Makefile.in | 4 ++--
nspr/pr/src/Makefile.in | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/nspr/lib/ds/Makefile.in b/nspr/lib/ds/Makefile.in
index e737791..d56b0a7 100644
--- a/nspr/lib/ds/Makefile.in
+++ b/nspr/lib/ds/Makefile.in
@@ -101,8 +101,8 @@ ECHO = echo
TINC = $(OBJDIR)/_pl_bld.h
PROD = $(notdir $(SHARED_LIBRARY))
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000
ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
SUF = i64
diff --git a/nspr/lib/libc/src/Makefile.in b/nspr/lib/libc/src/Makefile.in
index e8a6d9f..0485737 100644
--- a/nspr/lib/libc/src/Makefile.in
+++ b/nspr/lib/libc/src/Makefile.in
@@ -103,8 +103,8 @@ ECHO = echo
TINC = $(OBJDIR)/_pl_bld.h
PROD = $(notdir $(SHARED_LIBRARY))
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000
ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
SUF = i64
diff --git a/nspr/lib/prstreams/Makefile.in b/nspr/lib/prstreams/Makefile.in
index aeb2944..83ae423 100644
--- a/nspr/lib/prstreams/Makefile.in
+++ b/nspr/lib/prstreams/Makefile.in
@@ -105,8 +105,8 @@ ECHO = echo
TINC = $(OBJDIR)/_pl_bld.h
PROD = $(notdir $(SHARED_LIBRARY))
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000
ifeq ($(OS_ARCH), WINNT)
SUF = i64
diff --git a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
index 19c5a69..989cc8c 100644
--- a/nspr/pr/src/Makefile.in
+++ b/nspr/pr/src/Makefile.in
@@ -46,7 +46,7 @@ MKSHLIB += -M $(MAPFILE)
endif
#
# In Solaris 2.6 or earlier, -lrt is called -lposix4.
-#
+#
LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE)))
ifeq (5.7, $(LIBRT_TEST))
LIBRT=-lrt
@@ -311,8 +311,8 @@ PROD = $(notdir $(SHARED_LIBRARY))
endif
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000
ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
SUF = i64
--
2.19.2

4
pkgs/development/libraries/nspr/default.nix
View File

@ -12,6 +12,10 @@ stdenv.mkDerivation {
sha256 = "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c";
};
patches = [
./0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch
];
outputs = [ "out" "dev" ];
outputBin = "dev";

4
pkgs/development/libraries/openssl/default.nix
View File

@ -132,8 +132,8 @@ in {
};
openssl_1_1 = common {
version = "1.1.1a";
sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w";
version = "1.1.1b";
sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw";
patches = [
./1.1/nix-ssl-cert-file.patch

4
pkgs/development/libraries/pixman/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pixman-${version}";
version = "0.36.0";
version = "0.38.0";
src = fetchurl {
url = "mirror://xorg/individual/lib/${name}.tar.bz2";
sha256 = "1p40fygy9lcn6ypkzh14azksi570brcpr3979bjpff8qk76c14px";
sha256 = "1a1nnkjv0rqdj26847r0saly0kzckjfp4y3ly30bvpjxi7vy6s5p";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/development/libraries/poppler/default.nix
View File

@ -8,7 +8,7 @@
}:
let # beware: updates often break cups-filters build
version = "0.73.0";
version = "0.74.0";
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "00yv7011y40jc5iw9b7zjyg8ij5wsfbjm32kli5qha1ij11majz4";
sha256 = "0bvb0yq9zsl2b811j4l4x0vf8g5lgmqbndkb2hvgsrr5639rzq4j";
};
outputs = [ "out" "dev" ];

1
pkgs/development/libraries/qt-5/mkDerivation.nix
View File

@ -19,7 +19,6 @@ let
cmakeFlags =
(args.cmakeFlags or [])
++ [
"-DBUILD_TESTING=OFF"
("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release"))
];

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

@ -301,7 +301,6 @@ stdenv.mkDerivation {
then
[
"-platform macx-clang"
"-no-use-gold-linker"
"-no-fontconfig"
"-qt-freetype"
"-qt-libpng"
@ -329,9 +328,6 @@ stdenv.mkDerivation {
"-glib"
"-system-libjpeg"
"-system-libpng"
# gold linker of binutils 2.28 generates duplicate symbols
# TODO: remove for newer version of binutils
"-no-use-gold-linker"
]
++ lib.optional withGtk3 "-gtk"
++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify"

2
pkgs/development/libraries/science/biology/bicpl/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libminc netpbm ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBUILD_TESTING=FALSE" ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" ];
doCheck = false;
# internal_volume_io.h: No such file or directory

2
pkgs/development/libraries/science/biology/mirtk/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DBUILD_TESTING=ON";
cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON";
doCheck = true;

Some files were not shown because too many files have changed in this diff Show More