mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-02 18:47:58 +03:00
Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
commit
0d065994f6
27
.github/CODEOWNERS
vendored
27
.github/CODEOWNERS
vendored
@ -141,6 +141,15 @@
|
||||
/pkgs/development/tools/build-managers/rebar3 @gleber
|
||||
/pkgs/development/tools/erlang @gleber
|
||||
|
||||
# Audio
|
||||
/nixos/modules/services/audio/botamusique.nix @mweinelt
|
||||
/nixos/modules/services/audio/snapserver.nix @mweinelt
|
||||
/nixos/tests/modules/services/audio/botamusique.nix @mweinelt
|
||||
/nixos/tests/snapcast.nix @mweinelt
|
||||
|
||||
# Browsers
|
||||
/pkgs/applications/networking/browsers/firefox @mweinelt
|
||||
|
||||
# Jetbrains
|
||||
/pkgs/applications/editors/jetbrains @edwtjo
|
||||
|
||||
@ -167,12 +176,30 @@
|
||||
/nixos/tests/hardened.nix @joachifm
|
||||
/pkgs/os-specific/linux/kernel/hardened-config.nix @joachifm
|
||||
|
||||
# Home Automation
|
||||
/nixos/modules/services/misc/home-assistant.nix @mweinelt
|
||||
/nixos/modules/services/misc/zigbee2mqtt.nix @mweinelt
|
||||
/nixos/tests/home-assistant.nix @mweinelt
|
||||
/nixos/tests/zigbee2mqtt.nix @mweinelt
|
||||
/pkgs/servers/home-assistant @mweinelt
|
||||
/pkgs/tools/misc/esphome @mweinelt
|
||||
|
||||
# Network Time Daemons
|
||||
/pkgs/tools/networking/chrony @thoughtpolice
|
||||
/pkgs/tools/networking/ntp @thoughtpolice
|
||||
/pkgs/tools/networking/openntpd @thoughtpolice
|
||||
/nixos/modules/services/networking/ntp @thoughtpolice
|
||||
|
||||
# Network
|
||||
/pkgs/tools/networking/kea/default.nix @mweinelt
|
||||
/pkgs/tools/networking/babeld/default.nix @mweinelt
|
||||
/nixos/modules/services/networking/babeld.nix @mweinelt
|
||||
/nixos/modules/services/networking/kea.nix @mweinelt
|
||||
/nixos/modules/services/networking/knot.nix @mweinelt
|
||||
/nixos/tests/babeld.nix @mweinelt
|
||||
/nixos/tests/kea.nix @mweinelt
|
||||
/nixos/tests/knot.nix @mweinelt
|
||||
|
||||
# Dhall
|
||||
/pkgs/development/dhall-modules @Gabriel439 @Profpatsch @ehmry
|
||||
/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch @ehmry
|
||||
|
@ -228,6 +228,15 @@
|
||||
to your configuration.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Normal users (with <literal>isNormalUser = true</literal>)
|
||||
which have non-empty <literal>subUidRanges</literal> or
|
||||
<literal>subGidRanges</literal> set no longer have additional
|
||||
implicit ranges allocated. To enable automatic allocation back
|
||||
set <literal>autoSubUidGidRange = true</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-notable-changes">
|
||||
|
@ -77,6 +77,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- `documentation.man` has been refactored to support choosing a man implementation other than GNU's `man-db`. For this, `documentation.man.manualPages` has been renamed to `documentation.man.man-db.manualPages`. If you want to use the new alternative man implementation `mandoc`, add `documentation.man = { enable = true; man-db.enable = false; mandoc.enable = true; }` to your configuration.
|
||||
|
||||
- Normal users (with `isNormalUser = true`) which have non-empty `subUidRanges` or `subGidRanges` set no longer have additional implicit ranges allocated. To enable automatic allocation back set `autoSubUidGidRange = true`.
|
||||
|
||||
## Other Notable Changes {#sec-release-22.05-notable-changes}
|
||||
|
||||
- The option [services.redis.servers](#opt-services.redis.servers) was added
|
||||
|
@ -228,9 +228,7 @@ in rec {
|
||||
mkdir -p $out/getty.target.wants/
|
||||
ln -s ../autovt@tty1.service $out/getty.target.wants/
|
||||
|
||||
ln -s ../local-fs.target ../remote-fs.target \
|
||||
../nss-lookup.target ../nss-user-lookup.target ../swap.target \
|
||||
$out/multi-user.target.wants/
|
||||
ln -s ../remote-fs.target $out/multi-user.target.wants/
|
||||
''}
|
||||
''; # */
|
||||
|
||||
|
@ -351,7 +351,7 @@ foreach my $u (values %usersOut) {
|
||||
push @subGids, $value;
|
||||
}
|
||||
|
||||
if($u->{isNormalUser}) {
|
||||
if($u->{autoSubUidGidRange}) {
|
||||
my $subordinate = allocSubUid($name);
|
||||
$subUidMap->{$name} = $subordinate;
|
||||
my $value = join(":", ($name, $subordinate, 65536));
|
||||
|
@ -204,6 +204,16 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
autoSubUidGidRange = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
example = true;
|
||||
description = ''
|
||||
Automatically allocate subordinate user and group ids for this user.
|
||||
Allocated range is currently always of size 65536.
|
||||
'';
|
||||
};
|
||||
|
||||
createHome = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
@ -320,6 +330,9 @@ let
|
||||
(mkIf (!cfg.mutableUsers && config.initialHashedPassword != null) {
|
||||
hashedPassword = mkDefault config.initialHashedPassword;
|
||||
})
|
||||
(mkIf (config.isNormalUser && config.subUidRanges == [] && config.subGidRanges == []) {
|
||||
autoSubUidGidRange = mkDefault true;
|
||||
})
|
||||
];
|
||||
|
||||
};
|
||||
@ -419,7 +432,7 @@ let
|
||||
{ inherit (u)
|
||||
name uid group description home createHome isSystemUser
|
||||
password passwordFile hashedPassword
|
||||
isNormalUser subUidRanges subGidRanges
|
||||
autoSubUidGidRange subUidRanges subGidRanges
|
||||
initialPassword initialHashedPassword;
|
||||
shell = utils.toShellPath u.shell;
|
||||
}) cfg.users;
|
||||
|
@ -11,23 +11,17 @@ let
|
||||
enabled = elem "amdgpu-pro" drivers;
|
||||
|
||||
package = config.boot.kernelPackages.amdgpu-pro;
|
||||
package32 = pkgs.pkgsi686Linux.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
|
||||
package32 = pkgs.pkgsi686Linux.linuxPackages.amdgpu-pro.override { kernel = null; };
|
||||
|
||||
opengl = config.hardware.opengl;
|
||||
|
||||
kernel = pkgs.linux_4_9.override {
|
||||
extraConfig = ''
|
||||
KALLSYMS_ALL y
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
config = mkIf enabled {
|
||||
|
||||
nixpkgs.config.xorg.abiCompat = "1.19";
|
||||
nixpkgs.config.xorg.abiCompat = "1.20";
|
||||
|
||||
services.xserver.drivers = singleton
|
||||
{ name = "amdgpu"; modules = [ package ]; display = true; };
|
||||
@ -36,31 +30,39 @@ in
|
||||
hardware.opengl.package32 = package32;
|
||||
hardware.opengl.setLdLibraryPath = true;
|
||||
|
||||
boot.extraModulePackages = [ package ];
|
||||
boot.extraModulePackages = [ package.kmod ];
|
||||
|
||||
boot.kernelPackages =
|
||||
pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor kernel);
|
||||
boot.kernelPackages = pkgs.linuxKernel.packagesFor
|
||||
(pkgs.linuxKernel.kernels.linux_5_10.override {
|
||||
structuredExtraConfig = {
|
||||
DEVICE_PRIVATE = kernel.yes;
|
||||
KALLSYMS_ALL = kernel.yes;
|
||||
};
|
||||
});
|
||||
|
||||
boot.blacklistedKernelModules = [ "radeon" ];
|
||||
|
||||
hardware.firmware = [ package ];
|
||||
hardware.firmware = [ package.fw ];
|
||||
|
||||
system.activationScripts.setup-amdgpu-pro = ''
|
||||
mkdir -p /run/lib
|
||||
ln -sfn ${package}/lib ${package.libCompatDir}
|
||||
ln -sfn ${package} /run/amdgpu-pro
|
||||
'' + optionalString opengl.driSupport32Bit ''
|
||||
ln -sfn ${package32}/lib ${package32.libCompatDir}
|
||||
ln -sfn ${package}/opt/amdgpu{,-pro} /run
|
||||
'';
|
||||
|
||||
system.requiredKernelConfig = with config.lib.kernelConfig; [
|
||||
(isYes "DEVICE_PRIVATE")
|
||||
(isYes "KALLSYMS_ALL")
|
||||
];
|
||||
|
||||
boot.initrd.extraUdevRulesCommands = ''
|
||||
cp -v ${package}/etc/udev/rules.d/*.rules $out/
|
||||
'';
|
||||
|
||||
environment.systemPackages =
|
||||
[ package.vulkan ] ++
|
||||
# this isn't really DRI, but we'll reuse this option for now
|
||||
optional config.hardware.opengl.driSupport32Bit package32.vulkan;
|
||||
|
||||
environment.etc = {
|
||||
"amd/amdrc".source = package + "/etc/amd/amdrc";
|
||||
"amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb";
|
||||
"gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf";
|
||||
"modprobe.d/blacklist-radeon.conf".source = package + "/etc/modprobe.d/blacklist-radeon.conf";
|
||||
amd.source = package + "/etc/amd";
|
||||
};
|
||||
|
||||
};
|
||||
|
@ -252,8 +252,8 @@ let
|
||||
promTypes.scrape_config = types.submodule {
|
||||
options = {
|
||||
authorization = mkOption {
|
||||
type = types.attrs;
|
||||
default = {};
|
||||
type = types.nullOr types.attrs;
|
||||
default = null;
|
||||
description = ''
|
||||
Sets the `Authorization` header on every scrape request with the configured credentials.
|
||||
'';
|
||||
|
@ -20,10 +20,11 @@ let
|
||||
|
||||
buildCfg = name: c:
|
||||
let
|
||||
plugins =
|
||||
plugins' =
|
||||
if any (n: !any (m: m == n) cfg.plugins) (c.plugins or [])
|
||||
then throw "`plugins` attribute in uWSGI configuration contains plugins not in config.services.uwsgi.plugins"
|
||||
else c.plugins or cfg.plugins;
|
||||
plugins = unique plugins';
|
||||
|
||||
hasPython = v: filter (n: n == "python${v}") plugins != [];
|
||||
hasPython2 = hasPython "2";
|
||||
@ -48,13 +49,10 @@ let
|
||||
pyhome = "${pythonEnv}";
|
||||
env =
|
||||
# Argh, uwsgi expects list of key-values there instead of a dictionary.
|
||||
let env' = c.env or [];
|
||||
getPath =
|
||||
x: if hasPrefix "PATH=" x
|
||||
then substring (stringLength "PATH=") (stringLength x) x
|
||||
else null;
|
||||
oldPaths = filter (x: x != null) (map getPath env');
|
||||
in env' ++ [ "PATH=${optionalString (oldPaths != []) "${last oldPaths}:"}${pythonEnv}/bin" ];
|
||||
let envs = partition (hasPrefix "PATH=") (c.env or []);
|
||||
oldPaths = map (x: substring (stringLength "PATH=") (stringLength x) x) envs.right;
|
||||
paths = oldPaths ++ [ "${pythonEnv}/bin" ];
|
||||
in [ "PATH=${concatStringsSep ":" paths}" ] ++ envs.wrong;
|
||||
}
|
||||
else if isEmperor
|
||||
then {
|
||||
@ -225,7 +223,7 @@ in {
|
||||
};
|
||||
|
||||
services.uwsgi.package = pkgs.uwsgi.override {
|
||||
inherit (cfg) plugins;
|
||||
plugins = unique cfg.plugins;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -703,7 +703,7 @@ in
|
||||
|
||||
environment =
|
||||
optionalAttrs config.hardware.opengl.setLdLibraryPath
|
||||
{ LD_LIBRARY_PATH = pkgs.addOpenGLRunpath.driverLink; }
|
||||
{ LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.addOpenGLRunpath.driverLink ]; }
|
||||
// cfg.displayManager.job.environment;
|
||||
|
||||
preStart =
|
||||
|
@ -561,26 +561,16 @@ in {
|
||||
+ " mkpart primary 2048M -1s" # PV2
|
||||
+ " set 2 lvm on",
|
||||
"udevadm settle",
|
||||
"sleep 1",
|
||||
"pvcreate /dev/vda1 /dev/vda2",
|
||||
"sleep 1",
|
||||
"vgcreate MyVolGroup /dev/vda1 /dev/vda2",
|
||||
"sleep 1",
|
||||
"lvcreate --size 1G --name swap MyVolGroup",
|
||||
"sleep 1",
|
||||
"lvcreate --size 3G --name nixos MyVolGroup",
|
||||
"sleep 1",
|
||||
"mkswap -f /dev/MyVolGroup/swap -L swap",
|
||||
"swapon -L swap",
|
||||
"mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
|
||||
"mount LABEL=nixos /mnt",
|
||||
)
|
||||
'';
|
||||
postBootCommands = ''
|
||||
assert "loaded active" in machine.succeed(
|
||||
"systemctl list-units 'lvm2-pvscan@*' -ql --no-legend | tee /dev/stderr"
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
# Boot off an encrypted root partition with the default LUKS header format
|
||||
|
@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpg123";
|
||||
version = "1.28.2";
|
||||
version = "1.29.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "006v44nz4nkpgvxz1k2vbbrfpa2m47hyydscs0wf3iysiyvd9vvy";
|
||||
sha256 = "sha256-ljiF2Mx3Ji8ot3GHx9GJ4yGV5kJE3iUwt5jd8yGD6Ec=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals withConplay [ "conplay" ];
|
||||
|
@ -72,7 +72,7 @@ in {
|
||||
lib.concatStringsSep "." (map toString
|
||||
# Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413
|
||||
# This filter method is still technically wrong, but it's computationally cheap enough and tapers over the issue
|
||||
(builtins.filter (n: n > 0) version));
|
||||
(builtins.filter (n: n >= 0) version));
|
||||
# TODO: Broken should not result in src being null (hack to avoid eval errors)
|
||||
src = if (isNull sha256 || broken) then null else
|
||||
lib.getAttr fetcher (fetcherGenerators args sourceArgs);
|
||||
|
@ -1,12 +1,12 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "8.2.3848";
|
||||
version = "8.2.3877";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim";
|
||||
repo = "vim";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U6xrEZbieRBU0FDdTloYdZzuNpJ9+Q7FZgfI+0SPEAQ=";
|
||||
sha256 = "sha256-NqTO2TdhOs63eP7CdWY9U9nbR7No3hqPV5rGhYF9arA=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -108,6 +108,7 @@ mkDerivation rec {
|
||||
python
|
||||
regex
|
||||
sip
|
||||
setuptools
|
||||
zeroconf
|
||||
jeepney
|
||||
# the following are distributed with calibre, but we use upstream instead
|
||||
|
@ -27,6 +27,11 @@ mkDerivation rec {
|
||||
sha256 = "sha256-Os/5igKGYBeY/FxO6I+7mpFohuk3yHGLd7vE2GewFpU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "-Werror" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
|
@ -1,11 +1,14 @@
|
||||
{ lib, setuptools, boto3, requests, click, pyyaml, pydantic
|
||||
, buildPythonApplication, pythonOlder, installShellFiles, fetchFromGitHub
|
||||
, awscli }:
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, awscli
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nimbo";
|
||||
version = "0.2.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = python3.pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nimbo-sh";
|
||||
@ -13,13 +16,31 @@ buildPythonApplication rec {
|
||||
rev = "v${version}";
|
||||
sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "awscli>=1.19<2.0" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
propagatedBuildInputs = [ setuptools boto3 awscli requests click pyyaml pydantic ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
boto3
|
||||
requests
|
||||
click
|
||||
pyyaml
|
||||
pydantic
|
||||
];
|
||||
|
||||
# nimbo tests require an AWS instance
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "nimbo" ];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ awscli ])
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd nimbo \
|
||||
--zsh <(_NIMBO_COMPLETE=source_zsh $out/bin/nimbo) \
|
||||
|
@ -306,6 +306,7 @@ let
|
||||
"colorlog"
|
||||
"emoji"
|
||||
"immutabledict"
|
||||
"PyYAML"
|
||||
"sarge"
|
||||
"sentry-sdk"
|
||||
"watchdog"
|
||||
|
@ -129,6 +129,8 @@ buildStdenv.mkDerivation ({
|
||||
inherit src unpackPhase meta;
|
||||
|
||||
patches = [
|
||||
# Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1745560:
|
||||
./fix-build-with-wayland-1.20.patch
|
||||
] ++
|
||||
lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++
|
||||
lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++
|
||||
|
@ -0,0 +1,13 @@
|
||||
diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
|
||||
index 7a448e6..7792581 100644
|
||||
--- a/widget/gtk/mozwayland/mozwayland.c
|
||||
+++ b/widget/gtk/mozwayland/mozwayland.c
|
||||
@@ -200,3 +200,8 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; }
|
||||
|
||||
MOZ_EXPORT void wl_list_insert_list(struct wl_list* list,
|
||||
struct wl_list* other) {}
|
||||
+
|
||||
+MOZ_EXPORT struct wl_proxy *
|
||||
+wl_proxy_marshal_flags(struct wl_proxy *proxy, uint32_t opcode,
|
||||
+ const struct wl_interface *interface, uint32_t version,
|
||||
+ uint32_t flags, ...) { return NULL; }
|
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notmuch";
|
||||
version = "0.34.1";
|
||||
version = "0.34.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
|
||||
sha256 = "05nq64gp8vnrwrl22d60v7ixgdhm9339ajhcdfkq0ll1qiycyyj5";
|
||||
sha256 = "wfLO7kf2iXESItcgWvKj/npKnYwy5OCyStZviN9qR9M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -89,7 +89,7 @@ EOF
|
||||
ln -s $out/lib/liblapacke.so.3 $out/lib/liblapacke.so
|
||||
fi
|
||||
|
||||
cp ${lib.getDev lapack-reference}/include/lapacke{,_mangling,_config}.h $dev/include
|
||||
cp ${lib.getDev lapack-reference}/include/lapacke{,_mangling,_config,_utils}.h $dev/include
|
||||
|
||||
cat <<EOF > $dev/lib/pkgconfig/lapacke.pc
|
||||
Name: lapacke
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ fetchurl, lib, stdenv, cmake, ninja }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "poppler-data-0.4.10";
|
||||
name = "poppler-data-0.4.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://poppler.freedesktop.org/${name}.tar.gz";
|
||||
sha256 = "0c3vjs3p7rjc4yfacnhd865r27czmzwcr4j2z4jldi68dvvcwbvf";
|
||||
sha256 = "sha256-LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tzdata";
|
||||
version = "2021c";
|
||||
version = "2021e";
|
||||
|
||||
srcs =
|
||||
[ (fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
|
||||
sha256 = "0himprzx3ahxkmg4rvp8n5lqry76qzc65j6sfq151hqirg4d3wdl";
|
||||
sha256 = "1cdjdcxl0s9xf0dg1z64kh7llm80byxqlzrkkjzcdlyh6yvl5v07";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
|
||||
sha256 = "01fsa661vzdij46z286pa8q07cppqz29sr2pf0qqldqpldbb6km3";
|
||||
sha256 = "0x8pcfmjvxk29yfh8bklchv2f0vpl4yih0gc4wyx292l78wncijq";
|
||||
})
|
||||
];
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "material-kwin-decoration";
|
||||
version = "unstable-20211028";
|
||||
version = "unstable-2021-10-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zren";
|
||||
@ -25,6 +25,11 @@ mkDerivation rec {
|
||||
sha256 = "sha256-aYlnPFhf+ISVe5Ycryu5BSXY8Lb5OoueMqnWQZiv6Lc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "-Werror" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-desktop";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-voqvpk17ov0xB57tY505/aHqd+9301pnjwGcTZHUc8I=";
|
||||
sha256 = "sha256-NDKe79rK0jMqatuuU4yNpuUiNcd3WpCLfDIECgdT7Go=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -54,11 +54,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.16.12";
|
||||
version = "1.16.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "sha256-Kv2Dnct20rsILFAsAaClzb/An9YwdXg1NjxP3o4vv+g=";
|
||||
sha256 = "sha256-sJJmVOrrAe9DgWY49C17FoHy0/QblVnwdzVSK3r61Bo=";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
@ -95,7 +95,7 @@ in stdenv.mkDerivation (rec {
|
||||
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
|
||||
''
|
||||
# Patch llvm-config to return correct library path based on --link-{shared,static}.
|
||||
+ optionalString (enableSharedLibraries) ''
|
||||
+ ''
|
||||
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
|
||||
patch -p1 < ./outputs.patch
|
||||
'' + ''
|
||||
|
@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
|
@ -30,6 +30,7 @@ let
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++14"
|
||||
"-DCLANGD_BUILD_XPC=OFF"
|
||||
"-DLLVM_ENABLE_RTTI=ON"
|
||||
"-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"
|
||||
] ++ lib.optionals enableManpages [
|
||||
"-DCLANG_INCLUDE_DOCS=ON"
|
||||
|
@ -93,7 +93,7 @@ in stdenv.mkDerivation (rec {
|
||||
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
|
||||
''
|
||||
# Patch llvm-config to return correct library path based on --link-{shared,static}.
|
||||
+ optionalString (enableSharedLibraries) ''
|
||||
+ ''
|
||||
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
|
||||
patch -p1 < ./outputs.patch
|
||||
'' + ''
|
||||
|
@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
|
@ -31,6 +31,7 @@ let
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++14"
|
||||
"-DCLANGD_BUILD_XPC=OFF"
|
||||
"-DLLVM_ENABLE_RTTI=ON"
|
||||
"-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"
|
||||
] ++ lib.optionals enableManpages [
|
||||
"-DCLANG_INCLUDE_DOCS=ON"
|
||||
|
@ -74,7 +74,7 @@ in stdenv.mkDerivation (rec {
|
||||
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
|
||||
''
|
||||
# Patch llvm-config to return correct library path based on --link-{shared,static}.
|
||||
+ optionalString (enableSharedLibraries) ''
|
||||
+ ''
|
||||
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
|
||||
patch -p1 < ./outputs.patch
|
||||
'' + ''
|
||||
|
@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
|
@ -21,6 +21,7 @@ let
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++14"
|
||||
"-DCLANGD_BUILD_XPC=OFF"
|
||||
"-DLLVM_ENABLE_RTTI=ON"
|
||||
"-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"
|
||||
] ++ lib.optionals enableManpages [
|
||||
"-DCLANG_INCLUDE_DOCS=ON"
|
||||
|
@ -68,7 +68,7 @@ in stdenv.mkDerivation (rec {
|
||||
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
|
||||
''
|
||||
# Patch llvm-config to return correct library path based on --link-{shared,static}.
|
||||
+ optionalString (enableSharedLibraries) ''
|
||||
+ ''
|
||||
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
|
||||
patch -p1 < ./outputs.patch
|
||||
'' + ''
|
||||
|
@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
|
@ -0,0 +1,10 @@
|
||||
--- a/lib/xray/xray_buffer_queue.h
|
||||
+++ b/lib/xray/xray_buffer_queue.h
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#include "sanitizer_common/sanitizer_atomic.h"
|
||||
#include "sanitizer_common/sanitizer_mutex.h"
|
||||
+#include <cstddef>
|
||||
#include <deque>
|
||||
#include <unordered_set>
|
||||
#include <utility>
|
@ -58,6 +58,7 @@ stdenv.mkDerivation {
|
||||
|
||||
./sys-ustat.patch
|
||||
../../common/compiler-rt/libsanitizer-no-cyclades-9.patch
|
||||
./compiler-rt-5-cstddef.patch
|
||||
] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
|
||||
|
||||
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
|
||||
|
@ -82,7 +82,7 @@ stdenv.mkDerivation ({
|
||||
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' ""
|
||||
''
|
||||
# Patch llvm-config to return correct library path based on --link-{shared,static}.
|
||||
+ optionalString (enableSharedLibraries) ''
|
||||
+ ''
|
||||
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
|
||||
patch -p1 < ./outputs.patch
|
||||
'' + ''
|
||||
|
@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
|
@ -80,7 +80,7 @@ stdenv.mkDerivation ({
|
||||
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' ""
|
||||
''
|
||||
# Patch llvm-config to return correct library path based on --link-{shared,static}.
|
||||
+ optionalString (enableSharedLibraries) ''
|
||||
+ ''
|
||||
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
|
||||
patch -p1 < ./outputs.patch
|
||||
'' + ''
|
||||
|
@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
|
@ -84,7 +84,7 @@ in stdenv.mkDerivation ({
|
||||
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' ""
|
||||
''
|
||||
# Patch llvm-config to return correct library path based on --link-{shared,static}.
|
||||
+ optionalString (enableSharedLibraries) ''
|
||||
+ ''
|
||||
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
|
||||
patch -p1 < ./outputs.patch
|
||||
'' + ''
|
||||
|
@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
|
@ -87,7 +87,7 @@ in stdenv.mkDerivation ({
|
||||
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' ""
|
||||
''
|
||||
# Patch llvm-config to return correct library path based on --link-{shared,static}.
|
||||
+ optionalString (enableSharedLibraries) ''
|
||||
+ ''
|
||||
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
|
||||
patch -p1 < ./outputs.patch
|
||||
'' + ''
|
||||
|
@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
|
@ -85,7 +85,7 @@ in stdenv.mkDerivation (rec {
|
||||
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' ""
|
||||
''
|
||||
# Patch llvm-config to return correct library path based on --link-{shared,static}.
|
||||
+ optionalString (enableSharedLibraries) ''
|
||||
+ ''
|
||||
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
|
||||
patch -p1 < ./outputs.patch
|
||||
'' + ''
|
||||
|
@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
|
@ -21,6 +21,7 @@ let
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++14"
|
||||
"-DCLANGD_BUILD_XPC=OFF"
|
||||
"-DLLVM_ENABLE_RTTI=ON"
|
||||
"-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"
|
||||
] ++ lib.optionals enableManpages [
|
||||
"-DCLANG_INCLUDE_DOCS=ON"
|
||||
|
@ -60,7 +60,7 @@ in stdenv.mkDerivation (rec {
|
||||
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
|
||||
''
|
||||
# Patch llvm-config to return correct library path based on --link-{shared,static}.
|
||||
+ optionalString (enableSharedLibraries) ''
|
||||
+ ''
|
||||
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
|
||||
patch -p1 < ./outputs.patch
|
||||
'' + ''
|
||||
|
@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
|
@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
|
@ -104,13 +104,13 @@ in rec {
|
||||
};
|
||||
|
||||
vala_0_48 = generic {
|
||||
version = "0.48.20";
|
||||
sha256 = "sha256-RrHIF/dIUfvMOV/E+eoRlQLPh7kzPMllbhzczAvTN24=";
|
||||
version = "0.48.21";
|
||||
sha256 = "sha256-MFRVrrdo1u2bAYNgtVGC5IsW2xvBY6TluBQg+Y0h2Zg=";
|
||||
};
|
||||
|
||||
vala_0_52 = generic {
|
||||
version = "0.52.8";
|
||||
sha256 = "sha256-d3t9HLVnFewyJUXQEw5/9Y2eem0b2WtuKX6eYOgRh5M=";
|
||||
version = "0.52.9";
|
||||
sha256 = "sha256-HpMH2B4hHxniUB6P5PtN0Z+5J8SEtV/873FOjFFdAHk=";
|
||||
};
|
||||
|
||||
vala_0_54 = generic {
|
||||
|
@ -1,4 +1,4 @@
|
||||
{lib, stdenv, fetchurl}:
|
||||
{lib, stdenv, fetchurl, buildPackages}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yasm";
|
||||
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.tortall.net/projects/yasm/";
|
||||
description = "Complete rewrite of the NASM assembler";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ go, cacert, git, lib, stdenv, vend }:
|
||||
{ go, cacert, git, lib, stdenv }:
|
||||
|
||||
{ name ? "${args'.pname}-${args'.version}"
|
||||
, src
|
||||
@ -106,10 +106,7 @@ let
|
||||
exit 10
|
||||
fi
|
||||
|
||||
${if runVend then ''
|
||||
echo "running 'vend' to rewrite vendor folder"
|
||||
${vend}/bin/vend
|
||||
'' else if proxyVendor then ''
|
||||
${if proxyVendor then ''
|
||||
mkdir -p "''${GOPATH}/pkg/mod/cache/download"
|
||||
go mod download
|
||||
'' else ''
|
||||
|
@ -193,7 +193,8 @@ in with passthru; stdenv.mkDerivation {
|
||||
prePatch = optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
|
||||
substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
|
||||
'' + optionalString (stdenv.isDarwin && x11Support) ''
|
||||
'' + optionalString (pythonOlder "3.9" && stdenv.isDarwin && x11Support) ''
|
||||
# Broken on >= 3.9; replaced with ./3.9/darwin-tcl-tk.patch
|
||||
substituteInPlace setup.py --replace /Library/Frameworks /no-such-path
|
||||
'';
|
||||
|
||||
|
@ -185,10 +185,10 @@ in {
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "10";
|
||||
patch = "0";
|
||||
patch = "1";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "00mhn6kj4qkvkkv6hh2klnnjr0yk0c9hspp7njc7n6m1lvkzi6as";
|
||||
sha256 = "0xz1wrd6xi20sbli30vm6jclc4rlnnd03irybknf2p8sdrdjdwd7";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
@ -17,21 +17,10 @@ let
|
||||
# Contains the ruby version heuristics
|
||||
rubyVersion = import ./ruby-version.nix { inherit lib; };
|
||||
|
||||
# Needed during postInstall
|
||||
buildRuby =
|
||||
if stdenv.hostPlatform == stdenv.buildPlatform
|
||||
then "$out/bin/ruby"
|
||||
else "${buildPackages.ruby}/bin/ruby";
|
||||
|
||||
generic = { version, sha256 }: let
|
||||
ver = version;
|
||||
tag = ver.gitTag;
|
||||
atLeast30 = lib.versionAtLeast ver.majMin "3.0";
|
||||
baseruby = self.override {
|
||||
useRailsExpress = false;
|
||||
docSupport = false;
|
||||
rubygemsSupport = false;
|
||||
};
|
||||
self = lib.makeOverridable (
|
||||
{ stdenv, buildPackages, lib
|
||||
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
|
||||
@ -59,6 +48,12 @@ let
|
||||
, buildEnv, bundler, bundix
|
||||
, libiconv, libobjc, libunwind, Foundation
|
||||
, makeWrapper, buildRubyGem, defaultGemConfig
|
||||
, baseRuby ? buildPackages.ruby.override {
|
||||
useRailsExpress = false;
|
||||
docSupport = false;
|
||||
rubygemsSupport = false;
|
||||
}
|
||||
, useBaseRuby ? stdenv.hostPlatform != stdenv.buildPlatform || useRailsExpress
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ruby";
|
||||
@ -81,7 +76,7 @@ let
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook bison ]
|
||||
++ (op docSupport groff)
|
||||
++ op (stdenv.buildPlatform != stdenv.hostPlatform) buildPackages.ruby;
|
||||
++ op useBaseRuby baseRuby;
|
||||
buildInputs = [ autoconf ]
|
||||
++ (op fiddleSupport libffi)
|
||||
++ (ops cursesSupport [ ncurses readline ])
|
||||
@ -104,7 +99,7 @@ let
|
||||
inherit patchSet useRailsExpress ops fetchpatch;
|
||||
patchLevel = ver.patchLevel;
|
||||
}).${ver.majMinTiny}
|
||||
++ [ ./do-not-regenerate-revision.h.patch ]
|
||||
++ op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch
|
||||
++ op (atLeast30 && useRailsExpress) ./do-not-update-gems-baseruby.patch
|
||||
# Ruby prior to 3.0 has a bug the installer (tools/rbinstall.rb) but
|
||||
# the resulting error was swallowed. Newer rubygems no longer swallows
|
||||
@ -133,24 +128,24 @@ let
|
||||
sed -i ext/io/console/io-console.gemspec -e '/s\.date/d'
|
||||
'';
|
||||
|
||||
configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby-${version}"]
|
||||
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
|
||||
++ op (!jitSupport) "--disable-jit-support"
|
||||
++ op (!docSupport) "--disable-install-doc"
|
||||
++ op (jemallocSupport) "--with-jemalloc"
|
||||
++ ops stdenv.isDarwin [
|
||||
# on darwin, we have /usr/include/tk.h -- so the configure script detects
|
||||
# that tk is installed
|
||||
"--with-out-ext=tk"
|
||||
# on yosemite, "generating encdb.h" will hang for a very long time without this flag
|
||||
"--with-setjmp-type=setjmp"
|
||||
]
|
||||
++ op (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
"--with-baseruby=${buildRuby}";
|
||||
configureFlags = [
|
||||
(lib.enableFeature (!stdenv.hostPlatform.isStatic) "shared")
|
||||
(lib.enableFeature true "pthread")
|
||||
(lib.withFeatureAs true "soname" "ruby-${version}")
|
||||
(lib.withFeatureAs useBaseRuby "baseruby" "${baseRuby}/bin/ruby")
|
||||
(lib.enableFeature jitSupport "jit-support")
|
||||
(lib.enableFeature docSupport "install-doc")
|
||||
(lib.withFeature jemallocSupport "jemalloc")
|
||||
(lib.withFeatureAs docSupport "ridir" "${placeholder "devdoc"}/share/ri")
|
||||
] ++ ops stdenv.isDarwin [
|
||||
# on darwin, we have /usr/include/tk.h -- so the configure script detects
|
||||
# that tk is installed
|
||||
"--with-out-ext=tk"
|
||||
# on yosemite, "generating encdb.h" will hang for a very long time without this flag
|
||||
"--with-setjmp-type=setjmp"
|
||||
];
|
||||
|
||||
preConfigure = opString docSupport ''
|
||||
configureFlagsArray+=("--with-ridir=$devdoc/share/ri")
|
||||
|
||||
# rdoc creates XDG_DATA_DIR (defaulting to $HOME/.local/share) even if
|
||||
# it's not going to be used.
|
||||
export HOME=$TMPDIR
|
||||
@ -208,13 +203,16 @@ let
|
||||
# Add rbconfig shim so ri can find docs
|
||||
mkdir -p $devdoc/lib/ruby/site_ruby
|
||||
cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb
|
||||
'' + opString useRailsExpress ''
|
||||
sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig
|
||||
'' + opString useBaseRuby ''
|
||||
# Prevent the baseruby from being included in the closure.
|
||||
sed -i '/^ CONFIG\["BASERUBY"\]/d' $rbConfig
|
||||
sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
|
||||
${removeReferencesTo}/bin/remove-references-to \
|
||||
-t ${baseRuby} \
|
||||
$rbConfig $out/lib/libruby*
|
||||
'';
|
||||
|
||||
disallowedRequisites = op (!jitSupport) stdenv.cc.cc;
|
||||
disallowedRequisites = op (!jitSupport) stdenv.cc.cc
|
||||
++ op useBaseRuby baseRuby;
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Ruby language";
|
||||
@ -227,7 +225,6 @@ let
|
||||
passthru = rec {
|
||||
version = ver;
|
||||
rubyEngine = "ruby";
|
||||
baseRuby = baseruby;
|
||||
libPath = "lib/${rubyEngine}/${ver.libDir}";
|
||||
gemPath = "lib/${rubyEngine}/gems/${ver.libDir}";
|
||||
devEnv = import ./dev.nix {
|
||||
@ -246,6 +243,8 @@ let
|
||||
minorVersion = ver.minor;
|
||||
teenyVersion = ver.tiny;
|
||||
patchLevel = ver.patchLevel;
|
||||
} // lib.optionalAttrs useBaseRuby {
|
||||
inherit baseRuby;
|
||||
};
|
||||
}
|
||||
) args; in self;
|
||||
@ -266,4 +265,12 @@ in {
|
||||
git = "1q19w5i1jkfxn7qq6f9v9ngax9h52gxwijk7hp312dx6amwrkaim";
|
||||
};
|
||||
};
|
||||
|
||||
ruby_3_1 = generic {
|
||||
version = rubyVersion "3" "1" "0" "";
|
||||
sha256 = {
|
||||
src = "sha256-UKBQTG7ctNYc5rjP292qlXBxlfqw7Ne16SZUsqlBKFQ=";
|
||||
git = "sha256-TcsoWY+zVZeue1/ypV1L0WERp1UVK35WtVtYPYiJh4c=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -10,4 +10,6 @@
|
||||
"${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
|
||||
"${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
|
||||
];
|
||||
"3.1.0" = ops useRailsExpress [ # no patches yet (2021-12-25)
|
||||
];
|
||||
}
|
||||
|
@ -0,0 +1,43 @@
|
||||
From a31d1f1683ef2e9c063c3fa1db79d111cca99414 Mon Sep 17 00:00:00 2001
|
||||
From: David Redondo <kde@david-redondo.de>
|
||||
Date: Fri, 10 Dec 2021 16:22:34 +0100
|
||||
Subject: [PATCH] Fix build against wayland 1.20
|
||||
|
||||
Fixes #5088
|
||||
|
||||
(cherry picked from commit e2ade2bfc46d915cd306c63c830b81d800b2575f)
|
||||
---
|
||||
src/video/wayland/SDL_waylanddyn.h | 2 ++
|
||||
src/video/wayland/SDL_waylandsym.h | 4 ++++
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h
|
||||
index 485a9c19f..37070e946 100644
|
||||
--- a/src/video/wayland/SDL_waylanddyn.h
|
||||
+++ b/src/video/wayland/SDL_waylanddyn.h
|
||||
@@ -81,6 +81,8 @@ void SDL_WAYLAND_UnloadSymbols(void);
|
||||
#define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener)
|
||||
#define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor)
|
||||
#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned)
|
||||
+#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags)
|
||||
+#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags)
|
||||
|
||||
#define wl_seat_interface (*WAYLAND_wl_seat_interface)
|
||||
#define wl_surface_interface (*WAYLAND_wl_surface_interface)
|
||||
diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h
|
||||
index c4c189d3c..789f49e27 100644
|
||||
--- a/src/video/wayland/SDL_waylandsym.h
|
||||
+++ b/src/video/wayland/SDL_waylandsym.h
|
||||
@@ -71,6 +71,10 @@ SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_prox
|
||||
SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10)
|
||||
SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...))
|
||||
|
||||
+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20)
|
||||
+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...))
|
||||
+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args))
|
||||
+
|
||||
SDL_WAYLAND_INTERFACE(wl_seat_interface)
|
||||
SDL_WAYLAND_INTERFACE(wl_surface_interface)
|
||||
SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)
|
||||
--
|
||||
2.33.1
|
@ -35,7 +35,11 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "dev" ];
|
||||
outputBin = "dev"; # sdl-config
|
||||
|
||||
patches = [ ./find-headers.patch ];
|
||||
patches = [
|
||||
./find-headers.patch
|
||||
# To fix the build with wayland 1.20.0:
|
||||
./Fix-build-against-wayland-1.20.patch
|
||||
];
|
||||
|
||||
# Fix with mesa 19.2: https://bugzilla.libsdl.org/show_bug.cgi?id=4797
|
||||
postPatch = ''
|
||||
|
@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
|
||||
name = "${pname}-src";
|
||||
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
|
||||
rev = "refs/tags/v-${version}";
|
||||
sha256 = "9HKkpWbDiSqMI1KraIXnFioEnTYFh6Sddtm72vZMsK4=";
|
||||
sha256 = "M+58gJjP33yOuq6RYN73HG7wACPaYRz7WFC/AFFGMzw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-common";
|
||||
version = "0.6.17";
|
||||
version = "0.6.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+FzTEpotxco4+9gLVUL+rkCWoMjRCorKQ47JINHsnNA=";
|
||||
sha256 = "sha256-5Y+cfiVtZGmExPuE3s5m8hnd0HrPwSiKptj0DM1mtUY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, s2n-tls, zlib
|
||||
, aws-crt-cpp
|
||||
, aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums
|
||||
, CoreAudio, AudioToolbox
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
version = "1.9.121";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
owner = "aws";
|
||||
repo = "aws-sdk-cpp";
|
||||
rev = version;
|
||||
sha256 = "sha256-VQpWauk0tdJ1QU0HmtdTwQdKbiAuTTXXsUo2cqpqmdU=";
|
||||
@ -82,6 +82,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./cmake-dirs.patch
|
||||
|
||||
# fix cmake config
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aws/aws-sdk-cpp/commit/b102aaf5693c4165c84b616ab9ffb9edfb705239.diff";
|
||||
sha256 = "sha256-38QBo3MEFpyHPb8jZEURRPkoeu4DqWhVeErJayiHKF0=";
|
||||
})
|
||||
];
|
||||
|
||||
# Builds in 2+h with 2 cores, and ~10m with a big-parallel builder.
|
||||
@ -89,7 +95,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A C++ interface for Amazon Web Services";
|
||||
homepage = "https://github.com/awslabs/aws-sdk-cpp";
|
||||
homepage = "https://github.com/aws/aws-sdk-cpp";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ eelco orivej ];
|
||||
|
@ -1,6 +1,9 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
, autoreconfHook
|
||||
, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros#L195
|
||||
, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros (LARGE_CONFIG)
|
||||
, nix
|
||||
, nix_2_3
|
||||
, nixUnstable
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -36,6 +39,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
# Assuming this package is picked up by these packages as expected.
|
||||
inherit
|
||||
nix
|
||||
nixUnstable
|
||||
nix_2_3
|
||||
;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++";
|
||||
|
||||
|
@ -8,11 +8,11 @@
|
||||
let self =
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "c-ares";
|
||||
version = "1.17.2";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://c-ares.haxx.se/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-SAPIRM4gzlEO8OuD+OpB+iTsqunSgMRoxYLSuyWzkT0=";
|
||||
sha256 = "sha256-Gn1SqKhKn7/7G+kTPA9uFyF9kepab6Yfa0cpzaeOu88=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "c-blosc";
|
||||
version = "1.21.0";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Blosc";
|
||||
repo = "c-blosc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-B8SFOc1oGgU5AGAbkqe5oz045H08TnymNAbzz2oOKoo=";
|
||||
sha256 = "sha256-6SKEyciwDOxcbO8chvmxrLCxLkc93zxo6eH0c/lRyT8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chromaprint";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/acoustid/chromaprint/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0sknmyl5254rc55bvkhfwpl4dfvz45xglk1rq8zq5crmwq058fjp";
|
||||
sha256 = "sha256-oarY+juLGLeNN1Wzdn+v+au2ckLgG0eOyaZOGQ8zXhw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
# always built for checks but install static lib only when necessary
|
||||
preInstall = lib.optionalString (!enableStatic) "rm libcryptopp.a";
|
||||
preInstall = lib.optionalString (!enableStatic) "rm -f libcryptopp.a";
|
||||
|
||||
installTargets = [ "install-lib" ];
|
||||
installFlags = [ "LDCONF=true" ];
|
||||
|
@ -11,10 +11,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
name = "db-${version}";
|
||||
pname = "db";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.oracle.com/berkeley-db/${name}.tar.gz";
|
||||
url = "https://download.oracle.com/berkeley-db/${pname}-${version}.tar.gz";
|
||||
sha256 = sha256;
|
||||
};
|
||||
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "enchant";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-e0sa/PLNi/ppHe6mGIQE0zfyMXS7w5ucKt0r80Bzbpw=";
|
||||
sha256 = "sha256-zpukf9TTQDG9aURVmKaYpmEWArKw6R1wXpGm9QmerW4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "expat";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-zwMtDbqbkoY2VI4ysyei1msaq2PE9KE90TLC0dLy+2o=";
|
||||
sha256 = "sha256-vC/1j0nCmqx7/3BabBZ6gh8mxRIHn/CKxDL9D9ybsZk=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ]; # TODO: fix referrers
|
||||
|
@ -19,7 +19,7 @@ assert stdenv.cc.isClang -> llvmPackages != null;
|
||||
assert elem precision [ "single" "double" "long-double" "quad-precision" ];
|
||||
|
||||
let
|
||||
version = "3.3.9";
|
||||
version = "3.3.10";
|
||||
withDoc = stdenv.cc.isGNU;
|
||||
in
|
||||
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation {
|
||||
"http://fftw.org/fftw-${version}.tar.gz"
|
||||
"ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-vyx85AsEroEa9xTetRJRDMLBe5q51t3PSf5Eh+6nrz0=";
|
||||
sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ]
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
@ -21,6 +22,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix font style detection
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/92fbf14b0d7c4737ffe1e8326b7ab8ffae5548c3.patch";
|
||||
sha256 = "1wmyax2151hg3m11q61mv25k45zk2w3xapb4p1r6wzk91zjlsgyr";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetype";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-i+45vTloxIBLcGFKCjrVlyma0OgkvIqtXOiq9IBnvec=";
|
||||
sha256 = "sha256-MzOufP2ohCnJenrmO30BqzmAdsO2cYLpYOVoQFDyxcg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fribidi";
|
||||
version = "1.0.10";
|
||||
version = "1.0.11";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
# NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "009wcpgk4jj5x52skjkfs6xar6x38mcngs75rb59nj9ig1y6h73z";
|
||||
sha256 = "sha256-MPk+nGPuYn0aLO3PWaw01FvzAkCYL5nkTG4BVGa05z0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glib-networking";
|
||||
version = "2.70.0";
|
||||
version = "2.70.1";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0dbg1na239mbavn4hknkax5sns9q2dbdnqw9wcpmhv58mzkhid36";
|
||||
sha256 = "Kha/wtJxzNMmbj+0YryKQQPALoG7szmqktb7BgWS17w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -45,11 +45,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glib";
|
||||
version = "2.70.1";
|
||||
version = "2.70.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "+be85/UXU6H0OFO7ysqL8J4V6ZQmjinP16dvZWNiY8A=";
|
||||
sha256 = "BVFFnIXNPaPVjdyQFv0ovlr1A/XhYVpxultRKslFgG8=";
|
||||
};
|
||||
|
||||
patches = optionals stdenv.isDarwin [
|
||||
|
20
pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch
Normal file
20
pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch
Normal file
@ -0,0 +1,20 @@
|
||||
Based on https://gmplib.org/repo/gmp-6.2/raw-rev/561a9c25298e,
|
||||
adapted for 5.x by ris
|
||||
|
||||
diff -r e1fd9db13b47 -r 561a9c25298e mpz/inp_raw.c
|
||||
--- a/mpz/inp_raw.c Tue Dec 22 23:49:51 2020 +0100
|
||||
+++ b/mpz/inp_raw.c Thu Oct 21 19:06:49 2021 +0200
|
||||
@@ -81,8 +81,11 @@
|
||||
|
||||
abs_csize = ABS (csize);
|
||||
|
||||
+ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8))
|
||||
+ return 0; /* Bit size overflows */
|
||||
+
|
||||
/* round up to a multiple of limbs */
|
||||
- abs_xsize = (abs_csize*8 + GMP_NUMB_BITS-1) / GMP_NUMB_BITS;
|
||||
+ abs_xsize = ((mp_bitcnt_t)abs_csize*8 + GMP_NUMB_BITS-1) / GMP_NUMB_BITS;
|
||||
|
||||
if (abs_xsize != 0)
|
||||
{
|
||||
|
@ -22,7 +22,11 @@ let self = stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ m4 ];
|
||||
|
||||
patches = if stdenv.isDarwin then [ ./need-size-t.patch ] else null;
|
||||
patches = [
|
||||
./5.1.3-CVE-2021-43618.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
./need-size-t.patch
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-pic"
|
||||
|
19
pkgs/development/libraries/gmp/6.2.1-CVE-2021-43618.patch
Normal file
19
pkgs/development/libraries/gmp/6.2.1-CVE-2021-43618.patch
Normal file
@ -0,0 +1,19 @@
|
||||
https://gmplib.org/repo/gmp-6.2/raw-rev/561a9c25298e
|
||||
|
||||
diff -r e1fd9db13b47 -r 561a9c25298e mpz/inp_raw.c
|
||||
--- a/mpz/inp_raw.c Tue Dec 22 23:49:51 2020 +0100
|
||||
+++ b/mpz/inp_raw.c Thu Oct 21 19:06:49 2021 +0200
|
||||
@@ -88,8 +88,11 @@
|
||||
|
||||
abs_csize = ABS (csize);
|
||||
|
||||
+ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8))
|
||||
+ return 0; /* Bit size overflows */
|
||||
+
|
||||
/* round up to a multiple of limbs */
|
||||
- abs_xsize = BITS_TO_LIMBS (abs_csize*8);
|
||||
+ abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8);
|
||||
|
||||
if (abs_xsize != 0)
|
||||
{
|
||||
|
@ -20,6 +20,8 @@ let self = stdenv.mkDerivation rec {
|
||||
sha256 = "0z2ddfiwgi0xbf65z4fg4hqqzlhv0cc6hdcswf3c6n21xdmk5sga";
|
||||
};
|
||||
|
||||
patches = [ ./6.2.1-CVE-2021-43618.patch ];
|
||||
|
||||
#outputs TODO: split $cxx due to libstdc++ dependency
|
||||
# maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added
|
||||
# - see #5855 for related discussion
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gsl";
|
||||
version = "2.7";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gsl/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-77vzeF2g5TA4vnkHUAYotGYVLbw8FzqH3hteui4jYCs=";
|
||||
sha256 = "sha256-3LD71DBIgyt1f/mUJpGo3XACbV2g/4VgHlJof23us0s=";
|
||||
};
|
||||
|
||||
preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''
|
||||
|
@ -20,14 +20,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gupnp";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
outputs = [ "out" "dev" ]
|
||||
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-WQ/7ArhNoqGuxo/VNLxArxs33T9iI/nRV3/EirSL428=";
|
||||
sha256 = "sha256-iZGWteZvA7jiXwRqemWM0qaFG+y4Py1VNFqzKBZV3Aw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -24,7 +24,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.0.0";
|
||||
version = "3.1.2";
|
||||
inherit (lib) optional optionals optionalString;
|
||||
mesonFeatureFlag = opt: b:
|
||||
"-D${opt}=${if b then "enabled" else "disabled"}";
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
||||
owner = "harfbuzz";
|
||||
repo = "harfbuzz";
|
||||
rev = version;
|
||||
sha256 = "sha256-yRRr4RcnbwoZ1Hn3+zbbocKFyBSLYx/exaAHNGsPINA=";
|
||||
sha256 = "sha256-1xndbJhx+1AzJNnpvvdEcBHPZMPaMI03h6sG2h1d3qs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,32 +1,39 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1
|
||||
, darwin }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, libusb1
|
||||
, udev
|
||||
, Cocoa
|
||||
, IOKit
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hidapi";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libusb";
|
||||
repo = "hidapi";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb";
|
||||
sha256 = "0dzigvmwbg20b33xn0sklnf489m8g84yrcm8kqlrsd7x8iymsg63";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ ]
|
||||
++ lib.optionals stdenv.isLinux [ libusb1 udev ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libusb1 udev ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]);
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa IOKit ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for communicating with USB and Bluetooth HID devices";
|
||||
homepage = "https://github.com/libusb/hidapi";
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
# Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal)
|
||||
license = licenses.bsd3;
|
||||
# You can choose between GPLv3, BSD or HIDAPI license (even more liberal)
|
||||
license = with licenses; [ bsd3 /* or */ gpl3Only ] ;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -1,7 +1,15 @@
|
||||
{
|
||||
mkDerivation, lib, fetchurl,
|
||||
extra-cmake-modules,
|
||||
qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysqlclient
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
, qttranslations
|
||||
, kcoreaddons
|
||||
, python2
|
||||
, sqlite
|
||||
, postgresql
|
||||
, libmysqlclient
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
@ -13,6 +21,19 @@ mkDerivation rec {
|
||||
sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with newer QT versions
|
||||
(fetchpatch {
|
||||
url = "https://github.com/KDE/kdb/commit/b36d74f13a1421437a725fb74502c993c359392a.patch";
|
||||
sha256 = "sha256-ENMZTUZ3yCKUhHPMUcDe1cMY2GLBz0G3ZvMRyj8Hfrw=";
|
||||
})
|
||||
# fix build with newer posgresql versions
|
||||
(fetchpatch {
|
||||
url = "https://github.com/KDE/kdb/commit/40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911.patch";
|
||||
sha256 = "sha256-cZpX6L/NZX3vztnh0s2+v4J7kBcKgUdecY53LRp8CwM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysqlclient ];
|
||||
|
@ -1,8 +1,8 @@
|
||||
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
|
||||
diff --git a/kde-modules/KDEInstallDirsCommon.cmake b/kde-modules/KDEInstallDirsCommon.cmake
|
||||
index c1d056b..d9e19f0 100644
|
||||
--- a/kde-modules/KDEInstallDirs.cmake
|
||||
+++ b/kde-modules/KDEInstallDirs.cmake
|
||||
@@ -242,35 +242,6 @@
|
||||
--- a/kde-modules/KDEInstallDirsCommon.cmake
|
||||
+++ b/kde-modules/KDEInstallDirsCommon.cmake
|
||||
@@ -15,35 +15,6 @@
|
||||
# GNUInstallDirs code deals with re-configuring, but that is dealt with
|
||||
# by the _define_* macros in this module).
|
||||
set(_LIBDIR_DEFAULT "lib")
|
||||
|
@ -1 +1 @@
|
||||
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.87/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.89/ -A '*.tar.xz' )
|
||||
|
@ -1,45 +0,0 @@
|
||||
From 715c5f461b4992dac066601202a673bc551a5e33 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||
Date: Sun, 16 Feb 2020 14:23:31 -0600
|
||||
Subject: [PATCH 1/4] kinit-libpath
|
||||
|
||||
---
|
||||
src/kdeinit/kinit.cpp | 22 +++++++++-------------
|
||||
1 file changed, 9 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
|
||||
index 8fff17a..0801b75 100644
|
||||
--- a/src/kdeinit/kinit.cpp
|
||||
+++ b/src/kdeinit/kinit.cpp
|
||||
@@ -622,19 +622,15 @@ static pid_t launch(int argc, const char *_name, const char *args,
|
||||
|
||||
if (!libpath.isEmpty()) {
|
||||
if (libpath_relative) {
|
||||
- // NB: Because Qt makes the actual dlopen() call, the
|
||||
- // RUNPATH of kdeinit is *not* respected - see
|
||||
- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
|
||||
- // - so we try hacking it in ourselves
|
||||
- QString install_lib_dir = QFile::decodeName(
|
||||
- CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/");
|
||||
- QString orig_libpath = libpath;
|
||||
- libpath = install_lib_dir + libpath;
|
||||
- l.setFileName(libpath);
|
||||
- if (!l.load()) {
|
||||
- libpath = orig_libpath;
|
||||
- l.setFileName(libpath);
|
||||
- l.load();
|
||||
+ // Try to load the library relative to the active profiles.
|
||||
+ QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
|
||||
+ // Reverse the profile list.
|
||||
+ std::reverse(profiles.begin(), profiles.end());
|
||||
+ for (const QByteArray &profile: profiles) {
|
||||
+ if (!profile.isEmpty()) {
|
||||
+ l.setFileName(QFile::decodeName(profile) + QStringLiteral("/lib/") + libpath);
|
||||
+ if (l.load()) break;
|
||||
+ }
|
||||
}
|
||||
} else {
|
||||
l.load();
|
||||
--
|
||||
2.23.1
|
||||
|
@ -11,7 +11,7 @@ diff --git a/src/start_kdeinit/start_kdeinit_wrapper.c b/src/start_kdeinit/start
|
||||
index 891f50c..ef664ad 100644
|
||||
--- a/src/start_kdeinit/start_kdeinit_wrapper.c
|
||||
+++ b/src/start_kdeinit/start_kdeinit_wrapper.c
|
||||
@@ -23,7 +23,7 @@
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
@ -14,7 +14,6 @@ mkDerivation {
|
||||
kconfig kcrash ki18n kio kservice kwindowsystem
|
||||
];
|
||||
patches = [
|
||||
./0001-kinit-libpath.patch
|
||||
./0002-start_kdeinit-path.patch
|
||||
./0003-kdeinit-extra-libs.patch
|
||||
./0004-start_kdeinit-environ-hard-limit.patch
|
||||
|
@ -11,10 +11,10 @@ diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
|
||||
index 36f5600..881f176 100644
|
||||
--- a/src/kpackage/package.cpp
|
||||
+++ b/src/kpackage/package.cpp
|
||||
@@ -858,7 +858,7 @@ PackagePrivate::PackagePrivate()
|
||||
@@ -866,7 +866,7 @@ PackagePrivate::PackagePrivate()
|
||||
PackagePrivate::PackagePrivate()
|
||||
: QSharedData()
|
||||
, fallbackPackage(nullptr)
|
||||
, metadata(nullptr)
|
||||
- , externalPaths(false)
|
||||
+ , externalPaths(true)
|
||||
, valid(false)
|
||||
|
@ -1,18 +1,10 @@
|
||||
{ mkDerivation
|
||||
, fetchpatch
|
||||
, extra-cmake-modules
|
||||
, aspell, qtbase, qttools
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "sonnet";
|
||||
patches = [
|
||||
# Pull upstream path to fix determinism.
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/frameworks/sonnet/-/commit/a01fc66b8affb01221d1fdf84146a78c172d4c6b.patch";
|
||||
sha256 = "1jzd65rmgvfpcxrsnsmdz8ac1ldqs9rjfryy8fryy0ibzbhc1050";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ aspell qttools ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
|
@ -4,667 +4,667 @@
|
||||
|
||||
{
|
||||
attica = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/attica-5.87.0.tar.xz";
|
||||
sha256 = "0wjfrlmwg03js544xjlpznxxqv14cj40fpzbfnlj24kjgd1ai8dq";
|
||||
name = "attica-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/attica-5.89.0.tar.xz";
|
||||
sha256 = "03q2ajvwrl1x6h0jcvc6nh0avj7dqhx4k1lx5qa3xgfxwk01kgp9";
|
||||
name = "attica-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
baloo = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/baloo-5.87.0.tar.xz";
|
||||
sha256 = "0h55hn6klsq19l44qzc95l1r7hx2zr9hr4ysxd8kvcxc02imaswb";
|
||||
name = "baloo-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/baloo-5.89.0.tar.xz";
|
||||
sha256 = "091gjzn4armm4xs61csavwgij54mv8v9hx3gvva18g06gjkajyis";
|
||||
name = "baloo-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
bluez-qt = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/bluez-qt-5.87.0.tar.xz";
|
||||
sha256 = "1shk3riddgdb0i6f0603hbhww13z1b566rdaplxsbgk8cyhl5acz";
|
||||
name = "bluez-qt-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/bluez-qt-5.89.0.tar.xz";
|
||||
sha256 = "00wczjvvhxzi12ijf65d66x36gm0x6j5z3b6cwqgdz2s66wr0jw5";
|
||||
name = "bluez-qt-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-icons = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/breeze-icons-5.87.0.tar.xz";
|
||||
sha256 = "19f7n4r6b0b1l8hc79xbj8gc18xf488bk4i0wdbw22x9vwl4h58h";
|
||||
name = "breeze-icons-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/breeze-icons-5.89.0.tar.xz";
|
||||
sha256 = "12l2wzc3pah5qapznriaffh4wz97s6nqxlj9i119k9qw295d6wfw";
|
||||
name = "breeze-icons-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
extra-cmake-modules = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/extra-cmake-modules-5.87.0.tar.xz";
|
||||
sha256 = "1axwz0p3ggjpcxpqqlyng3fa2pxmjxgybncgkp8i81i7iq6sf72l";
|
||||
name = "extra-cmake-modules-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/extra-cmake-modules-5.89.0.tar.xz";
|
||||
sha256 = "0bzhd6xcphrcnbg8ylx91rq5y3vvl3jfcgik19bvh8sr4ad25mrx";
|
||||
name = "extra-cmake-modules-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
frameworkintegration = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/frameworkintegration-5.87.0.tar.xz";
|
||||
sha256 = "1bbgxqgy28abrk2cgzj7k2m18xmkl9kw58dal03pzlmh77br00lb";
|
||||
name = "frameworkintegration-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/frameworkintegration-5.89.0.tar.xz";
|
||||
sha256 = "0f7cqxmgnwi4n8fa8vifqaysbk7839x1qbmp9qfa998jxnn1w92f";
|
||||
name = "frameworkintegration-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivities = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kactivities-5.87.0.tar.xz";
|
||||
sha256 = "1ynngg9x70dwcnn4ncf7h63hj5p187d4mk1aqriax0iz21mfjmp9";
|
||||
name = "kactivities-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kactivities-5.89.0.tar.xz";
|
||||
sha256 = "1dhxl487246kpx4w5zhhdgk94jwns09dvragvh2bb787mszqq5v9";
|
||||
name = "kactivities-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivities-stats = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kactivities-stats-5.87.0.tar.xz";
|
||||
sha256 = "1n7jzbfwgwclnrnssxm180fis74qp3v9nximhc0l8fmb8ac1f106";
|
||||
name = "kactivities-stats-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kactivities-stats-5.89.0.tar.xz";
|
||||
sha256 = "1pp3vkkadaday0pzd09hdhccw6hbrqp481hcdzzyqj1x2ckb59bj";
|
||||
name = "kactivities-stats-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kapidox = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kapidox-5.87.0.tar.xz";
|
||||
sha256 = "0iyla9i4ln6w9wkm4dand53ir6gzsm4180diwi9p2q5mfrk0rvja";
|
||||
name = "kapidox-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kapidox-5.89.0.tar.xz";
|
||||
sha256 = "0a3vwh3rzpcaylz77fs4biiadljchs2lfh6svg149yg95yqwng3b";
|
||||
name = "kapidox-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
karchive = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/karchive-5.87.0.tar.xz";
|
||||
sha256 = "0d8wqrynwmqazlf5v7qas9akrvcwr4lrqg3dcbnq61mmc252wgqh";
|
||||
name = "karchive-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/karchive-5.89.0.tar.xz";
|
||||
sha256 = "1s45mns9km1fy2d07d2nmslf4dc2pl5i169ncq2dc7vabjvyh59b";
|
||||
name = "karchive-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kauth = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kauth-5.87.0.tar.xz";
|
||||
sha256 = "1gbq487v2nn0zyis6xdvsn0mz7yy131vafq76jdi7b6nyh5c1lgi";
|
||||
name = "kauth-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kauth-5.89.0.tar.xz";
|
||||
sha256 = "1ys9xr7js8rj07ff7ncp9d52rcn10bg49jcyg4ldam07bfpq36nz";
|
||||
name = "kauth-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kbookmarks = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kbookmarks-5.87.0.tar.xz";
|
||||
sha256 = "0klws0psdq9vx09p38ckki7aqbdkcns1smk8ckj79krpsjv8q9nx";
|
||||
name = "kbookmarks-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kbookmarks-5.89.0.tar.xz";
|
||||
sha256 = "16bh5daimpjwy0gz56v32vslnmzmyfsf8z92s5gi13bkjfp03syn";
|
||||
name = "kbookmarks-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcalendarcore = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kcalendarcore-5.87.0.tar.xz";
|
||||
sha256 = "0ig2w0dxrf9ih9hqk5rvqqmyhg658m1hs4807zl66llplkr58q0n";
|
||||
name = "kcalendarcore-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kcalendarcore-5.89.0.tar.xz";
|
||||
sha256 = "1xy045d5jl3qk9ka13ximk7x70q5pswh143kqk7cf6x0f7bvgpap";
|
||||
name = "kcalendarcore-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcmutils = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kcmutils-5.87.0.tar.xz";
|
||||
sha256 = "09pcif2gmkbhwqb8cxfs89nw81wdpdsd4a2n7xdm1xz6lpwwmk1h";
|
||||
name = "kcmutils-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kcmutils-5.89.0.tar.xz";
|
||||
sha256 = "0za9x8v9lnwyib1gip6wbmda19wfjaf2yh6yiqlszxcbsfq7kzhm";
|
||||
name = "kcmutils-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcodecs = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kcodecs-5.87.0.tar.xz";
|
||||
sha256 = "1fb8agbkwxnxb0hlzz0ya460z3ihn9qz2zvjdxvk21rjhmp1alh7";
|
||||
name = "kcodecs-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kcodecs-5.89.0.tar.xz";
|
||||
sha256 = "1j2pmsyi8lvhnzhrrvsm98x7inf503vr2b58yl070zp293fyhd9q";
|
||||
name = "kcodecs-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcompletion = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kcompletion-5.87.0.tar.xz";
|
||||
sha256 = "15c9sgdgw6cf5y2jjgjlsxn0p0pxvrmhzcyq05d9fqhy185ng03p";
|
||||
name = "kcompletion-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kcompletion-5.89.0.tar.xz";
|
||||
sha256 = "0bv9kxrdprk1jvsf9mqkag0pkq7h1wngdpvdx9wfy4kkbj7y46zf";
|
||||
name = "kcompletion-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfig = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kconfig-5.87.0.tar.xz";
|
||||
sha256 = "1l8px5qpf5qfma24filim1swblgbdvnf25pc38qc6s79inkganrl";
|
||||
name = "kconfig-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kconfig-5.89.0.tar.xz";
|
||||
sha256 = "0ixil0qyd8byn4ix5w9mp5kdvkscnwhamknrnbqzikhmmknprccf";
|
||||
name = "kconfig-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfigwidgets = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kconfigwidgets-5.87.0.tar.xz";
|
||||
sha256 = "18m3nqlp87am2w8my4y933ck9k3cs5q62nkhbp8ngaavw8cfbd84";
|
||||
name = "kconfigwidgets-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kconfigwidgets-5.89.0.tar.xz";
|
||||
sha256 = "0rzqx2knc8bc26jyislb1dw5qdhmkga3cqlyiyynbawx3scind60";
|
||||
name = "kconfigwidgets-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcontacts = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kcontacts-5.87.0.tar.xz";
|
||||
sha256 = "02zyirvds572rxbdc47ncs71a66z5hql0vpj8lx1zpr0nnvpvlcv";
|
||||
name = "kcontacts-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kcontacts-5.89.0.tar.xz";
|
||||
sha256 = "1yjgrzn3bx8fzmr6mjd2c99gxlh0nqm1fi3sgmcn1bj07jdrp52r";
|
||||
name = "kcontacts-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcoreaddons = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kcoreaddons-5.87.0.tar.xz";
|
||||
sha256 = "19pdpz7jjknccaqc2i6zfmclmrk60clzanvx72ryvh7yb0xyk7yj";
|
||||
name = "kcoreaddons-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kcoreaddons-5.89.0.tar.xz";
|
||||
sha256 = "0ss27wz8z2lfhn0njads2rwd62aciamr0vcbj4gyfiv2ddw8bl71";
|
||||
name = "kcoreaddons-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcrash = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kcrash-5.87.0.tar.xz";
|
||||
sha256 = "1l48dn5vqn4lns57v61p1a8r3pklx4xclsa3890pjf6iviqxf22r";
|
||||
name = "kcrash-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kcrash-5.89.0.tar.xz";
|
||||
sha256 = "07pc449qqvz6rfs1wk6r2jgfncpliig8c1cxzhbkzqrkcf1gj6ba";
|
||||
name = "kcrash-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdav = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kdav-5.87.0.tar.xz";
|
||||
sha256 = "0sb1g0wdpql5gw52nxhzkk1wa9md2k25lwyf902g3pf7ahdgdk5z";
|
||||
name = "kdav-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kdav-5.89.0.tar.xz";
|
||||
sha256 = "1wyg6bxfp1r1snk40y6q70ix00aqwx4sl4z7jrg12h38cnc8sa6v";
|
||||
name = "kdav-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdbusaddons = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kdbusaddons-5.87.0.tar.xz";
|
||||
sha256 = "14xmrvak95aqc98a6k6ldg1w4g7syx2xng3vgvwj9wzpzr3shp6p";
|
||||
name = "kdbusaddons-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kdbusaddons-5.89.0.tar.xz";
|
||||
sha256 = "1yh5xx01wsjcj6axcw1r94p32rrs111078prssgnngbrihbhbjzh";
|
||||
name = "kdbusaddons-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeclarative = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kdeclarative-5.87.0.tar.xz";
|
||||
sha256 = "0zx4alsqk3vqfgyi6x7v2mcar92j3swmg0ms0b9mjl95bvpgi4k7";
|
||||
name = "kdeclarative-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kdeclarative-5.89.0.tar.xz";
|
||||
sha256 = "18a4rcx60h5j44d79bhr2l46f3lhgnf2x0sb64dr7dcc0m5rmsay";
|
||||
name = "kdeclarative-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kded = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kded-5.87.0.tar.xz";
|
||||
sha256 = "18dw1dd2lmwsh04yan1q72c5lzcgzm9kig1rqag3rg81h7pclsr5";
|
||||
name = "kded-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kded-5.89.0.tar.xz";
|
||||
sha256 = "1rr3g7b60zlx8j7d7k2hlhhv2wa67lakfpyd1zgpy2y3k281hbfl";
|
||||
name = "kded-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdelibs4support = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/portingAids/kdelibs4support-5.87.0.tar.xz";
|
||||
sha256 = "17kw76fd97rhdyna3dc7hsajvd8bv9l71qx0xaqn65pvzbndf2jf";
|
||||
name = "kdelibs4support-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/portingAids/kdelibs4support-5.89.0.tar.xz";
|
||||
sha256 = "1672f75f0wmdrqhx9vynzgflm3ssmngkpp1r5li53ppb11wg6sbr";
|
||||
name = "kdelibs4support-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesignerplugin = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/portingAids/kdesignerplugin-5.87.0.tar.xz";
|
||||
sha256 = "12rckqvg6w5cycvmxbrkvxi7ysfk6bqk3yi1ik4ryqh4x5dz2am9";
|
||||
name = "kdesignerplugin-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/portingAids/kdesignerplugin-5.89.0.tar.xz";
|
||||
sha256 = "0g8y51i70m8s7y829qyqnki57s8d4l3xdpdbn1p2rr1szglj8hvf";
|
||||
name = "kdesignerplugin-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesu = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kdesu-5.87.0.tar.xz";
|
||||
sha256 = "05bb3hcb00j1f047q6ngbb8arrp4s03da880sky0slvvicm4ynkr";
|
||||
name = "kdesu-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kdesu-5.89.0.tar.xz";
|
||||
sha256 = "0jmww11l6709cpfriwklhij5izsh948mki9grzzq3jijw8zs0mrx";
|
||||
name = "kdesu-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdewebkit = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/portingAids/kdewebkit-5.87.0.tar.xz";
|
||||
sha256 = "1a578sa6nfp2vycrrhc37idwg47nrrfhv6dp8rfb2gj4vf67bzcv";
|
||||
name = "kdewebkit-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/portingAids/kdewebkit-5.89.0.tar.xz";
|
||||
sha256 = "0xwd346z928yk4iwykgashc36m2xqnwn49jix5jbk1w57dbia2da";
|
||||
name = "kdewebkit-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdnssd = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kdnssd-5.87.0.tar.xz";
|
||||
sha256 = "1rs8i75qm1vazy8cnvcv3sha6faf27bav491z8brcs8fiab96dnw";
|
||||
name = "kdnssd-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kdnssd-5.89.0.tar.xz";
|
||||
sha256 = "0v72g137l8kl2xapfrcrw8w6zmn94h08hvwdggzr9fvgswzdbvsh";
|
||||
name = "kdnssd-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdoctools = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kdoctools-5.87.0.tar.xz";
|
||||
sha256 = "0md5wiv5mv4q63g9ads8d0xg8qxlh91dqgyg66n8abcg56qq83ps";
|
||||
name = "kdoctools-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kdoctools-5.89.0.tar.xz";
|
||||
sha256 = "1x8q45y2sgi3d9j79qcx02z2939j52mp1jrs3rjqq42xxvvrlcg1";
|
||||
name = "kdoctools-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kemoticons = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kemoticons-5.87.0.tar.xz";
|
||||
sha256 = "0iah6ws0x9xnm900rii2k82gf155cbwlnxbz2rxbybp1dmbjbz5y";
|
||||
name = "kemoticons-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kemoticons-5.89.0.tar.xz";
|
||||
sha256 = "0mcyq20ca6x73jhwwhhwq8jzqpadnazjy5y9dyfa2wz8ijbnjqzw";
|
||||
name = "kemoticons-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kfilemetadata = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kfilemetadata-5.87.0.tar.xz";
|
||||
sha256 = "1nh4gzprc588q8zfz94j76x3vvf77cnsc30xrs07316726mksw2i";
|
||||
name = "kfilemetadata-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kfilemetadata-5.89.0.tar.xz";
|
||||
sha256 = "04abysdijmpdd05grihawpbw8f9h3fhlv3y7wjz76kl66gyqg035";
|
||||
name = "kfilemetadata-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kglobalaccel = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kglobalaccel-5.87.0.tar.xz";
|
||||
sha256 = "1wk6mxq6ylkvalcwbrkmc0whvkbllkfwnsf4hxz86cnixqb7ybjh";
|
||||
name = "kglobalaccel-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kglobalaccel-5.89.0.tar.xz";
|
||||
sha256 = "0jxxlhmwsgrx1p6w1al9c11bglxn5im181wqih7ds5h2naa7b8kj";
|
||||
name = "kglobalaccel-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kguiaddons = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kguiaddons-5.87.0.tar.xz";
|
||||
sha256 = "1k88x22f8db90x28fryg6cp239sfs0zrjk18l72v09bg3zc7y1lh";
|
||||
name = "kguiaddons-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kguiaddons-5.89.0.tar.xz";
|
||||
sha256 = "17mxkk4w4q6bkqblkdinw2b0jdfxhk7xkfy5hw730gjm6is6p861";
|
||||
name = "kguiaddons-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kholidays = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kholidays-5.87.0.tar.xz";
|
||||
sha256 = "1ca51vkmwwrl1fvs2fw16nvpmag2licywwmwjiaapkk8hv6v1gzm";
|
||||
name = "kholidays-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kholidays-5.89.0.tar.xz";
|
||||
sha256 = "0ry0n73dkjxv7ani753mh8ymy4yblhj841ca5y5kci8wr9h6358w";
|
||||
name = "kholidays-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
khtml = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/portingAids/khtml-5.87.0.tar.xz";
|
||||
sha256 = "1jxpznzw4r8ikx0g5n1fg0qrkllph5cwih4lcvwjn6cqx2ypgn6f";
|
||||
name = "khtml-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/portingAids/khtml-5.89.0.tar.xz";
|
||||
sha256 = "072pawwp62mx5shh8x4mcpr8h6a24qr82zyyiricz4jba0r7z3yr";
|
||||
name = "khtml-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ki18n = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/ki18n-5.87.0.tar.xz";
|
||||
sha256 = "0395khchbhp7x4fgb2fwxlpx0mhdvbkgd0v7kwgmm0n4bkn7jphi";
|
||||
name = "ki18n-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/ki18n-5.89.0.tar.xz";
|
||||
sha256 = "1zlq0ywd8hnaniwdv3vd76xmv91cdn6pqs6k9y6dz3fayl15p0g6";
|
||||
name = "ki18n-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kiconthemes = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kiconthemes-5.87.0.tar.xz";
|
||||
sha256 = "04chb3y3d6hxwy9f1xdifvl2mbcd8xbh7fv6x5m5vnb1cviwc6j7";
|
||||
name = "kiconthemes-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kiconthemes-5.89.0.tar.xz";
|
||||
sha256 = "1hv8blvvg12agjynl0yvvsl8dfsyk2aa9clmq60igcs5lm4jpvaa";
|
||||
name = "kiconthemes-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kidletime = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kidletime-5.87.0.tar.xz";
|
||||
sha256 = "1m0p602i9c4dmkll3g8flmzq23ywv20rxnvzc1c8bf5kqn6321qp";
|
||||
name = "kidletime-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kidletime-5.89.0.tar.xz";
|
||||
sha256 = "0547yj8yn9nly3bkq3in38ljhwbg0bvj0wp3yxp2dl05wpyvzqfz";
|
||||
name = "kidletime-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kimageformats = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kimageformats-5.87.0.tar.xz";
|
||||
sha256 = "0c4qq5j6hzz90kh7mmirafglr9l5wck3r67ij436gpmq69ignvmg";
|
||||
name = "kimageformats-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kimageformats-5.89.0.tar.xz";
|
||||
sha256 = "1m3fl14lzsfl0fam38nnalapc1xhpryf1ibvcm7bgh4g1cm1bvnw";
|
||||
name = "kimageformats-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kinit = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kinit-5.87.0.tar.xz";
|
||||
sha256 = "0435syvhisagbq82qcbims5adq88ivv793gvb3kx03hxhyyx81xs";
|
||||
name = "kinit-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kinit-5.89.0.tar.xz";
|
||||
sha256 = "1llaqz7yv011k4g1fvy1rzlff8bdgvqwqvh3s3nrqahwq2gx2rr9";
|
||||
name = "kinit-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kio = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kio-5.87.0.tar.xz";
|
||||
sha256 = "0sxwrqvfkqm679v99lx50vd2p4bx10pdzrjhxg0njfwww2fxa7mr";
|
||||
name = "kio-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kio-5.89.0.tar.xz";
|
||||
sha256 = "1ka8s6cj7ms74w4xj6x91hx1ijlh883x3ibjwmbhva6mbzk1z0nx";
|
||||
name = "kio-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kirigami2 = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kirigami2-5.87.0.tar.xz";
|
||||
sha256 = "1wvj0nnb1dd1k12arlmlx99gjhk7v2jpw5sgyjka6kkps31nr1zi";
|
||||
name = "kirigami2-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kirigami2-5.89.0.tar.xz";
|
||||
sha256 = "1jn5c0lhh7hcp81278kagw0r96nri80x9vrg51jg7cs42h7pfp98";
|
||||
name = "kirigami2-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemmodels = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kitemmodels-5.87.0.tar.xz";
|
||||
sha256 = "1qx78pfbnwsq8nn6fa8qjjc0zn4nwh4dqs0ifb9iaam33cl3kw92";
|
||||
name = "kitemmodels-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kitemmodels-5.89.0.tar.xz";
|
||||
sha256 = "10bag80kjz4x22097z9w1liw73kkirk72266vr0qplyr00jwqi33";
|
||||
name = "kitemmodels-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemviews = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kitemviews-5.87.0.tar.xz";
|
||||
sha256 = "1nrg92nyc39fl1n7k38pa4k8dahwl76wadv0v0ixyh1zx0x4clbg";
|
||||
name = "kitemviews-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kitemviews-5.89.0.tar.xz";
|
||||
sha256 = "180n41gkv6vgmljcqh2sg5922glq59z56zq7y299vwnkgix9aqns";
|
||||
name = "kitemviews-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjobwidgets = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kjobwidgets-5.87.0.tar.xz";
|
||||
sha256 = "0s0g4dygc6c9p5w7vdk7bninizsdhj5xan351x15b4k0ddgq8sz5";
|
||||
name = "kjobwidgets-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kjobwidgets-5.89.0.tar.xz";
|
||||
sha256 = "02ysdzn25a9lms70fawnz3h5vdxy9p528qmbxslsnpz29r5h2wb8";
|
||||
name = "kjobwidgets-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjs = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/portingAids/kjs-5.87.0.tar.xz";
|
||||
sha256 = "1ihwhjgk3k2nmyfg2brdjriymm2qi5dgmh47phmb9b2gvzqx6yg8";
|
||||
name = "kjs-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/portingAids/kjs-5.89.0.tar.xz";
|
||||
sha256 = "0yxk4qwl4cxv3kklvla5q3xx2vgj4lwp4pb3bplkkbighm01naih";
|
||||
name = "kjs-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjsembed = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/portingAids/kjsembed-5.87.0.tar.xz";
|
||||
sha256 = "0j8b637k8vx2qhl3zf6744ywykv6hnfcs2xgsq0i8w5ji0a2jigv";
|
||||
name = "kjsembed-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/portingAids/kjsembed-5.89.0.tar.xz";
|
||||
sha256 = "08ajxgh1lfbx8nf4vsljzcwkfjih8fyqp9nr2xbv2a9dbv51x1sf";
|
||||
name = "kjsembed-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kmediaplayer = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/portingAids/kmediaplayer-5.87.0.tar.xz";
|
||||
sha256 = "0mrmb7q4wmj8v9ipb9vh4c8scl1mr0frz3yvpc96dyimvb87pp08";
|
||||
name = "kmediaplayer-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/portingAids/kmediaplayer-5.89.0.tar.xz";
|
||||
sha256 = "0hf44hij1bqcfvxhs7ka00habgh3lc39xajnblpm9br8xybgkaz0";
|
||||
name = "kmediaplayer-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knewstuff = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/knewstuff-5.87.0.tar.xz";
|
||||
sha256 = "0xnilr3r3l36g3j7a2nf2kqmill22ibrr6qfniqcywmcqpnq7x4q";
|
||||
name = "knewstuff-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/knewstuff-5.89.0.tar.xz";
|
||||
sha256 = "1qw3lm4vjxal7r314y0zqj59fmzj4b9z2dsd10r3mxpiwjra0s45";
|
||||
name = "knewstuff-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifications = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/knotifications-5.87.0.tar.xz";
|
||||
sha256 = "03zraci1lnzz3d5i97i2m2h4z8xp4fmm28aizk3xipqkgy3q61c3";
|
||||
name = "knotifications-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/knotifications-5.89.0.tar.xz";
|
||||
sha256 = "1jghpawqp0zy1scs2l0dqz2sqv4xd65xiavabpjwhycx5pxpvbhs";
|
||||
name = "knotifications-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifyconfig = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/knotifyconfig-5.87.0.tar.xz";
|
||||
sha256 = "0jd5yzjg625ixm3fbmpafvg6wc69cvppqr0z0y0wzkbzbd930ggh";
|
||||
name = "knotifyconfig-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/knotifyconfig-5.89.0.tar.xz";
|
||||
sha256 = "041qnnxhsi35xygyzlppvpghfd8fxraas824dz7rfjiym2zid7jh";
|
||||
name = "knotifyconfig-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpackage = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kpackage-5.87.0.tar.xz";
|
||||
sha256 = "1dmhj1byxmk407mcz62ydrzzjab6c4da22blkm4f5das79blkdsy";
|
||||
name = "kpackage-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kpackage-5.89.0.tar.xz";
|
||||
sha256 = "198n0gr2v9r11ml2vkx9xazxf3rbw3qgc44l7x134rpn1jv9b0s3";
|
||||
name = "kpackage-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kparts = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kparts-5.87.0.tar.xz";
|
||||
sha256 = "0jmjyvrskhvnp0w1d9l9k5azwf1ppda97qp2801179x77bgdfbgi";
|
||||
name = "kparts-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kparts-5.89.0.tar.xz";
|
||||
sha256 = "0vdz1sxqkx2nynlsywyp8j2ciq226cs40c3m70lqs0j5w283i5ra";
|
||||
name = "kparts-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpeople = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kpeople-5.87.0.tar.xz";
|
||||
sha256 = "002qnfxyrzv9jr1z86ih7v7bprbpfx311s646rbmjc6c9wqa5a1a";
|
||||
name = "kpeople-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kpeople-5.89.0.tar.xz";
|
||||
sha256 = "12bry15lr7xpgmfgpw1mdd805n1af6050vaa3pk4mbf0vc6clg5y";
|
||||
name = "kpeople-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kplotting = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kplotting-5.87.0.tar.xz";
|
||||
sha256 = "1np6rqrxldnhz82ak291kr87zqccmp9a3v4gvxl0xsm2qnpzxlxz";
|
||||
name = "kplotting-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kplotting-5.89.0.tar.xz";
|
||||
sha256 = "1asqzv5jl2nb9ml5vwlpcsi9f2vw7y8rcihlvkf569s7kxsrswns";
|
||||
name = "kplotting-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpty = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kpty-5.87.0.tar.xz";
|
||||
sha256 = "1qd2lj53m0gbpmfilwrcz5v2m735daqlxj2qv1j5m28b3bjwz2li";
|
||||
name = "kpty-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kpty-5.89.0.tar.xz";
|
||||
sha256 = "0053sx30d1w2m03wqv3mhkjrxdf7ps1xj8h74fv0a0clf9ab0i4x";
|
||||
name = "kpty-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kquickcharts = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kquickcharts-5.87.0.tar.xz";
|
||||
sha256 = "1dx4ilwih9pfimfn5l3fgjf0z1k75p6sb7y03akgnl4i9w2aycv8";
|
||||
name = "kquickcharts-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kquickcharts-5.89.0.tar.xz";
|
||||
sha256 = "05syj1162j1zhg9wws81kk9z2ri3jvlvnq95l3gv29zf582j7h91";
|
||||
name = "kquickcharts-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kross = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/portingAids/kross-5.87.0.tar.xz";
|
||||
sha256 = "1nnyl67b43064y5gvj7ccvzz5481vbaycjhxxzgf4iaj0qm2vpfh";
|
||||
name = "kross-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/portingAids/kross-5.89.0.tar.xz";
|
||||
sha256 = "0j88ikhxypyy4yickcz3hcdfaj8g7qjinf5va7g5ghzjar7q9x4y";
|
||||
name = "kross-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
krunner = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/krunner-5.87.0.tar.xz";
|
||||
sha256 = "0ygqfaif9xp30ahrld85xzsgmfmy51560hl8ym8shggwar20kb1s";
|
||||
name = "krunner-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/krunner-5.89.0.tar.xz";
|
||||
sha256 = "11wzn33k6gwfiwc6idhsr8fj441c82bbzz8bx8i228ymvnqrdcqx";
|
||||
name = "krunner-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kservice = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kservice-5.87.0.tar.xz";
|
||||
sha256 = "0a3fcqhwbzqwy9wy1787p8hr1s1jfmz3y1dk2spiifwk9l668mxn";
|
||||
name = "kservice-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kservice-5.89.0.tar.xz";
|
||||
sha256 = "0srbjazz302w7zsxh5zcq5zhgz8ad09zxld1rpfkyxg5z820lrq5";
|
||||
name = "kservice-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktexteditor = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/ktexteditor-5.87.0.tar.xz";
|
||||
sha256 = "13dnwf2zvp3k6xb0ry5a11gaf2j7x2swhq8d689w4gf3awpma7rg";
|
||||
name = "ktexteditor-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/ktexteditor-5.89.0.tar.xz";
|
||||
sha256 = "02bg84dmqadjlwfmccviz0d0wj0qf9fy2i9igq4mv150hqy93bb7";
|
||||
name = "ktexteditor-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktextwidgets = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/ktextwidgets-5.87.0.tar.xz";
|
||||
sha256 = "04gmqw8wjf6r8lpsjcsg0925a6b6hnckzy5i9ykvian1kq2d79fr";
|
||||
name = "ktextwidgets-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/ktextwidgets-5.89.0.tar.xz";
|
||||
sha256 = "0yz2y111hjs1zq1f8887sn334gpf0sv4lrfq3i5dj0x3vcjgmccl";
|
||||
name = "ktextwidgets-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kunitconversion = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kunitconversion-5.87.0.tar.xz";
|
||||
sha256 = "1b5yvs0inr0kj7i4j5yavlxz6n8h3d2wbgw39r2harzxd4xjzz4h";
|
||||
name = "kunitconversion-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kunitconversion-5.89.0.tar.xz";
|
||||
sha256 = "1bmnlcsi8qbba38ywr3f4vd7kddiwzmrnn9n69c6626jg4aj3g1q";
|
||||
name = "kunitconversion-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kwallet-5.87.0.tar.xz";
|
||||
sha256 = "1a2qiwhf6hwh6qs9x84hz1ryaaqqm8bpg9v29kjy6cq9krn3mwar";
|
||||
name = "kwallet-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kwallet-5.89.0.tar.xz";
|
||||
sha256 = "1yy34asal5jni78jxywddh3hjpzsr1myck0f89h78a2zc28xnd1h";
|
||||
name = "kwallet-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kwayland-5.87.0.tar.xz";
|
||||
sha256 = "03lrlprvc3bj43f0l0dirg93l7amzlcx4ajaqh9h54g030qanfmc";
|
||||
name = "kwayland-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kwayland-5.89.0.tar.xz";
|
||||
sha256 = "1sq4zy9bifbqlg8s3af2vwxyyg84kmxfyvdi479cn46vdavylp2j";
|
||||
name = "kwayland-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwidgetsaddons = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kwidgetsaddons-5.87.0.tar.xz";
|
||||
sha256 = "00gv9lxiah6yg8lxjd0md0zyvhi7zc9s6fg14jfh0cb1i0zrn49b";
|
||||
name = "kwidgetsaddons-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kwidgetsaddons-5.89.0.tar.xz";
|
||||
sha256 = "1rs30ialmrhwvxah6rvzbavjnp4ziaaf0j0jcm63kyqbb5nywgmk";
|
||||
name = "kwidgetsaddons-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwindowsystem = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kwindowsystem-5.87.0.tar.xz";
|
||||
sha256 = "0rxmpawp5g46xp5irk1gcdq6n2y9r9vlx1dm5gpqhcfh7gr64ja2";
|
||||
name = "kwindowsystem-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kwindowsystem-5.89.0.tar.xz";
|
||||
sha256 = "1h0v72mb7s36ggw8nv70rpk16q0cflbhgvqwzlfqvh68kbs35a4q";
|
||||
name = "kwindowsystem-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlgui = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/kxmlgui-5.87.0.tar.xz";
|
||||
sha256 = "1wnss0rjspgih3m2a3faflamf7n681k8sf8pzrcsrvvrzq95n65i";
|
||||
name = "kxmlgui-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/kxmlgui-5.89.0.tar.xz";
|
||||
sha256 = "0mjfg0hd9rswz3jpmc8xjw5jqgip58cx3bavijdlnp7pla7r7j56";
|
||||
name = "kxmlgui-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlrpcclient = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/portingAids/kxmlrpcclient-5.87.0.tar.xz";
|
||||
sha256 = "03l5zs4l52f3w01hsk00r8hmnccyy3iw2vhiclvpp6dksmb8yad7";
|
||||
name = "kxmlrpcclient-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/portingAids/kxmlrpcclient-5.89.0.tar.xz";
|
||||
sha256 = "0ri3z76r1v1vfp3j0mrpvan6jzmp57a5g4vwshv4zgyvr484qhlp";
|
||||
name = "kxmlrpcclient-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
modemmanager-qt = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/modemmanager-qt-5.87.0.tar.xz";
|
||||
sha256 = "1ag98r2hhd93gki3dvlz48sgqc2805b0p0w4m0az0czvxnclg0rk";
|
||||
name = "modemmanager-qt-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/modemmanager-qt-5.89.0.tar.xz";
|
||||
sha256 = "1sam8cr638h9gyp60dhgmrpddy6y7waf9xaij46kvc0xdan501fi";
|
||||
name = "modemmanager-qt-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
networkmanager-qt = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/networkmanager-qt-5.87.0.tar.xz";
|
||||
sha256 = "0a4sxcm88mfry1sjc4r0qx5aqmbb61ghmd912wqk19nx18qgkm5y";
|
||||
name = "networkmanager-qt-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/networkmanager-qt-5.89.0.tar.xz";
|
||||
sha256 = "1x1pxsf4dm8h0bj6my9rg2j95nnn81919fv9apvqglf6i3xd2pq4";
|
||||
name = "networkmanager-qt-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen-icons5 = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/oxygen-icons5-5.87.0.tar.xz";
|
||||
sha256 = "0mpxv2m6nkl1cp3p0xgpm916k2ykvkyk0x0ka4azs8iyy0anc36m";
|
||||
name = "oxygen-icons5-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/oxygen-icons5-5.89.0.tar.xz";
|
||||
sha256 = "1gmx2k5hqfa0lap2y9sv7csi09s8nl3rvab5nz731wr3s9m2frpr";
|
||||
name = "oxygen-icons5-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-framework = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/plasma-framework-5.87.0.tar.xz";
|
||||
sha256 = "1y7w4b7jb8rnkfan97yln5w9w68skrmif4wqqba4f9mj6y2dcajb";
|
||||
name = "plasma-framework-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/plasma-framework-5.89.0.tar.xz";
|
||||
sha256 = "0wx6a3agplfmf2p86ljhgd3pjx7f15g1hp660i62zw84zvpsh2dp";
|
||||
name = "plasma-framework-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
prison = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/prison-5.87.0.tar.xz";
|
||||
sha256 = "0vb8ny4za37v4nmcy9qw8zz5zcr46clci9lg22s84f26l4vlcs87";
|
||||
name = "prison-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/prison-5.89.0.tar.xz";
|
||||
sha256 = "0jd3qfj5k4fxqpbkjpr81mvni9kqppcq0gn5yyc9nys4wk4nr934";
|
||||
name = "prison-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
purpose = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/purpose-5.87.0.tar.xz";
|
||||
sha256 = "0ddpm2hm3x1p25hkjzff4vs906n5bkkk4j3myh0gvyqn8accdhsd";
|
||||
name = "purpose-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/purpose-5.89.0.tar.xz";
|
||||
sha256 = "1sfhwzw1ghr1yg4fkrz0r2myd5569mscsr98pnc3plr78ppq9lwy";
|
||||
name = "purpose-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qqc2-desktop-style = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/qqc2-desktop-style-5.87.0.tar.xz";
|
||||
sha256 = "02i4rg5gf7i63lm4f0afm9n3lgzvklpbg43d0zcsdwzph386baq7";
|
||||
name = "qqc2-desktop-style-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/qqc2-desktop-style-5.89.0.tar.xz";
|
||||
sha256 = "1q2y0hb69f3ldaslbpw8v0xapchqndjp4wzgmghd1zqab8lqjl5c";
|
||||
name = "qqc2-desktop-style-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
solid = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/solid-5.87.0.tar.xz";
|
||||
sha256 = "0zmcc4ryp4j93999f0fgwvchs4gycbynsz0wghrhdqkfhsjvhqra";
|
||||
name = "solid-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/solid-5.89.0.tar.xz";
|
||||
sha256 = "1gy8ddg5803fpdifg68gkjrl9l2dwjrmwyzq5jzsfr6yabcfih93";
|
||||
name = "solid-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
sonnet = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/sonnet-5.87.0.tar.xz";
|
||||
sha256 = "1cc9j9ks33s6amr01a7ywnqiqvm498vlmqqva40ddvkfq1azxmhs";
|
||||
name = "sonnet-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/sonnet-5.89.0.tar.xz";
|
||||
sha256 = "0fdkx68hyp5fq0fyfbq0691vcx70qm7md2nd4028gmpcbxxaixa1";
|
||||
name = "sonnet-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
syndication = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/syndication-5.87.0.tar.xz";
|
||||
sha256 = "1xbs83smgqzk01r7nds6p74v9n1pa0zhlafbbxlj2m226p1zf8bs";
|
||||
name = "syndication-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/syndication-5.89.0.tar.xz";
|
||||
sha256 = "186dw32jhgfwz7dz9payx645gvhgzcf6qy5qiad6ifkvda50g9cw";
|
||||
name = "syndication-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
syntax-highlighting = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/syntax-highlighting-5.87.0.tar.xz";
|
||||
sha256 = "148wm3qdjkwzvcm51x3cppsxl4rylbjyjp1pfh6545fhikm5nqi6";
|
||||
name = "syntax-highlighting-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/syntax-highlighting-5.89.0.tar.xz";
|
||||
sha256 = "0iy9ryjf6bcxwp9kni00p82mx1bg101z8331ykixffn41vfgxb9a";
|
||||
name = "syntax-highlighting-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
threadweaver = {
|
||||
version = "5.87.0";
|
||||
version = "5.89.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.87/threadweaver-5.87.0.tar.xz";
|
||||
sha256 = "1gqpzv2ijw66fpvaqv66xsglh19lv0k4j9i505xmmkzlyddbhkch";
|
||||
name = "threadweaver-5.87.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.89/threadweaver-5.89.0.tar.xz";
|
||||
sha256 = "03yrlp9ixfb3wsrfmgxfhryzy2jsfnk4wnphmlk5nh98nxa9706x";
|
||||
name = "threadweaver-5.89.0.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -1,10 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lib3ds-1.3.0";
|
||||
pname = "lib3ds";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://lib3ds.googlecode.com/files/${name}.zip";
|
||||
url = "http://lib3ds.googlecode.com/files/lib3ds-${version}.zip";
|
||||
sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m";
|
||||
};
|
||||
|
||||
|
@ -1,10 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libLAS-1.8.1";
|
||||
pname = "libLAS";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/liblas/${name}.tar.bz2";
|
||||
url = "https://download.osgeo.org/liblas/libLAS-${version}.tar.bz2";
|
||||
sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
|
||||
};
|
||||
|
||||
|
@ -1,9 +1,11 @@
|
||||
{lib, stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libcdaudio-0.99.12p2";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcdaudio";
|
||||
version = "0.99.12p2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libcdaudio/libcdaudio-0.99.12p2.tar.gz";
|
||||
url = "mirror://sourceforge/libcdaudio/libcdaudio-${version}.tar.gz";
|
||||
sha256 = "1fsy6dlzxrx177qc877qhajm9l4g28mvh06h2l15rxy4bapzknjz" ;
|
||||
};
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user