commit
b7e5fea35e
@ -92,32 +92,43 @@ mkDerivation {
|
||||
}
|
||||
```
|
||||
## Adding a library to Nixpkgs
|
||||
Add a Qt library to all-packages.nix by adding it to the collection inside `mkLibsForQt5`. This ensures that the library is built with every available version of Qt as needed.
|
||||
|
||||
### Example Adding a Qt library to all-packages.nix {#qt-library-all-packages-nix}
|
||||
Qt libraries are added to `qt5-packages.nix` and are made available for every Qt
|
||||
version supported.
|
||||
### Example adding a Qt library {#qt-library-all-packages-nix}
|
||||
|
||||
The following represents the contents of `qt5-packages.nix`.
|
||||
```
|
||||
{
|
||||
# ...
|
||||
|
||||
mkLibsForQt5 = self: with self; {
|
||||
# ...
|
||||
|
||||
mylib = callPackage ../path/to/mylib {};
|
||||
};
|
||||
mylib = callPackage ../path/to/mylib {};
|
||||
|
||||
# ...
|
||||
}
|
||||
```
|
||||
## Adding an application to Nixpkgs
|
||||
Add a Qt application to *all-packages.nix* using `libsForQt5.callPackage` instead of the usual `callPackage`. The former ensures that all dependencies are built with the same version of Qt.
|
||||
Applications that use Qt are also added to `qt5-packages.nix`. An alias is added
|
||||
in the top-level `all-packages.nix` pointing to the package with the desired Qt5 version.
|
||||
|
||||
### Example Adding a QT application to all-packages.nix {#qt-application-all-packages-nix}
|
||||
```nix
|
||||
### Example adding a Qt application {#qt-application-all-packages-nix}
|
||||
|
||||
The following represents the contents of `qt5-packages.nix`.
|
||||
```
|
||||
{
|
||||
# ...
|
||||
|
||||
myapp = libsForQt5.callPackage ../path/to/myapp/ {};
|
||||
myapp = callPackage ../path/to/myapp {};
|
||||
|
||||
# ...
|
||||
}
|
||||
```
|
||||
|
||||
The following represents the contents of `all-packages.nix`.
|
||||
```
|
||||
{
|
||||
# ...
|
||||
|
||||
myapp = libsForQt5.myapp;
|
||||
|
||||
# ...
|
||||
}
|
||||
|
@ -48,7 +48,7 @@ in
|
||||
panel = mkOption {
|
||||
type = with types; nullOr path;
|
||||
default = null;
|
||||
example = literalExample "''${pkgs.plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
|
||||
example = literalExample "''${pkgs.plasma5Packages.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
|
||||
description = "Replace the IBus panel with another panel.";
|
||||
};
|
||||
};
|
||||
|
@ -430,8 +430,8 @@ let
|
||||
${optionalString cfg.pamMount
|
||||
"auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
|
||||
${optionalString cfg.enableKwallet
|
||||
("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
|
||||
" kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")}
|
||||
("auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" +
|
||||
" kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")}
|
||||
${optionalString cfg.enableGnomeKeyring
|
||||
"auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"}
|
||||
${optionalString cfg.gnupg.enable
|
||||
@ -509,8 +509,8 @@ let
|
||||
${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)
|
||||
"session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
|
||||
${optionalString (cfg.enableKwallet)
|
||||
("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
|
||||
" kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")}
|
||||
("session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" +
|
||||
" kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")}
|
||||
${optionalString (cfg.enableGnomeKeyring)
|
||||
"session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}
|
||||
${optionalString cfg.gnupg.enable
|
||||
|
@ -7,8 +7,8 @@ let
|
||||
xcfg = config.services.xserver;
|
||||
cfg = xcfg.desktopManager.plasma5;
|
||||
|
||||
inherit (pkgs) kdeApplications kdeFrameworks plasma5;
|
||||
inherit (pkgs) qt5 libsForQt5;
|
||||
libsForQt5 = pkgs.plasma5Packages;
|
||||
inherit (libsForQt5) kdeApplications kdeFrameworks plasma5;
|
||||
inherit (pkgs) writeText;
|
||||
|
||||
pulseaudio = config.hardware.pulseaudio;
|
||||
@ -198,8 +198,8 @@ in
|
||||
};
|
||||
|
||||
security.wrappers = {
|
||||
kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/libexec/kcheckpass";
|
||||
start_kdeinit.source = "${lib.getBin pkgs.kdeFrameworks.kinit}/libexec/kf5/start_kdeinit";
|
||||
kcheckpass.source = "${lib.getBin libsForQt5.kscreenlocker}/libexec/kcheckpass";
|
||||
start_kdeinit.source = "${lib.getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit";
|
||||
kwin_wayland = {
|
||||
source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
|
||||
capabilities = "cap_sys_nice+ep";
|
||||
@ -213,7 +213,7 @@ in
|
||||
'';
|
||||
|
||||
environment.systemPackages =
|
||||
with qt5; with libsForQt5;
|
||||
with libsForQt5;
|
||||
with plasma5; with kdeApplications; with kdeFrameworks;
|
||||
[
|
||||
frameworkintegration
|
||||
|
@ -9,7 +9,7 @@ let
|
||||
|
||||
cfg = config.boot.plymouth;
|
||||
|
||||
nixosBreezePlymouth = pkgs.plasma5.breeze-plymouth.override {
|
||||
nixosBreezePlymouth = pkgs.plasma5Packages.breeze-plymouth.override {
|
||||
logoFile = cfg.logo;
|
||||
logoName = "nixos";
|
||||
osName = "NixOS";
|
||||
|
@ -5,7 +5,7 @@
|
||||
, flashplayer, hal-flash
|
||||
, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify
|
||||
, gnome3/*.gnome-shell*/
|
||||
, browserpass, chrome-gnome-shell, uget-integrator, plasma5, bukubrow, pipewire
|
||||
, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire
|
||||
, tridactyl-native
|
||||
, fx_cast_bridge
|
||||
, udev
|
||||
@ -77,7 +77,7 @@ let
|
||||
++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native
|
||||
++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
|
||||
++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
|
||||
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5.plasma-browser-integration
|
||||
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration
|
||||
++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
|
||||
++ extraNativeMessagingHosts
|
||||
);
|
||||
|
@ -1,20 +1,20 @@
|
||||
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc
|
||||
, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml
|
||||
, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wayvnc";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "any1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1vlrk6zdkv0kl1ckxv65nay9vm6yjrs4kadsdvp42nryiifrdhad";
|
||||
sha256 = "0q48fgh6gf3jicy4bk3kq18h9lhqfq9qz32ri6j9ffvbb8mcw64s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja scdoc wayland ];
|
||||
buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml ];
|
||||
buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A VNC server for wlroots based Wayland compositors";
|
||||
|
@ -51,7 +51,7 @@ stripDirs() {
|
||||
|
||||
if [ -n "${dirs}" ]; then
|
||||
header "stripping (with command $cmd and flags $stripFlags) in$dirs"
|
||||
find $dirs -type f -exec $cmd $commonStripFlags $stripFlags '{}' \; #
|
||||
find $dirs -type f -exec $cmd $commonStripFlags $stripFlags '{}' \; 2>/dev/null
|
||||
stopNest
|
||||
fi
|
||||
}
|
||||
|
@ -8,12 +8,12 @@ let
|
||||
pname = "clang";
|
||||
inherit version;
|
||||
|
||||
src = fetch "clang" "02ajkij85966vd150iy246mv16dsaph1kfi0y8wnncp8w6nar5hg";
|
||||
src = fetch "clang" "0kab4zmkxffg98a3rx95756jlwhxflalin5w05g1anpwxv175xbk";
|
||||
inherit clang-tools-extra_src;
|
||||
|
||||
unpackPhase = ''
|
||||
unpackFile $src
|
||||
mv clang-${version}* clang
|
||||
mv clang-* clang
|
||||
sourceRoot=$PWD/clang
|
||||
unpackFile ${clang-tools-extra_src}
|
||||
mv clang-tools-extra-* $sourceRoot/tools/extra
|
||||
|
@ -11,7 +11,7 @@ in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "compiler-rt";
|
||||
inherit version;
|
||||
src = fetch pname "0d5j5l8phwqjjscmk8rmqn0i2i0abl537gdbkagl8fjpzy1gyjip";
|
||||
src = fetch pname "1z470r8c5aahdwkmflglx998n0i77j8b1c69d7cir1kf27qy6yq8";
|
||||
|
||||
nativeBuildInputs = [ cmake python3 llvm ];
|
||||
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
|
||||
|
@ -6,16 +6,18 @@
|
||||
}:
|
||||
|
||||
let
|
||||
release_version = "11.0.0";
|
||||
version = release_version; # differentiating these (variables) is important for RCs
|
||||
release_version = "11.0.1";
|
||||
candidate = ""; # empty or "rcN"
|
||||
dash-candidate = stdenv.lib.optionalString (candidate != "") "-${candidate}";
|
||||
version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
|
||||
targetConfig = stdenv.targetPlatform.config;
|
||||
|
||||
fetch = name: sha256: fetchurl {
|
||||
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";
|
||||
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
clang-tools-extra_src = fetch "clang-tools-extra" "02bcwwn54661madhq4nxc069s7p7pj5gpqi8ww50w3anbpviilzy";
|
||||
clang-tools-extra_src = fetch "clang-tools-extra" "1j8n6n4l54k2lrdxh266y1fl4z8vy5dc76wsf0csk5n3ikfi38ic";
|
||||
|
||||
tools = stdenv.lib.makeExtensible (tools: let
|
||||
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
|
||||
|
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
||||
pname = "libc++";
|
||||
inherit version;
|
||||
|
||||
src = fetch "libcxx" "0ylbkcd38zrrz9xmkq9na3d9s8d96hc286dwfwd73wi205lyc7kc";
|
||||
src = fetch "libcxx" "0gaybwkn76vhakvipxslp7pmv2wm7agxkqwk5f5aizhzc9lzdmcz";
|
||||
|
||||
postUnpack = ''
|
||||
unpackFile ${libcxxabi.src}
|
||||
|
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
||||
pname = "libc++abi";
|
||||
inherit version;
|
||||
|
||||
src = fetch "libcxxabi" "05ac7rkjbla03bc0lf92f901dfjgxdvp8cr9fpn59a5p4x27ssaq";
|
||||
src = fetch "libcxxabi" "0gv8pxq95gvsybldj21hdfkmm0r5cn1z7jhd72l231n0lmb70saa";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
|
||||
|
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||
pname = "libunwind";
|
||||
inherit version;
|
||||
|
||||
src = fetch pname "0bwjd2xf51r2apn8p0f9shb6nc8hnqzq1n9gggjvyjmi6cf02mc4";
|
||||
src = fetch pname "0zsixkaiwp007afxlpsf5dc7wfrv8sj9wxzjw6f1r4bjv1rv3cvd";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
pname = "lld";
|
||||
inherit version;
|
||||
|
||||
src = fetch pname "077xyh7sij6mhp4dc4kdcmp9whrpz332fa12rwxnzp3wgd5bxrzg";
|
||||
src = fetch pname "1dq82dkam8x2niha18v7ckh30zmzyclydzipqkf7h41r3ah0vfk0";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ llvm libxml2 ];
|
||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
|
||||
pname = "lldb";
|
||||
inherit version;
|
||||
|
||||
src = fetch pname "0wic9lyb2la9bkzdc13szkm4f793w1mddp50xvh237iraygw0w45";
|
||||
src = fetch pname "1yzjbsn81l2r3v9js2fxrglkwvz1f2rxyxh6430nydbrs0bqklz8";
|
||||
|
||||
patches = [ ./lldb-procfs.patch ];
|
||||
|
||||
|
@ -32,12 +32,12 @@ in stdenv.mkDerivation (rec {
|
||||
pname = "llvm";
|
||||
inherit version;
|
||||
|
||||
src = fetch pname "0s94lwil98w7zb7cjrbnxli0z7gklb312pkw74xs1d6zk346hgwi";
|
||||
polly_src = fetch "polly" "0h442ivcslr3dv3q3g1nw5avh77f8cxsp6zild1hgspj266xpynw";
|
||||
src = fetch pname "0a5mb65xa5bal8q6cb37xgkqis2bip87fsafgq3wbsva9cjprn6c";
|
||||
polly_src = fetch "polly" "1smrqm9s0r2g9h0v0nil6y9wn2ih4l5bddk4dhgn538ngc7cxpq8";
|
||||
|
||||
unpackPhase = ''
|
||||
unpackFile $src
|
||||
mv llvm-${version}* llvm
|
||||
mv llvm-${release_version}* llvm
|
||||
sourceRoot=$PWD/llvm
|
||||
'' + optionalString enablePolly ''
|
||||
unpackFile $polly_src
|
||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
pname = "openmp";
|
||||
inherit version;
|
||||
|
||||
src = fetch pname "0k389d0g9zlfyzh1kpb3i5jdawzpn0hrdxzbjinpvdv7rbw4sw1d";
|
||||
src = fetch pname "19rcv25y41ww3zlfg0lwprzijl3cn7jgc0v5540jzpp7j0ds45ad";
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ llvm ];
|
||||
|
@ -19,8 +19,8 @@
|
||||
} @ args:
|
||||
|
||||
import ./default.nix {
|
||||
rustcVersion = "1.48.0";
|
||||
rustcSha256 = "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf";
|
||||
rustcVersion = "1.49.0";
|
||||
rustcSha256 = "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm";
|
||||
|
||||
llvmSharedForBuild = pkgsBuildBuild.llvm_11.override { enableSharedLibraries = true; };
|
||||
llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; };
|
||||
@ -33,20 +33,20 @@ import ./default.nix {
|
||||
|
||||
# Note: the version MUST be one version prior to the version we're
|
||||
# building
|
||||
bootstrapVersion = "1.47.0";
|
||||
bootstrapVersion = "1.48.0";
|
||||
|
||||
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
|
||||
bootstrapHashes = {
|
||||
i686-unknown-linux-gnu = "84bf092130ea5216fc701871e633563fc1c01b6528f60cb0767e96cd8eec30bf";
|
||||
x86_64-unknown-linux-gnu = "d0e11e1756a072e8e246b05d54593402813d047d12e44df281fbabda91035d96";
|
||||
arm-unknown-linux-gnueabihf = "82e12affb47596b68d0ca64045f4eb698c10ff15406afca604e12cdd07e17b26";
|
||||
armv7-unknown-linux-gnueabihf = "19d0fe3892a8e98f99c5aa84f4d6f260853147650cb71f2bae985c91de6c29af";
|
||||
aarch64-unknown-linux-gnu = "753c905e89a714ab9bce6fe1397b721f29c0760c32f09d2f328af3d39919c8e6";
|
||||
x86_64-apple-darwin = "84e5be6c5c78734deba911dcf80316be1e4c7da2c59413124d039ad96620612f";
|
||||
powerpc64le-unknown-linux-gnu = "5760c3b1897ea70791320c2565f3eef700a3d54059027b84bbe6b8d6157f81c8";
|
||||
i686-unknown-linux-gnu = "7fdb8836a1f0427d5b47e6a2d496f67ebff04350407411f57cf20c9b3544e26f";
|
||||
x86_64-unknown-linux-gnu = "950420a35b2dd9091f1b93a9ccd5abc026ca7112e667f246b1deb79204e2038b";
|
||||
arm-unknown-linux-gnueabihf = "e68a81eebd4570343a0fc35cb8ee24cad911d6cee2e374f284b76546ca6636d5";
|
||||
armv7-unknown-linux-gnueabihf = "3aed4a63ebdd57690a31d11afbe95e6407edc224a6769be5694a1ed43bf899cb";
|
||||
aarch64-unknown-linux-gnu = "c4769418d8d89f432e4a3a21ad60f99629e4b13bbfc29aef7d9d51c4e8ee8a8a";
|
||||
x86_64-apple-darwin = "20e727cad10f43e3abcedb2a80979ae26923038e0e8a855e8a783da255054113";
|
||||
powerpc64le-unknown-linux-gnu = "e6457a0214f3b1b04bd5b2618bba7e3826e254216420dede2971b571a1c13bb1";
|
||||
};
|
||||
|
||||
selectRustPackage = pkgs: pkgs.rust_1_48;
|
||||
selectRustPackage = pkgs: pkgs.rust_1_49;
|
||||
|
||||
rustcPatches = [
|
||||
];
|
@ -1,19 +1,19 @@
|
||||
From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
|
||||
From: Frederik Rietdijk <fridh@fridh.nl>
|
||||
Date: Mon, 28 Aug 2017 09:24:06 +0200
|
||||
From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
|
||||
From: Greg Roodt <greg@canva.com>
|
||||
Date: Wed, 9 Dec 2020 17:59:24 +1100
|
||||
Subject: [PATCH] Don't use ldconfig
|
||||
|
||||
---
|
||||
Lib/ctypes/util.py | 70 ++----------------------------------------------------
|
||||
1 file changed, 2 insertions(+), 68 deletions(-)
|
||||
Lib/ctypes/util.py | 77 ++--------------------------------------------
|
||||
1 file changed, 2 insertions(+), 75 deletions(-)
|
||||
|
||||
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
|
||||
index 5e8b31a854..7b45ce6c15 100644
|
||||
index 0c2510e161..7fb98af308 100644
|
||||
--- a/Lib/ctypes/util.py
|
||||
+++ b/Lib/ctypes/util.py
|
||||
@@ -94,46 +94,7 @@ elif os.name == "posix":
|
||||
import re, tempfile
|
||||
|
||||
@@ -100,53 +100,7 @@ elif os.name == "posix":
|
||||
return thefile.read(4) == elf_header
|
||||
|
||||
def _findLib_gcc(name):
|
||||
- # Run GCC's linker with the -t (aka --trace) option and examine the
|
||||
- # library name it prints out. The GCC command will fail because we
|
||||
@ -51,17 +51,24 @@ index 5e8b31a854..7b45ce6c15 100644
|
||||
- # Raised if the file was already removed, which is the normal
|
||||
- # behaviour of GCC if linking fails
|
||||
- pass
|
||||
- res = re.search(expr, trace)
|
||||
- res = re.findall(expr, trace)
|
||||
- if not res:
|
||||
- return None
|
||||
- return os.fsdecode(res.group(0))
|
||||
-
|
||||
- for file in res:
|
||||
- # Check if the given file is an elf file: gcc can report
|
||||
- # some files that are linker scripts and not actual
|
||||
- # shared objects. See bpo-41976 for more details
|
||||
- if not _is_elf(file):
|
||||
- continue
|
||||
- return os.fsdecode(file)
|
||||
+ return None
|
||||
|
||||
|
||||
|
||||
|
||||
if sys.platform == "sunos5":
|
||||
@@ -255,34 +216,7 @@ elif os.name == "posix":
|
||||
@@ -268,34 +222,7 @@ elif os.name == "posix":
|
||||
else:
|
||||
|
||||
|
||||
def _findSoname_ldconfig(name):
|
||||
- import struct
|
||||
- if struct.calcsize('l') == 4:
|
||||
@ -92,9 +99,8 @@ index 5e8b31a854..7b45ce6c15 100644
|
||||
- except OSError:
|
||||
- pass
|
||||
+ return None
|
||||
|
||||
|
||||
def _findLib_ld(name):
|
||||
# See issue #9998 for why this is needed
|
||||
--
|
||||
2.15.0
|
||||
|
||||
--
|
||||
2.24.3 (Apple Git-128)
|
||||
|
@ -216,7 +216,7 @@ in with passthru; stdenv.mkDerivation {
|
||||
else
|
||||
./3.7/fix-finding-headers-when-cross-compiling.patch
|
||||
)
|
||||
] ++ optionals (isPy36 || isPy37 || isPy38) [
|
||||
] ++ optionals (isPy36 || isPy37) [
|
||||
# Backport a fix for ctypes.util.find_library.
|
||||
./3.7/find_library.patch
|
||||
];
|
||||
|
@ -154,10 +154,10 @@ in {
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "8";
|
||||
patch = "6";
|
||||
patch = "7";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "qeC3nSeqBW65zOjWOkJ7X5urFGXe4/lC3P2yWoL0q4o=";
|
||||
sha256 = "sha256-3cwd8Wu1uHqkLsXSCluQLy0IjKommyjgFZD5enmOxQo=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
Binary file not shown.
@ -42,7 +42,7 @@
|
||||
|
||||
let
|
||||
version = "2.32";
|
||||
patchSuffix = "-24";
|
||||
patchSuffix = "-25";
|
||||
sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";
|
||||
in
|
||||
|
||||
@ -63,10 +63,10 @@ stdenv.mkDerivation ({
|
||||
and using git or something would complicate bootstrapping.
|
||||
Fortunately it's not too big.
|
||||
$ git checkout release/2.32/master; git describe
|
||||
glibc-2.32-24-g1d49bede4d
|
||||
$ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-24.patch.gz
|
||||
glibc-2.32-25-g0d9793e82a
|
||||
$ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-25.patch.gz
|
||||
*/
|
||||
./2.32-24.patch.gz
|
||||
./2.32-25.patch.gz
|
||||
|
||||
/* Allow NixOS and Nix to handle the locale-archive. */
|
||||
./nix-locale-archive.patch
|
||||
|
@ -14,11 +14,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpgme";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0nqfipv5s4npfidsm1rs3kpq0r0av9bfqfd5r035jibx5k0jniqb";
|
||||
sha256 = "1bg13l5s8x9p1v0jyv29n84bay27pflindpzjsc9gj7i4wdkrg7f";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -1,30 +1,47 @@
|
||||
{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }:
|
||||
{ stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen
|
||||
, xkeyboard_config, libxcb, libxml2
|
||||
, python3
|
||||
, libX11
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxkbcommon";
|
||||
version = "0.10.0";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz";
|
||||
sha256 = "1wmnl0hngn6vrqrya4r8hvimlkr4jag39yjprls4gyrqvh667hsp";
|
||||
sha256 = "0lmwglj16anhpaq0h830xsl1ivknv75i4lir9bk88aq73s2jy852";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ];
|
||||
buildInputs = [ xkeyboard_config libxcb ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ];
|
||||
buildInputs = [ xkeyboard_config libxcb libxml2 ];
|
||||
checkInputs = [ python3 ];
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable-wayland=false"
|
||||
"-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"
|
||||
"-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc)
|
||||
"-Dx-locale-root=${libX11.out}/share/X11/locale"
|
||||
"-Denable-wayland=false"
|
||||
"-Denable-xkbregistry=false" # Optional, separate library (TODO: Install into extra output)
|
||||
];
|
||||
|
||||
doCheck = false; # fails, needs unicode locale
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
patchShebangs ../test/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library to handle keyboard descriptions";
|
||||
longDescription = ''
|
||||
libxkbcommon is a keyboard keymap compiler and support library which
|
||||
processes a reduced subset of keymaps as defined by the XKB (X Keyboard
|
||||
Extension) specification. It also contains a module for handling Compose
|
||||
and dead keys.
|
||||
''; # and a separate library for listing available keyboard layouts.
|
||||
homepage = "https://xkbcommon.org";
|
||||
changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${version}/NEWS";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
platforms = with platforms; unix;
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ callPackage, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "2.3.1";
|
||||
branch = "2.3";
|
||||
version = "2.4.0";
|
||||
branch = "2.4";
|
||||
revision = "v${version}";
|
||||
sha256 = "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb";
|
||||
sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf";
|
||||
|
||||
extraFlags = [
|
||||
"-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}"
|
||||
@ -14,24 +14,8 @@ callPackage ./generic.nix (args // rec {
|
||||
patches = [
|
||||
./fix-cmake-config-includedir.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/uclouvain/openjpeg/commit/21399f6b7d318fcdf4406d5e88723c4922202aa3.patch";
|
||||
name = "CVE-2019-12973-1.patch";
|
||||
sha256 = "161yvnfbzy2016qqapm0ywfgglgs1v8ljnk6fj8d2bwdh1cxxz8f";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/uclouvain/openjpeg/commit/3aef207f90e937d4931daf6d411e092f76d82e66.patch";
|
||||
name = "CVE-2019-12973-2.patch";
|
||||
sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04.patch";
|
||||
name = "CVE-2020-6851.patch";
|
||||
sha256 = "1lfwlzqxb69cwzjp8v9lijz4c2qhf3b8m6sq1khipqlgrb3l58xw";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074.patch";
|
||||
name = "CVE-2020-8112.patch";
|
||||
sha256 = "16kykc8wbq9kx9w9kkf3i7snak82m184qrl9bpxvkjl7h0n9aw49";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch";
|
||||
sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8";
|
||||
})
|
||||
];
|
||||
})
|
||||
|
@ -1,14 +1,3 @@
|
||||
--- a/cmake/OpenJPEGConfig.cmake.in
|
||||
+++ b/cmake/OpenJPEGConfig.cmake.in
|
||||
@@ -32,7 +32,7 @@
|
||||
set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
|
||||
file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
|
||||
|
||||
- get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
|
||||
+ get_filename_component(OPENJPEG_INCLUDE_DIRS "@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
|
||||
|
||||
else()
|
||||
if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
|
||||
--- a/src/lib/openjp2/libopenjp2.pc.cmake.in
|
||||
+++ b/src/lib/openjp2/libopenjp2.pc.cmake.in
|
||||
@@ -3,7 +3,7 @@
|
||||
|
@ -76,7 +76,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Open-source JPEG 2000 codec written in C language";
|
||||
homepage = "http://www.openjpeg.org/";
|
||||
homepage = "https://www.openjpeg.org/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ codyopel ];
|
||||
platforms = platforms.all;
|
||||
|
@ -9,11 +9,11 @@ let
|
||||
});
|
||||
in buildPythonPackage rec {
|
||||
pname = "scipy";
|
||||
version = "1.5.4";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4a453d5e5689de62e5d38edf40af3f17560bfd63c9c5bd228c18c1f99afa155b";
|
||||
sha256 = "0rh5b1rwdcvvagld8vpxnpaibszy1skpx39a0fwzd5gx5pwcjvfb";
|
||||
};
|
||||
|
||||
checkInputs = [ nose pytest ];
|
||||
|
@ -392,7 +392,8 @@ in
|
||||
nokogiri = attrs: {
|
||||
buildFlags = [
|
||||
"--use-system-libraries"
|
||||
"--with-zlib-dir=${zlib.dev}"
|
||||
"--with-zlib-lib=${zlib.out}/lib"
|
||||
"--with-zlib-include=${zlib.dev}/include"
|
||||
"--with-xml2-lib=${libxml2.out}/lib"
|
||||
"--with-xml2-include=${libxml2.dev}/include/libxml2"
|
||||
"--with-xslt-lib=${libxslt.out}/lib"
|
||||
|
@ -3,51 +3,56 @@ GEM
|
||||
specs:
|
||||
ast (2.4.1)
|
||||
backport (1.1.2)
|
||||
benchmark (0.1.0)
|
||||
benchmark (0.1.1)
|
||||
e2mmap (0.1.0)
|
||||
jaro_winkler (1.5.4)
|
||||
maruku (0.7.3)
|
||||
mini_portile2 (2.4.0)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
parallel (1.19.2)
|
||||
kramdown (2.3.0)
|
||||
rexml
|
||||
kramdown-parser-gfm (1.1.0)
|
||||
kramdown (~> 2.0)
|
||||
mini_portile2 (2.5.0)
|
||||
nokogiri (1.11.1)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
parallel (1.20.1)
|
||||
parser (2.7.2.0)
|
||||
ast (~> 2.4.1)
|
||||
racc (1.5.2)
|
||||
rainbow (3.0.0)
|
||||
regexp_parser (1.8.1)
|
||||
regexp_parser (2.0.3)
|
||||
reverse_markdown (2.0.0)
|
||||
nokogiri
|
||||
rexml (3.2.4)
|
||||
rubocop (0.93.0)
|
||||
rubocop (1.7.0)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 2.7.1.5)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
regexp_parser (>= 1.8)
|
||||
regexp_parser (>= 1.8, < 3.0)
|
||||
rexml
|
||||
rubocop-ast (>= 0.6.0)
|
||||
rubocop-ast (>= 1.2.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 2.0)
|
||||
rubocop-ast (0.7.1)
|
||||
rubocop-ast (1.4.0)
|
||||
parser (>= 2.7.1.5)
|
||||
ruby-progressbar (1.10.1)
|
||||
solargraph (0.39.17)
|
||||
ruby-progressbar (1.11.0)
|
||||
solargraph (0.40.1)
|
||||
backport (~> 1.1)
|
||||
benchmark
|
||||
bundler (>= 1.17.2)
|
||||
e2mmap
|
||||
jaro_winkler (~> 1.5)
|
||||
maruku (~> 0.7, >= 0.7.3)
|
||||
nokogiri (~> 1.9, >= 1.9.1)
|
||||
kramdown (~> 2.3)
|
||||
kramdown-parser-gfm (~> 1.1)
|
||||
parser (~> 2.3)
|
||||
reverse_markdown (>= 1.0.5, < 3)
|
||||
rubocop (~> 0.52)
|
||||
rubocop (>= 0.52)
|
||||
thor (~> 1.0)
|
||||
tilt (~> 2.0)
|
||||
yard (~> 0.9, >= 0.9.24)
|
||||
thor (1.0.1)
|
||||
tilt (2.0.10)
|
||||
unicode-display_width (1.7.0)
|
||||
yard (0.9.25)
|
||||
yard (0.9.26)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
bundlerApp {
|
||||
pname = "solargraph";
|
||||
exes = ["solargraph" "solargraph-runtime"];
|
||||
exes = [ "solargraph" ];
|
||||
gemdir = ./.;
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "solargraph";
|
||||
|
@ -24,10 +24,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jadlpsl504ql436a6bx8ihp0bkg3rvxg7fbi4r1bmra3cqz0h88";
|
||||
sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
};
|
||||
e2mmap = {
|
||||
groups = ["default"];
|
||||
@ -49,46 +49,58 @@
|
||||
};
|
||||
version = "1.5.4";
|
||||
};
|
||||
maruku = {
|
||||
kramdown = {
|
||||
dependencies = ["rexml"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r7bxpgnx2hp3g12bjrmdrpv663dfqxsdp0af69kjhxmaxpia56x";
|
||||
sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.3";
|
||||
version = "2.3.0";
|
||||
};
|
||||
kramdown-parser-gfm = {
|
||||
dependencies = ["kramdown"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
|
||||
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2"];
|
||||
dependencies = ["mini_portile2" "racc"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
|
||||
sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.10";
|
||||
version = "1.11.1";
|
||||
};
|
||||
parallel = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
|
||||
sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.19.2";
|
||||
version = "1.20.1";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
@ -101,6 +113,16 @@
|
||||
};
|
||||
version = "2.7.2.0";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.2";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -116,10 +138,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n";
|
||||
sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.1";
|
||||
version = "2.0.3";
|
||||
};
|
||||
reverse_markdown = {
|
||||
dependencies = ["nokogiri"];
|
||||
@ -148,10 +170,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nrv7i81549addig09grw17qkab3l4319dcsf9y7psl7aa76ng3a";
|
||||
sha256 = "12kkyzyzh30mi9xs52lc1pjki1al4x9acdaikj40wslhpwp1ng1l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.93.0";
|
||||
version = "1.7.0";
|
||||
};
|
||||
rubocop-ast = {
|
||||
dependencies = ["parser"];
|
||||
@ -159,31 +181,31 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "129hgz4swc8n0g01715v7y00k0h4mlzkxh63q7z27q7mjp54rl74";
|
||||
sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.1";
|
||||
version = "1.4.0";
|
||||
};
|
||||
ruby-progressbar = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
|
||||
sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
};
|
||||
solargraph = {
|
||||
dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
|
||||
dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06fby6dpq1jcq30x8ladig4dvz8j2pxd08mkrad3d41jx33zd2hg";
|
||||
sha256 = "0q0dh4da4qygn92vjwqz0w6m4pdhs2zdmrx3zlmxmghizh32ghk7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.39.17";
|
||||
version = "0.40.1";
|
||||
};
|
||||
thor = {
|
||||
groups = ["default"];
|
||||
@ -220,9 +242,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "126m49mvh4lbvlvrprq7xj2vjixbq3xqr8dwr089vadvs0rkn4rd";
|
||||
sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.25";
|
||||
version = "0.9.26";
|
||||
};
|
||||
}
|
@ -14,13 +14,9 @@ source 'https://rubygems.org' do
|
||||
gem 'cocoapods'
|
||||
gem 'cocoapods-acknowledgements'
|
||||
gem 'cocoapods-art'
|
||||
gem 'cocoapods-bin'
|
||||
gem 'cocoapods-browser'
|
||||
gem 'cocoapods-bugsnag'
|
||||
gem 'cocoapods-check'
|
||||
gem 'cocoapods-clean'
|
||||
gem 'cocoapods-clean_build_phases_scripts'
|
||||
gem 'cocoapods-core'
|
||||
gem 'cocoapods-coverage'
|
||||
gem 'cocoapods-deintegrate'
|
||||
gem 'cocoapods-dependencies'
|
||||
@ -31,18 +27,9 @@ source 'https://rubygems.org' do
|
||||
gem 'cocoapods-generate'
|
||||
gem 'cocoapods-git_url_rewriter'
|
||||
gem 'cocoapods-keys'
|
||||
gem 'cocoapods-no-dev-schemes'
|
||||
gem 'cocoapods-open'
|
||||
gem 'cocoapods-packager'
|
||||
gem 'cocoapods-playgrounds'
|
||||
gem 'cocoapods-plugins'
|
||||
gem 'cocoapods-prune-localizations'
|
||||
gem 'cocoapods-rome'
|
||||
gem 'cocoapods-search'
|
||||
gem 'cocoapods-sorted-search'
|
||||
gem 'cocoapods-static-swift-framework'
|
||||
gem 'cocoapods-stats'
|
||||
gem 'cocoapods-tdfire-binary'
|
||||
gem 'cocoapods-testing'
|
||||
gem 'cocoapods-trunk'
|
||||
gem 'cocoapods-try'
|
||||
|
@ -19,7 +19,7 @@
|
||||
let
|
||||
reuseLibs = enableShared && withAllTargets;
|
||||
|
||||
version = "2.34";
|
||||
version = "2.35.1";
|
||||
basename = "binutils";
|
||||
# The targetPrefix prepended to binary names to allow multiple binuntils on the
|
||||
# PATH to both be usable.
|
||||
@ -34,7 +34,7 @@ let
|
||||
# HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
|
||||
normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl {
|
||||
url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2";
|
||||
sha256 = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49";
|
||||
sha256 = "sha256-Mg56HQ9G/Nn0E/EEbiFsviO7K85t62xqYzBEJeSLGUI=";
|
||||
});
|
||||
in
|
||||
|
||||
@ -48,12 +48,6 @@ stdenv.mkDerivation {
|
||||
# Make binutils output deterministic by default.
|
||||
./deterministic.patch
|
||||
|
||||
# Bfd looks in BINDIR/../lib for some plugins that don't
|
||||
# exist. This is pointless (since users can't install plugins
|
||||
# there) and causes a cycle between the lib and bin outputs, so
|
||||
# get rid of it.
|
||||
./no-plugins.patch
|
||||
|
||||
# Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and
|
||||
# elf32-littlearm-vxworks in favor of the first.
|
||||
# https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766
|
||||
|
@ -1,21 +0,0 @@
|
||||
diff --git a/bfd/plugin.c b/bfd/plugin.c
|
||||
index 537ab60311..bfe7957f96 100644
|
||||
--- a/bfd/plugin.c
|
||||
+++ b/bfd/plugin.c
|
||||
@@ -386,6 +386,7 @@ load_plugin (bfd *abfd)
|
||||
if (plugin_program_name == NULL)
|
||||
return found;
|
||||
|
||||
+#if 0
|
||||
/* Try not to search the same dir twice, by looking at st_dev and
|
||||
st_ino for the dir. If we are on a file system that always sets
|
||||
st_ino to zero or the actual st_ino is zero we might waste some
|
||||
@@ -437,7 +438,7 @@ load_plugin (bfd *abfd)
|
||||
if (found)
|
||||
break;
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
return found;
|
||||
}
|
||||
|
@ -196,6 +196,11 @@ let
|
||||
INET_UDP_DIAG = module;
|
||||
INET_RAW_DIAG = whenAtLeast "4.14" module;
|
||||
INET_DIAG_DESTROY = whenAtLeast "4.9" yes;
|
||||
|
||||
# enable multipath-tcp
|
||||
MPTCP = whenAtLeast "5.6" yes;
|
||||
MPTCP_IPV6 = whenAtLeast "5.6" yes;
|
||||
INET_MPTCP_DIAG = whenAtLeast "5.9" module;
|
||||
};
|
||||
|
||||
wireless = {
|
||||
|
@ -532,11 +532,11 @@ lib.makeScope newScope (self: with self; {
|
||||
}) {};
|
||||
|
||||
fonttosfnt = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation {
|
||||
name = "fonttosfnt-1.0.5";
|
||||
name = "fonttosfnt-1.2.1";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2";
|
||||
sha256 = "00w5in1gznai141wishz8ng7spvi5274n16zj0pdl1ma2vsmy2n8";
|
||||
url = "mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2";
|
||||
sha256 = "16r51h5wfy85wnbq3q8v8a184hb25c3ksjgix0mlcywdz7qkbj07";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
@ -1,61 +0,0 @@
|
||||
From 51e8117654fb092ae5412d7aa184bfc6b498c954 Mon Sep 17 00:00:00 2001
|
||||
From: rnhmjoj <rnhmjoj@inventati.org>
|
||||
Date: Fri, 7 Feb 2020 17:46:54 +0100
|
||||
Subject: [PATCH 1/2] Fix incorrect error handling in macTime()
|
||||
|
||||
mktime() and time() return (time_t -1) to signal an error.
|
||||
Checking for negative values will incorrectly assume an error
|
||||
happened for any calendar date before the unix epoch.
|
||||
---
|
||||
util.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/util.c b/util.c
|
||||
index bcbfa2f..4482c9a 100644
|
||||
--- a/util.c
|
||||
+++ b/util.c
|
||||
@@ -213,10 +213,10 @@ macTime(int *hi, unsigned *lo)
|
||||
tm.tm_isdst = -1;
|
||||
|
||||
macEpoch = mktime_gmt(&tm);
|
||||
- if(macEpoch < 0) return -1;
|
||||
+ if(macEpoch == -1) return -1;
|
||||
|
||||
current = time(NULL);
|
||||
- if(current < 0)
|
||||
+ if(current == -1)
|
||||
return -1;
|
||||
|
||||
if(current < macEpoch) {
|
||||
--
|
||||
2.23.0
|
||||
|
||||
From 81a61c049e6de80120531f0770b22e7637c9acb9 Mon Sep 17 00:00:00 2001
|
||||
From: rnhmjoj <rnhmjoj@inventati.org>
|
||||
Date: Fri, 7 Feb 2020 17:47:52 +0100
|
||||
Subject: [PATCH 2/2] Fix uninitialised memory write
|
||||
|
||||
If macTime() fails write zeros instead of unitialized memory to
|
||||
the date fields.
|
||||
---
|
||||
write.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/write.c b/write.c
|
||||
index 318adef..c8a86e4 100644
|
||||
--- a/write.c
|
||||
+++ b/write.c
|
||||
@@ -434,8 +434,8 @@ fixupChecksum(FILE *out, int full_length, int head_position)
|
||||
static int
|
||||
writehead(FILE* out, FontPtr font)
|
||||
{
|
||||
- int time_hi;
|
||||
- unsigned time_lo;
|
||||
+ int time_hi = 0;
|
||||
+ unsigned time_lo = 0;
|
||||
|
||||
macTime(&time_hi, &time_lo);
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
@ -22,11 +22,6 @@ self: super:
|
||||
buildInputs = attrs.buildInputs ++ [ self.xorgproto ];
|
||||
});
|
||||
|
||||
fonttosfnt = super.fonttosfnt.overrideAttrs (attrs: {
|
||||
# https://gitlab.freedesktop.org/xorg/app/fonttosfnt/merge_requests/6
|
||||
patches = [ ./fix-uninitialised-memory.patch ];
|
||||
});
|
||||
|
||||
bitmap = super.bitmap.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ];
|
||||
postInstall = ''
|
||||
|
@ -11,7 +11,7 @@ mirror://xorg/individual/app/appres-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2
|
||||
mirror://xorg/individual/app/bitmap-1.0.9.tar.gz
|
||||
mirror://xorg/individual/app/editres-1.0.7.tar.bz2
|
||||
mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2
|
||||
mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2
|
||||
mirror://xorg/individual/app/ico-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/listres-1.0.4.tar.bz2
|
||||
|
@ -1,11 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub, zlib, xz
|
||||
, lz4 ? null
|
||||
, lz4Support ? false
|
||||
, lz4
|
||||
, zstd
|
||||
}:
|
||||
|
||||
assert lz4Support -> (lz4 != null);
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "squashfs";
|
||||
version = "4.4";
|
||||
@ -24,15 +21,13 @@ stdenv.mkDerivation {
|
||||
./4k-align.patch
|
||||
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
||||
buildInputs = [ zlib xz zstd ]
|
||||
++ lib.optional lz4Support lz4;
|
||||
buildInputs = [ zlib xz zstd lz4 ];
|
||||
|
||||
preBuild = "cd squashfs-tools";
|
||||
|
||||
installFlags = [ "INSTALL_DIR=\${out}/bin" ];
|
||||
|
||||
makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" ]
|
||||
++ lib.optional lz4Support "LZ4_SUPPORT=1";
|
||||
makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://squashfs.sourceforge.net/";
|
||||
|
@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
# We have no LTO here since commit 22284b07. With GCC 10 that triggers a warning.
|
||||
postPatch = if stdenv.isi686 then "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults" else null;
|
||||
NIX_CFLAGS_COMPILE = if stdenv.isi686 then "-Wno-error=stringop-truncation" else null;
|
||||
postPatch = "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults";
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ popt ];
|
||||
|
@ -267,7 +267,7 @@ mapAliases ({
|
||||
k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
|
||||
julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15
|
||||
julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15
|
||||
kdeconnect = kdeApplications.kdeconnect-kde; # added 2020-10-28
|
||||
kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28
|
||||
kdiff3-qt5 = kdiff3; # added 2017-02-18
|
||||
keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
|
||||
keepassx-community = keepassxc; # added 2017-11
|
||||
@ -319,6 +319,7 @@ mapAliases ({
|
||||
libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22
|
||||
libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09
|
||||
links = links2; # added 2016-01-31
|
||||
linux_mptcp_5_9 = linux_5_9; # added 2020-01-07
|
||||
linux_rpi0 = linux_rpi1;
|
||||
linuxPackages_rpi0 = linuxPackages_rpi1;
|
||||
|
||||
@ -826,8 +827,8 @@ mapAliases ({
|
||||
between mixed versions of qt. See:
|
||||
https://github.com/NixOS/nixpkgs/pull/101369 */
|
||||
|
||||
inherit (kdeFrameworks) breeze-icons oxygen-icons5;
|
||||
inherit (kdeApplications)
|
||||
inherit (plasma5Packages) breeze-icons oxygen-icons5;
|
||||
inherit (plasma5Packages)
|
||||
akonadi akregator ark
|
||||
bomber bovo
|
||||
dolphin dragon
|
||||
@ -859,7 +860,7 @@ mapAliases ({
|
||||
spectacle
|
||||
yakuake
|
||||
;
|
||||
inherit (plasma5)
|
||||
inherit (plasma5Packages)
|
||||
bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover
|
||||
kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
|
||||
kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
|
||||
@ -868,7 +869,7 @@ mapAliases ({
|
||||
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
|
||||
systemsettings xdg-desktop-portal-kde
|
||||
;
|
||||
inherit (plasma5.thirdParty)
|
||||
inherit (plasma5Packages.thirdParty)
|
||||
plasma-applet-caffeine-plus
|
||||
kwin-dynamic-workspaces
|
||||
kwin-tiling
|
||||
|
@ -7825,7 +7825,7 @@ in
|
||||
|
||||
sonata = callPackage ../applications/audio/sonata { };
|
||||
|
||||
soundkonverter = kdeApplications.callPackage ../applications/audio/soundkonverter {};
|
||||
soundkonverter = libsForQt5.soundkonverter;
|
||||
|
||||
sozu = callPackage ../servers/sozu { };
|
||||
|
||||
@ -10550,14 +10550,14 @@ in
|
||||
rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
rust_1_48 = callPackage ../development/compilers/rust/1_48.nix {
|
||||
rust_1_49 = callPackage ../development/compilers/rust/1_49.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
rust = rust_1_48;
|
||||
rust = rust_1_49;
|
||||
|
||||
rustPackages_1_45 = rust_1_45.packages.stable;
|
||||
rustPackages_1_48 = rust_1_48.packages.stable;
|
||||
rustPackages = rustPackages_1_48;
|
||||
rustPackages_1_49 = rust_1_49.packages.stable;
|
||||
rustPackages = rustPackages_1_49;
|
||||
|
||||
inherit (rustPackages) cargo clippy rustc rustPlatform;
|
||||
|
||||
@ -11784,7 +11784,7 @@ in
|
||||
};
|
||||
|
||||
# Does not actually depend on Qt 5
|
||||
inherit (kdeFrameworks) extra-cmake-modules;
|
||||
inherit (plasma5Packages) extra-cmake-modules;
|
||||
|
||||
coccinelle = callPackage ../development/tools/misc/coccinelle {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
|
||||
@ -14211,16 +14211,6 @@ in
|
||||
|
||||
judy = callPackage ../development/libraries/judy { };
|
||||
|
||||
kdeFrameworks =
|
||||
let
|
||||
mkFrameworks = import ../development/libraries/kde-frameworks;
|
||||
attrs = {
|
||||
inherit libsForQt5;
|
||||
inherit lib fetchurl;
|
||||
};
|
||||
in
|
||||
recurseIntoAttrs (makeOverridable mkFrameworks attrs);
|
||||
|
||||
keybinder = callPackage ../development/libraries/keybinder {
|
||||
automake = automake111x;
|
||||
lua = lua5_1;
|
||||
@ -16154,215 +16144,30 @@ in
|
||||
inherit llvmPackages_5;
|
||||
});
|
||||
|
||||
libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5);
|
||||
libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix {
|
||||
inherit lib pkgs;
|
||||
qt5 = qt512;
|
||||
});
|
||||
|
||||
libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5);
|
||||
libsForQt514 = recurseIntoAttrs (import ./qt5-packages.nix {
|
||||
inherit lib pkgs;
|
||||
qt5 = qt514;
|
||||
});
|
||||
|
||||
libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5);
|
||||
libsForQt515 = recurseIntoAttrs (import ./qt5-packages.nix {
|
||||
inherit lib pkgs;
|
||||
qt5 = qt515;
|
||||
});
|
||||
|
||||
# TODO bump to 5.14 on darwin once it's not broken; see #95199
|
||||
qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt515;
|
||||
libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt515;
|
||||
|
||||
# plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
|
||||
plasma5Packages = libsForQt515;
|
||||
|
||||
qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
|
||||
|
||||
mkLibsForQt5 = self: with self; {
|
||||
|
||||
### KDE FRAMEWORKS
|
||||
|
||||
inherit (kdeFrameworks.override { libsForQt5 = self; })
|
||||
attica baloo bluez-qt kactivities kactivities-stats
|
||||
karchive kauth kbookmarks kcmutils kcalendarcore kcodecs kcompletion kconfig
|
||||
kconfigwidgets kcoreaddons kcrash kdav kdbusaddons kdeclarative kdelibs4support
|
||||
kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons
|
||||
khtml ki18n kiconthemes kidletime kimageformats kio kitemmodels kitemviews
|
||||
kjobwidgets kjs kjsembed kmediaplayer knewstuff knotifications
|
||||
knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner
|
||||
kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
|
||||
kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
|
||||
networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet
|
||||
syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose
|
||||
kcontacts kquickcharts kdoctools kapidox kdesu kinit kded frameworkintegration
|
||||
kdewebkit breeze-icons
|
||||
;
|
||||
|
||||
### KDE PLASMA 5
|
||||
|
||||
inherit (plasma5.override { libsForQt5 = self; })
|
||||
kdecoration khotkeys libkscreen libksysguard bluedevil
|
||||
breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover kactivitymanagerd
|
||||
kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit
|
||||
kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration
|
||||
kwin kwrited milou oxygen plasma-browser-integration plasma-desktop
|
||||
plasma-integration plasma-nm plasma-pa plasma-thunderbolt plasma-vault plasma-workspace
|
||||
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
|
||||
systemsettings xdg-desktop-portal-kde
|
||||
;
|
||||
|
||||
inherit ((plasma5.override { libsForQt5 = self; }).thirdParty)
|
||||
plasma-applet-caffeine-plus kwin-dynamic-workspaces kwin-tiling krohnkite
|
||||
;
|
||||
|
||||
### KDE APPLICATIONS
|
||||
|
||||
inherit (kdeApplications.override { libsForQt5 = self; })
|
||||
libkdcraw libkexiv2 libkipi libkomparediff2 libksane libkcddb akonadi-contacts
|
||||
akonadi-calendar akonadi-notes akonadi-search kaccounts-integration kidentitymanagement
|
||||
kontactinterface kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs
|
||||
filelight granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic
|
||||
kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser
|
||||
kdenlive kdf kdialog kdiamond keditbookmarks kfind kfloppy kget kgpg khelpcenter
|
||||
kig kigo killbots kitinerary kleopatra klettres klines kmag kmail kmines kmix kmplot
|
||||
knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact korganizer
|
||||
kpkpass krdc kreversi krfb kshisen ksquares ksystemlog kteatime ktimer ktouch kturtle
|
||||
kwalletmanager kwave marble minuet okular picmi spectacle yakuake
|
||||
;
|
||||
|
||||
### LIBRARIES
|
||||
|
||||
accounts-qt = callPackage ../development/libraries/accounts-qt { };
|
||||
|
||||
alkimia = callPackage ../development/libraries/alkimia { };
|
||||
|
||||
appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };
|
||||
|
||||
dxflib = callPackage ../development/libraries/dxflib {};
|
||||
|
||||
drumstick = callPackage ../development/libraries/drumstick { };
|
||||
|
||||
fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
|
||||
|
||||
fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };
|
||||
|
||||
qgpgme = callPackage ../development/libraries/gpgme { };
|
||||
|
||||
grantlee = callPackage ../development/libraries/grantlee/5 { };
|
||||
|
||||
qtcurve = callPackage ../data/themes/qtcurve {};
|
||||
|
||||
herqq = callPackage ../development/libraries/herqq { };
|
||||
|
||||
kdb = callPackage ../development/libraries/kdb { };
|
||||
|
||||
kde2-decoration = callPackage ../data/themes/kde2 { };
|
||||
|
||||
kdiagram = callPackage ../development/libraries/kdiagram { };
|
||||
|
||||
kdsoap = callPackage ../development/libraries/kdsoap { };
|
||||
|
||||
kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { };
|
||||
|
||||
kproperty = callPackage ../development/libraries/kproperty { };
|
||||
|
||||
kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };
|
||||
|
||||
kreport = callPackage ../development/libraries/kreport { };
|
||||
|
||||
kquickimageedit = callPackage ../development/libraries/kquickimageedit { };
|
||||
|
||||
ldutils = callPackage ../development/libraries/ldutils { };
|
||||
|
||||
libcommuni = callPackage ../development/libraries/libcommuni { };
|
||||
|
||||
libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
|
||||
|
||||
libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
|
||||
|
||||
libktorrent = callPackage ../development/libraries/libktorrent { };
|
||||
|
||||
liblastfm = callPackage ../development/libraries/liblastfm { };
|
||||
|
||||
libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };
|
||||
|
||||
packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };
|
||||
|
||||
libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) AGL Cocoa Foundation;
|
||||
};
|
||||
|
||||
libqglviewer = callPackage ../development/libraries/libqglviewer {
|
||||
inherit (darwin.apple_sdk.frameworks) AGL;
|
||||
};
|
||||
|
||||
libqtav = callPackage ../development/libraries/libqtav { };
|
||||
|
||||
kpmcore = callPackage ../development/libraries/kpmcore { };
|
||||
|
||||
mlt = callPackage ../development/libraries/mlt/qt-5.nix { };
|
||||
|
||||
openbr = callPackage ../development/libraries/openbr { };
|
||||
|
||||
phonon = callPackage ../development/libraries/phonon { };
|
||||
|
||||
phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { };
|
||||
|
||||
phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { };
|
||||
|
||||
plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { };
|
||||
|
||||
polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { };
|
||||
|
||||
poppler = callPackage ../development/libraries/poppler {
|
||||
lcms = lcms2;
|
||||
qt5Support = true;
|
||||
suffix = "qt5";
|
||||
};
|
||||
|
||||
poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix {
|
||||
lcms = lcms2;
|
||||
qt5Support = true;
|
||||
suffix = "qt5";
|
||||
};
|
||||
|
||||
pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
|
||||
|
||||
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
|
||||
|
||||
qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { };
|
||||
|
||||
qmltermwidget = callPackage ../development/libraries/qmltermwidget {
|
||||
inherit (darwin.apple_sdk.libs) utmp;
|
||||
};
|
||||
|
||||
qmlbox2d = callPackage ../development/libraries/qmlbox2d { };
|
||||
|
||||
qoauth = callPackage ../development/libraries/qoauth { };
|
||||
|
||||
qscintilla = callPackage ../development/libraries/qscintilla {
|
||||
withQt5 = true;
|
||||
};
|
||||
|
||||
qtutilities = callPackage ../development/libraries/qtutilities { };
|
||||
|
||||
qtinstaller = callPackage ../development/libraries/qtinstaller { };
|
||||
|
||||
qtkeychain = callPackage ../development/libraries/qtkeychain {
|
||||
withQt5 = true;
|
||||
};
|
||||
|
||||
qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };
|
||||
|
||||
qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { };
|
||||
|
||||
qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { };
|
||||
|
||||
quazip = callPackage ../development/libraries/quazip { };
|
||||
|
||||
qwt = callPackage ../development/libraries/qwt/6.nix { };
|
||||
|
||||
soqt = callPackage ../development/libraries/soqt { };
|
||||
|
||||
telepathy = callPackage ../development/libraries/telepathy/qt { };
|
||||
|
||||
qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };
|
||||
|
||||
# Not a library, but we do want it to be built for every qt version there
|
||||
# is, to allow users to choose the right build if needed.
|
||||
sddm = callPackage ../applications/display-managers/sddm { };
|
||||
|
||||
signond = callPackage ../development/libraries/signond {};
|
||||
};
|
||||
|
||||
qtEnv = qt5.env;
|
||||
qt5Full = qt5.full;
|
||||
|
||||
@ -18941,13 +18746,6 @@ in
|
||||
|
||||
linux_mptcp = linux_mptcp_95;
|
||||
|
||||
linux_mptcp_5_9 = linux_5_9.override {
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
MPTCP = yes;
|
||||
MPTCP_IPV6 = yes;
|
||||
};
|
||||
};
|
||||
|
||||
linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix {
|
||||
kernelPatches = linux_4_19.kernelPatches;
|
||||
};
|
||||
@ -20305,7 +20103,7 @@ in
|
||||
fira-mono = callPackage ../data/fonts/fira-mono { };
|
||||
|
||||
flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
inherit (plasma5Packages) breeze-icons;
|
||||
};
|
||||
|
||||
font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4;
|
||||
@ -20410,7 +20208,7 @@ in
|
||||
kopia = callPackage ../tools/backup/kopia { };
|
||||
|
||||
kora-icon-theme = callPackage ../data/icons/kora-icon-theme {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
inherit (libsForQt5.kdeFrameworks) breeze-icons;
|
||||
};
|
||||
|
||||
koreader = callPackage ../applications/misc/koreader {};
|
||||
@ -20470,7 +20268,7 @@ in
|
||||
luculent = callPackage ../data/fonts/luculent { };
|
||||
|
||||
luna-icons = callPackage ../data/icons/luna-icons {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
inherit (plasma5Packages) breeze-icons;
|
||||
};
|
||||
|
||||
maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { };
|
||||
@ -20607,11 +20405,11 @@ in
|
||||
paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
|
||||
|
||||
papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
inherit (plasma5Packages) breeze-icons;
|
||||
};
|
||||
|
||||
papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
inherit (plasma5Packages) breeze-icons;
|
||||
};
|
||||
|
||||
papis = with python3Packages; toPythonApplication papis;
|
||||
@ -20643,7 +20441,7 @@ in
|
||||
pop-gtk-theme = callPackage ../data/themes/pop-gtk { };
|
||||
|
||||
pop-icon-theme = callPackage ../data/icons/pop-icon-theme {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
inherit (plasma5Packages) breeze-icons;
|
||||
};
|
||||
|
||||
posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
|
||||
@ -20929,7 +20727,7 @@ in
|
||||
yaru-theme = callPackage ../data/themes/yaru {};
|
||||
|
||||
zafiro-icons = callPackage ../data/icons/zafiro-icons {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
inherit (plasma5Packages) breeze-icons;
|
||||
};
|
||||
|
||||
zeal = libsForQt514.callPackage ../data/documentation/zeal { };
|
||||
@ -23016,16 +22814,6 @@ in
|
||||
|
||||
kapow = libsForQt5.callPackage ../applications/misc/kapow { };
|
||||
|
||||
kdeApplications =
|
||||
let
|
||||
mkApplications = import ../applications/kde;
|
||||
attrs = {
|
||||
inherit libsForQt5;
|
||||
inherit lib fetchurl;
|
||||
};
|
||||
in
|
||||
recurseIntoAttrs (makeOverridable mkApplications attrs);
|
||||
|
||||
okteta = libsForQt5.callPackage ../applications/editors/okteta { };
|
||||
|
||||
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
|
||||
@ -27358,22 +27146,6 @@ in
|
||||
|
||||
xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
|
||||
|
||||
### DESKTOP ENVIRONMENTS / PLASMA 5
|
||||
|
||||
plasma5 =
|
||||
let
|
||||
mkPlasma5 = import ../desktops/plasma-5;
|
||||
attrs = {
|
||||
# ATTN: The Qt version used in the NixOS Plasma module must be updated
|
||||
# whenever this changes!
|
||||
inherit libsForQt5;
|
||||
inherit lib fetchurl;
|
||||
gconf = gnome2.GConf;
|
||||
inherit gsettings-desktop-schemas;
|
||||
};
|
||||
in
|
||||
recurseIntoAttrs (makeOverridable mkPlasma5 attrs);
|
||||
|
||||
### SCIENCE/CHEMISTY
|
||||
|
||||
avogadro = callPackage ../applications/science/chemistry/avogadro {
|
||||
|
196
pkgs/top-level/qt5-packages.nix
Normal file
196
pkgs/top-level/qt5-packages.nix
Normal file
@ -0,0 +1,196 @@
|
||||
|
||||
# Qt packages set.
|
||||
#
|
||||
# Attributes in this file are packages requiring Qt and will be made available
|
||||
# for every Qt version. Qt applications are called from `all-packages.nix` via
|
||||
# this file.
|
||||
|
||||
|
||||
{ lib
|
||||
, pkgs
|
||||
, qt5
|
||||
}:
|
||||
|
||||
(lib.makeScope pkgs.newScope ( self:
|
||||
|
||||
let
|
||||
libsForQt5 = self;
|
||||
callPackage = self.callPackage;
|
||||
|
||||
kdeFrameworks = let
|
||||
mkFrameworks = import ../development/libraries/kde-frameworks;
|
||||
attrs = {
|
||||
inherit libsForQt5;
|
||||
inherit (pkgs) lib fetchurl;
|
||||
};
|
||||
in (lib.makeOverridable mkFrameworks attrs);
|
||||
|
||||
plasma5 = let
|
||||
mkPlasma5 = import ../desktops/plasma-5;
|
||||
attrs = {
|
||||
inherit libsForQt5;
|
||||
inherit (pkgs) lib fetchurl;
|
||||
gconf = pkgs.gnome2.GConf;
|
||||
inherit (pkgs) gsettings-desktop-schemas;
|
||||
};
|
||||
in (lib.makeOverridable mkPlasma5 attrs);
|
||||
|
||||
kdeApplications = let
|
||||
mkApplications = import ../applications/kde;
|
||||
attrs = {
|
||||
inherit libsForQt5;
|
||||
inherit (pkgs) lib fetchurl;
|
||||
};
|
||||
in (lib.makeOverridable mkApplications attrs);
|
||||
|
||||
in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // {
|
||||
|
||||
inherit kdeFrameworks plasma5 kdeApplications qt5;
|
||||
|
||||
### LIBRARIES
|
||||
|
||||
accounts-qt = callPackage ../development/libraries/accounts-qt { };
|
||||
|
||||
alkimia = callPackage ../development/libraries/alkimia { };
|
||||
|
||||
appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };
|
||||
|
||||
dxflib = callPackage ../development/libraries/dxflib {};
|
||||
|
||||
drumstick = callPackage ../development/libraries/drumstick { };
|
||||
|
||||
fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
|
||||
|
||||
fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };
|
||||
|
||||
qgpgme = callPackage ../development/libraries/gpgme { };
|
||||
|
||||
grantlee = callPackage ../development/libraries/grantlee/5 { };
|
||||
|
||||
qtcurve = callPackage ../data/themes/qtcurve {};
|
||||
|
||||
herqq = callPackage ../development/libraries/herqq { };
|
||||
|
||||
kdb = callPackage ../development/libraries/kdb { };
|
||||
|
||||
kde2-decoration = callPackage ../data/themes/kde2 { };
|
||||
|
||||
kdiagram = callPackage ../development/libraries/kdiagram { };
|
||||
|
||||
kdsoap = callPackage ../development/libraries/kdsoap { };
|
||||
|
||||
kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { };
|
||||
|
||||
kproperty = callPackage ../development/libraries/kproperty { };
|
||||
|
||||
kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };
|
||||
|
||||
kreport = callPackage ../development/libraries/kreport { };
|
||||
|
||||
kquickimageedit = callPackage ../development/libraries/kquickimageedit { };
|
||||
|
||||
ldutils = callPackage ../development/libraries/ldutils { };
|
||||
|
||||
libcommuni = callPackage ../development/libraries/libcommuni { };
|
||||
|
||||
libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
|
||||
|
||||
libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
|
||||
|
||||
libktorrent = callPackage ../development/libraries/libktorrent { };
|
||||
|
||||
liblastfm = callPackage ../development/libraries/liblastfm { };
|
||||
|
||||
libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };
|
||||
|
||||
packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };
|
||||
|
||||
libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) AGL Cocoa Foundation;
|
||||
};
|
||||
|
||||
libqglviewer = callPackage ../development/libraries/libqglviewer {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) AGL;
|
||||
};
|
||||
|
||||
libqtav = callPackage ../development/libraries/libqtav { };
|
||||
|
||||
kpmcore = callPackage ../development/libraries/kpmcore { };
|
||||
|
||||
mlt = callPackage ../development/libraries/mlt/qt-5.nix { };
|
||||
|
||||
openbr = callPackage ../development/libraries/openbr { };
|
||||
|
||||
phonon = callPackage ../development/libraries/phonon { };
|
||||
|
||||
phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { };
|
||||
|
||||
phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { };
|
||||
|
||||
plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { };
|
||||
|
||||
polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { };
|
||||
|
||||
poppler = callPackage ../development/libraries/poppler {
|
||||
lcms = pkgs.lcms2;
|
||||
qt5Support = true;
|
||||
suffix = "qt5";
|
||||
};
|
||||
|
||||
poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix {
|
||||
lcms = pkgs.lcms2;
|
||||
qt5Support = true;
|
||||
suffix = "qt5";
|
||||
};
|
||||
|
||||
pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
|
||||
|
||||
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
|
||||
|
||||
qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { };
|
||||
|
||||
qmltermwidget = callPackage ../development/libraries/qmltermwidget {
|
||||
inherit (pkgs.darwin.apple_sdk.libs) utmp;
|
||||
};
|
||||
|
||||
qmlbox2d = callPackage ../development/libraries/qmlbox2d { };
|
||||
|
||||
qoauth = callPackage ../development/libraries/qoauth { };
|
||||
|
||||
qscintilla = callPackage ../development/libraries/qscintilla {
|
||||
withQt5 = true;
|
||||
};
|
||||
|
||||
qtutilities = callPackage ../development/libraries/qtutilities { };
|
||||
|
||||
qtinstaller = callPackage ../development/libraries/qtinstaller { };
|
||||
|
||||
qtkeychain = callPackage ../development/libraries/qtkeychain {
|
||||
withQt5 = true;
|
||||
};
|
||||
|
||||
qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };
|
||||
|
||||
qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { };
|
||||
|
||||
qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { };
|
||||
|
||||
quazip = callPackage ../development/libraries/quazip { };
|
||||
|
||||
qwt = callPackage ../development/libraries/qwt/6.nix { };
|
||||
|
||||
soqt = callPackage ../development/libraries/soqt { };
|
||||
|
||||
telepathy = callPackage ../development/libraries/telepathy/qt { };
|
||||
|
||||
qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };
|
||||
|
||||
# Not a library, but we do want it to be built for every qt version there
|
||||
# is, to allow users to choose the right build if needed.
|
||||
sddm = callPackage ../applications/display-managers/sddm { };
|
||||
|
||||
signond = callPackage ../development/libraries/signond {};
|
||||
|
||||
soundkonverter = callPackage ../applications/audio/soundkonverter {};
|
||||
|
||||
})))
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user