mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 02:42:59 +00:00
Merge branch 'staging' into staging-next
This commit is contained in:
commit
5d5d432ec4
@ -86,9 +86,9 @@ One advantage is that when `pkgs.zlib` is updated, it will automatically update
|
||||
|
||||
postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
|
||||
substituteInPlace configure \
|
||||
--replace '/usr/bin/libtool' 'ar' \
|
||||
--replace 'AR="libtool"' 'AR="ar"' \
|
||||
--replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
|
||||
--replace-fail '/usr/bin/libtool' 'ar' \
|
||||
--replace-fail 'AR="libtool"' 'AR="ar"' \
|
||||
--replace-fail 'ARFLAGS="-o"' 'ARFLAGS="-r"'
|
||||
'';
|
||||
})
|
||||
```
|
||||
|
@ -700,7 +700,7 @@ with import <nixpkgs> {};
|
||||
hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") {
|
||||
postPatch = ''
|
||||
substituteInPlace lib/zoneinfo.rs \
|
||||
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
--replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
@ -54,7 +54,7 @@ Some common issues when packaging software for Darwin:
|
||||
# ...
|
||||
prePatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace '/usr/bin/xcrun clang' clang
|
||||
--replace-fail '/usr/bin/xcrun clang' clang
|
||||
'';
|
||||
}
|
||||
```
|
||||
|
@ -230,9 +230,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/bin/solo5-virtio-mkimage \
|
||||
--replace "/usr/lib/syslinux" "${syslinux}/share/syslinux" \
|
||||
--replace "/usr/share/syslinux" "${syslinux}/share/syslinux" \
|
||||
--replace "cp " "cp --no-preserve=mode "
|
||||
--replace-fail "/usr/lib/syslinux" "${syslinux}/share/syslinux" \
|
||||
--replace-fail "/usr/share/syslinux" "${syslinux}/share/syslinux" \
|
||||
--replace-fail "cp " "cp --no-preserve=mode "
|
||||
|
||||
wrapProgram $out/bin/solo5-virtio-mkimage \
|
||||
--prefix PATH : ${lib.makeBinPath [ dosfstools mtools parted syslinux ]}
|
||||
@ -1253,9 +1253,20 @@ postInstall = ''
|
||||
|
||||
Performs string substitution on the contents of \<infile\>, writing the result to \<outfile\>. The substitutions in \<subs\> are of the following form:
|
||||
|
||||
#### `--replace` \<s1\> \<s2\> {#fun-substitute-replace}
|
||||
#### `--replace-fail` \<s1\> \<s2\> {#fun-substitute-replace-fail}
|
||||
|
||||
Replace every occurrence of the string \<s1\> by \<s2\>.
|
||||
Will error if no change is made.
|
||||
|
||||
#### `--replace-warn` \<s1\> \<s2\> {#fun-substitute-replace-warn}
|
||||
|
||||
Replace every occurrence of the string \<s1\> by \<s2\>.
|
||||
Will print a warning if no change is made.
|
||||
|
||||
#### `--replace-quiet` \<s1\> \<s2\> {#fun-substitute-replace-quiet}
|
||||
|
||||
Replace every occurrence of the string \<s1\> by \<s2\>.
|
||||
Will do nothing if no change can be made.
|
||||
|
||||
#### `--subst-var` \<varName\> {#fun-substitute-subst-var}
|
||||
|
||||
@ -1269,8 +1280,8 @@ Example:
|
||||
|
||||
```shell
|
||||
substitute ./foo.in ./foo.out \
|
||||
--replace /usr/bin/bar $bar/bin/bar \
|
||||
--replace "a string containing spaces" "some other text" \
|
||||
--replace-fail /usr/bin/bar $bar/bin/bar \
|
||||
--replace-fail "a string containing spaces" "some other text" \
|
||||
--subst-var someVar
|
||||
```
|
||||
|
||||
|
@ -92,6 +92,24 @@ To use your custom kernel package in your NixOS configuration, set
|
||||
boot.kernelPackages = pkgs.linuxPackagesFor yourCustomKernel;
|
||||
```
|
||||
|
||||
## Rust {#sec-linux-rust}
|
||||
|
||||
The Linux kernel does not have Rust language support enabled by
|
||||
default. For kernel versions 6.7 or newer, experimental Rust support
|
||||
can be enabled. In a NixOS configuration, set:
|
||||
|
||||
```nix
|
||||
boot.kernelPatches = [
|
||||
{
|
||||
name = "Rust Support";
|
||||
patch = null;
|
||||
features = {
|
||||
rust = true;
|
||||
};
|
||||
}
|
||||
];
|
||||
```
|
||||
|
||||
## Developing kernel modules {#sec-linux-config-developing-modules}
|
||||
|
||||
This section was moved to the [Nixpkgs manual](https://nixos.org/nixpkgs/manual#sec-linux-kernel-developing-modules).
|
||||
|
@ -103,6 +103,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- `services.resolved.fallbackDns` can now be used to disable the upstream fallback servers entirely by setting it to an empty list. To get the previous behaviour of the upstream defaults set it to null, the new default, instead.
|
||||
|
||||
- `xxd` has been moved from `vim` default output to its own output to reduce closure size. The canonical way to reference it across all platforms is `unixtools.xxd`.
|
||||
|
||||
- `services.avahi.nssmdns` got split into `services.avahi.nssmdns4` and `services.avahi.nssmdns6` which enable the mDNS NSS switch for IPv4 and IPv6 respectively.
|
||||
Since most mDNS responders only register IPv4 addresses, most users want to keep the IPv6 support disabled to avoid long timeouts.
|
||||
|
||||
@ -169,6 +171,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
- The option [`services.nextcloud.config.dbport`] of the Nextcloud module was removed to match upstream.
|
||||
The port can be specified in [`services.nextcloud.config.dbhost`](#opt-services.nextcloud.config.dbhost).
|
||||
|
||||
- `stdenv`: The `--replace` flag in `substitute`, `substituteInPlace`, `substituteAll`, `substituteAllStream`, and `substituteStream` is now deprecated if favor of the new `--replace-fail`, `--replace-warn` and `--replace-quiet`. The deprecated `--replace` equates to `--replace-warn`.
|
||||
|
||||
- The Yama LSM is now enabled by default in the kernel, which prevents ptracing
|
||||
non-child processes. This means you will not be able to attach gdb to an
|
||||
existing process, but will need to start that process from gdb (so it is a
|
||||
|
@ -1076,7 +1076,7 @@ in
|
||||
boot.initrd.systemd = {
|
||||
contents."/etc/crypttab".source = stage1Crypttab;
|
||||
|
||||
extraBin.systemd-cryptsetup = "${config.boot.initrd.systemd.package}/lib/systemd/systemd-cryptsetup";
|
||||
extraBin.systemd-cryptsetup = "${config.boot.initrd.systemd.package}/bin/systemd-cryptsetup";
|
||||
|
||||
additionalUpstreamUnits = [
|
||||
"cryptsetup-pre.target"
|
||||
@ -1084,7 +1084,7 @@ in
|
||||
"remote-cryptsetup.target"
|
||||
];
|
||||
storePaths = [
|
||||
"${config.boot.initrd.systemd.package}/lib/systemd/systemd-cryptsetup"
|
||||
"${config.boot.initrd.systemd.package}/bin/systemd-cryptsetup"
|
||||
"${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-cryptsetup-generator"
|
||||
];
|
||||
|
||||
|
@ -70,6 +70,7 @@ let
|
||||
"systemd-tmpfiles-setup.service"
|
||||
"timers.target"
|
||||
"umount.target"
|
||||
"systemd-bsod.service"
|
||||
] ++ cfg.additionalUpstreamUnits;
|
||||
|
||||
upstreamWants = [
|
||||
@ -424,6 +425,7 @@ in {
|
||||
|
||||
storePaths = [
|
||||
# systemd tooling
|
||||
"${cfg.package}/lib/systemd/systemd-executor"
|
||||
"${cfg.package}/lib/systemd/systemd-fsck"
|
||||
"${cfg.package}/lib/systemd/systemd-hibernate-resume"
|
||||
"${cfg.package}/lib/systemd/systemd-journald"
|
||||
@ -433,6 +435,7 @@ in {
|
||||
"${cfg.package}/lib/systemd/systemd-shutdown"
|
||||
"${cfg.package}/lib/systemd/systemd-sulogin-shell"
|
||||
"${cfg.package}/lib/systemd/systemd-sysctl"
|
||||
"${cfg.package}/lib/systemd/systemd-bsod"
|
||||
|
||||
# generators
|
||||
"${cfg.package}/lib/systemd/system-generators/systemd-debug-generator"
|
||||
|
@ -448,6 +448,7 @@ in {
|
||||
kerberos = handleTest ./kerberos/default.nix {};
|
||||
kernel-generic = handleTest ./kernel-generic.nix {};
|
||||
kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix {};
|
||||
kernel-rust = runTestOn ["x86_64-linux"] ./kernel-rust.nix;
|
||||
keter = handleTest ./keter.nix {};
|
||||
kexec = handleTest ./kexec.nix {};
|
||||
keycloak = discoverTests (import ./keycloak.nix);
|
||||
|
30
nixos/tests/kernel-rust.nix
Normal file
30
nixos/tests/kernel-rust.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ pkgs, ... }: {
|
||||
name = "kernel-rust";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ blitz ];
|
||||
};
|
||||
|
||||
nodes.machine = { config, pkgs, ... }:
|
||||
{
|
||||
boot.kernelPackages = pkgs.linuxPackages_testing;
|
||||
|
||||
boot.extraModulePackages = [
|
||||
config.boot.kernelPackages.rust-out-of-tree-module
|
||||
];
|
||||
|
||||
boot.kernelPatches = [
|
||||
{
|
||||
name = "Rust Support";
|
||||
patch = null;
|
||||
features = {
|
||||
rust = true;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("default.target")
|
||||
machine.succeed("modprobe rust_out_of_tree")
|
||||
'';
|
||||
}
|
@ -21,11 +21,11 @@ assert withConplay -> !libOnly;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "${lib.optionalString libOnly "lib"}mpg123";
|
||||
version = "1.32.3";
|
||||
version = "1.32.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";
|
||||
hash = "sha256-LZkTpX1O6PSXoYLG6CWCYCQJeCpPtIHpif7r9ENYZ7Q=";
|
||||
hash = "sha256-WplmQzj7L3UbZi9A7iWATQydtrV13LXOdBxtxkIkoIo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay";
|
||||
|
@ -12,11 +12,10 @@
|
||||
|
||||
# now defaults to false because some tests can be flaky (clipboard etc), see
|
||||
# also: https://github.com/neovim/neovim/issues/16233
|
||||
, doCheck ? false
|
||||
, nodejs ? null, fish ? null, python3 ? null
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation (finalAttrs:
|
||||
let
|
||||
nvim-lpeg-dylib = luapkgs: if stdenv.isDarwin
|
||||
then (luapkgs.lpeg.overrideAttrs (oa: {
|
||||
preConfigure = ''
|
||||
@ -42,7 +41,7 @@ let
|
||||
(nvim-lpeg-dylib ps)
|
||||
luabitop
|
||||
mpack
|
||||
] ++ lib.optionals doCheck [
|
||||
] ++ lib.optionals finalAttrs.doCheck [
|
||||
luv
|
||||
coxpcall
|
||||
busted
|
||||
@ -64,17 +63,17 @@ let
|
||||
in deterministicLuajit.withPackages(ps: [ ps.mpack (nvim-lpeg-dylib ps) ])
|
||||
else lua.luaOnBuild;
|
||||
|
||||
pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]);
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
in {
|
||||
pname = "neovim-unwrapped";
|
||||
version = "0.9.5";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "neovim";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CcaBqA0yFCffNPmXOJTo8c9v1jrEBiqAl8CG5Dj5YxE=";
|
||||
};
|
||||
|
||||
@ -87,7 +86,7 @@ in
|
||||
|
||||
dontFixCmake = true;
|
||||
|
||||
inherit lua;
|
||||
inherit lua treesitter-parsers;
|
||||
|
||||
buildInputs = [
|
||||
gperf
|
||||
@ -105,15 +104,17 @@ in
|
||||
tree-sitter
|
||||
unibilium
|
||||
] ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]
|
||||
++ lib.optionals doCheck [ glibcLocales procps ]
|
||||
++ lib.optionals finalAttrs.doCheck [ glibcLocales procps ]
|
||||
;
|
||||
|
||||
inherit doCheck;
|
||||
doCheck = false;
|
||||
|
||||
# to be exhaustive, one could run
|
||||
# make oldtests too
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
make functionaltest
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -123,7 +124,9 @@ in
|
||||
];
|
||||
|
||||
# extra programs test via `make functionaltest`
|
||||
nativeCheckInputs = [
|
||||
nativeCheckInputs = let
|
||||
pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]);
|
||||
in [
|
||||
fish
|
||||
nodejs
|
||||
pyEnv # for src/clint.py
|
||||
@ -166,11 +169,11 @@ in
|
||||
ln -s \
|
||||
${tree-sitter.buildGrammar {
|
||||
inherit language src;
|
||||
version = "neovim-${version}";
|
||||
version = "neovim-${finalAttrs.version}";
|
||||
}}/parser \
|
||||
$out/lib/nvim/parser/${language}.so
|
||||
'')
|
||||
treesitter-parsers);
|
||||
finalAttrs.treesitter-parsers);
|
||||
|
||||
shellHook=''
|
||||
export VIMRUNTIME=$PWD/runtime
|
||||
@ -199,4 +202,4 @@ in
|
||||
maintainers = with maintainers; [ manveru rvolosatovs ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -1,12 +1,14 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "9.0.2116";
|
||||
version = "9.1.0004";
|
||||
|
||||
outputs = [ "out" "xxd" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim";
|
||||
repo = "vim";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZKcNg/RrjvEsxpIcTjzQYi1xig3zLeTV+PXaBb4gUuM=";
|
||||
hash = "sha256-Y5ZSJLEFdptEMA0xvstr6H1G4iiaYXpkJGSSFwoTfc0=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -14,12 +16,21 @@ rec {
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
postPatch =
|
||||
# Use man from $PATH; escape sequences are still problematic.
|
||||
''
|
||||
substituteInPlace runtime/ftplugin/man.vim \
|
||||
--replace "/usr/bin/man " "man "
|
||||
'';
|
||||
# Use man from $PATH; escape sequences are still problematic.
|
||||
postPatch = ''
|
||||
substituteInPlace runtime/ftplugin/man.vim \
|
||||
--replace "/usr/bin/man " "man "
|
||||
'';
|
||||
|
||||
# man page moving is done in postFixup instead of postInstall otherwise fixupPhase moves it right back where it was
|
||||
postFixup = ''
|
||||
moveToOutput bin/xxd "$xxd"
|
||||
moveToOutput share/man/man1/xxd.1.gz "$xxd"
|
||||
for manFile in $out/share/man/*/man1/xxd.1*; do
|
||||
# moveToOutput does not take full paths or wildcards...
|
||||
moveToOutput "share/man/$(basename "$(dirname "$(dirname "$manFile")")")/man1/xxd.1.gz" "$xxd"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The most popular clone of the VI editor";
|
||||
@ -28,5 +39,6 @@ rec {
|
||||
maintainers = with maintainers; [ das_j equirosa ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "vim";
|
||||
outputsToInstall = [ "out" "xxd" ];
|
||||
};
|
||||
}
|
||||
|
@ -15,7 +15,7 @@ in
|
||||
stdenv.mkDerivation {
|
||||
pname = "vim";
|
||||
|
||||
inherit (common) version src postPatch hardeningDisable enableParallelBuilding enableParallelInstalling meta;
|
||||
inherit (common) version outputs src postPatch hardeningDisable enableParallelBuilding enableParallelInstalling postFixup meta;
|
||||
|
||||
nativeBuildInputs = [ gettext pkg-config ];
|
||||
buildInputs = [ ncurses bash gawk ]
|
||||
@ -62,11 +62,4 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
__impureHostDeps = [ "/dev/ptmx" ];
|
||||
|
||||
# To fix the trouble in vim73, that it cannot cross-build with this patch
|
||||
# to bypass a configure script check that cannot be done cross-building.
|
||||
# http://groups.google.com/group/vim_dev/browse_thread/thread/66c02efd1523554b?pli=1
|
||||
# patchPhase = ''
|
||||
# sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure
|
||||
# '';
|
||||
}
|
||||
|
@ -66,7 +66,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
pname = "vim-full";
|
||||
|
||||
inherit (common) version postPatch hardeningDisable enableParallelBuilding meta;
|
||||
inherit (common) version outputs postPatch hardeningDisable enableParallelBuilding meta;
|
||||
|
||||
src = builtins.getAttr source {
|
||||
default = common.src; # latest release
|
||||
@ -181,7 +181,7 @@ in stdenv.mkDerivation {
|
||||
ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString wrapPythonDrv ''
|
||||
postFixup = common.postFixup + lib.optionalString wrapPythonDrv ''
|
||||
wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" \
|
||||
--set NIX_PYTHONPATH "${python3}/${python3.sitePackages}"
|
||||
'';
|
||||
|
@ -97,7 +97,6 @@
|
||||
, errcheck
|
||||
, go-motion
|
||||
, go-tools
|
||||
, gocode
|
||||
, gocode-gomod
|
||||
, godef
|
||||
, gogetdoc
|
||||
@ -110,6 +109,7 @@
|
||||
, iferr
|
||||
, impl
|
||||
, reftools
|
||||
, revive
|
||||
, # hurl dependencies
|
||||
hurl
|
||||
, # must be lua51Packages
|
||||
@ -1507,13 +1507,11 @@
|
||||
vim-go =
|
||||
let
|
||||
binPath = lib.makeBinPath [
|
||||
# TODO: package commented packages
|
||||
asmfmt
|
||||
delve
|
||||
errcheck
|
||||
go-motion
|
||||
go-tools # contains staticcheck
|
||||
gocode
|
||||
go-tools # contains staticcheck, keyify
|
||||
gocode-gomod
|
||||
godef
|
||||
gogetdoc
|
||||
@ -1521,15 +1519,12 @@
|
||||
golangci-lint
|
||||
gomodifytags
|
||||
gopls
|
||||
# gorename
|
||||
gotags
|
||||
gotools
|
||||
# guru
|
||||
gotools # contains guru, gorename
|
||||
iferr
|
||||
impl
|
||||
# keyify
|
||||
reftools
|
||||
# revive
|
||||
revive
|
||||
];
|
||||
in
|
||||
super.vim-go.overrideAttrs {
|
||||
|
@ -49,13 +49,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.1-25";
|
||||
version = "7.1.1-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-HKDeeh8DNj0y7wS4DqctXhmNaOqZ02JeBXRFrEpH0M4=";
|
||||
hash = "sha256-diJhCRDT0SbAYZdBPoxZJWlrUW2Nz4/d7H0Nnybw0Yw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
@ -98,9 +98,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optional (enableGL || enableX11) copyDesktopItems
|
||||
++ lib.optional (stdenv.isDarwin && (enableGL || enableX11)) desktopToDarwinBundle
|
||||
++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ]
|
||||
++ lib.optionals (enablePython) [ which swig ]
|
||||
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle fixDarwinDylibNames xcbuild ];
|
||||
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames xcbuild ];
|
||||
|
||||
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ]
|
||||
++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
|
||||
@ -126,7 +127,7 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
desktopItems = lib.optionals (enableGL || enableX11) [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
desktopName = pname;
|
||||
|
@ -13,7 +13,7 @@ buildGoModule rec {
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ];
|
||||
ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" ];
|
||||
vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
@ -0,0 +1,12 @@
|
||||
diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh
|
||||
--- rsync-3.2.7/configure.sh 2022-10-20 17:57:22
|
||||
+++ rsync-3.2.7-fixed/configure.sh 2024-01-01 19:51:58
|
||||
@@ -7706,7 +7706,7 @@ else $as_nop
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
-main()
|
||||
+int main()
|
||||
{
|
||||
if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
|
||||
exit(1);
|
@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
|
||||
# https://github.com/WayneD/rsync/issues/511#issuecomment-1774612577
|
||||
# original source: https://build.opensuse.org/package/view_file/network/rsync/rsync-fortified-strlcpy-fix.patch?expand=1&rev=3f8dd2f4a404c96c0f69176e60893714
|
||||
./rsync-fortified-strlcpy-fix.patch
|
||||
# https://github.com/WayneD/rsync/pull/558
|
||||
./configure.ac-fix-failing-IPv6-check.patch
|
||||
];
|
||||
|
||||
buildInputs = [ libiconv zlib popt ]
|
||||
|
@ -19,7 +19,7 @@ buildGoModule rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-buildid=" "-X github.com/sigstore/gitsign/pkg/version.gitVersion=${version}" ];
|
||||
ldflags = [ "-s" "-w" "-X github.com/sigstore/gitsign/pkg/version.gitVersion=${version}" ];
|
||||
|
||||
preCheck = ''
|
||||
# test all paths
|
||||
|
@ -23,11 +23,11 @@ let
|
||||
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "mercurial${lib.optionalString fullBuild "-full"}";
|
||||
version = "6.6.1";
|
||||
version = "6.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||
sha256 = "sha256-opRlo/5Ao+jUm6g0MTSsKrooa2g//rg42gz25FIflpU=";
|
||||
sha256 = "sha256-y0lNe+fdwvydMXHIiDCvnAKyHHU+PlET3vrJwDc7S2A=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
@ -37,7 +37,7 @@ let
|
||||
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "mercurial-${version}";
|
||||
sha256 = "sha256-wLV0qdCfMgGpZRxnZik/lRwZHm/66p0sJn/mYVRvRkQ=";
|
||||
sha256 = "sha256-yOysqMrTWDx/ENcJng8Rm338NI9vpuBGH6Yq8B7+MFg=";
|
||||
sourceRoot = "mercurial-${version}/rust";
|
||||
} else null;
|
||||
cargoRoot = if rustSupport then "rust" else null;
|
||||
|
@ -44,7 +44,7 @@
|
||||
, libmtp
|
||||
, liboggz
|
||||
, libopus
|
||||
, libplacebo
|
||||
, libplacebo_5
|
||||
, libpulseaudio
|
||||
, libraw1394
|
||||
, librsvg
|
||||
@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libmtp
|
||||
liboggz
|
||||
libopus
|
||||
libplacebo
|
||||
libplacebo_5
|
||||
libpulseaudio
|
||||
libraw1394
|
||||
librsvg
|
||||
|
@ -551,10 +551,10 @@ stdenv.mkDerivation {
|
||||
# additional -isystem flags will confuse gfortran (see
|
||||
# https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903)
|
||||
+ optionalString (libcxx == null && isClang && (useGccForLibs && gccForLibs.langCC or false)) ''
|
||||
for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*; do
|
||||
for dir in ${gccForLibs}/include/c++/*; do
|
||||
echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
|
||||
done
|
||||
for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*/${targetPlatform.config}; do
|
||||
for dir in ${gccForLibs}/include/c++/*/${targetPlatform.config}; do
|
||||
echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
|
||||
done
|
||||
''
|
||||
|
@ -39,6 +39,8 @@
|
||||
# Not needed with buildGoModule
|
||||
, goPackagePath ? ""
|
||||
|
||||
, ldflags ? [ ]
|
||||
|
||||
# needed for buildFlags{,Array} warning
|
||||
, buildFlags ? ""
|
||||
, buildFlagsArray ? ""
|
||||
@ -154,6 +156,9 @@ let
|
||||
GOFLAGS = lib.optionals (!proxyVendor) [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ];
|
||||
inherit CGO_ENABLED enableParallelBuilding GO111MODULE GOTOOLCHAIN;
|
||||
|
||||
# If not set to an explicit value, set the buildid empty for reproducibility.
|
||||
ldflags = ldflags ++ lib.optionals (!lib.any (lib.hasPrefix "-buildid=") ldflags) [ "-buildid=" ];
|
||||
|
||||
configurePhase = args.configurePhase or (''
|
||||
runHook preConfigure
|
||||
|
||||
@ -301,4 +306,5 @@ in
|
||||
lib.warnIf (args' ? vendorSha256) "`vendorSha256` is deprecated. Use `vendorHash` instead"
|
||||
lib.warnIf (buildFlags != "" || buildFlagsArray != "")
|
||||
"Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"
|
||||
lib.warnIf (builtins.elem "-buildid=" ldflags) "`-buildid=` is set by default as ldflag by buildGoModule"
|
||||
package
|
||||
|
@ -37,6 +37,8 @@
|
||||
|
||||
, CGO_ENABLED ? go.CGO_ENABLED
|
||||
|
||||
, ldflags ? [ ]
|
||||
|
||||
# needed for buildFlags{,Array} warning
|
||||
, buildFlags ? ""
|
||||
, buildFlagsArray ? ""
|
||||
@ -91,6 +93,9 @@ let
|
||||
|
||||
GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
|
||||
|
||||
# If not set to an explicit value, set the buildid empty for reproducibility.
|
||||
ldflags = ldflags ++ lib.optionals (!lib.any (lib.hasPrefix "-buildid=") ldflags) [ "-buildid=" ];
|
||||
|
||||
configurePhase = args.configurePhase or (''
|
||||
runHook preConfigure
|
||||
|
||||
@ -280,4 +285,5 @@ let
|
||||
in
|
||||
lib.warnIf (buildFlags != "" || buildFlagsArray != "")
|
||||
"Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"
|
||||
lib.warnIf (builtins.elem "-buildid=" ldflags) "`-buildid=` is set by default as ldflag by buildGoModule"
|
||||
package
|
||||
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
||||
vendorHash = "sha256-8+PdkanodNZW/xeFf+tDm3Ej7DRSpBBtiT/CqjnWthw=";
|
||||
|
||||
CGO_ENABLED = "0";
|
||||
ldflags = [ "-s" "-w" "-buildid=" "-X github.com/gomods/athens/pkg/build.version=${version}" ];
|
||||
ldflags = [ "-s" "-w" "-X github.com/gomods/athens/pkg/build.version=${version}" ];
|
||||
|
||||
subPackages = [ "cmd/proxy" ];
|
||||
|
||||
|
158
pkgs/by-name/bl/bluez/package.nix
Normal file
158
pkgs/by-name/bl/bluez/package.nix
Normal file
@ -0,0 +1,158 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, alsa-lib
|
||||
, dbus
|
||||
, docutils
|
||||
, ell
|
||||
, enableExperimental ? false
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, glib
|
||||
, json_c
|
||||
, libical
|
||||
, pkg-config
|
||||
, python3
|
||||
, readline
|
||||
, systemdMinimal
|
||||
, udev
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bluez";
|
||||
version = "5.71";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-uCjUGMk87R9Vthb7VILPAVN0QL+zT72hpWTz7OlHNdg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
dbus
|
||||
ell
|
||||
glib
|
||||
json_c
|
||||
libical
|
||||
python3
|
||||
readline
|
||||
udev
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
docutils
|
||||
pkg-config
|
||||
python3.pkgs.wrapPython
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "test" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tools/hid2hci.rules \
|
||||
--replace /sbin/udevadm ${systemdMinimal}/bin/udevadm \
|
||||
--replace "hid2hci " "$out/lib/udev/hid2hci "
|
||||
'' +
|
||||
# Disable some tests:
|
||||
# - test-mesh-crypto depends on the following kernel settings:
|
||||
# CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC]
|
||||
''
|
||||
if [[ ! -f unit/test-mesh-crypto.c ]]; then
|
||||
echo "unit/test-mesh-crypto.c no longer exists"
|
||||
false
|
||||
fi
|
||||
echo 'int main() { return 77; }' > unit/test-mesh-crypto.c
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
(lib.enableFeature enableExperimental "experimental")
|
||||
(lib.enableFeature true "btpclient")
|
||||
(lib.enableFeature true "cups")
|
||||
(lib.enableFeature true "external-ell")
|
||||
(lib.enableFeature true "health")
|
||||
(lib.enableFeature true "hid2hci")
|
||||
(lib.enableFeature true "library")
|
||||
(lib.enableFeature true "logger")
|
||||
(lib.enableFeature true "mesh")
|
||||
(lib.enableFeature true "midi")
|
||||
(lib.enableFeature true "nfc")
|
||||
(lib.enableFeature true "pie")
|
||||
(lib.enableFeature true "sixaxis")
|
||||
# Set "deprecated" to provide ciptool, sdptool, and rfcomm (unmaintained);
|
||||
# superseded by new D-Bus APIs
|
||||
(lib.enableFeature true "deprecated")
|
||||
(lib.withFeatureAs true "dbusconfdir" "${placeholder "out"}/share")
|
||||
(lib.withFeatureAs true "dbussessionbusdir" "${placeholder "out"}/share/dbus-1/services")
|
||||
(lib.withFeatureAs true "dbussystembusdir" "${placeholder "out"}/share/dbus-1/system-services")
|
||||
(lib.withFeatureAs true "systemdsystemunitdir" "${placeholder "out"}/etc/systemd/system")
|
||||
(lib.withFeatureAs true "systemduserunitdir" "${placeholder "out"}/etc/systemd/user")
|
||||
(lib.withFeatureAs true "udevdir" "${placeholder "out"}/lib/udev")
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"rulesdir=${placeholder "out"}/lib/udev/rules.d"
|
||||
];
|
||||
|
||||
# Work around `make install' trying to create /var/lib/bluetooth.
|
||||
installFlags = [
|
||||
"statedir=$(TMPDIR)/var/lib/bluetooth"
|
||||
];
|
||||
|
||||
doCheck = stdenv.hostPlatform.isx86_64;
|
||||
|
||||
postInstall = let
|
||||
pythonPath = with python3.pkgs; [
|
||||
dbus-python
|
||||
pygobject3
|
||||
recursivePthLoader
|
||||
];
|
||||
in
|
||||
''
|
||||
mkdir -p $test/{bin,test}
|
||||
cp -a test $test
|
||||
pushd $test/test
|
||||
for t in \
|
||||
list-devices \
|
||||
monitor-bluetooth \
|
||||
simple-agent \
|
||||
test-adapter \
|
||||
test-device \
|
||||
test-thermometer \
|
||||
; do
|
||||
ln -s ../test/$t $test/bin/bluez-$t
|
||||
done
|
||||
popd
|
||||
wrapPythonProgramsIn $test/test "$test/test ${toString pythonPath}"
|
||||
|
||||
# for bluez4 compatibility for NixOS
|
||||
mkdir $out/sbin
|
||||
ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
|
||||
ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
|
||||
|
||||
# Add extra configuration
|
||||
mkdir $out/etc/bluetooth
|
||||
ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/204418
|
||||
ln -s /etc/bluetooth/input.conf $out/etc/bluetooth/input.conf
|
||||
ln -s /etc/bluetooth/network.conf $out/etc/bluetooth/network.conf
|
||||
|
||||
# Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez
|
||||
for files in $(find tools/ -type f -perm -755); do
|
||||
filename=$(basename $files)
|
||||
install -Dm755 tools/$filename $out/bin/$filename
|
||||
done
|
||||
install -Dm755 attrib/gatttool $out/bin/gatttool
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.bluez.org/";
|
||||
description = "Official Linux Bluetooth protocol stack";
|
||||
changelog = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog?h=${finalAttrs.version}";
|
||||
license = with lib.licenses; [ bsd2 gpl2Plus lgpl21Plus mit ];
|
||||
mainProgram = "btinfo";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
@ -1,27 +0,0 @@
|
||||
From a908a574daf8bac10bb2a0ee3771052d2167a85f Mon Sep 17 00:00:00 2001
|
||||
From: Randy Eckenrode <randy@largeandhighquality.com>
|
||||
Date: Sun, 3 Dec 2023 15:41:20 -0500
|
||||
Subject: [PATCH] Fix test failure on Darwin on a case-sensitive fs
|
||||
|
||||
This was encountered while looking into an issue with
|
||||
https://github.com/NixOS/nixpkgs/pull/268583.
|
||||
|
||||
I run my Nix store on case-sensitive APFS, so the test fails due to
|
||||
trying to link `-framework ldap` instead of `-framework LDAP`.
|
||||
---
|
||||
test cases/osx/5 extra frameworks/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test cases/osx/5 extra frameworks/meson.build b/test cases/osx/5 extra frameworks/meson.build
|
||||
index f6c01e63a1bd..96532846c632 100644
|
||||
--- a/test cases/osx/5 extra frameworks/meson.build
|
||||
+++ b/test cases/osx/5 extra frameworks/meson.build
|
||||
@@ -7,7 +7,7 @@ dep_main = dependency('Foundation')
|
||||
assert(dep_main.type_name() == 'extraframeworks', 'type_name is ' + dep_main.type_name())
|
||||
|
||||
# https://github.com/mesonbuild/meson/issues/10002
|
||||
-ldap_dep = dependency('ldap', method : 'extraframework')
|
||||
+ldap_dep = dependency('LDAP', method : 'extraframework')
|
||||
assert(ldap_dep.type_name() == 'extraframeworks', 'type_name is ' + ldap_dep.type_name())
|
||||
|
||||
stlib = static_library('stat', 'stat.c', install : true, dependencies: [opengl_dep, ldap_dep])
|
@ -18,13 +18,13 @@ let
|
||||
in
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "meson";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mesonbuild";
|
||||
repo = "meson";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Jt3PWnbv/8P6Rvf3E/Yli2vdtfgx3CmsW+jlc9CK5KA=";
|
||||
hash = "sha256-KNNtHi3jx0MRiOgmluA4ucZJWB2WeIYdApfHuspbCqg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -65,9 +65,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
# Nixpkgs cctools does not have bitcode support.
|
||||
./006-disable-bitcode.patch
|
||||
|
||||
# https://github.com/mesonbuild/meson/pull/12587
|
||||
./007-darwin-case-sensitivity.patch
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals (python3.pythonOlder "3.9") [
|
||||
|
@ -16,7 +16,7 @@ buildGo121Module rec {
|
||||
vendorHash = "sha256-RsjUPLe8omoN+XGyNhHDxzNfZR7VVTkh/f/On1oCRqM=";
|
||||
|
||||
CGO_ENABLED = "0";
|
||||
ldflags = [ "-s" "-w" "-buildid=" "-X main.version=${version}" ];
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
flags = [ "-trimpath" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "iana-etc";
|
||||
version = "20230316";
|
||||
version = "20231227";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
|
||||
sha256 = "sha256-5acFYPSwevEw5tZNbQDpui3stWuMdnhaKHqC8lhnsOY=";
|
||||
sha256 = "sha256-8Pa6LtAml8axjrUS32UbFIqTtM8v124U2Tt0J4sC0Is=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
@ -135,6 +135,8 @@ let
|
||||
# We pick "/" path to effectively avoid sysroot offset and make it work
|
||||
# as a native case.
|
||||
"--with-build-sysroot=/"
|
||||
# Same with the stdlibc++ headers embedded in the gcc output
|
||||
"--with-gxx-include-dir=${placeholder "out"}/include/c++/${version}/"
|
||||
]
|
||||
|
||||
# Basic configuration
|
||||
|
@ -12,9 +12,20 @@ inputs to be retained in runtime closure.
|
||||
Typical examples are `nix` -> `nlohmann_json` and `pipewire` ->
|
||||
`lttng-ust.dev`.
|
||||
|
||||
For this reason we want to remove the occurrences of hashes in the
|
||||
expansion of `__FILE__`. `nuke-references` does it by replacing hashes
|
||||
by `eeeeee...` but those paths are also used for debug symbols. It is
|
||||
handy to be able to invert the transformation to go back to the original
|
||||
store path for debuginfod servers. The chosen solution is to make the
|
||||
hash uppercase:
|
||||
- it does not trigger runtime references (except for all digit hashes,
|
||||
which are unlikely enough)
|
||||
- it visually looks like a bogus store path
|
||||
- it is easy to find the original store path if required
|
||||
|
||||
Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as:
|
||||
|
||||
-fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver
|
||||
-fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/$HASH1-nlohmann-json-ver
|
||||
-fmacro-prefix-map=/nix/...
|
||||
|
||||
In practice it quickly exhausts argument length limit due to `gcc`
|
||||
@ -25,9 +36,9 @@ is present in the environment.
|
||||
|
||||
Tested as:
|
||||
|
||||
$ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o -
|
||||
$ printf "# 0 \"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o -
|
||||
...
|
||||
.string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv"
|
||||
.string "/nix/store/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA-pppppp-vvvvvvv"
|
||||
...
|
||||
|
||||
Mangled successfully.
|
||||
@ -43,7 +54,7 @@ Mangled successfully.
|
||||
/* Perform user-specified mapping of filename prefixes. Return the
|
||||
GC-allocated new name corresponding to FILENAME or FILENAME if no
|
||||
remapping was performed. */
|
||||
@@ -76,7 +79,30 @@ remap_filename (file_prefix_map *maps, const char *filename)
|
||||
@@ -76,7 +79,31 @@ remap_filename (file_prefix_map *maps, const char *filename)
|
||||
if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0)
|
||||
break;
|
||||
if (!map)
|
||||
@ -51,8 +62,7 @@ Mangled successfully.
|
||||
+ {
|
||||
+ if (maps == macro_prefix_maps)
|
||||
+ {
|
||||
+ /* Remap all fo $NIX_STORE/.{32} paths to
|
||||
+ * equivalent $NIX_STORE/e{32}.
|
||||
+ /* Remap the 32 characters after $NIX_STORE/ to uppercase
|
||||
+ *
|
||||
+ * That way we avoid argument parameters explosion
|
||||
+ * and still avoid embedding headers into runtime closure:
|
||||
@ -66,7 +76,9 @@ Mangled successfully.
|
||||
+ {
|
||||
+ s = (char *) ggc_alloc_atomic (name_len + 1);
|
||||
+ memcpy(s, name, name_len + 1);
|
||||
+ memset(s + nix_store_len + 1, 'e', 32);
|
||||
+ for (int i = nix_store_len + 1; i < nix_store_len + 1 + 32; i++) {
|
||||
+ s[i] = TOUPPER(s[i]);
|
||||
+ }
|
||||
+ return s;
|
||||
+ }
|
||||
+ }
|
||||
@ -75,7 +87,7 @@ Mangled successfully.
|
||||
name = filename + map->old_len;
|
||||
name_len = strlen (name) + 1;
|
||||
|
||||
@@ -90,7 +116,6 @@ remap_filename (file_prefix_map *maps, const char *filename)
|
||||
@@ -90,7 +117,6 @@ remap_filename (file_prefix_map *maps, const char *filename)
|
||||
ignore it in DW_AT_producer (dwarf2out.cc). */
|
||||
|
||||
/* Linked lists of file_prefix_map structures. */
|
||||
|
60
pkgs/development/compilers/gcc/patches/13/ICE-PR110280.patch
Normal file
60
pkgs/development/compilers/gcc/patches/13/ICE-PR110280.patch
Normal file
@ -0,0 +1,60 @@
|
||||
From f4029de35fb1b293a4fd586574b1b4b73ddf7880 Mon Sep 17 00:00:00 2001
|
||||
From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org>
|
||||
Date: Wed, 26 Jul 2023 22:36:26 +0530
|
||||
Subject: [PATCH] [aarch64/match.pd] Fix ICE observed in PR110280.
|
||||
|
||||
gcc/ChangeLog:
|
||||
PR tree-optimization/110280
|
||||
* match.pd (vec_perm_expr(v, v, mask) -> v): Explicitly build vector
|
||||
using build_vector_from_val with the element of input operand, and
|
||||
mask's type if operand and mask's types don't match.
|
||||
|
||||
gcc/testsuite/ChangeLog:
|
||||
PR tree-optimization/110280
|
||||
* gcc.target/aarch64/sve/pr110280.c: New test.
|
||||
|
||||
(cherry picked from commit 85d8e0d8d5342ec8b4e6a54e22741c30b33c6f04)
|
||||
---
|
||||
gcc/match.pd | 9 ++++++++-
|
||||
gcc/testsuite/gcc.target/aarch64/sve/pr110280.c | 12 ++++++++++++
|
||||
2 files changed, 20 insertions(+), 1 deletion(-)
|
||||
create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
|
||||
|
||||
diff --git a/gcc/match.pd b/gcc/match.pd
|
||||
index 9118244825054..c3bb4fbc0a7a2 100644
|
||||
--- a/gcc/match.pd
|
||||
+++ b/gcc/match.pd
|
||||
@@ -8292,7 +8292,14 @@ and,
|
||||
|
||||
(simplify
|
||||
(vec_perm vec_same_elem_p@0 @0 @1)
|
||||
- @0)
|
||||
+ (if (types_match (type, TREE_TYPE (@0)))
|
||||
+ @0
|
||||
+ (with
|
||||
+ {
|
||||
+ tree elem = uniform_vector_p (@0);
|
||||
+ }
|
||||
+ (if (elem)
|
||||
+ { build_vector_from_val (type, elem); }))))
|
||||
|
||||
/* Push VEC_PERM earlier if that may help FMA perception (PR101895). */
|
||||
(simplify
|
||||
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
|
||||
new file mode 100644
|
||||
index 0000000000000..d3279f383629f
|
||||
--- /dev/null
|
||||
+++ b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
|
||||
@@ -0,0 +1,12 @@
|
||||
+/* { dg-do compile } */
|
||||
+/* { dg-options "-O3 -fdump-tree-optimized" } */
|
||||
+
|
||||
+#include "arm_sve.h"
|
||||
+
|
||||
+svuint32_t l()
|
||||
+{
|
||||
+ _Alignas(16) const unsigned int lanes[4] = {0, 0, 0, 0};
|
||||
+ return svld1rq_u32(svptrue_b8(), lanes);
|
||||
+}
|
||||
+
|
||||
+/* { dg-final { scan-tree-dump-not "VEC_PERM_EXPR" "optimized" } } */
|
@ -12,9 +12,20 @@ inputs to be retained in runtime closure.
|
||||
Typical examples are `nix` -> `nlohmann_json` and `pipewire` ->
|
||||
`lttng-ust.dev`.
|
||||
|
||||
For this reason we want to remove the occurrences of hashes in the
|
||||
expansion of `__FILE__`. `nuke-references` does it by replacing hashes
|
||||
by `eeeeee...` but those paths are also used for debug symbols. It is
|
||||
handy to be able to invert the transformation to go back to the original
|
||||
store path for debuginfod servers. The chosen solution is to make the
|
||||
hash uppercase:
|
||||
- it does not trigger runtime references (except for all digit hashes,
|
||||
which are unlikely enough)
|
||||
- it visually looks like a bogus store path
|
||||
- it is easy to find the original store path if required
|
||||
|
||||
Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as:
|
||||
|
||||
-fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver
|
||||
-fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/$HASH1-nlohmann-json-ver
|
||||
-fmacro-prefix-map=/nix/...
|
||||
|
||||
In practice it quickly exhausts argument length limit due to `gcc`
|
||||
@ -25,9 +36,9 @@ is present in the environment.
|
||||
|
||||
Tested as:
|
||||
|
||||
$ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o -
|
||||
$ printf "# 0 \"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o -
|
||||
...
|
||||
.string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv"
|
||||
.string "/nix/store/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA-pppppp-vvvvvvv"
|
||||
...
|
||||
|
||||
Mangled successfully.
|
||||
@ -43,14 +54,13 @@ Mangled successfully.
|
||||
/* Perform user-specified mapping of filename prefixes. Return the
|
||||
GC-allocated new name corresponding to FILENAME or FILENAME if no
|
||||
remapping was performed. */
|
||||
@@ -102,6 +105,29 @@ remap_filename (file_prefix_map *maps, const char *filename)
|
||||
@@ -102,6 +105,30 @@ remap_filename (file_prefix_map *maps, const char *filename)
|
||||
break;
|
||||
if (!map)
|
||||
{
|
||||
+ if (maps == macro_prefix_maps)
|
||||
+ {
|
||||
+ /* Remap all fo $NIX_STORE/.{32} paths to
|
||||
+ * equivalent $NIX_STORE/e{32}.
|
||||
+ /* Remap all fo $NIX_STORE/.{32} paths to uppercase
|
||||
+ *
|
||||
+ * That way we avoid argument parameters explosion
|
||||
+ * and still avoid embedding headers into runtime closure:
|
||||
@ -64,7 +74,9 @@ Mangled successfully.
|
||||
+ {
|
||||
+ s = (char *) ggc_alloc_atomic (name_len + 1);
|
||||
+ memcpy(s, name, name_len + 1);
|
||||
+ memset(s + nix_store_len + 1, 'e', 32);
|
||||
+ for (int i = nix_store_len + 1; i < nix_store_len + 1 + 32; i++) {
|
||||
+ s[i] = TOUPPER(s[i]);
|
||||
+ }
|
||||
+ if (realname != filename)
|
||||
+ free (const_cast <char *> (realname));
|
||||
+ return s;
|
||||
@ -73,7 +85,7 @@ Mangled successfully.
|
||||
if (realname != filename)
|
||||
free (const_cast <char *> (realname));
|
||||
return filename;
|
||||
@@ -124,7 +150,6 @@ remap_filename (file_prefix_map *maps, const char *filename)
|
||||
@@ -124,7 +151,6 @@ remap_filename (file_prefix_map *maps, const char *filename)
|
||||
ignore it in DW_AT_producer (gen_command_line_string in opts.cc). */
|
||||
|
||||
/* Linked lists of file_prefix_map structures. */
|
||||
@ -81,4 +93,3 @@ Mangled successfully.
|
||||
static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map */
|
||||
static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map */
|
||||
|
||||
|
||||
|
@ -74,6 +74,7 @@ in
|
||||
++ optional langFortran (if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch)
|
||||
++ optional atLeast7 ./ppc-musl.patch
|
||||
++ optional is12 ./12/lambda-ICE-PR109241.patch # backport ICE fix on ccache code
|
||||
++ optional is13 ./13/ICE-PR110280.patch # backport ICE fix on const_unop
|
||||
++ optional (atLeast9 && langD) ./libphobos.patch
|
||||
|
||||
|
||||
|
@ -9,13 +9,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glslang";
|
||||
version = "13.1.1";
|
||||
version = "14.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "glslang";
|
||||
rev = version;
|
||||
hash = "sha256-fuzNsVYdnThMzd4tLN/sTbCBXg6qXKLDJRziOKyOBGg=";
|
||||
hash = "sha256-7kIIU45pe+IF7lGltpIKSvQBmcXR+TWFvmx7ztMNrpc=";
|
||||
};
|
||||
|
||||
# These get set at all-packages, keep onto them for child drvs
|
||||
|
@ -46,11 +46,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "go";
|
||||
version = "1.21.5";
|
||||
version = "1.21.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-KFy730tubmLtWPNw8/bYwwgl1uVsWFPGbTwjvNsJ2xk=";
|
||||
hash = "sha256-Ekkmpi5F942qu67bnAEdl2MxhqM8I4/8HiUyDAIEYkg=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -158,6 +158,7 @@ let
|
||||
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
|
||||
echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
|
||||
echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''
|
||||
echo "-lunwind" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString stdenv.targetPlatform.isWasm ''
|
||||
|
@ -248,7 +248,7 @@ in stdenv.mkDerivation (rec {
|
||||
] ++ optionals isDarwin [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
(
|
||||
|
@ -173,6 +173,7 @@ let
|
||||
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
|
||||
echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
|
||||
echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''
|
||||
echo "-lunwind" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString stdenv.targetPlatform.isWasm ''
|
||||
|
@ -256,7 +256,7 @@ in stdenv.mkDerivation (rec {
|
||||
] ++ optionals isDarwin [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
(
|
||||
|
@ -173,6 +173,7 @@ let
|
||||
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
|
||||
echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
|
||||
echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''
|
||||
echo "-lunwind" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString stdenv.targetPlatform.isWasm ''
|
||||
|
@ -244,7 +244,7 @@ in stdenv.mkDerivation (rec {
|
||||
] ++ optionals isDarwin [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
(
|
||||
|
@ -213,6 +213,7 @@ in let
|
||||
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
|
||||
echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
|
||||
echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''
|
||||
echo "-lunwind" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString stdenv.targetPlatform.isWasm ''
|
||||
|
@ -206,7 +206,7 @@ in stdenv.mkDerivation (rec {
|
||||
] ++ optionals isDarwin [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
(
|
||||
|
@ -216,6 +216,7 @@ in let
|
||||
(!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false)
|
||||
"-lunwind"
|
||||
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
|
||||
nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
|
||||
};
|
||||
|
||||
clangNoLibcxx = wrapCCWith rec {
|
||||
|
@ -205,7 +205,7 @@ in stdenv.mkDerivation (rec {
|
||||
] ++ optionals isDarwin [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
(
|
||||
|
@ -221,6 +221,7 @@ in let
|
||||
(!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false)
|
||||
"-lunwind"
|
||||
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
|
||||
nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
|
||||
};
|
||||
|
||||
clangNoLibcxx = wrapCCWith rec {
|
||||
|
@ -56,6 +56,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-AaM9A6tQ4YAw7uDqCIV4VaiUyLZv+unwcOqbakwW9/k=";
|
||||
relative = "libcxx";
|
||||
})
|
||||
# fix for https://github.com/NixOS/nixpkgs/issues/269548
|
||||
# https://github.com/llvm/llvm-project/pull/77218
|
||||
(fetchpatch {
|
||||
name = "darwin-system-libcxxabi-link-flags.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/c5b89b29ee6e3c444a355fd1cf733ce7ab2e316a.patch";
|
||||
hash = "sha256-LNoPg1KCoP8RWxU/AzHR52f4Dww24I9BGQJedMhFxyQ=";
|
||||
relative = "libcxx";
|
||||
})
|
||||
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
../../libcxx-0001-musl-hacks.patch
|
||||
];
|
||||
|
@ -343,7 +343,7 @@ in stdenv.mkDerivation (rec {
|
||||
] ++ optionals isDarwin [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
(
|
||||
|
@ -226,6 +226,7 @@ in let
|
||||
(!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false)
|
||||
"-lunwind"
|
||||
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
|
||||
nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
|
||||
};
|
||||
|
||||
clangNoLibcxx = wrapCCWith rec {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, llvm_meta
|
||||
, monorepoSrc, runCommand
|
||||
, monorepoSrc, runCommand, fetchpatch
|
||||
, cmake, ninja, python3, fixDarwinDylibNames, version
|
||||
, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi
|
||||
, libcxxabi, libcxxrt, libunwind
|
||||
@ -47,6 +47,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./gnu-install-dirs.patch
|
||||
# fix for https://github.com/NixOS/nixpkgs/issues/269548
|
||||
# https://github.com/llvm/llvm-project/pull/77218
|
||||
(fetchpatch {
|
||||
name = "darwin-system-libcxxabi-link-flags.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/c5b89b29ee6e3c444a355fd1cf733ce7ab2e316a.patch";
|
||||
hash = "sha256-LNoPg1KCoP8RWxU/AzHR52f4Dww24I9BGQJedMhFxyQ=";
|
||||
relative = "libcxx";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -331,7 +331,7 @@ in
|
||||
] ++ optionals isDarwin [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
(
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, llvm_meta
|
||||
, monorepoSrc, runCommand
|
||||
, monorepoSrc, runCommand, fetchpatch
|
||||
, cmake, ninja, python3, fixDarwinDylibNames, version
|
||||
, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi
|
||||
, libcxxabi, libcxxrt, libunwind
|
||||
@ -45,6 +45,17 @@ stdenv.mkDerivation rec {
|
||||
chmod -R u+w .
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# fix for https://github.com/NixOS/nixpkgs/issues/269548
|
||||
# https://github.com/llvm/llvm-project/pull/77218
|
||||
(fetchpatch {
|
||||
name = "darwin-system-libcxxabi-link-flags.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/c5b89b29ee6e3c444a355fd1cf733ce7ab2e316a.patch";
|
||||
hash = "sha256-LNoPg1KCoP8RWxU/AzHR52f4Dww24I9BGQJedMhFxyQ=";
|
||||
relative = "libcxx";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cd ../runtimes
|
||||
'';
|
||||
|
@ -330,7 +330,7 @@ stdenv.mkDerivation (rec {
|
||||
] ++ optionals isDarwin [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
(
|
||||
|
@ -161,6 +161,7 @@ let
|
||||
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
|
||||
echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
|
||||
echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''
|
||||
echo "-lunwind" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString stdenv.targetPlatform.isWasm ''
|
||||
|
@ -222,7 +222,7 @@ in stdenv.mkDerivation (rec {
|
||||
] ++ optionals (isDarwin) [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
(
|
||||
|
@ -161,6 +161,7 @@ let
|
||||
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
|
||||
echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
|
||||
echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''
|
||||
echo "-lunwind" >> $out/nix-support/cc-ldflags
|
||||
'' + lib.optionalString stdenv.targetPlatform.isWasm ''
|
||||
|
@ -237,7 +237,7 @@ in stdenv.mkDerivation (rec {
|
||||
] ++ optionals (isDarwin) [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
(
|
||||
|
@ -216,6 +216,7 @@ in let
|
||||
(!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false)
|
||||
"-lunwind"
|
||||
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
|
||||
nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
|
||||
};
|
||||
|
||||
clangNoLibcxx = wrapCCWith rec {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, llvm_meta
|
||||
, monorepoSrc, runCommand
|
||||
, monorepoSrc, runCommand, fetchpatch
|
||||
, cmake, ninja, python3, fixDarwinDylibNames, version
|
||||
, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi
|
||||
, libcxxabi, libcxxrt, libunwind
|
||||
@ -45,6 +45,17 @@ stdenv.mkDerivation rec {
|
||||
chmod -R u+w .
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# fix for https://github.com/NixOS/nixpkgs/issues/269548
|
||||
# https://github.com/llvm/llvm-project/pull/77218
|
||||
(fetchpatch {
|
||||
name = "darwin-system-libcxxabi-link-flags.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/c5b89b29ee6e3c444a355fd1cf733ce7ab2e316a.patch";
|
||||
hash = "sha256-LNoPg1KCoP8RWxU/AzHR52f4Dww24I9BGQJedMhFxyQ=";
|
||||
relative = "libcxx";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cd ../runtimes
|
||||
'';
|
||||
|
@ -329,7 +329,7 @@ stdenv.mkDerivation (rec {
|
||||
] ++ optionals isDarwin [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
(
|
||||
|
@ -57,7 +57,7 @@ let
|
||||
isJdk8 = lib.versions.major dist.jdkVersion == "8";
|
||||
|
||||
jdk = stdenv.mkDerivation rec {
|
||||
pname = "zulu${dist.zuluVersion}-${javaPackage}";
|
||||
pname = "zulu-${javaPackage}";
|
||||
version = dist.jdkVersion;
|
||||
|
||||
src = fetchurl {
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rubygems";
|
||||
version = "3.5.3";
|
||||
version = "3.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
|
||||
hash = "sha256-8xFe6AgJkvJXwBYbgR4HsBLyAXXtiTSfsayYl33cXJw=";
|
||||
hash = "sha256-v3D+6NzBHr6nbTE5nDtu6pBZCwbBxYfO8bblPsMrASg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-auth";
|
||||
version = "0.7.7";
|
||||
version = "0.7.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-auth";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GO3Sfbi1dwsqQM6rlnEHyE7wolQjdVwD5BAu5ychEuY=";
|
||||
hash = "sha256-yJ0sgw0y9tIiIHgTPVnfYd8zAGjO83qfeeEzstGH9CE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "catch2";
|
||||
version = "3.4.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catchorg";
|
||||
repo = "Catch2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DqGGfNjKPW9HFJrX9arFHyNYjB61uoL6NabZatTWrr0=";
|
||||
hash = "sha256-OyYNUfnu6h1+MfCF8O+awQ4Usad0qrdCtdZhYgOY+Vw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "lib" "doc" "man" ];
|
||||
separateDebugInfo = true;
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
|
@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/troglobit/editline/commit/265c1fb6a0b99bedb157dc7c320f2c9629136518.patch";
|
||||
sha256 = "sha256-9fhQH0hT8BcykGzOUoT18HBtWjjoXnePSGDJQp8GH30=";
|
||||
})
|
||||
|
||||
# Pending autoconf-2.72 upstream support:
|
||||
# https://github.com/troglobit/editline/pull/64
|
||||
(fetchpatch {
|
||||
name = "autoconf-2.72.patch";
|
||||
url = "https://github.com/troglobit/editline/commit/f444a316f5178b8e20fe31e7b2d979e651da077e.patch";
|
||||
hash = "sha256-m3jExTkPvE+ZBwHzf/A+ugzzfbLmeWYn726l7Po7f10=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-wcVxnypZfOPgbJOM+5n7aX2gk96nuFfMAE3B3PG7oYI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
groff
|
||||
pkg-config
|
||||
@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
nuspell
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
checkInputs = [
|
||||
unittest-cpp
|
||||
];
|
||||
|
||||
|
@ -213,6 +213,7 @@
|
||||
, libopenmpt
|
||||
, libopus
|
||||
, libplacebo
|
||||
, libplacebo_5
|
||||
, libpulseaudio
|
||||
, libraw1394
|
||||
, librsvg
|
||||
@ -356,7 +357,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-FQV9/PiarPXCm45ldtCsxGHjlrriL8DKpn1LaKJ8owI=";
|
||||
}
|
||||
)
|
||||
++ (lib.optional (stdenv.isDarwin && lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2")
|
||||
++ (lib.optional (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2")
|
||||
{ # this can be removed post 6.1
|
||||
name = "fix_build_failure_due_to_PropertyKey_EncoderID";
|
||||
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475";
|
||||
@ -584,7 +585,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it?
|
||||
++ optionals withJack [ libjack2 ]
|
||||
++ optionals withLadspa [ ladspaH ]
|
||||
++ optionals withLibplacebo [ libplacebo vulkan-headers ]
|
||||
++ optionals withLibplacebo [ (if (lib.versionAtLeast version "6.1") then libplacebo else libplacebo_5) vulkan-headers ]
|
||||
++ optionals withLzma [ xz ]
|
||||
++ optionals withMfx [ intel-media-sdk ]
|
||||
++ optionals withModplug [ libmodplug ]
|
||||
|
@ -4,7 +4,6 @@
|
||||
, boost
|
||||
, cmake
|
||||
, double-conversion
|
||||
, fetchpatch
|
||||
, fmt_8
|
||||
, gflags
|
||||
, glog
|
||||
@ -64,12 +63,21 @@ stdenv.mkDerivation rec {
|
||||
# temporary hack until folly builds work on aarch64,
|
||||
# see https://github.com/facebook/folly/issues/1880
|
||||
"-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.isx86_64 then "x86_64" else "dummy"}"
|
||||
|
||||
# ensure correct dirs in $dev/lib/pkgconfig/libfolly.pc
|
||||
# see https://github.com/NixOS/nixpkgs/issues/144170
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
];
|
||||
|
||||
# split outputs to reduce downstream closure sizes
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
# patch prefix issues again
|
||||
# see https://github.com/NixOS/nixpkgs/issues/144170
|
||||
postFixup = ''
|
||||
substituteInPlace "$out"/lib/pkgconfig/libfolly.pc \
|
||||
--replace '=''${prefix}//' '=/' \
|
||||
--replace '=''${exec_prefix}//' '=/'
|
||||
substituteInPlace $dev/lib/cmake/${pname}/${pname}-targets-release.cmake \
|
||||
--replace '$'{_IMPORT_PREFIX}/lib/ $out/lib/
|
||||
'';
|
||||
|
||||
# folly-config.cmake, will `find_package` these, thus there should be
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch2
|
||||
, pkg-config
|
||||
, python3
|
||||
, freetype
|
||||
@ -15,25 +14,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fontconfig";
|
||||
version = "2.14.2";
|
||||
version = "2.15.0";
|
||||
|
||||
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-26aVtXvOFQI9LO7e+CBiwrkl5R9dTMSu9zbPE/YKRos=";
|
||||
hash = "sha256-Y6BljQ4G4PqIYQZFK1jvBPIfWCAuoCqUw53g0zNdfA4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Provide 11-lcdfilter-none.conf for NixOS module
|
||||
# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/268
|
||||
(fetchpatch2 {
|
||||
name = "add-optional-11-lcdfilter-none-configuration.patch";
|
||||
url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/c2666a6d9a6ed18b1bfcef8176e25f62993e24db.patch";
|
||||
hash = "sha256-UBzkxy3uxFO+g0aQtPnBZv7OncgQdinwzNwWS8ngjcE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
gperf
|
||||
|
@ -1,16 +1,29 @@
|
||||
{ runCommand, stdenv, lib, libxslt, fontconfig, dejavu_fonts, fontDirectories }:
|
||||
{ runCommand, stdenv, lib, libxslt, fontconfig, dejavu_fonts, fontDirectories
|
||||
, impureFontDirectories ? [
|
||||
# nix user profile
|
||||
"~/.nix-profile/lib/X11/fonts" "~/.nix-profile/share/fonts"
|
||||
]
|
||||
++ lib.optional stdenv.isDarwin "~/Library/Fonts"
|
||||
++ [
|
||||
# FHS paths for non-NixOS platforms
|
||||
"/usr/share/fonts" "/usr/local/share/fonts"
|
||||
]
|
||||
# darwin paths
|
||||
++ lib.optionals stdenv.isDarwin [ "/Library/Fonts" "/System/Library/Fonts" ]
|
||||
# nix default profile
|
||||
++ [ "/nix/var/nix/profiles/default/lib/X11/fonts" "/nix/var/nix/profiles/default/share/fonts" ] }:
|
||||
|
||||
runCommand "fonts.conf"
|
||||
{
|
||||
nativeBuildInputs = [ libxslt ];
|
||||
buildInputs = [ fontconfig ];
|
||||
inherit fontDirectories;
|
||||
# Add a default font for non-nixos systems, <1MB and in nixos defaults.
|
||||
fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ]
|
||||
# further non-nixos fonts on darwin
|
||||
++ lib.optionals stdenv.isDarwin [ "/System/Library/Fonts" "/Library/Fonts" "~/Library/Fonts" ];
|
||||
impureFontDirectories = impureFontDirectories ++ [ dejavu_fonts.minimal ];
|
||||
}
|
||||
''
|
||||
xsltproc --stringparam fontDirectories "$fontDirectories" \
|
||||
--stringparam impureFontDirectories "$impureFontDirectories" \
|
||||
--path ${fontconfig.out}/share/xml/fontconfig \
|
||||
${./make-fonts-conf.xsl} ${fontconfig.out}/etc/fonts/fonts.conf \
|
||||
> $out
|
||||
|
@ -15,6 +15,7 @@
|
||||
<xsl:output method='xml' encoding="UTF-8" doctype-system="urn:fontconfig:fonts.dtd" />
|
||||
|
||||
<xsl:param name="fontDirectories" />
|
||||
<xsl:param name="impureFontDirectories" />
|
||||
|
||||
<xsl:template match="/fontconfig">
|
||||
|
||||
@ -23,29 +24,26 @@
|
||||
|
||||
<!-- the first cachedir will be used to store the cache -->
|
||||
<cachedir prefix="xdg">fontconfig</cachedir>
|
||||
<xsl:text>
</xsl:text>
|
||||
<!-- /var/cache/fontconfig is useful for non-nixos systems -->
|
||||
<cachedir>/var/cache/fontconfig</cachedir>
|
||||
<xsl:text>
</xsl:text>
|
||||
|
||||
<!-- system-wide config -->
|
||||
<include ignore_missing="yes">/etc/fonts/conf.d</include>
|
||||
<xsl:text>
</xsl:text>
|
||||
|
||||
<dir prefix="xdg">fonts</dir>
|
||||
<xsl:text>
</xsl:text>
|
||||
<xsl:for-each select="str:tokenize($fontDirectories)">
|
||||
<dir><xsl:value-of select="." /></dir>
|
||||
<xsl:text>
</xsl:text>
|
||||
</xsl:for-each>
|
||||
|
||||
<!-- nix user profile -->
|
||||
<dir>~/.nix-profile/lib/X11/fonts</dir>
|
||||
<dir>~/.nix-profile/share/fonts</dir>
|
||||
|
||||
<!-- FHS paths for non-NixOS platforms -->
|
||||
<dir>/usr/share/fonts</dir>
|
||||
<dir>/usr/local/share/fonts</dir>
|
||||
|
||||
<!-- nix default profile -->
|
||||
<dir>/nix/var/nix/profiles/default/lib/X11/fonts</dir>
|
||||
<dir>/nix/var/nix/profiles/default/share/fonts</dir>
|
||||
<xsl:for-each select="str:tokenize($impureFontDirectories)">
|
||||
<dir><xsl:value-of select="." /></dir>
|
||||
<xsl:text>
</xsl:text>
|
||||
</xsl:for-each>
|
||||
|
||||
</fontconfig>
|
||||
|
||||
|
@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoconf automake pkg-config ];
|
||||
|
||||
buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libavif ]
|
||||
++ lib.optional withXorg libXpm;
|
||||
buildInputs = [ zlib freetype libpng libjpeg libwebp libtiff libavif ]
|
||||
++ lib.optionals withXorg [ fontconfig libXpm ];
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
|
@ -35,11 +35,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnutls";
|
||||
version = "3.8.2";
|
||||
version = "3.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
|
||||
hash = "sha256-52XlAW/6m53SQ+NjoEYNV3B0RE7iSRJn2y6WycKt73c=";
|
||||
hash = "sha256-90/FlUsn1Oxt+7Ed6ph4iLWxJCiaNwOvytoO5SD0Fz4=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
|
||||
|
@ -4,6 +4,7 @@
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, libunwind
|
||||
, perl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -29,7 +30,8 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
# tcmalloc uses libunwind in a way that works correctly only on non-ARM dynamically linked linux
|
||||
buildInputs = lib.optional (stdenv.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic )) libunwind;
|
||||
buildInputs = [ perl ]
|
||||
++ lib.optional (stdenv.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic )) libunwind;
|
||||
|
||||
# Disable general dynamic TLS on AArch to support dlopen()'ing the library:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1483558
|
||||
|
@ -1 +1 @@
|
||||
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.113/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.114/ -A '*.tar.xz' )
|
||||
|
@ -4,667 +4,667 @@
|
||||
|
||||
{
|
||||
attica = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/attica-5.113.0.tar.xz";
|
||||
sha256 = "0p6n2jvky5x9gpwmp31mdxf0bzywaljgnkszgbklyc35xk9i6j14";
|
||||
name = "attica-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/attica-5.114.0.tar.xz";
|
||||
sha256 = "0gkdsm1vyyyxxyl4rni9s2bdz5w6zphzjl58fddjl899da06hqfq";
|
||||
name = "attica-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
baloo = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/baloo-5.113.0.tar.xz";
|
||||
sha256 = "1jv7202dj2w0vcv49bgp0iv1sfy3kdqr974rcr77pcfzhhda9bix";
|
||||
name = "baloo-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/baloo-5.114.0.tar.xz";
|
||||
sha256 = "19sib1y0m5h2gnnpr9rfk810p6pdfm4zzxlm0a44r7910llp8i50";
|
||||
name = "baloo-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
bluez-qt = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/bluez-qt-5.113.0.tar.xz";
|
||||
sha256 = "1y6nkl9zc5298jc6klxz88h6srmma085w1q5l4jmjihgys2zkcx7";
|
||||
name = "bluez-qt-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/bluez-qt-5.114.0.tar.xz";
|
||||
sha256 = "1ni50jwnb5ww8mkql0p3q8660c0srj8p0ik27lvxakwdq4wf6l9s";
|
||||
name = "bluez-qt-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-icons = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/breeze-icons-5.113.0.tar.xz";
|
||||
sha256 = "0kb3wchx84dpi77zsi1b9pzlkhg3sjagxcsf1pdappagq3xn1p48";
|
||||
name = "breeze-icons-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/breeze-icons-5.114.0.tar.xz";
|
||||
sha256 = "0z5cpv10jyjdwjfkm7nj6hyp4vj29apm476hvbpb4gan27jyb91y";
|
||||
name = "breeze-icons-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
extra-cmake-modules = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/extra-cmake-modules-5.113.0.tar.xz";
|
||||
sha256 = "1i1vpf9860cwrq5b01yrgf94hmzk9dx637j638shgjmyxr058pi6";
|
||||
name = "extra-cmake-modules-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/extra-cmake-modules-5.114.0.tar.xz";
|
||||
sha256 = "0z4nqravsfzlsgvkg5rha2d0qxfr3pfncw7z2fxzzqvzj7mfk6im";
|
||||
name = "extra-cmake-modules-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
frameworkintegration = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/frameworkintegration-5.113.0.tar.xz";
|
||||
sha256 = "17i7frachq23kfg78ar33x5acwf7pmwl1a5c02qif44mml8b09hi";
|
||||
name = "frameworkintegration-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/frameworkintegration-5.114.0.tar.xz";
|
||||
sha256 = "1dqgzhhh8gnvl8jsvh2i6pjn935d61avh63b4z9kpllhvp9a2lnd";
|
||||
name = "frameworkintegration-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivities = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kactivities-5.113.0.tar.xz";
|
||||
sha256 = "1d9lkhp344wdss9vab3gh9h31f1k6fifdhp17fblpkykgyvbb26y";
|
||||
name = "kactivities-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kactivities-5.114.0.tar.xz";
|
||||
sha256 = "10pyynqz8c22la9aqms080iqlisj3irbi1kwnn3s0vg5dsjxr1p3";
|
||||
name = "kactivities-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivities-stats = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kactivities-stats-5.113.0.tar.xz";
|
||||
sha256 = "136z2njw3k2l71xp4vg10sm5q925xh8yfr9a784wnr0kwngdb71i";
|
||||
name = "kactivities-stats-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kactivities-stats-5.114.0.tar.xz";
|
||||
sha256 = "1zhrs2p3c831rwx7ww87i82k5i236vfywdxv7zhz93k3vffyqby7";
|
||||
name = "kactivities-stats-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kapidox = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kapidox-5.113.0.tar.xz";
|
||||
sha256 = "05407c01wnjyslbbz0w5wipjpx6ng3izya41mg13g700ainj9q1x";
|
||||
name = "kapidox-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kapidox-5.114.0.tar.xz";
|
||||
sha256 = "0xxw3lvipyax8r1af3ypwjj6waarbp2z9n11fjb4kvyigsypglmb";
|
||||
name = "kapidox-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
karchive = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/karchive-5.113.0.tar.xz";
|
||||
sha256 = "03a3p85hmx4ycfp0y5l9yw4cy3i9jwy7jd27psmckr4q0538k91d";
|
||||
name = "karchive-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/karchive-5.114.0.tar.xz";
|
||||
sha256 = "015gc1zarny8r478p7g9m6r67l5dk3r0vcp28ilmfmznxy0k0hda";
|
||||
name = "karchive-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kauth = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kauth-5.113.0.tar.xz";
|
||||
sha256 = "0ncpyq2l53p4yhhxkvk23x0ji9amrbnm6kbz8dp573cqww79pih2";
|
||||
name = "kauth-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kauth-5.114.0.tar.xz";
|
||||
sha256 = "1rkf9mc9718wn8pzd3d3wcg3lsn0vkr9a2cqnz86rbg3cf2qdbir";
|
||||
name = "kauth-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kbookmarks = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kbookmarks-5.113.0.tar.xz";
|
||||
sha256 = "1fgnh8amy2ghn50i59al0iyqvj05pzdxai9qxqzbvi65f1pibi7d";
|
||||
name = "kbookmarks-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kbookmarks-5.114.0.tar.xz";
|
||||
sha256 = "06lnsyjhh80mdcqjww40glinmrjydbmkhv27a267vf34r7kam9rc";
|
||||
name = "kbookmarks-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcalendarcore = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kcalendarcore-5.113.0.tar.xz";
|
||||
sha256 = "18psjzqcfzaplcfjpjda983mrpv306il0j49q3rm9hj9ycj54wc2";
|
||||
name = "kcalendarcore-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kcalendarcore-5.114.0.tar.xz";
|
||||
sha256 = "0aimda01zqw4fz5ldvz4vh767bi10r00kvm62n89nxhsq46wlk7p";
|
||||
name = "kcalendarcore-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcmutils = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kcmutils-5.113.0.tar.xz";
|
||||
sha256 = "1xbfzw2zfl966zp70jzfp3hjzn334zf4hnwr82priffafgrin57s";
|
||||
name = "kcmutils-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kcmutils-5.114.0.tar.xz";
|
||||
sha256 = "1pblf3c60m0gn3vhdprw28f8y54kij02jwz91r2vnmng8d1xkrp9";
|
||||
name = "kcmutils-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcodecs = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kcodecs-5.113.0.tar.xz";
|
||||
sha256 = "1xvaq0yg4n4lwyq3yx2m8jrvfg7f0qrwgxxam4rmp2l245bvn34i";
|
||||
name = "kcodecs-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kcodecs-5.114.0.tar.xz";
|
||||
sha256 = "080zvcqd8iq05p5x3qaf3rryx75lg2l2j1dr18sp50ir50zfwh2w";
|
||||
name = "kcodecs-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcompletion = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kcompletion-5.113.0.tar.xz";
|
||||
sha256 = "016280h98j1ssvc3a4b3vyh4s93s9y9hn1jrpbfbkm9xxnvi7k79";
|
||||
name = "kcompletion-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kcompletion-5.114.0.tar.xz";
|
||||
sha256 = "0qvdxqlh1dklkbmqfjg5gc3dkdicgzn6q5lgvyf8cv46dinj6mwc";
|
||||
name = "kcompletion-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfig = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kconfig-5.113.0.tar.xz";
|
||||
sha256 = "0fwhn3yp4gfwjiy5dx7gs0zd65yjlrrzkqpy7fpg7n97qf99q2a8";
|
||||
name = "kconfig-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kconfig-5.114.0.tar.xz";
|
||||
sha256 = "0hghdh4p6cq9ckp4g5jdgd8w47pdsxxvzimrdfjrs71lmy8ydiy2";
|
||||
name = "kconfig-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfigwidgets = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kconfigwidgets-5.113.0.tar.xz";
|
||||
sha256 = "0bmk5qxiss7a71xpfsbqj831wkcf94b7wfbw9xisvnxlfmf60y4v";
|
||||
name = "kconfigwidgets-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kconfigwidgets-5.114.0.tar.xz";
|
||||
sha256 = "16layydkcwfbvzxqjzprkq8bbxifn0z0wm7mc9bzwrfxy761rjnj";
|
||||
name = "kconfigwidgets-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcontacts = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kcontacts-5.113.0.tar.xz";
|
||||
sha256 = "1y9cdv1g2ypwl4b0hk1sxk7lvb5qkbm4n1gh62plqsran62jsimm";
|
||||
name = "kcontacts-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kcontacts-5.114.0.tar.xz";
|
||||
sha256 = "0lyqvbs216p5zpssaf4pyccph7nbwkbvhpmhbi32y2rm23cmxlwf";
|
||||
name = "kcontacts-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcoreaddons = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kcoreaddons-5.113.0.tar.xz";
|
||||
sha256 = "1bhanzfjw2i49sx2hjnim8k72vvbs7gyig7nkqkgbaxzpa8qgwrf";
|
||||
name = "kcoreaddons-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kcoreaddons-5.114.0.tar.xz";
|
||||
sha256 = "1wv3s3xsiii96k17nzs2fb0ih2lyg52krf58v44nlk9wfi4wmnqx";
|
||||
name = "kcoreaddons-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcrash = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kcrash-5.113.0.tar.xz";
|
||||
sha256 = "1mg90xm6ckcd30s07psn30sgh81lx8kfs0p1h6cblg4q8bkgkndv";
|
||||
name = "kcrash-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kcrash-5.114.0.tar.xz";
|
||||
sha256 = "1avi4yd3kpjqxrvci1nicxbh9mjafj1w2vgfmqanq66b76s4kxj1";
|
||||
name = "kcrash-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdav = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kdav-5.113.0.tar.xz";
|
||||
sha256 = "1djng9c741xairr84nvjbkq4dk551p7yk91g8d4nndy8s1kiz1dv";
|
||||
name = "kdav-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kdav-5.114.0.tar.xz";
|
||||
sha256 = "11959fxz24snk2l31kw8w96wah0s2fjimimrxh6xhppiy5qp2fp2";
|
||||
name = "kdav-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdbusaddons = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kdbusaddons-5.113.0.tar.xz";
|
||||
sha256 = "101a406f8i0wgaxd0ilvfcb3plzjgvxw9bhhm5pin6fpr0xkjrnk";
|
||||
name = "kdbusaddons-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kdbusaddons-5.114.0.tar.xz";
|
||||
sha256 = "0pzzznyxhi48z5hhdsdxz3vaaihrdshpx65ha2v2nn2gh3ww7ikm";
|
||||
name = "kdbusaddons-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeclarative = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kdeclarative-5.113.0.tar.xz";
|
||||
sha256 = "1wj9arkmjdrac04cq2w5bw5184jnlq5xn2cw6n7lajc31yrbc0rk";
|
||||
name = "kdeclarative-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kdeclarative-5.114.0.tar.xz";
|
||||
sha256 = "0w98pj8acxb4m9645963rzq5vja1fbih5czz24mf9zdqlg2dkz8g";
|
||||
name = "kdeclarative-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kded = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kded-5.113.0.tar.xz";
|
||||
sha256 = "1vb3z7r2l206n7p70a4cbkrm7fvyk7hqqf0bz7514r4g86l4l5n4";
|
||||
name = "kded-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kded-5.114.0.tar.xz";
|
||||
sha256 = "00n4isc4ahii0ldrg761lkmnq27kmrfqs9zkmpvmgbg57259mvc3";
|
||||
name = "kded-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdelibs4support = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/portingAids/kdelibs4support-5.113.0.tar.xz";
|
||||
sha256 = "1z843zq1g5n3b8gb20y8266hyikvbzdsgc77gvcgzvqfdxk19l24";
|
||||
name = "kdelibs4support-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/portingAids/kdelibs4support-5.114.0.tar.xz";
|
||||
sha256 = "17473him2fjfcw5f88diarqac815wsakfyb9fka82a4qqh9l41mc";
|
||||
name = "kdelibs4support-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesignerplugin = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/portingAids/kdesignerplugin-5.113.0.tar.xz";
|
||||
sha256 = "05hwq8rpm1f9ad5fyk2gjqxm6gvvx2gx2zdbklww9ghlh8qndl9i";
|
||||
name = "kdesignerplugin-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/portingAids/kdesignerplugin-5.114.0.tar.xz";
|
||||
sha256 = "0zlvkayv6zl5rp1076bscmdzyw93y7sxqb5848w11vs0g9amcj9n";
|
||||
name = "kdesignerplugin-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesu = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kdesu-5.113.0.tar.xz";
|
||||
sha256 = "085d3d6qpl4m7z8smm0bq9khfjjglpb1gd9n8q0d541127y2cpq4";
|
||||
name = "kdesu-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kdesu-5.114.0.tar.xz";
|
||||
sha256 = "14dcf32izn4lxr8vx372rfznflc1rcxwanx06phkd8mx9zyg4jxr";
|
||||
name = "kdesu-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdewebkit = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/portingAids/kdewebkit-5.113.0.tar.xz";
|
||||
sha256 = "18bmg88xj07h8y5f3f2ckjs9m61mf8jrxrg4vg8hrf4nabxz20xn";
|
||||
name = "kdewebkit-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/portingAids/kdewebkit-5.114.0.tar.xz";
|
||||
sha256 = "04zc2qs13k04gsn124mnh6sqi3pax8c014jcb0qdh3h2r2y72bz3";
|
||||
name = "kdewebkit-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdnssd = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kdnssd-5.113.0.tar.xz";
|
||||
sha256 = "1hbb9zy1f13m45b6kzndxw619vnmx0s418brqgkdaxgsh12j5anq";
|
||||
name = "kdnssd-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kdnssd-5.114.0.tar.xz";
|
||||
sha256 = "1zw5rkprr54j05ic8zljk57zahp2v6333slr253r3n1679zqlv64";
|
||||
name = "kdnssd-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdoctools = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kdoctools-5.113.0.tar.xz";
|
||||
sha256 = "0cfs4znhp7psrz99j3brp8q39gg0bpzvkrdx90zl6vvrc06d2zaa";
|
||||
name = "kdoctools-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kdoctools-5.114.0.tar.xz";
|
||||
sha256 = "15s58r2zvdckw30x9q9ir8h1i8q2ncfgjn9h4jnmylwm79z3z27v";
|
||||
name = "kdoctools-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kemoticons = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kemoticons-5.113.0.tar.xz";
|
||||
sha256 = "127frvsp1h9hg755vz2i609wxqqgzgsz15iqr7hcpbmmf6xvm8i2";
|
||||
name = "kemoticons-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kemoticons-5.114.0.tar.xz";
|
||||
sha256 = "0w87prkhdmba7y8ylbycdpwdzd2djmp7hvv5ljb9s4aqqhnn3vw4";
|
||||
name = "kemoticons-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kfilemetadata = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kfilemetadata-5.113.0.tar.xz";
|
||||
sha256 = "1ap25y66y1r185fghvkkkkp4f6acnkazny8wxw5hv1gg25ilpsir";
|
||||
name = "kfilemetadata-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kfilemetadata-5.114.0.tar.xz";
|
||||
sha256 = "15va29chlsrxii02w1ax718hp1b14ym59lcfyzh7w30zlf681560";
|
||||
name = "kfilemetadata-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kglobalaccel = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kglobalaccel-5.113.0.tar.xz";
|
||||
sha256 = "0ibm1wd7fhi3j5za0agyq2zrs9nx5a8b47iijkzgkpz9ylxniwrs";
|
||||
name = "kglobalaccel-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kglobalaccel-5.114.0.tar.xz";
|
||||
sha256 = "19mmav055fnzyl760fyhf0pdvaidd5i1h04l2hcnpin4p1jnpfap";
|
||||
name = "kglobalaccel-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kguiaddons = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kguiaddons-5.113.0.tar.xz";
|
||||
sha256 = "1ykhxgx89x1qv916pcz3j0q14ylalg9v23jjw0dbwpg5hlj4qlyc";
|
||||
name = "kguiaddons-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kguiaddons-5.114.0.tar.xz";
|
||||
sha256 = "0riya9plcz9c1ndhdbsradssndshbm12705swn7vf7am17n7f947";
|
||||
name = "kguiaddons-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kholidays = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kholidays-5.113.0.tar.xz";
|
||||
sha256 = "1wq397j3m3s9a45k9h5hsdsfansvb3a5q8biag2w3fsb1i84id0i";
|
||||
name = "kholidays-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kholidays-5.114.0.tar.xz";
|
||||
sha256 = "19r8dxglz5ll6iyvigsccil3ikvcsnyy5nwcpjvjr1c0brigcjmy";
|
||||
name = "kholidays-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
khtml = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/portingAids/khtml-5.113.0.tar.xz";
|
||||
sha256 = "0m284rwq8f49j71lcapzr4qi0f72a0adnv67mfg5blar867161mq";
|
||||
name = "khtml-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/portingAids/khtml-5.114.0.tar.xz";
|
||||
sha256 = "1mf84zs9hjvmi74f8rgqzrfkqjq597f9k64dn1bqcj13v0w10vry";
|
||||
name = "khtml-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ki18n = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/ki18n-5.113.0.tar.xz";
|
||||
sha256 = "0hl0qp3653xiwa5ndk82ygy2kgrc0pygqkknb1cx5w54s56bm57w";
|
||||
name = "ki18n-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/ki18n-5.114.0.tar.xz";
|
||||
sha256 = "1yg03awcx5ay6lgbgwv91i0ankrm94z9m0wky4v03gnwnvw8pa0v";
|
||||
name = "ki18n-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kiconthemes = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kiconthemes-5.113.0.tar.xz";
|
||||
sha256 = "0q2c1s8pwl7dnx9v7q061zn5n1prk0vv0j77kki9wfncjaf15g0g";
|
||||
name = "kiconthemes-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kiconthemes-5.114.0.tar.xz";
|
||||
sha256 = "0ndiqmcs1ybj4acc6k3p9jwq09slqc4nj12ifqvlxrfj3ak6sb28";
|
||||
name = "kiconthemes-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kidletime = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kidletime-5.113.0.tar.xz";
|
||||
sha256 = "1cdfhn3mcxvizba1gpf0viba3g0mnva3l226lkca3p9ps8c4z3rm";
|
||||
name = "kidletime-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kidletime-5.114.0.tar.xz";
|
||||
sha256 = "06sc9w54g4n7s5gjkqz08rgcz6v3pr0bdgx3gbjgzass6l4m8w7p";
|
||||
name = "kidletime-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kimageformats = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kimageformats-5.113.0.tar.xz";
|
||||
sha256 = "0gys83sazgbj7h3yiaacqr464z951ixygrhzcw16cnqjm8phic44";
|
||||
name = "kimageformats-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kimageformats-5.114.0.tar.xz";
|
||||
sha256 = "1nfzpgnrbwncx9zp9cwa169jlfv7i85p00a07d4jc5hrdyvvkn0w";
|
||||
name = "kimageformats-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kinit = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kinit-5.113.0.tar.xz";
|
||||
sha256 = "1ydmgxyr5j9zi0a5vlb64kkjxka3rsyvzj10y3dww92qyapnn2bv";
|
||||
name = "kinit-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kinit-5.114.0.tar.xz";
|
||||
sha256 = "0b6z9gq05vz20hm5y9ai3sbqq3gxwm3a3z88dkvi7dywk7vbqcph";
|
||||
name = "kinit-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kio = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kio-5.113.0.tar.xz";
|
||||
sha256 = "1bjmv3wdpmzqbv1xzzl0ydirccbknnjyqn6wzb057zgy7kpi1cd8";
|
||||
name = "kio-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kio-5.114.0.tar.xz";
|
||||
sha256 = "0nwmxbfhvfw69q07vxvflri7rkdczyc89xv4ll3nrzrhgf15kb2z";
|
||||
name = "kio-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kirigami2 = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kirigami2-5.113.0.tar.xz";
|
||||
sha256 = "0zy3s841q2xw4d048a3qh4cfh9kb3qaqxml4ny5zi73crm173h8y";
|
||||
name = "kirigami2-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kirigami2-5.114.0.tar.xz";
|
||||
sha256 = "1bd232gs4394fa3aq31mjqrn8f3vjsghx7817szi7ryvnn6fnqkw";
|
||||
name = "kirigami2-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemmodels = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kitemmodels-5.113.0.tar.xz";
|
||||
sha256 = "01i1s7rw7ndp3gnl3bg0pv8a9qz95rmz0jxkw97p72gcah2q2yvk";
|
||||
name = "kitemmodels-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kitemmodels-5.114.0.tar.xz";
|
||||
sha256 = "1bfmcrbcbrvp2rcaf32vzvarqwp41gn6s4xpf56hnxbwf9kgk1fl";
|
||||
name = "kitemmodels-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemviews = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kitemviews-5.113.0.tar.xz";
|
||||
sha256 = "0wnmgm72kv7vxadsrkdbnjknb4lkzrmn6gk7car7jx2i91kz7xdd";
|
||||
name = "kitemviews-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kitemviews-5.114.0.tar.xz";
|
||||
sha256 = "00vl2ck0pq0sqcxvhlr2pimgr27hd9v7y9dz6w4arb5smi5q1ixg";
|
||||
name = "kitemviews-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjobwidgets = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kjobwidgets-5.113.0.tar.xz";
|
||||
sha256 = "0f5shrapjvwp8bc34vypzfsfl07pj7nmdflf9lcwc8h3kwf2rxqr";
|
||||
name = "kjobwidgets-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kjobwidgets-5.114.0.tar.xz";
|
||||
sha256 = "1ymlqi5cqcs79nj1vff8pqwgvy0dxj5vv7l529w3a3n315hkrny8";
|
||||
name = "kjobwidgets-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjs = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/portingAids/kjs-5.113.0.tar.xz";
|
||||
sha256 = "0h50jyd9mddnavafikn9haqqcq1mql2v8qcc1c233ffplkx1f6hb";
|
||||
name = "kjs-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/portingAids/kjs-5.114.0.tar.xz";
|
||||
sha256 = "08nh6yr6bqifpb5s9a4wbjwmwnm7zp5k8hcdmyb6mlcbam9qp6j7";
|
||||
name = "kjs-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjsembed = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/portingAids/kjsembed-5.113.0.tar.xz";
|
||||
sha256 = "0bwsj0n3d038vs3n2mw6x8srbg4da40bw59q14cpv70ws1sg2r2n";
|
||||
name = "kjsembed-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/portingAids/kjsembed-5.114.0.tar.xz";
|
||||
sha256 = "1xglisxv7nfsbj9lgpvc4c5ql4f6m7n71vf7vih5ff3aqybrkgxa";
|
||||
name = "kjsembed-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kmediaplayer = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/portingAids/kmediaplayer-5.113.0.tar.xz";
|
||||
sha256 = "1nyn7x28j17yrb7zx31519h2ghp5h3pwk6baxais0q1mv9azyfay";
|
||||
name = "kmediaplayer-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/portingAids/kmediaplayer-5.114.0.tar.xz";
|
||||
sha256 = "092yvzvrkvr8xxncw7h5ghfd2bggzxsqfj67c2vhymhfw4i0c54x";
|
||||
name = "kmediaplayer-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knewstuff = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/knewstuff-5.113.0.tar.xz";
|
||||
sha256 = "0fj17rxyp9wmmc9jh8zjpgwpia9r4xlvabvkb4ynd1vhy58k8w51";
|
||||
name = "knewstuff-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/knewstuff-5.114.0.tar.xz";
|
||||
sha256 = "15xmx7rnnrsz2cj044aviyr4hi9h8r0nnva9qzcjcq2hkkgj7wjj";
|
||||
name = "knewstuff-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifications = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/knotifications-5.113.0.tar.xz";
|
||||
sha256 = "1yzpf12wsi3h3v7z68b42rjdrnfkah6avq4y611b0r004shgkl1x";
|
||||
name = "knotifications-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/knotifications-5.114.0.tar.xz";
|
||||
sha256 = "0cjd5ml9hyzprjgmrc132cmp7g9hnl0h5swlxw2ifqnxxyfkg72b";
|
||||
name = "knotifications-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifyconfig = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/knotifyconfig-5.113.0.tar.xz";
|
||||
sha256 = "1gdzyxcc371lmnzc153k8wdyxgsv7r2y44j8d5srld36amssxnc6";
|
||||
name = "knotifyconfig-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/knotifyconfig-5.114.0.tar.xz";
|
||||
sha256 = "049n64qlr69zv1dc1dhgbsca37179hp06xfsxnhg97lblz3p3gds";
|
||||
name = "knotifyconfig-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpackage = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kpackage-5.113.0.tar.xz";
|
||||
sha256 = "04605kr2w0yhwx64lqq1qc1zmmip7vkxnxv3fs2846864814fkk2";
|
||||
name = "kpackage-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kpackage-5.114.0.tar.xz";
|
||||
sha256 = "0v165az3k5lfszxy0kl2464573y0dcq92fyfiklwnkkcjsvba69d";
|
||||
name = "kpackage-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kparts = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kparts-5.113.0.tar.xz";
|
||||
sha256 = "0mx95xrr6pad4q5p0sn2iqmc59787bpfkvkyiz9li56wynh1jf48";
|
||||
name = "kparts-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kparts-5.114.0.tar.xz";
|
||||
sha256 = "1rrf765p554r7l8j23gx5zxdq6wimh0v91qdkwz7ilm2qr16vd5v";
|
||||
name = "kparts-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpeople = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kpeople-5.113.0.tar.xz";
|
||||
sha256 = "08g44hq1iywycf44imdqkql4gx2vyg87n1nxxqq6ssva0kybia7n";
|
||||
name = "kpeople-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kpeople-5.114.0.tar.xz";
|
||||
sha256 = "04v0s3amn6lbb16qvp1r6figckva6xk8z7djk8jda8fbnx8dx2r1";
|
||||
name = "kpeople-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kplotting = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kplotting-5.113.0.tar.xz";
|
||||
sha256 = "16pfia711y9iqnl0svyg00g7a2x4ln8yaxmrmy74xj7y0dj5jcyj";
|
||||
name = "kplotting-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kplotting-5.114.0.tar.xz";
|
||||
sha256 = "17x58pplln0plqiyhjpzdiqxngylxq5gkc5gk7b91xzm783x2k0n";
|
||||
name = "kplotting-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpty = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kpty-5.113.0.tar.xz";
|
||||
sha256 = "0hzn18lidiiaxr08fjhk0r5zh0m01ls46w1fyjnv42bvf7vd7v5y";
|
||||
name = "kpty-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kpty-5.114.0.tar.xz";
|
||||
sha256 = "0fm7bfp89kvg1a64q8piiyal71p6vjnqcm13zak6r9fbfwcm0gs9";
|
||||
name = "kpty-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kquickcharts = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kquickcharts-5.113.0.tar.xz";
|
||||
sha256 = "0v47c6mdx72rdz441zk4csc6a2bj6wi7772vlpz2yr3ay70l8f5d";
|
||||
name = "kquickcharts-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kquickcharts-5.114.0.tar.xz";
|
||||
sha256 = "1f91x92qdzxp31z7ixx9jn41hq9f3w9hjia94pab9vsnaz8prbd1";
|
||||
name = "kquickcharts-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kross = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/portingAids/kross-5.113.0.tar.xz";
|
||||
sha256 = "1cqdcm086a4kjrb9k6cwqn05fg5ij3zppc8bi7dxrgrfxc494c8s";
|
||||
name = "kross-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/portingAids/kross-5.114.0.tar.xz";
|
||||
sha256 = "0bbpi63lxbb4ylx2jd172a2bqyxkd606n7w8zrvcjy466lkv3sz4";
|
||||
name = "kross-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
krunner = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/krunner-5.113.0.tar.xz";
|
||||
sha256 = "0z7d6nyvrlgr7aw9ibz1xgp62220iwzvhqpqikwlxhc9hjggmdlh";
|
||||
name = "krunner-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/krunner-5.114.0.tar.xz";
|
||||
sha256 = "1rjs9b87bi4f6pdm9fwnha2sj2mrq260l80iz2jq1zah83p546sw";
|
||||
name = "krunner-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kservice = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kservice-5.113.0.tar.xz";
|
||||
sha256 = "09ph72jb40pkw1nzayvzzav4m6240amkj6jvx390dmsvr7jzn0nb";
|
||||
name = "kservice-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kservice-5.114.0.tar.xz";
|
||||
sha256 = "0jdvlplnsb9w628wh3ip6awxvhgyc097zh7ls9614ymkbnpc9xca";
|
||||
name = "kservice-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktexteditor = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/ktexteditor-5.113.0.tar.xz";
|
||||
sha256 = "02nclhfgqximsl8w6la5w0fshzcj71nrz5kjb2p1s28xdf1ahvgg";
|
||||
name = "ktexteditor-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/ktexteditor-5.114.0.tar.xz";
|
||||
sha256 = "06amzk6290imi2gj3v1k3f56zdlad7zbz4wwlf34v4iibj9mfgw8";
|
||||
name = "ktexteditor-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktextwidgets = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/ktextwidgets-5.113.0.tar.xz";
|
||||
sha256 = "060grfna4kj8nhxgk38yf3csqfgxg0358dkwmg8aw5y5k0jys2az";
|
||||
name = "ktextwidgets-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/ktextwidgets-5.114.0.tar.xz";
|
||||
sha256 = "0w1wwyd3fy351rmkhf3i55is5031j2zxvswm0b1sb3pd159v888v";
|
||||
name = "ktextwidgets-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kunitconversion = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kunitconversion-5.113.0.tar.xz";
|
||||
sha256 = "1x7gwrz43wvd3r87x545bxxyzhqj87mhhx05dqh0b09vqk6gxzza";
|
||||
name = "kunitconversion-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kunitconversion-5.114.0.tar.xz";
|
||||
sha256 = "1qyqvl8fy105zwma5nrkz9zg5932w2f33daw0azhj322iffrm39n";
|
||||
name = "kunitconversion-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kwallet-5.113.0.tar.xz";
|
||||
sha256 = "0aq8d5c5p9j19bzspd205gh297n7fh5f26m49826fx5mp1im4lwn";
|
||||
name = "kwallet-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kwallet-5.114.0.tar.xz";
|
||||
sha256 = "1cji8bvy5m77zljyrrgipsw8pxcds1sgikxlq3sdfxymcsw2wr36";
|
||||
name = "kwallet-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kwayland-5.113.0.tar.xz";
|
||||
sha256 = "1anhvz4b1q835py451jznnfj9z2jh1fwnx4lfwhi67viaplpiwqg";
|
||||
name = "kwayland-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kwayland-5.114.0.tar.xz";
|
||||
sha256 = "1lzmlbv5vl656cigjj07hbc0gj6g1i2xqanvnhxj360109kzilf1";
|
||||
name = "kwayland-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwidgetsaddons = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kwidgetsaddons-5.113.0.tar.xz";
|
||||
sha256 = "01rabfl2v5l9r3fgwgy75krib1486mdc4k3kfi035s6dvg8iy015";
|
||||
name = "kwidgetsaddons-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kwidgetsaddons-5.114.0.tar.xz";
|
||||
sha256 = "1cc8lsk9v0cp2wiy1q26mlkf8np0yj01sq8a7w13ga5s6hv4sh2n";
|
||||
name = "kwidgetsaddons-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwindowsystem = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kwindowsystem-5.113.0.tar.xz";
|
||||
sha256 = "1hzavawsl14rsl9qb874zahvsvkrbcin7fg1xn1d7ssypphlis51";
|
||||
name = "kwindowsystem-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kwindowsystem-5.114.0.tar.xz";
|
||||
sha256 = "03xbsf1pmswd2kpn3pdszp4vndclsh7j02fp22npxaxllmfr4va9";
|
||||
name = "kwindowsystem-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlgui = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/kxmlgui-5.113.0.tar.xz";
|
||||
sha256 = "022l557z9jgrz2hj8hh9z7cjkvfhl5rdp81jhk2gd3wzmyf5zzmq";
|
||||
name = "kxmlgui-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/kxmlgui-5.114.0.tar.xz";
|
||||
sha256 = "0gvjf32ssc0r0bdpb1912ldsr5rjls8vrscwy5gm9g5gw504hmmr";
|
||||
name = "kxmlgui-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlrpcclient = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/portingAids/kxmlrpcclient-5.113.0.tar.xz";
|
||||
sha256 = "141vlxxnyll5q0wg2va5prg0wf0hpymlzfkg37h1ngjwjs2x2yc1";
|
||||
name = "kxmlrpcclient-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/portingAids/kxmlrpcclient-5.114.0.tar.xz";
|
||||
sha256 = "1fgjai3vj3yk67ynhd7blilyrdhdn5nvma3v3j1sbdg98pr7qzar";
|
||||
name = "kxmlrpcclient-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
modemmanager-qt = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/modemmanager-qt-5.113.0.tar.xz";
|
||||
sha256 = "069irg7ckws06qzq5mwkxvzx4r2xqwagwif6dq284hjihrz38l8b";
|
||||
name = "modemmanager-qt-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/modemmanager-qt-5.114.0.tar.xz";
|
||||
sha256 = "16jqhmcpsffl9a7c0bb4hwjy3bw5rakdsnc5n6y8djc6237jl9pi";
|
||||
name = "modemmanager-qt-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
networkmanager-qt = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/networkmanager-qt-5.113.0.tar.xz";
|
||||
sha256 = "03wdbw6dr9a49qcs1j2lm9q894rvdl8xqjpwm3yrrjb866yyhcg1";
|
||||
name = "networkmanager-qt-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/networkmanager-qt-5.114.0.tar.xz";
|
||||
sha256 = "10anjsnrzawrfjlznjvvl2sbxrajl2ddnq2kgl314b5dk7z3yk4n";
|
||||
name = "networkmanager-qt-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen-icons = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/oxygen-icons-5.113.0.tar.xz";
|
||||
sha256 = "0grdn0gz59lfp4n5mmlan71x3iwgm87dnhk8mla02dn7hv0fl0xx";
|
||||
name = "oxygen-icons-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/oxygen-icons-5.114.0.tar.xz";
|
||||
sha256 = "0f6hv5g8y2ggagrq9x9b78bqxqg6bqcpm1xxhf69ybgjikrqdf2r";
|
||||
name = "oxygen-icons-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-framework = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/plasma-framework-5.113.0.tar.xz";
|
||||
sha256 = "0iijawnh9ri1n6qgdrraf3lq5sy7z0jy5ihmfzk22pn10ba992ky";
|
||||
name = "plasma-framework-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/plasma-framework-5.114.0.tar.xz";
|
||||
sha256 = "058hl76q35bw3rzmv348azk1lmhkpgmfrxr3jd9s1hphijr8sgcx";
|
||||
name = "plasma-framework-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
prison = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/prison-5.113.0.tar.xz";
|
||||
sha256 = "18y4gxj5zml59a8i7gzr5cbbzi5wyknbva2ihfdpqf85vw3x2wdp";
|
||||
name = "prison-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/prison-5.114.0.tar.xz";
|
||||
sha256 = "1wbr1lryxmrx65ilq1bhqsdhhikrih977nhpb02fq0cqnvv7v9i7";
|
||||
name = "prison-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
purpose = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/purpose-5.113.0.tar.xz";
|
||||
sha256 = "0p5zcvrkaw71w8795x2a4lx3z977j6jcnwbi9wi1956gcx4avhhf";
|
||||
name = "purpose-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/purpose-5.114.0.tar.xz";
|
||||
sha256 = "1lj67f0x4gvbh9by3c3crbbwwnx7b9ifjna9ggziya4m6zj0m4z1";
|
||||
name = "purpose-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qqc2-desktop-style = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/qqc2-desktop-style-5.113.0.tar.xz";
|
||||
sha256 = "0sk0sk7cq511m0rjmgsg1z8s4sy064qmbql472ljyblafm71wj6p";
|
||||
name = "qqc2-desktop-style-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/qqc2-desktop-style-5.114.0.tar.xz";
|
||||
sha256 = "1y5g91vybjvhwmzpfwrc70q5j7jxf5b972f9fh2vzb930jir6c8g";
|
||||
name = "qqc2-desktop-style-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
solid = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/solid-5.113.0.tar.xz";
|
||||
sha256 = "0vhhkn15axfvlwrf9np91hnipw1lb2x9zh0ajpngvxzcnj6kvn7r";
|
||||
name = "solid-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/solid-5.114.0.tar.xz";
|
||||
sha256 = "1slxlj5jhp8g745l328932934633nl81sq3n8fd73h655hymsk4s";
|
||||
name = "solid-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
sonnet = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/sonnet-5.113.0.tar.xz";
|
||||
sha256 = "17v3a2j0vhx7mzv0wfgqky248m57gasyv1xbjqpzjdr3x2f1zhy6";
|
||||
name = "sonnet-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/sonnet-5.114.0.tar.xz";
|
||||
sha256 = "0zxi96i3gfpx759qc1nyz7jqlswg5ivgr1w9gbbsm1x5fi9ikadx";
|
||||
name = "sonnet-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
syndication = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/syndication-5.113.0.tar.xz";
|
||||
sha256 = "1nzcfk4qsjvrgci3vk78jjpbig61pm0y73h3qs83yld1zw3az3jx";
|
||||
name = "syndication-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/syndication-5.114.0.tar.xz";
|
||||
sha256 = "13rjb1zm9yd8vbm9h7avqih5v0rr2srqwglm29l7mcnankqlh4n7";
|
||||
name = "syndication-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
syntax-highlighting = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/syntax-highlighting-5.113.0.tar.xz";
|
||||
sha256 = "1blifnqikvrlkcskwjdk54mvh8yd4r0vzz282mi64w7alimlilgl";
|
||||
name = "syntax-highlighting-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/syntax-highlighting-5.114.0.tar.xz";
|
||||
sha256 = "1skblg2m0sar63qrgkjsg0w9scixggm5qj7lp4gzjn4hwq6m3n63";
|
||||
name = "syntax-highlighting-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
threadweaver = {
|
||||
version = "5.113.0";
|
||||
version = "5.114.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.113/threadweaver-5.113.0.tar.xz";
|
||||
sha256 = "1x7i7mdg5v22y04m720k9fqj7xagm8qnlssb1xjs9nj0aqif8jgp";
|
||||
name = "threadweaver-5.113.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.114/threadweaver-5.114.0.tar.xz";
|
||||
sha256 = "1y07g58w6z3i11y3djg3aaxanhp9hzaciq61l4dn1gqwghn09xgh";
|
||||
name = "threadweaver-5.114.0.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -22,12 +22,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcamera";
|
||||
version = "0.0.5";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.libcamera.org/libcamera/libcamera.git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rd1YIEosg4+H/FJBYCoxdQlV9F0evU5fckHJrSdVPOE=";
|
||||
hash = "sha256-icHZtv25QvJEv0DlELT3cDxho3Oz2BJAMNKr5W4bshk=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdrm";
|
||||
version = "2.4.119";
|
||||
version = "2.4.120";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-CknxLwm1tuaOqq/z8Cynz/mqkmk5shLTQxYdPorFYpE=";
|
||||
hash = "sha256-O/VTY/dsclCUZEGrUdOmzArlGAVcD/AXMkq3bN77Mno=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
|
@ -9,7 +9,7 @@
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libwebp
|
||||
, openexr
|
||||
, openexr_3
|
||||
, pkg-config
|
||||
, zlib
|
||||
, buildDocs ? true
|
||||
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
||||
libjpeg
|
||||
libpng
|
||||
libwebp
|
||||
openexr
|
||||
openexr_3
|
||||
zlib
|
||||
];
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -19,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmbim";
|
||||
version = "1.28.4";
|
||||
version = "1.30.0";
|
||||
|
||||
outputs = [ "out" "dev" ]
|
||||
++ lib.optionals withDocs [ "man" ];
|
||||
@ -29,27 +28,9 @@ stdenv.mkDerivation rec {
|
||||
owner = "mobile-broadband";
|
||||
repo = "libmbim";
|
||||
rev = version;
|
||||
hash = "sha256-aaYjvJ2OMTzkUyqWCyHdmsKJ3VGqBmKQzb1DWK/1cPU=";
|
||||
hash = "sha256-sHTpu9WeMZroT+1I18ObEHWSzcyj/Relyz8UNe+WawI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Intel Mutual Authentication - FCC lock. Part of 1.30, backported to
|
||||
# openSUSE and Fedora and ChromeOS.
|
||||
# https://src.fedoraproject.org/rpms/libmbim/blob/rawhide/f/libmbim.spec
|
||||
(fetchpatch {
|
||||
url = "https://cgit.freedesktop.org/libmbim/libmbim/patch/?id=910db9cb2b6fde303d3b4720890cf6dc6fc00880";
|
||||
hash = "sha256-412sXdWb8WsSexe1scI/C57dwENgNWoREGO1GxSF4hs=";
|
||||
})
|
||||
|
||||
# Intel Tools. Allows tracing various commands. Part of 1.30, backported to
|
||||
# openSUSE, Fedora and ChromeOS.
|
||||
# https://src.fedoraproject.org/rpms/libmbim/blob/rawhide/f/libmbim.spec
|
||||
(fetchpatch {
|
||||
url = "https://cgit.freedesktop.org/libmbim/libmbim/patch/?id=8a6dec6ed11931601e605c9537da9904b3be5bc0";
|
||||
hash = "sha256-tU4zkUl5aZJE+g/qbnWprUHe/PmZvqVKB9qecSaUBhk=";
|
||||
})
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dudevdir=${placeholder "out"}/lib/udev"
|
||||
(lib.mesonBool "introspection" withIntrospection)
|
||||
|
77
pkgs/development/libraries/libplacebo/5.nix
Normal file
77
pkgs/development/libraries/libplacebo/5.nix
Normal file
@ -0,0 +1,77 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3Packages
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, shaderc
|
||||
, lcms2
|
||||
, libGL
|
||||
, libX11
|
||||
, libunwind
|
||||
, libdovi
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libplacebo";
|
||||
version = "5.264.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "code.videolan.org";
|
||||
owner = "videolan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YEefuEfJURi5/wswQKskA/J1UGzessQQkBpltJ0Spq8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
vulkan-headers
|
||||
python3Packages.jinja2
|
||||
python3Packages.glad2
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
vulkan-loader
|
||||
shaderc
|
||||
lcms2
|
||||
libGL
|
||||
libX11
|
||||
libunwind
|
||||
libdovi
|
||||
];
|
||||
|
||||
mesonFlags = with lib; [
|
||||
(mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml")
|
||||
(mesonBool "demos" false) # Don't build and install the demo programs
|
||||
(mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer
|
||||
(mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
(mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind`
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace 'python_env.append' '#'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reusable library for GPU-accelerated video/image rendering primitives";
|
||||
longDescription = ''
|
||||
Reusable library for GPU-accelerated image/view processing primitives and
|
||||
shaders, as well a batteries-included, extensible, high-quality rendering
|
||||
pipeline (similar to mpv's vo_gpu). Supports Vulkan, OpenGL and Metal (via
|
||||
MoltenVK).
|
||||
'';
|
||||
homepage = "https://code.videolan.org/videolan/libplacebo";
|
||||
changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${version}";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ primeos tadeokondrak ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
@ -10,21 +10,22 @@
|
||||
, shaderc
|
||||
, lcms2
|
||||
, libGL
|
||||
, xorg
|
||||
, libX11
|
||||
, libunwind
|
||||
, libdovi
|
||||
, xxHash
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libplacebo";
|
||||
version = "5.264.1";
|
||||
version = "6.338.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "code.videolan.org";
|
||||
owner = "videolan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YEefuEfJURi5/wswQKskA/J1UGzessQQkBpltJ0Spq8=";
|
||||
hash = "sha256-NZmwR3+lIC2PF+k+kqCjoMYkMM/PKOJmDwAq7t6YONY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -41,18 +42,19 @@ stdenv.mkDerivation rec {
|
||||
shaderc
|
||||
lcms2
|
||||
libGL
|
||||
xorg.libX11
|
||||
libX11
|
||||
libunwind
|
||||
libdovi
|
||||
xxHash
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml"
|
||||
"-Ddemos=false" # Don't build and install the demo programs
|
||||
"-Dd3d11=disabled" # Disable the Direct3D 11 based renderer
|
||||
"-Dglslang=disabled" # rely on shaderc for GLSL compilation instead
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-Dunwind=disabled" # libplacebo doesn’t build with `darwin.libunwind`
|
||||
mesonFlags = with lib; [
|
||||
(mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml")
|
||||
(mesonBool "demos" false) # Don't build and install the demo programs
|
||||
(mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer
|
||||
(mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
(mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind`
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libqmi";
|
||||
version = "1.32.4";
|
||||
version = "1.34.0";
|
||||
|
||||
outputs = [ "out" "dev" ]
|
||||
++ lib.optional withIntrospection "devdoc";
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "mobile-broadband";
|
||||
repo = "libqmi";
|
||||
rev = version;
|
||||
hash = "sha256-cczGvoD+2+G6uiAt0Iv1BO4/FqzO9bkqhFsEwOfp7qw=";
|
||||
hash = "sha256-l9ev9ZOWicVNZ/Wj//KNd3NHcefIrLVriqJhEpwWvtQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, lcms2
|
||||
, pkg-config
|
||||
@ -16,23 +15,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libraw";
|
||||
version = "0.21.1";
|
||||
version = "0.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibRaw";
|
||||
repo = "LibRaw";
|
||||
rev = version;
|
||||
sha256 = "sha256-K9mULf6V/TCl5Vu4iuIdSGF9HzQlgNQLRFHIpNbmAlY";
|
||||
hash = "sha256-p9CmOCulvV7+KKn1lXwpcysOo0+mD5UgPqy2ki0cIFE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-1729.patch";
|
||||
url = "https://github.com/LibRaw/LibRaw/commit/9ab70f6dca19229cb5caad7cc31af4e7501bac93.patch";
|
||||
hash = "sha256-OAyqphxvtSM15NI77HwtGTmTmP9YNu3xhZ6D1CceJ7I=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "lib" "dev" "doc" ];
|
||||
|
||||
propagatedBuildInputs = [ lcms2 ];
|
||||
|
@ -1,22 +1,16 @@
|
||||
{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, buildPackages }:
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, xz, buildPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libunwind";
|
||||
version = "1.6.2";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-SmrsZmmR+0XQiJxErt6K1usQgHHDVU/N/2cfnJR5SXY=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "libunwind";
|
||||
repo = "libunwind";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-z5YCue0zadQnMEbGFniFvDjXNy6dSHQDQnXRXS6Uh/Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix for aarch64 and non-4K pages. Remove once upgraded past 1.6.2.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libunwind/libunwind/commit/e85b65cec757ef589f28957d0c6c21c498a03bdf.patch";
|
||||
sha256 = "1lnlygvhqrdrjgw303pg2k2k4ms4gaghpjsgmhk47q83vy1yjwfg";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = if (stdenv.cc.isClang || stdenv.hostPlatform.isStatic) then ''
|
||||
substituteInPlace configure.ac --replace "-lgcc_s" ""
|
||||
'' else lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
@ -46,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A portable and efficient API to determine the call-chain of a program";
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
# https://github.com/libunwind/libunwind#libunwind
|
||||
platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ];
|
||||
platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "loongarch64-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxmlb";
|
||||
version = "0.3.14";
|
||||
version = "0.3.15";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "hughsie";
|
||||
repo = "libxmlb";
|
||||
rev = version;
|
||||
hash = "sha256-lpVXl/n/ecDLbbLQg9T+o4GdGZM7pNXGYTyVogNCl2E=";
|
||||
hash = "sha256-S0wBVhfRa81mAmqpYYAKAyKLnfnVsXJEcGA21i5tdzo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -60,6 +60,8 @@ stdenv.mkDerivation rec {
|
||||
"--without-crypto"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postFixup = ''
|
||||
moveToOutput bin/xslt-config "$dev"
|
||||
moveToOutput lib/xsltConf.sh "$dev"
|
||||
|
@ -1,5 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, cmake
|
||||
, fetchpatch2
|
||||
, fetchurl
|
||||
, perl
|
||||
, zlib
|
||||
@ -24,6 +25,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "sha256-lmmuXf46xbOJdTbchGaodMjPLA47H90I11snOIQpk2M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/nih-at/libzip/issues/404
|
||||
(fetchpatch2 {
|
||||
name = "Check-for-zstd_TARGET-before-using-it-in-a-regex.patch";
|
||||
url = "https://github.com/nih-at/libzip/commit/c719428916b4d19e838f873b1a177b126a080d61.patch";
|
||||
hash = "sha256-4ksbXEM8kNvs3wtbIaXLEQNSKaxl0es/sIg0EINaTHE=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
nativeBuildInputs = [ cmake perl groff ];
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openexr";
|
||||
version = "2.5.8";
|
||||
version = "2.5.10";
|
||||
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "openexr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-N7XdDaDsYdx4TXvHplQDTvhHNUmW5rntdaTKua4C0es=";
|
||||
hash = "sha256-xdC+T79ZQBx/XhuIXtP93Roj0N9lF+E65ReEKQ4kIsg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-DrpldpNgN5pWKzIuuPIrynGX3EpP8YhJlu+lLfNFGxQ=";
|
||||
})
|
||||
|
||||
# Backport gcc-13 fix:
|
||||
# https://github.com/AcademySoftwareFoundation/openexr/pull/1264
|
||||
# GCC 13 fixes
|
||||
./gcc-13.patch
|
||||
];
|
||||
|
||||
|
@ -1,33 +1,25 @@
|
||||
https://github.com/AcademySoftwareFoundation/openexr/pull/1264
|
||||
https://github.com/AcademySoftwareFoundation/openexr/commit/d0088a3c6943a9a53fc24e29885414d082d531fe.patch
|
||||
From 8aa103fe6e815514990e59708468eabc36f7f332 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=C3=A9clairevoyant?=
|
||||
<848000+eclairevoyant@users.noreply.github.com>
|
||||
Date: Fri, 5 Jan 2024 18:12:16 -0500
|
||||
Subject: [PATCH] gcc13
|
||||
|
||||
--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp
|
||||
+++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
|
||||
@@ -159,6 +159,7 @@
|
||||
#include <limits>
|
||||
|
||||
#include <cstddef>
|
||||
+#include <cstdint>
|
||||
|
||||
|
||||
// Windows specific addition to prevent the indirect import of the redefined min/max macros
|
||||
--- a/OpenEXR/IlmImf/ImfHuf.cpp
|
||||
+++ b/OpenEXR/IlmImf/ImfHuf.cpp
|
||||
@@ -53,6 +53,7 @@
|
||||
#include <cstring>
|
||||
#include <cassert>
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
|
||||
|
||||
using namespace std;
|
||||
--- a/OpenEXR/IlmImf/ImfMisc.cpp
|
||||
+++ b/OpenEXR/IlmImf/ImfMisc.cpp
|
||||
@@ -52,6 +52,7 @@
|
||||
#include <ImfConvert.h>
|
||||
#include <ImfPartType.h>
|
||||
---
|
||||
OpenEXR/IlmImf/ImfTiledMisc.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/OpenEXR/IlmImf/ImfTiledMisc.cpp b/OpenEXR/IlmImf/ImfTiledMisc.cpp
|
||||
index 06ea3144..749537d4 100644
|
||||
--- a/OpenEXR/IlmImf/ImfTiledMisc.cpp
|
||||
+++ b/OpenEXR/IlmImf/ImfTiledMisc.cpp
|
||||
@@ -46,6 +46,7 @@
|
||||
#include <ImfTileDescription.h>
|
||||
#include <algorithm>
|
||||
#include <limits>
|
||||
+#include <cstdint>
|
||||
|
||||
#include "ImfNamespace.h"
|
||||
|
||||
OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
@ -81,7 +81,7 @@ let
|
||||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "pipewire";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@ -97,7 +97,7 @@ let
|
||||
owner = "pipewire";
|
||||
repo = "pipewire";
|
||||
rev = version;
|
||||
sha256 = "sha256-mfnMluxJAxDbB6JlIM6HJ0zg7e1q3ia3uFbht6zeHCk=";
|
||||
sha256 = "sha256-rvf0sZRgDDLcqroLg7hcMUqXD/4JT+3lBRX6/m+3Ry8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -1,6 +1,8 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, libpng
|
||||
, glib /*just passthru*/
|
||||
@ -12,41 +14,57 @@
|
||||
, tigervnc
|
||||
, wlroots
|
||||
, xwayland
|
||||
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pixman";
|
||||
version = "0.42.2";
|
||||
version = "0.43.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://xorg/individual/lib/${pname}-${version}.tar.gz"
|
||||
"https://cairographics.org/releases/${pname}-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-6hSA762i/ZSLx1Nm98NJ4cltMpfQmj/mJibjjiNKYl4=";
|
||||
hash = "sha256-plwoIJhY+xa+5Q2AnID5Co5BXA5P2DIQeKGCJ4WlVgo=";
|
||||
};
|
||||
|
||||
separateDebugInfo = !stdenv.hostPlatform.isStatic;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
||||
buildInputs = [ libpng ];
|
||||
|
||||
configureFlags = lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"
|
||||
# Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved
|
||||
++ lib.optional (stdenv.isAarch64 && !stdenv.cc.isGNU) "--disable-arm-a64-neon";
|
||||
# Default "enabled" value attempts to enable CPU features on all
|
||||
# architectures and requires used to disable them:
|
||||
# https://gitlab.freedesktop.org/pixman/pixman/-/issues/88
|
||||
mesonAutoFeatures = "auto";
|
||||
mesonFlags = [
|
||||
"-Diwmmxt=disabled"
|
||||
]
|
||||
# Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved
|
||||
++ lib.optional (stdenv.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled";
|
||||
|
||||
preConfigure = ''
|
||||
# https://gitlab.freedesktop.org/pixman/pixman/-/issues/62
|
||||
export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 184 ? 184 : NIX_BUILD_CORES))
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postInstall = glib.flattenInclude;
|
||||
|
||||
passthru.tests = {
|
||||
inherit cairo qemu scribus tigervnc wlroots xwayland;
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit cairo qemu scribus tigervnc wlroots xwayland;
|
||||
};
|
||||
updateScript = gitUpdater {
|
||||
url = "https://gitlab.freedesktop.org/pixman/pixman.git";
|
||||
rev-prefix = "pixman-";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv, libobjc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "qrencode";
|
||||
version = "4.1.1";
|
||||
|
||||
@ -16,13 +16,9 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ libiconv libpng ]
|
||||
++ lib.optionals stdenv.isDarwin [ libobjc ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-tests"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ SDL2 ];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = false;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
@ -34,6 +30,11 @@ stdenv.mkDerivation rec {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.tests = finalAttrs.finalPackage.overrideAttrs (_: {
|
||||
configureFlags = [ "--with-tests" ];
|
||||
doCheck = true;
|
||||
});
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://fukuchi.org/works/qrencode/";
|
||||
description = "C library for encoding data in a QR Code symbol";
|
||||
@ -47,4 +48,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.all;
|
||||
mainProgram = "qrencode";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -51,6 +51,8 @@ let
|
||||
./qtdeclarative.patch
|
||||
# prevent headaches from stale qmlcache data
|
||||
./qtdeclarative-default-disable-qmlcache.patch
|
||||
# add version specific QML import path
|
||||
./qtdeclarative-qml-paths.patch
|
||||
];
|
||||
qtlocation = lib.optionals stdenv.cc.isClang [
|
||||
# Fix build with Clang 16
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user