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

Merge branch 'master' into staging-next

Browse Source 
This fixes an evaluation problem in check-esxi-hardware
This commit is contained in:
Vladimír Čunát 2020-09-02 09:36:44 +02:00
commit d95a022648
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
174 changed files with 2305 additions and 1333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/licenses.nix
View File

@ -436,6 +436,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
}; };
# Proprietary binaries; free to redistribute without modification. # Proprietary binaries; free to redistribute without modification.
databricks = {
fullName = "Databricks Proprietary License";
url = "https://pypi.org/project/databricks-connect";
free = false;
};
issl = { issl = {
fullName = "Intel Simplified Software License"; fullName = "Intel Simplified Software License";
url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; url = "https://software.intel.com/en-us/license/intel-simplified-software-license";

77
lib/systems/architectures.nix Normal file
View File

@ -0,0 +1,77 @@
{ lib }:
rec {
# platform.gcc.arch to its features (as in /proc/cpuinfo)
features = {
default = [ ];
# x86_64 Intel
westmere = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" ];
sandybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
ivybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
haswell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ];
broadwell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ];
skylake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ];
skylake-avx512 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ];
# x86_64 AMD
btver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" ];
btver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
bdver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ];
bdver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ];
bdver3 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ];
bdver4 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" "fma4" ];
znver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ];
znver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ];
# other
armv5te = [ ];
armv6 = [ ];
armv7-a = [ ];
armv8-a = [ ];
mips32 = [ ];
loongson2f = [ ];
};
# a superior CPU has all the features of an inferior and is able to build and test code for it
inferiors = {
# x86_64 Intel
default = [ ];
westmere = [ ];
sandybridge = [ "westmere" ] ++ inferiors.westmere;
ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge;
haswell = [ "ivybridge" ] ++ inferiors.ivybridge;
broadwell = [ "haswell" ] ++ inferiors.haswell;
skylake = [ "broadwell" ] ++ inferiors.broadwell;
skylake-avx512 = [ "skylake" ] ++ inferiors.skylake;
# x86_64 AMD
btver1 = [ ];
btver2 = [ ]; # TODO: fill this (need testing)
bdver1 = [ ]; # TODO: fill this (need testing)
bdver2 = [ ]; # TODO: fill this (need testing)
bdver3 = [ ]; # TODO: fill this (need testing)
bdver4 = [ ]; # TODO: fill this (need testing)
znver1 = [ ]; # TODO: fill this (need testing)
znver2 = [ ]; # TODO: fill this (need testing)
# other
armv5te = [ ];
armv6 = [ ];
armv7-a = [ ];
armv8-a = [ ];
mips32 = [ ];
loongson2f = [ ];
};
predicates = let
featureSupport = feature: x: builtins.elem feature features.${x};
in {
sse3Support = featureSupport "sse3";
ssse3Support = featureSupport "ssse3";
sse4_1Support = featureSupport "sse4_1";
sse4_2Support = featureSupport "sse4_2";
sse4_aSupport = featureSupport "sse4a";
avxSupport = featureSupport "avx";
avx2Support = featureSupport "avx2";
avx512Support = featureSupport "avx512";
aesSupport = featureSupport "aes";
fmaSupport = featureSupport "fma";
fma4Support = featureSupport "fma4";
};
}

3
lib/systems/default.nix
View File

@ -7,6 +7,7 @@ rec {
inspect = import ./inspect.nix { inherit lib; }; inspect = import ./inspect.nix { inherit lib; };
platforms = import ./platforms.nix { inherit lib; }; platforms = import ./platforms.nix { inherit lib; };
examples = import ./examples.nix { inherit lib; }; examples = import ./examples.nix { inherit lib; };
architectures = import ./architectures.nix { inherit lib; };
# Elaborate a `localSystem` or `crossSystem` so that it contains everything # Elaborate a `localSystem` or `crossSystem` so that it contains everything
# necessary. # necessary.
@ -76,6 +77,7 @@ rec {
# uname -r # uname -r
release = null; release = null;
}; };
isStatic = final.isWasm || final.isRedox;
kernelArch = kernelArch =
if final.isAarch32 then "arm" if final.isAarch32 then "arm"
@ -125,6 +127,7 @@ rec {
else throw "Don't know how to run ${final.config} executables."; else throw "Don't know how to run ${final.config} executables.";
} // mapAttrs (n: v: v final.parsed) inspect.predicates } // mapAttrs (n: v: v final.parsed) inspect.predicates
// mapAttrs (n: v: v final.platform.gcc.arch or "default") architectures.predicates
// args; // args;
in assert final.useAndroidPrebuilt -> final.isAndroid; in assert final.useAndroidPrebuilt -> final.isAndroid;
assert lib.foldl assert lib.foldl

6
maintainers/maintainer-list.nix
View File

@ -4310,6 +4310,12 @@
githubId = 494012; githubId = 494012;
name = "Kevin Cox"; name = "Kevin Cox";
}; };
kfollesdal = {
email = "kfollesdal@gmail.com";
github = "kfollesdal";
githubId = 546087;
name = "Kristoffer K. Føllesdal";
};
khumba = { khumba = {
email = "bog@khumba.net"; email = "bog@khumba.net";
github = "khumba"; github = "khumba";

47
nixos/doc/manual/release-notes/rl-2009.xml
View File

@ -997,6 +997,53 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
the previous behaviour using <literal>undervolt.useTimer</literal>. the previous behaviour using <literal>undervolt.useTimer</literal>.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
Agda has been heavily reworked.
<itemizedlist>
<listitem>
<para>
<literal>agda.mkDerivation</literal> has been heavily changed and
is now located at <package>agdaPackages.mkDerivation</package>.
</para>
</listitem>
<listitem>
<para>
New top-level packages <package>agda</package> and
<literal>agda.withPackages</literal> have been added, the second
of which sets up agda with access to chosen libraries.
</para>
</listitem>
<listitem>
<para>
All agda libraries now live under
<literal>agdaPackages</literal>.
</para>
</listitem>
<listitem>
<para>
Many broken libraries have been removed.
</para>
</listitem>
</itemizedlist>
See the <link
xlink:href="https://nixos.org/nixpkgs/manual/#agda">new
documentation</link> for more information.
</para>
</listitem>
<listitem>
<para>
The <literal>deepin</literal> package set has been removed from
nixpkgs. It was a work in progress to package the
<link xlink:href="https://www.deepin.org/en/dde/">Deepin Desktop Environment (DDE)</link>,
including libraries, tools and applications, and it was still
missing a service to lauch the desktop environment. It has shown
to no longer be a feasible goal due to reasons discussed in
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/94870">issue #94870</link>.
The package <literal>netease-cloud-music</literal> has also been
removed, as it depends on libraries from deepin.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section> </section>

1
nixos/modules/rename.nix
View File

@ -19,6 +19,7 @@ with lib;
# Completely removed modules # Completely removed modules
(mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "")
(mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")

10
nixos/modules/services/misc/beanstalkd.nix
View File

@ -28,6 +28,12 @@ in
example = "0.0.0.0"; example = "0.0.0.0";
}; };
}; };
openFirewall = mkOption {
type = types.bool;
default = false;
description = "Whether to open ports in the firewall for the server.";
};
}; };
}; };
@ -35,6 +41,10 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.listen.port ];
};
environment.systemPackages = [ pkg ]; environment.systemPackages = [ pkg ];
systemd.services.beanstalkd = { systemd.services.beanstalkd = {

14
nixos/modules/services/misc/nix-daemon.nix
View File

@ -587,16 +587,10 @@ in
nix.systemFeatures = mkDefault ( nix.systemFeatures = mkDefault (
[ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) ( optionals (pkgs.hostPlatform.platform ? gcc.arch) (
# a x86_64 builder can run code for `platform.gcc.arch` and minor architectures: # a builder can run code for `platform.gcc.arch` and inferior architectures
[ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ { [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++
sandybridge = [ "gccarch-westmere" ]; map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch}
ivybridge = [ "gccarch-westmere" "gccarch-sandybridge" ];
haswell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ];
broadwell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ];
skylake = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ];
skylake-avx512 = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ];
}.${pkgs.hostPlatform.platform.gcc.arch} or []
) )
); );

8
nixos/modules/system/boot/systemd.nix
View File

@ -1006,7 +1006,7 @@ in
"sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf";
"sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf";
"tmpfiles.d".source = pkgs.symlinkJoin { "tmpfiles.d".source = (pkgs.symlinkJoin {
name = "tmpfiles.d"; name = "tmpfiles.d";
paths = map (p: p + "/lib/tmpfiles.d") cfg.tmpfiles.packages; paths = map (p: p + "/lib/tmpfiles.d") cfg.tmpfiles.packages;
postBuild = '' postBuild = ''
@ -1016,8 +1016,10 @@ in
exit 1 exit 1
) )
done done
''; '' + concatMapStrings (name: optionalString (hasPrefix "tmpfiles.d/" name) ''
}; rm -f $out/${removePrefix "tmpfiles.d/" name}
'') config.system.build.etc.targets;
}) + "/*";
"systemd/system-generators" = { source = hooks "generators" cfg.generators; }; "systemd/system-generators" = { source = hooks "generators" cfg.generators; };
"systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; }; "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; };

1
nixos/modules/virtualisation/cri-o.nix
View File

@ -101,6 +101,7 @@ in
log_level = "${cfg.logLevel}" log_level = "${cfg.logLevel}"
manage_ns_lifecycle = true manage_ns_lifecycle = true
pinns_path = "${cfg.package}/bin/pinns" pinns_path = "${cfg.package}/bin/pinns"
hooks_dir = []
${optionalString (cfg.runtime != null) '' ${optionalString (cfg.runtime != null) ''
default_runtime = "${cfg.runtime}" default_runtime = "${cfg.runtime}"

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bchoppr"; pname = "bchoppr";
version = "1.6.4"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sjaehn"; owner = "sjaehn";
repo = pname; repo = pname;
rev = "${version}"; rev = "${version}";
sha256 = "16b0sg7q2b8l4y4bp5s3yzsj9j6jayjy2mlvqkby6l7hcgjcj493"; sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "BJumblr"; pname = "BJumblr";
version = "1.4.0"; version = "1.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sjaehn"; owner = "sjaehn";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "03x1gvri9yk000fvvc8zvvywf38cc41vkyhhp9xby71b23n5wbn0"; sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bschaffl"; pname = "bschaffl";
version = "0.3"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sjaehn"; owner = "sjaehn";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1pcch7j1wgsb77mjy58hl3z43p83dv0vcmyh129m9k216b09gy29"; sha256 = "1c09acqrbd387ba41f8ch1qykdap5h6cg9if5pgd16i4dmjnpghj";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/audio/dragonfly-reverb/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dragonfly-reverb"; pname = "dragonfly-reverb";
version = "3.1.1"; version = "3.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "michaelwillis"; owner = "michaelwillis";
repo = "dragonfly-reverb"; repo = "dragonfly-reverb";
rev = version; rev = version;
sha256 = "188cm45hr0i33m4h2irql1wrsmsfis65s706wjiid0z59q47rf9p"; sha256 = "0vfm2510shah67k87mdyar4wr4vqwii59y9lqfhwm6blxparkrqa";
fetchSubmodules = true; fetchSubmodules = true;
}; };

7
pkgs/applications/audio/geonkick/default.nix
View File

@ -2,20 +2,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "geonkick"; pname = "geonkick";
version = "2.3.3"; version = "2.3.7";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "iurie-sw"; owner = "iurie-sw";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0h1abb6q2bmi01a3v37adkc4zc03j47jpvffz8p2lpp33xhljghs"; sha256 = "1wdcbwiyy6i5agq5lffkyilyc8mv1cc4mp9h0nybn240vb2flqc2";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ]; buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ];
cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" ]; # https://github.com/iurie-sw/geonkick/issues/120
cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ];
meta = { meta = {
homepage = "https://gitlab.com/iurie-sw/geonkick"; homepage = "https://gitlab.com/iurie-sw/geonkick";

6
pkgs/applications/audio/ncspot/default.nix
View File

@ -14,16 +14,16 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ncspot"; pname = "ncspot";
version = "0.2.1"; version = "0.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrkfdn"; owner = "hrkfdn";
repo = "ncspot"; repo = "ncspot";
rev = "v${version}"; rev = "v${version}";
sha256 = "1yx0fc24bgh1x6fdwznc1hqvjq0j7i0zvws3bsyijzs7q48jm0z7"; sha256 = "1i17pidw2hylijwfn96f2bnswfxxwdln2ydsq8b1q4hfzfbxlfk2";
}; };
cargoSha256 = "0bh2shg80xbs2cw10dabrdxkvhf2csk5h9wmmk5z87q6w25paz1f"; cargoSha256 = "1cpy4wrj9dz2crva4p18f8hzym73x4m2mcfds4ppri4ir7qg29dr";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];

48
pkgs/applications/audio/surge/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ stdenv, fetchFromGitHub, cmake, git, pkg-config, python3
, cairo, libsndfile, libxcb, libxkbcommon, xcbutil, xcbutilcursor, xcbutilkeysyms, zenity
}:
stdenv.mkDerivation rec {
pname = "surge";
version = "1.7.1";
src = fetchFromGitHub {
owner = "surge-synthesizer";
repo = pname;
rev = "release_${version}";
sha256 = "1b3ccc78vrpzy18w7070zfa250dnd1bww147xxcnj457vd6n065s";
leaveDotGit = true; # for SURGE_VERSION
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake git pkg-config python3 ];
buildInputs = [ cairo libsndfile libxcb libxkbcommon xcbutil xcbutilcursor xcbutilkeysyms zenity ];
postPatch = ''
substituteInPlace src/common/SurgeStorage.cpp --replace "/usr/share/Surge" "$out/share/surge"
substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace '"zenity' '"${zenity}/bin/zenity'
substituteInPlace src/linux/UserInteractionsLinux.cpp --replace '"zenity' '"${zenity}/bin/zenity'
substituteInPlace vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp --replace /usr/bin/zenity ${zenity}/bin/zenity
'';
installPhase = ''
mkdir -p $out/lib/lv2 $out/lib/vst3 $out/share/surge
cp -r surge_products/Surge.lv2 $out/lib/lv2/
cp -r surge_products/Surge.vst3 $out/lib/vst3/
cp -r ../resources/data/* $out/share/surge/
'';
doInstallCheck = true;
installCheckPhase = ''
cd ..
build/surge-headless
'';
meta = with stdenv.lib; {
description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)";
homepage = "https://surge-synthesizer.github.io";
license = licenses.gpl3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ magnetophon orivej ];
};
}

43
pkgs/applications/audio/tunefish/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchFromGitHub, pkg-config, python3
, alsaLib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk
}:
stdenv.mkDerivation {
pname = "tunefish";
version = "unstable-2020-08-13";
src = fetchFromGitHub {
owner = "jpcima";
repo = "tunefish";
rev = "b3d83cc66201619f6399500f6897fbeb1786d9ed";
fetchSubmodules = true;
sha256 = "0rjpq3s609fblzkvnc9729glcnfinmxljh0z8ldpzr245h367zxh";
};
nativeBuildInputs = [ pkg-config python3 ];
buildInputs = [ alsaLib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ];
postPatch = ''
patchShebangs src/tunefish4/generate-lv2-ttl.py
'';
makeFlags = [
"-C" "src/tunefish4/Builds/LinuxMakefile"
"CONFIG=Release"
];
installPhase = ''
mkdir -p $out/lib/lv2
cp -r src/tunefish4/Builds/LinuxMakefile/build/Tunefish4.lv2 $out/lib/lv2
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = "https://tunefish-synth.com/";
description = "Virtual analog synthesizer LV2 plugin";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ orivej ];
platforms = [ "x86_64-linux" ];
};
}

6
pkgs/applications/blockchains/lnd.nix
View File

@ -4,16 +4,16 @@
buildGoModule rec { buildGoModule rec {
pname = "lnd"; pname = "lnd";
version = "0.10.3-beta"; version = "0.11.0-beta";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lightningnetwork"; owner = "lightningnetwork";
repo = "lnd"; repo = "lnd";
rev = "v${version}"; rev = "v${version}";
sha256 = "129vi8z2sk4hagk7axa675nba6sbj9km88zlq8a1g8di7v2k9z6a"; sha256 = "1r1hwz8ka5mnmrvj9zcd78kn68g8fg3d4bdx9i0xy4sc2hh1dcpj";
}; };
vendorSha256 = "0a4bk2qry0isnrvl0adwikqn6imxwzlaq5j3nglb5rmwwq2cdz0r"; vendorSha256 = "090b9sxvdwh787w0rhrcbky9pbx64qgqx1pvk9ysk3886nxdhf7k";
doCheck = false; doCheck = false;

6
pkgs/applications/blockchains/wasabiwallet/default.nix
View File

@ -24,11 +24,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wasabiwallet"; pname = "wasabiwallet";
version = "1.1.11.1"; version = "1.1.12";
src = fetchurl { src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
sha256 = "04v8f2h67aqvcb5a8vmzbp2sqnq7g4m0v1ng52ccb4ii668ya8hy"; sha256 = "0nfd0pwsgrkaxcxfs8wb3i8kslfcqnc91iahw3rmlcxdzb81kjs4";
}; };
dontBuild = true; dontBuild = true;

2
pkgs/applications/editors/android-studio/common.nix
View File

@ -200,7 +200,7 @@ in runCommand
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; rec { maintainers = with maintainers; rec {
stable = [ meutraa ]; stable = [ meutraa ];
beta = [ galagora ]; beta = [ meutraa ];
canary = [ meutraa ]; canary = [ meutraa ];
dev = canary; dev = canary;
}."${channel}"; }."${channel}";

6
pkgs/applications/editors/android-studio/default.nix
View File

@ -14,9 +14,9 @@ let
sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j"; sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j";
}; };
betaVersion = { betaVersion = {
version = "4.1.0.14"; # "Android Studio 4.1 Beta 4" version = "4.1.0.17"; # "Android Studio 4.1 RC 2"
build = "201.6667167"; build = "201.6776251";
sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290"; sha256Hash = "sha256-3W+eUcffRk7lZxbvf3X/Np4hkwAUqU51sQ061XR7Ddc=";
}; };
latestVersion = { # canary & dev latestVersion = { # canary & dev
version = "4.2.0.8"; # "Android Studio 4.2 Canary 8" version = "4.2.0.8"; # "Android Studio 4.2 Canary 8"

4
pkgs/applications/editors/texstudio/default.nix
View File

@ -3,13 +3,13 @@
mkDerivation rec { mkDerivation rec {
pname = "texstudio"; pname = "texstudio";
version = "2.12.22"; version = "3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "${pname}-org"; owner = "${pname}-org";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "037jvsfln8wav17qj9anxz2a7p51v7ky85wmhdj2hgwp40al651g"; sha256 = "1663lgl30698awa7fjplr8rjnf6capqvf8z80lzlnkfl5m9ph0jb";
}; };
nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ]; nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ];

4
pkgs/applications/graphics/xfractint/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, libX11, libXft}: {stdenv, fetchurl, libX11, libXft}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xfractint"; pname = "xfractint";
version = "20.04p15"; version = "20.04p16";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl { src = fetchurl {
url = "https://www.fractint.net/ftp/current/linux/xfractint-${version}.tar.gz"; url = "https://www.fractint.net/ftp/current/linux/xfractint-${version}.tar.gz";
sha256 = "1wv2hgyjvrjxzqxb55vz65ra80p24j8sd34llykk2qlx73x8f3nk"; sha256 = "1ba77jifxv8jql044mdydh4p4ms4w5vw3qrqmcfzlvqfxk7h2m2f";
}; };
buildInputs = [libX11 libXft]; buildInputs = [libX11 libXft];

4
pkgs/applications/misc/adobe-reader/default.nix
View File

@ -28,5 +28,9 @@ stdenv.mkDerivation {
description = "Adobe Reader, a viewer for PDF documents"; description = "Adobe Reader, a viewer for PDF documents";
homepage = "http://www.adobe.com/products/reader"; homepage = "http://www.adobe.com/products/reader";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
knownVulnerabilities = [
"Numerous unresolved vulnerabilities"
"See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53"
];
}; };
} }

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

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "minder"; pname = "minder";
version = "1.9.1"; version = "1.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "phase1geo"; owner = "phase1geo";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1823nl9hgsa9l04ra1drj3c7r8s5ybx6c06d9ijpwqz191sz2jg2"; sha256 = "0lhwwx515f0ycpinkhgbjnik7dj2c7fckikbgzwkzzs25xqp9ayj";
}; };
nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];

12
pkgs/applications/misc/qdirstat/default.nix
View File

@ -3,17 +3,19 @@
, makeWrapper, perlPackages, mkDerivation }: , makeWrapper, perlPackages, mkDerivation }:
let let
version = "1.6.1";
in mkDerivation rec {
pname = "qdirstat"; pname = "qdirstat";
inherit version; version = "1.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shundhammer"; owner = "shundhammer";
repo = "qdirstat"; repo = pname;
rev = version; rev = version;
sha256 = "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb"; sha256 = "163x3fxra0l3vvrzm25mh7jvcwjbmwsqlpppkxx76mkz9a1769fy";
}; };
in
mkDerivation {
inherit pname version src;
nativeBuildInputs = [ qmake makeWrapper ]; nativeBuildInputs = [ qmake makeWrapper ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sdcv"; pname = "sdcv";
version = "0.5.2"; version = "0.5.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Dushistov"; owner = "Dushistov";
repo = "sdcv"; repo = "sdcv";
rev = "v${version}"; rev = "v${version}";
sha256 = "1b67s4nj0s5fh3cjk7858qvhiisc557xx72xwzrb8hq6ijpwx5k0"; sha256 = "144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

770
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/cluster/tilt/default.nix
View File

@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself /* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the running in development environment and try to serve assets from the
source tree, which is not there once build completes. */ source tree, which is not there once build completes. */
version = "0.17.0"; version = "0.17.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tilt-dev"; owner = "tilt-dev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0bd01fmrf17njzf8ri4bw4qi7bxcvd3dx7yyf42qfvnp7hrfzipk"; sha256 = "0wiqnlam4f7085n3djvb5phhvw9df61bj8w6c5rcpffykg33vhmi";
}; };
vendorSha256 = null; vendorSha256 = null;

4
pkgs/applications/networking/remote/teamviewer/default.nix
View File

@ -6,11 +6,11 @@
mkDerivation rec { mkDerivation rec {
pname = "teamviewer"; pname = "teamviewer";
version = "15.5.6"; version = "15.8.3";
src = fetchurl { src = fetchurl {
url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb";
sha256 = "12dzrg9qf5gj9srv482n3jsjar8jhs3s5kkp6v5pvfp8kbmwcbib"; sha256 = "1c947yxgs0mv5x6qvy40dypbbhhjbglma1pwl66z39gzg51n2dmc";
}; };
unpackPhase = '' unpackPhase = ''

4
pkgs/applications/networking/seafile-client/default.nix
View File

@ -4,13 +4,13 @@
mkDerivation rec { mkDerivation rec {
pname = "seafile-client"; pname = "seafile-client";
version = "7.0.7"; version = "7.0.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "haiwen"; owner = "haiwen";
repo = "seafile-client"; repo = "seafile-client";
rev = "v${version}"; rev = "v${version}";
sha256 = "0szdyprljyckmbrw5sypizs22j96q84ak6nyidyr2j6gf4grh9mg"; sha256 = "0pcn6lfzma2hvpwsp9q0002wvym7zabpp8fvq29l101gzirn79m9";
}; };
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ];

8
pkgs/applications/office/gnumeric/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages { stdenv, fetchurl, pkg-config, intltool, perlPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages , goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages
, itstool , itstool
}: }:
@ -7,16 +7,16 @@ let
inherit (python3Packages) python pygobject3; inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gnumeric"; pname = "gnumeric";
version = "1.12.47"; version = "1.12.48";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1khrf72kiq50y8b5prbj2207k9shn36h2b2i588cc4wa28s9y5a0"; sha256 = "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p";
}; };
configureFlags = [ "--disable-component" ]; configureFlags = [ "--disable-component" ];
nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]; nativeBuildInputs = [ pkg-config intltool bison itstool wrapGAppsHook ];
# ToDo: optional libgda, introspection? # ToDo: optional libgda, introspection?
buildInputs = [ buildInputs = [

4
pkgs/applications/office/portfolio/default.nix
View File

@ -24,11 +24,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "PortfolioPerformance"; pname = "PortfolioPerformance";
version = "0.47.0"; version = "0.48.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "0l328wvikdmm2i0kbpv9qwd0mkbs24y89cgfg28swhcvpywjpk36"; sha256 = "12skl08isz2f1a6ksmcw7sm82xk909y636ch8jp80lglb21i0q1j";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/office/todo.txt-cli/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
let let
version = "2.11.0"; version = "2.12.0";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "todo.txt-cli"; pname = "todo.txt-cli";
inherit version; inherit version;
src = fetchurl { src = fetchurl {
url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz"; url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz";
sha256 = "0majx8lcvhh8ji54qi0sxr833wchdss95fjc92byd8g3lfz27rsz"; sha256 = "0gni8nj3wwdf7nl98d1bpx064bz5xari65hb998qqr92h0n9pnp6";
}; };
installPhase = '' installPhase = ''

4
pkgs/applications/office/zotero/default.nix
View File

@ -35,11 +35,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zotero"; pname = "zotero";
version = "5.0.88"; version = "5.0.89";
src = fetchurl { src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
sha256 = "19r9jmakr04raqripfnqm2b9gwpi52lklrrqgqyb1x35a4xvnj62"; sha256 = "18p4qnnfx9f2frk7f2nk1d7jr4cjzg9z7lfzrk7vq11qgbjdpqbl";
}; };
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];

4
pkgs/applications/radio/chirp/default.nix
View File

@ -4,11 +4,11 @@
}: }:
python2.pkgs.buildPythonApplication rec { python2.pkgs.buildPythonApplication rec {
pname = "chirp-daily"; pname = "chirp-daily";
version = "20200430"; version = "20200807";
src = fetchurl { src = fetchurl {
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
sha256 = "060fzplgmpfrk6wkfaasx7phpfk90mmylk6drbwzk4f9r1655vda"; sha256 = "60b682793698e6427ad485546eae3a044b8290a220f190633158a2fb0e942fa0";
}; };
propagatedBuildInputs = with python2.pkgs; [ propagatedBuildInputs = with python2.pkgs; [

4
pkgs/applications/science/electronics/openhantek6022/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec { mkDerivation rec {
pname = "openhantek6022"; pname = "openhantek6022";
version = "3.1.1"; version = "3.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenHantek"; owner = "OpenHantek";
repo = "OpenHantek6022"; repo = "OpenHantek6022";
rev = version; rev = version;
sha256 = "17b0qmz7g0nk7n7jhbh5xhs135dpj9kv41n42vvpdzwr6z5rk4qm"; sha256 = "104j7d3i5y6jd20c2z3l10sr6sgdy8iki3g9mlwhddnr8x6nzc03";
}; };
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];

61
pkgs/applications/science/math/nasc/default.nix
View File

@ -1,7 +1,9 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pkgconfig , pkgconfig
, python3
, meson
, ninja
, vala , vala
, gtk3 , gtk3
, glib , glib
@ -9,52 +11,67 @@
, libsoup , libsoup
, gtksourceview , gtksourceview
, libgee , libgee
, cmake , nix-update-script
, webkitgtk
, libqalculate , libqalculate
, cln , intltool
, gnuplot
, wrapGAppsHook , wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nasc"; pname = "nasc";
version = "0.5.4"; version = "0.7.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "parnold-x"; owner = "parnold-x";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn"; sha256 = "kSRc5RLkI6SBJirUYw6swZi8IJhaL3y74b2Zw8kh2XA=";
fetchSubmodules = true;
}; };
patches = [
# fix build with gcc9
(fetchpatch {
url = "https://github.com/parnold-x/nasc/commit/46b9b80e228b6b86001bded45d85e073a9411549.patch";
sha256 = "1sm2aw0xhw2chk036r231nmp2f2ypxcmzggwljkn7wfzgg3h1mx3";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake glib # post_install.py
vala gtk3 # post_install.py
intltool # for libqalculate
meson
ninja
pkgconfig pkgconfig
python3
vala
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
cln
libsoup
gtk3
glib glib
gtk3
gtksourceview gtksourceview
libgee libgee
libqalculate
pantheon.elementary-icon-theme pantheon.elementary-icon-theme
pantheon.granite pantheon.granite
]; webkitgtk
# We add libqalculate's runtime dependencies because nasc has it as a modified subproject.
] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs;
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
# patch subproject. same code in libqalculate expression
substituteInPlace subprojects/libqalculate/libqalculate/Calculator-plot.cc \
--replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
--replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Do maths like a normal person"; description = "Do maths like a normal person, designed for elementary OS";
longDescription = '' longDescription = ''
It’s an app where you do maths like a normal person. It lets you It’s an app where you do maths like a normal person. It lets you
type whatever you want and smartly figures out what is math and type whatever you want and smartly figures out what is math and
@ -63,7 +80,7 @@ stdenv.mkDerivation rec {
the equations it’s used in. the equations it’s used in.
''; '';
homepage = "https://github.com/parnold-x/nasc"; homepage = "https://github.com/parnold-x/nasc";
maintainers = with maintainers; [ samdroid-apps ]; maintainers = pantheon.maintainers;
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
}; };

10
pkgs/applications/science/math/nauty/default.nix
View File

@ -10,15 +10,13 @@ stdenv.mkDerivation rec {
sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww"; sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
configureFlags = { configureFlags = [
# Prevent nauty from sniffing some cpu features. While those are very # Prevent nauty from sniffing some cpu features. While those are very
# widely available, it can lead to nasty bugs when they are not available: # widely available, it can lead to nasty bugs when they are not available:
# https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA
default = [ "--disable-clz" "--disable-popcnt" ]; "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-popcnt"
westmere = [ "--disable-clz" ]; "--${if stdenv.hostPlatform.sse4_aSupport then "enable" else "disable"}-clz"
sandybridge = [ "--disable-clz" ]; ];
ivybridge = [ "--disable-clz" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"} or [];
installPhase = '' installPhase = ''
mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty}

87
pkgs/applications/version-management/sparkleshare/default.nix Normal file
View File

@ -0,0 +1,87 @@
{
appindicator-sharp,
coreutils,
fetchFromGitHub,
git,
glib,
gtk-sharp-3_0,
lib,
makeWrapper,
meson,
mono,
ninja,
notify-sharp,
openssh,
openssl,
pkg-config,
stdenv,
symlinkJoin,
webkit2-sharp,
xdg_utils,
}:
stdenv.mkDerivation rec {
pname = "sparkleshare";
version = "3.28";
src = fetchFromGitHub {
owner = "hbons";
repo = "SparkleShare";
rev = version;
sha256 = "sha256:1x5nv2f3mrsr4a336bz5kc2lzkzilfh43bxy2yqhhjp2dgb20497";
};
nativeBuildInputs = [
makeWrapper
meson
mono
ninja
pkg-config
];
buildInputs = [
appindicator-sharp
gtk-sharp-3_0
notify-sharp
webkit2-sharp
];
patchPhase = ''
# Nix will manage the icon cache.
echo '#!/bin/sh' >scripts/post-install.sh
'';
postInstall = ''
wrapProgram $out/bin/sparkleshare \
--set PATH ${symlinkJoin {
name = "mono-path";
paths = [
coreutils
git
glib
mono
openssh
openssl
xdg_utils
];
}}/bin \
--set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [
appindicator-sharp
gtk-sharp-3_0
webkit2-sharp
]} \
--set LD_LIBRARY_PATH ${lib.makeLibraryPath [
appindicator-sharp
gtk-sharp-3_0.gtk3
webkit2-sharp
webkit2-sharp.webkitgtk
]}
'';
meta = {
description = "Share and collaborate by syncing with any Git repository instantly. Linux, macOS, and Windows.";
homepage = "https://sparkleshare.org";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ kevincox ];
};
}

4
pkgs/applications/virtualization/podman/default.nix
View File

@ -16,13 +16,13 @@
buildGoModule rec { buildGoModule rec {
pname = "podman"; pname = "podman";
version = "2.0.5"; version = "2.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = "podman"; repo = "podman";
rev = "v${version}"; rev = "v${version}";
sha256 = "0db0q52va9w8aprzx08xnv6y84l4x4lc113sd97hjgjnhknp8d3m"; sha256 = "1kl8cfsqwfbjl14mbp58wrxfm90y2w58x6138zq0sn4jzwwpy1a4";
}; };
vendorSha256 = null; vendorSha256 = null;

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

@ -64,18 +64,26 @@ let
# older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
isGccArchSupported = arch: isGccArchSupported = arch:
if isGNU then if isGNU then
{ skylake = versionAtLeast ccVersion "6.0"; { # Intel
skylake = versionAtLeast ccVersion "6.0";
skylake-avx512 = versionAtLeast ccVersion "6.0"; skylake-avx512 = versionAtLeast ccVersion "6.0";
cannonlake = versionAtLeast ccVersion "8.0"; cannonlake = versionAtLeast ccVersion "8.0";
icelake-client = versionAtLeast ccVersion "8.0"; icelake-client = versionAtLeast ccVersion "8.0";
icelake-server = versionAtLeast ccVersion "8.0"; icelake-server = versionAtLeast ccVersion "8.0";
knm = versionAtLeast ccVersion "8.0"; knm = versionAtLeast ccVersion "8.0";
# AMD
znver1 = versionAtLeast ccVersion "6.0";
znver2 = versionAtLeast ccVersion "9.0";
}.${arch} or true }.${arch} or true
else if isClang then else if isClang then
{ cannonlake = versionAtLeast ccVersion "5.0"; { # Intel
cannonlake = versionAtLeast ccVersion "5.0";
icelake-client = versionAtLeast ccVersion "7.0"; icelake-client = versionAtLeast ccVersion "7.0";
icelake-server = versionAtLeast ccVersion "7.0"; icelake-server = versionAtLeast ccVersion "7.0";
knm = versionAtLeast ccVersion "7.0"; knm = versionAtLeast ccVersion "7.0";
# AMD
znver1 = versionAtLeast ccVersion "4.0";
znver2 = versionAtLeast ccVersion "9.0";
}.${arch} or true }.${arch} or true
else else
false; false;

4
pkgs/data/misc/cldr-emoji-annotation/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cldr-emoji-annotation"; pname = "cldr-emoji-annotation";
version = "37.0_13.0_0_1"; version = "37.0_13.0_0_2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fujiwarat"; owner = "fujiwarat";
repo = "cldr-emoji-annotation"; repo = "cldr-emoji-annotation";
rev = version; rev = version;
sha256 = "19cqxyrap3p7djzzs99pndjbcvzmdv86n2m1sw2zqiwpirw7y1sy"; sha256 = "0la3h6l58j9jfjvzwz65x56ijx7sppirwpqbqc06if4c2g0kzswj";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
(fetchpatch { (fetchpatch {
name = "0001-gnome-scores.h-Convert-to-UTF-8.patch"; name = "0001-gnome-scores.h-Convert-to-UTF-8.patch";
url = "https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff"; url = "https://gitlab.gnome.org/Archive/libgnomeui/-/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff";
sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk"; sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk";
}) })
]; ];

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

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.17.5/ ) WGET_ARGS=( https://download.kde.org/stable/plasma/5.18.5/ )

21
pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/kded/gtkconfig.cpp b/kded/gtkconfig.cpp
index 5303636..199c4d5 100644
--- a/kded/gtkconfig.cpp
+++ b/kded/gtkconfig.cpp
@@ -41,6 +41,16 @@ GtkConfig::GtkConfig(QObject *parent, const QVariantList&) :
kdeglobalsConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kdeglobals")))),
kwinConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kwinrc"))))
{
+ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.
+ // Normally this would be done by wrapGAppsHook, but this plugin
+ // (shared object) cannot be wrapped.
+ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS");
+ if (!xdgdata.isEmpty()) {
+ xdgdata.push_front(":");
+ }
+ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH));
+ qputenv("XDG_DATA_DIRS", xdgdata);
+
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerService(QStringLiteral("org.kde.GtkConfig"));
dbus.registerObject(QStringLiteral("/GtkConfig"), this, QDBusConnection::ExportScriptableSlots);

8
pkgs/desktops/plasma-5/kde-gtk-config/default.nix
View File

@ -2,7 +2,7 @@
mkDerivation, mkDerivation,
extra-cmake-modules, wrapGAppsHook, extra-cmake-modules, wrapGAppsHook,
glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
knewstuff, gsettings-desktop-schemas knewstuff, gsettings-desktop-schemas, xsettingsd
}: }:
mkDerivation { mkDerivation {
@ -11,14 +11,16 @@ mkDerivation {
dontWrapGApps = true; # There is nothing to wrap dontWrapGApps = true; # There is nothing to wrap
buildInputs = [ buildInputs = [
ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
knewstuff gsettings-desktop-schemas knewstuff gsettings-desktop-schemas xsettingsd
]; ];
patches = [ ./patches/follow-symlinks.patch ./patches/gsettings.patch ];
cmakeFlags = [ cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
"-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"
]; ];
# The gtkconfig KDED module will crash the daemon if the GSettings schemas
# aren't found.
patches = [ ./0001-gsettings-schemas-path.patch ];
preConfigure = '' preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\"" NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\""
''; '';

49
pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
View File

@ -1,49 +0,0 @@
From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 27 Oct 2015 18:07:54 -0500
Subject: [PATCH] follow symlinks
---
src/appearancegtk2.cpp | 2 +-
src/iconthemesmodel.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: kde-gtk-config-5.12.4/src/appearancegtk2.cpp
===================================================================
--- kde-gtk-config-5.12.4.orig/src/appearancegtk2.cpp
+++ kde-gtk-config-5.12.4/src/appearancegtk2.cpp
@@ -69,7 +69,7 @@ QString AppearanceGTK2::themesGtkrcFile(
QStringList themes=installedThemes();
themes=themes.filter(QRegExp("/"+themeName+"/?$"));
if(themes.size()==1) {
- QDirIterator it(themes.first(), QDirIterator::Subdirectories);
+ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while(it.hasNext()) {
it.next();
if(it.fileName()=="gtkrc") {
Index: kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
===================================================================
--- kde-gtk-config-5.12.4.orig/src/iconthemesmodel.cpp
+++ kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
@@ -47,7 +47,7 @@ QList<QDir> IconThemesModel::installedTh
foreach(const QString& dir, dirs) {
QDir userIconsDir(dir);
- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
while(it.hasNext()) {
QString currentPath = it.next();
QDir dir(currentPath);
Index: kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
===================================================================
--- kde-gtk-config-5.12.4.orig/src/cursorthemesmodel.cpp
+++ kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installed
foreach(const QString& dir, dirs) {
QDir userIconsDir(dir);
- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
while(it.hasNext()) {
QString currentPath = it.next();
QDir dir(currentPath);

21
pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
View File

@ -1,21 +0,0 @@
diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp
index 7b82d50..96831d8 100644
--- a/src/gtkconfigkcmodule.cpp
+++ b/src/gtkconfigkcmodule.cpp
@@ -91,6 +91,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args )
iconsProxyModel->sort(0);
ui->cb_icon->setModel(iconsProxyModel);
ui->cb_icon_fallback->setModel(iconsProxyModel);
+
+ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.
+ // Normally this would be done by wrapGAppsHook, but this plugin
+ // (shared object) cannot be wrapped.
+ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS");
+ if (!xdgdata.isEmpty()) {
+ xdgdata.push_front(":");
+ }
+ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH));
+ qputenv("XDG_DATA_DIRS", xdgdata);
m_tempGtk2Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/gtkrc-2.0";
m_tempGtk3Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/.config/gtk-3.0/settings.ini";

2
pkgs/desktops/plasma-5/kde-gtk-config/patches/series
View File

@ -1,2 +0,0 @@
follow-symlinks.patch
gsettings.patch

13
pkgs/desktops/plasma-5/kdeplasma-addons.nix
View File

@ -1,17 +1,18 @@
{ {
mkDerivation, mkDerivation,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kio, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kholidays,
knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus, kio, knewstuff, kpurpose, kross, krunner, kservice, ksysguard,
plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative,
qtwebengine, qtx11extras
}: }:
mkDerivation { mkDerivation {
name = "kdeplasma-addons"; name = "kdeplasma-addons";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kholidays kio
kross krunner kservice ksysguard kunitconversion ibus plasma-framework knewstuff kpurpose kross krunner kservice ksysguard kunitconversion ibus
plasma-workspace qtdeclarative qtx11extras kholidays plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras
]; ];
} }

9
pkgs/desktops/plasma-5/kinfocenter.nix
View File

@ -2,8 +2,9 @@
mkDerivation, mkDerivation,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage,
kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, solid kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils,
solid
}: }:
mkDerivation { mkDerivation {
@ -11,7 +12,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice kdeclarative kdelibs4support ki18n kiconthemes kio kirigami2 kpackage
kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid kservice kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid
]; ];
} }

76
pkgs/desktops/plasma-5/kscreen-417316.patch
View File

@ -1,76 +0,0 @@
https://phabricator.kde.org/file/data/dyr2qr4wrhxg4eahkgd3/PHID-FILE-7d4og3zr4mk53u6lzkk2/D27442.diff
https://bugs.kde.org/show_bug.cgi?id=417316
diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml kscreen-5.17.5/kcm/package/contents/ui/main.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/main.qml 2020-04-03 17:54:26.097809557 +0200
@@ -24,8 +24,8 @@
KCM.SimpleKCM {
id: root
- implicitWidth: units.gridUnit * 30
- implicitHeight: units.gridUnit * 38
+ implicitWidth: Kirigami.Units.gridUnit * 32
+ implicitHeight: Kirigami.Units.gridUnit * 38
property int selectedOutput: 0
@@ -113,7 +113,7 @@
id: screen
Layout.alignment: Qt.AlignHCenter
- Layout.preferredWidth: Math.max(root.width * 0.8, units.gridUnit * 26)
+ Layout.preferredWidth: Math.max(root.width * 0.8, Kirigami.Units.gridUnit * 26)
Layout.topMargin: Kirigami.Units.smallSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml kscreen-5.17.5/kcm/package/contents/ui/Output.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/Output.qml 2020-04-03 17:53:22.491686708 +0200
@@ -19,6 +19,7 @@
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.3 as Controls
import QtGraphicalEffects 1.0
+import org.kde.kirigami 2.4 as Kirigami
Rectangle {
id: output
@@ -77,7 +78,7 @@
Controls.Label {
Layout.fillWidth: true
- Layout.margins: units.smallSpacing
+ Layout.margins: Kirigami.Units.smallSpacing
text: model.display
wrapMode: Text.Wrap
@@ -87,7 +88,7 @@
Controls.Label {
Layout.fillWidth: true
- Layout.bottomMargin: units.smallSpacing
+ Layout.bottomMargin: Kirigami.Units.smallSpacing
text: "(" + model.size.width + "x" + model.size.height + ")"
horizontalAlignment: Text.AlignHCenter
diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml kscreen-5.17.5/kcm/package/contents/ui/Screen.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/Screen.qml 2020-04-03 17:53:22.491686708 +0200
@@ -45,7 +45,7 @@
property int xOffset: (width - totalSize.width / relativeFactor) / 2;
property int yOffset: (height - totalSize.height / relativeFactor) / 2;
- implicitHeight: Math.max(root.height * 0.4, units.gridUnit * 13)
+ implicitHeight: Math.max(root.height * 0.4, Kirigami.Units.gridUnit * 13)
Component.onCompleted: background.visible = true;
@@ -54,7 +54,7 @@
anchors {
bottom: parent.bottom
horizontalCenter: parent.horizontalCenter
- margins: units.smallSpacing
+ margins: Kirigami.Units.smallSpacing
}
spacing: units.smallSpacing
Controls.Button {

5
pkgs/desktops/plasma-5/kscreen.nix
View File

@ -2,17 +2,16 @@
mkDerivation, mkDerivation,
extra-cmake-modules, extra-cmake-modules,
kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n,
kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors,
kwindowsystem, kdeclarative, plasma-framework kwindowsystem, kdeclarative, plasma-framework
}: }:
mkDerivation { mkDerivation {
name = "kscreen"; name = "kscreen";
patches = [ ./kscreen-417316.patch ];
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors
kwindowsystem kdeclarative plasma-framework kwindowsystem kdeclarative plasma-framework
]; ];
} }

4
pkgs/desktops/plasma-5/ksysguard.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, mkDerivation,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
lm_sensors, libcap, libpcap, lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
knewstuff, libksysguard knewstuff, libksysguard
}: }:
@ -11,6 +11,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
kdelibs4support ki18n lm_sensors kdelibs4support ki18n libcap libpcap lm_sensors
]; ];
} }

8
pkgs/desktops/plasma-5/kwin/default.nix
View File

@ -5,13 +5,14 @@
epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
xwayland, xwayland,
qtdeclarative, qtmultimedia, qtscript, qtx11extras, qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors,
qtvirtualkeyboard, qtx11extras,
breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets, breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets,
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
plasma-framework, qtsensors, libcap, libdrm, mesa plasma-framework, libcap, libdrm, mesa
}: }:
# TODO (ttuegel): investigate qmlplugindump failure # TODO (ttuegel): investigate qmlplugindump failure
@ -23,7 +24,8 @@ mkDerivation {
epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor
xwayland xwayland
qtdeclarative qtmultimedia qtscript qtx11extras qtsensors qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors
qtvirtualkeyboard qtx11extras
breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes

4
pkgs/desktops/plasma-5/plasma-desktop/default.nix
View File

@ -12,7 +12,7 @@
kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n, kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n,
kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner, kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner,
kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework, kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework,
plasma-workspace, xf86inputlibinput plasma-workspace, qqc2-desktop-style, xf86inputlibinput
}: }:
mkDerivation { mkDerivation {
@ -27,7 +27,7 @@ mkDerivation {
attica baloo kactivities kactivities-stats kauth kcmutils kdbusaddons attica baloo kactivities kactivities-stats kauth kcmutils kdbusaddons
kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels
knewstuff knotifications knotifyconfig kpeople krunner kscreenlocker knewstuff knotifications knotifyconfig kpeople krunner kscreenlocker
ksysguard kwallet kwin plasma-framework plasma-workspace ksysguard kwallet kwin plasma-framework plasma-workspace qqc2-desktop-style
]; ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

2
pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
View File

@ -17,7 +17,7 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
void ClockHelper::toHwclock() void ClockHelper::toHwclock()
{ {
- QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath); - QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':')));
+ QString hwclock = QLatin1String(NIXPKGS_HWCLOCK); + QString hwclock = QLatin1String(NIXPKGS_HWCLOCK);
if (!hwclock.isEmpty()) { if (!hwclock.isEmpty()) {
KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc")); KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));

13
pkgs/desktops/plasma-5/plasma-pa.nix
View File

@ -1,15 +1,20 @@
{ {
mkDerivation, mkDerivation,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework,
libcanberra-gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem qtdeclarative,
gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop
}: }:
mkDerivation { mkDerivation {
name = "plasma-pa"; name = "plasma-pa";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop
libcanberra-gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem
kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework
kwindowsystem
qtdeclarative
]; ];
} }

39
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
View File

@ -1,4 +1,4 @@
From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001 From 6477e377fcca39c07ef5f91a55084d7d74715d00 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Jan 2020 05:00:53 -0600 Date: Tue, 28 Jan 2020 05:00:53 -0600
Subject: [PATCH 1/2] startkde Subject: [PATCH 1/2] startkde
@ -6,11 +6,11 @@ Subject: [PATCH 1/2] startkde
--- ---
startkde/startplasma-waylandsession.cpp | 2 +- startkde/startplasma-waylandsession.cpp | 2 +-
startkde/startplasma-x11.cpp | 2 +- startkde/startplasma-x11.cpp | 2 +-
startkde/startplasma.cpp | 32 ++++++++----------------- startkde/startplasma.cpp | 24 ++++++++++--------------
3 files changed, 12 insertions(+), 24 deletions(-) 3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
index 87c71c6..5fc5314 100644 index 87c71c6b3..5fc53140e 100644
--- a/startkde/startplasma-waylandsession.cpp --- a/startkde/startplasma-waylandsession.cpp
+++ b/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp
@@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/) @@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/)
@ -23,7 +23,7 @@ index 87c71c6..5fc5314 100644
cleanupX11(); cleanupX11();
out << "startplasma-waylandsession: Done.\n"; out << "startplasma-waylandsession: Done.\n";
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
index 3314b62..14cbe29 100644 index 3314b6283..14cbe29fa 100644
--- a/startkde/startplasma-x11.cpp --- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp
@@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/) @@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/)
@ -36,7 +36,7 @@ index 3314b62..14cbe29 100644
cleanupPlasmaEnvironment(); cleanupPlasmaEnvironment();
cleanupX11(); cleanupX11();
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index e0f7004..8ac41fd 100644 index 4c9f5cef6..5ea4c2cf1 100644
--- a/startkde/startplasma.cpp --- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp
@@ -34,7 +34,7 @@ QTextStream out(stderr); @@ -34,7 +34,7 @@ QTextStream out(stderr);
@ -48,22 +48,7 @@ index e0f7004..8ac41fd 100644
} }
QStringList allServices(const QLatin1String& prefix) QStringList allServices(const QLatin1String& prefix)
@@ -184,14 +184,6 @@ void runEnvironmentScripts() @@ -242,15 +242,15 @@ void setupX11()
}
}
sourceFiles(scripts);
-
- // Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
- // The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
- // to set it to a list of paths *not* including the KDE prefix if it's not /usr or
- // /usr/local.
- if (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) {
- qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share");
- }
}
@@ -240,15 +232,15 @@ void setupX11()
// If the user has overwritten fonts, the cursor font may be different now // If the user has overwritten fonts, the cursor font may be different now
// so don't move this up. // so don't move this up.
@ -84,7 +69,7 @@ index e0f7004..8ac41fd 100644
} }
// TODO: Check if Necessary // TODO: Check if Necessary
@@ -265,11 +257,7 @@ bool syncDBusEnvironment() @@ -267,11 +267,7 @@ bool syncDBusEnvironment()
{ {
int exitCode; int exitCode;
// At this point all environment variables are set, let's send it to the DBus session server to update the activation environment // At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
@ -97,7 +82,7 @@ index e0f7004..8ac41fd 100644
return exitCode == 0; return exitCode == 0;
} }
@@ -285,7 +273,7 @@ void setupFontDpi() @@ -287,7 +283,7 @@ void setupFontDpi()
//TODO port to c++? //TODO port to c++?
const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
QProcess p; QProcess p;
@ -106,7 +91,7 @@ index e0f7004..8ac41fd 100644
p.setProcessChannelMode(QProcess::ForwardedChannels); p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(input); p.write(input);
p.closeWriteChannel(); p.closeWriteChannel();
@@ -307,7 +295,7 @@ QProcess* setupKSplash() @@ -309,7 +305,7 @@ QProcess* setupKSplash()
KConfigGroup ksplashCfg = cfg.group("KSplash"); KConfigGroup ksplashCfg = cfg.group("KSplash");
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess; p = new QProcess;
@ -115,7 +100,7 @@ index e0f7004..8ac41fd 100644
} }
} }
return p; return p;
@@ -329,7 +317,7 @@ bool startKDEInit() @@ -331,7 +327,7 @@ bool startKDEInit()
{ {
// We set LD_BIND_NOW to increase the efficiency of kdeinit. // We set LD_BIND_NOW to increase the efficiency of kdeinit.
// kdeinit unsets this variable before loading applications. // kdeinit unsets this variable before loading applications.
@ -125,5 +110,5 @@ index e0f7004..8ac41fd 100644
messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation.")); messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation."));
return false; return false;
-- --
2.23.1 2.25.1

13
pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
View File

@ -1,4 +1,4 @@
From 7c6f939aea290bc3ec7629f26d02441d1d4bcb8a Mon Sep 17 00:00:00 2001 From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 5 Feb 2020 05:03:11 -0600 Date: Wed, 5 Feb 2020 05:03:11 -0600
Subject: [PATCH 2/2] absolute-wallpaper-install-dir Subject: [PATCH 2/2] absolute-wallpaper-install-dir
@ -8,15 +8,16 @@ Subject: [PATCH 2/2] absolute-wallpaper-install-dir
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
index ea9a943..c8458ba 100644 index 8494a5c8a..f723c1e1b 100644
--- a/sddm-theme/theme.conf.cmake --- a/sddm-theme/theme.conf.cmake
+++ b/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake
@@ -2,4 +2,4 @@ @@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
type=image type=image
color=#1d99f3 color=#1d99f3
fontSize=10 fontSize=10
-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png -background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg
+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png +background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg
needsFullUserModel=false
-- --
2.23.1 2.25.1

6
pkgs/desktops/plasma-5/plasma-workspace/default.nix
View File

@ -11,7 +11,8 @@
kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner, kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner,
kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin,
kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt, kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt,
phonon, plasma-framework, prison, solid, kholidays, phonon, plasma-framework, prison, solid, kholidays, kquickcharts,
appstream-qt,
qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
qtwayland, qtx11extras, qtwayland, qtx11extras,
@ -31,7 +32,7 @@ mkDerivation {
knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor
ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
libqalculate networkmanager-qt phonon plasma-framework prison solid libqalculate networkmanager-qt phonon plasma-framework prison solid
kholidays kholidays kquickcharts appstream-qt
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
]; ];
@ -47,7 +48,6 @@ mkDerivation {
./0002-absolute-wallpaper-install-dir.patch ./0002-absolute-wallpaper-install-dir.patch
]; ];
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"''
''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"'' ''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"''

12
pkgs/desktops/plasma-5/powerdevil.nix
View File

@ -21,16 +21,16 @@ mkDerivation {
patches = [ patches = [
# This fixes an issue where 'DDCA_Feature_List*' cannot be converted to # This fixes an issue where 'DDCA_Feature_List*' cannot be converted to
# 'DDCA_Feature_List'. # 'DDCA_Feature_List'.
# This can be dropped with the next release.
# https://bugs.kde.org/show_bug.cgi?id=423605 # https://bugs.kde.org/show_bug.cgi?id=423605
(fetchpatch { (fetchpatch {
url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch"; url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch";
sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s"; sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s";
}) })
# This is a backport of
# https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch, # Reduce log message spam by setting the default log level to Warning.
# which doesn't apply cleanly to 5.17.5. It should make it into 5.20, so (fetchpatch {
# this patch can be removed when we upgrade to 5.20. url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch";
./patches/0001-Add-a-logging-category-config-file.patch sha256 = "0vj70mhx6qhvbh4vn9qk9ir5w4s2m76hw2lsxmh3ibgsydz4yilz";
})
]; ];
} }

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

@ -1,374 +1,390 @@
# DO NOT EDIT! This file is generated automatically. # DO NOT EDIT! This file is generated automatically.
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/ # Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5
{ fetchurl, mirror }: { fetchurl, mirror }:
{ {
bluedevil = { bluedevil = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/bluedevil-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/bluedevil-5.18.5.tar.xz";
sha256 = "22e9c683dfc56a559e652809ade238f8eb0ffb09d5ab042f5cd4b8216f647c09"; sha256 = "5350efbaee01c78fd451e96bb2aceb7986d45ab05500476d1e95c4e79ec89a66";
name = "bluedevil-5.17.5.tar.xz"; name = "bluedevil-5.18.5.tar.xz";
}; };
}; };
breeze = { breeze = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/breeze-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/breeze-5.18.5.tar.xz";
sha256 = "f89bf857321b18789089efc9271d7bd7b6459a173dd078dd03242775db76c8d7"; sha256 = "1d08dfd24df4a4fcacad1e3759e559e82f6014ba63dc75dc32a24de6cd133563";
name = "breeze-5.17.5.tar.xz"; name = "breeze-5.18.5.tar.xz";
}; };
}; };
breeze-grub = { breeze-grub = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/breeze-grub-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/breeze-grub-5.18.5.tar.xz";
sha256 = "591a1d7a510c76a1f2729a61a4d14c0f33db4d1e8ea5dbc87b74f2e7e7e2a2ba"; sha256 = "24c40171601b82d1c7d01eb85d16718a2f46cf23ee792f5524ac89fda3d278b1";
name = "breeze-grub-5.17.5.tar.xz"; name = "breeze-grub-5.18.5.tar.xz";
}; };
}; };
breeze-gtk = { breeze-gtk = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/breeze-gtk-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/breeze-gtk-5.18.5.tar.xz";
sha256 = "6dbd8e7d936840fbaf7016574d07729c9d0791711ad6d371136585ddb8f76e66"; sha256 = "41c7e83a28c033903d4fcab3da28a4c74ddb72958e66693a2d2e451f716cb7e9";
name = "breeze-gtk-5.17.5.tar.xz"; name = "breeze-gtk-5.18.5.tar.xz";
}; };
}; };
breeze-plymouth = { breeze-plymouth = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/breeze-plymouth-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/breeze-plymouth-5.18.5.tar.xz";
sha256 = "e95f9eaf04e74383f5e1abe74d999787e408be7a34fd07a4f64e253e35150af0"; sha256 = "c0d48dc5a02f3236ff657f86ee8cf532cf885a0e8b36bfe79f007e4d5e277281";
name = "breeze-plymouth-5.17.5.tar.xz"; name = "breeze-plymouth-5.18.5.tar.xz";
}; };
}; };
discover = { discover = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/discover-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/discover-5.18.5.tar.xz";
sha256 = "986ef367aef59c5a956d4163f987a60cfd3674a300880376ddedc0222769789f"; sha256 = "d5ce4f4668c50ba9be37e04227db4bbe469e00470c87907f1e217fdcad6e76b6";
name = "discover-5.17.5.tar.xz"; name = "discover-5.18.5.tar.xz";
}; };
}; };
drkonqi = { drkonqi = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/drkonqi-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/drkonqi-5.18.5.tar.xz";
sha256 = "756c50f2458a8c564e608ea97244f6b2b3d5fb4a675a8cec29307be1d5ab5457"; sha256 = "b1a626c4ed2f9de8f8bc3359d8827e7fa6ac17486b8477674e47627fcf6efad1";
name = "drkonqi-5.17.5.tar.xz"; name = "drkonqi-5.18.5.tar.xz";
}; };
}; };
kactivitymanagerd = { kactivitymanagerd = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kactivitymanagerd-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kactivitymanagerd-5.18.5.tar.xz";
sha256 = "362721c3a9712751fba29cd1f1ef440a1e74561a611f2d171692a4ddc895b3e4"; sha256 = "24f32eb4585d427ee62e08a9fa2f057353085c62644d6bec8fb4b2568e507ac7";
name = "kactivitymanagerd-5.17.5.tar.xz"; name = "kactivitymanagerd-5.18.5.tar.xz";
}; };
}; };
kde-cli-tools = { kde-cli-tools = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kde-cli-tools-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kde-cli-tools-5.18.5.tar.xz";
sha256 = "d14299ebeaf89854cb89435cfaaa4da1d84bf23a97df23ff8c7f95dae5bec55f"; sha256 = "e3981d1a17111f4e284b787a6e841d7ff47f4fdbca0ad17e105c0a047e5aaaa8";
name = "kde-cli-tools-5.17.5.tar.xz"; name = "kde-cli-tools-5.18.5.tar.xz";
}; };
}; };
kdecoration = { kdecoration = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kdecoration-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kdecoration-5.18.5.tar.xz";
sha256 = "7d8f0128306d436aeba010e47a3dddbcb9fb9fd05ef9308cbad1934914875cd9"; sha256 = "f09856245f2cb08d9013da4c3128b5438f1e2f58af40031eb547ae765f57a9c8";
name = "kdecoration-5.17.5.tar.xz"; name = "kdecoration-5.18.5.tar.xz";
}; };
}; };
kde-gtk-config = { kde-gtk-config = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kde-gtk-config-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kde-gtk-config-5.18.5.tar.xz";
sha256 = "5feff23c756f1fb0ba9ab88c2aed92c0e7c5521c757f5a0cdd057273538f0010"; sha256 = "9d7b1fd8b61f9f99c5a5721ea0227c4562588834a4886d66637f4c092f0e53ab";
name = "kde-gtk-config-5.17.5.tar.xz"; name = "kde-gtk-config-5.18.5.tar.xz";
}; };
}; };
kdeplasma-addons = { kdeplasma-addons = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kdeplasma-addons-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kdeplasma-addons-5.18.5.tar.xz";
sha256 = "997d6a3542ab1f1fd7fb17580693dc8281ff29b03c82577dbae3fc1ec4cccdb8"; sha256 = "1d135a32a7442f79dba4cb4e23221cd2ad1aad36b54fb12bfa91918daf3ff53f";
name = "kdeplasma-addons-5.17.5.tar.xz"; name = "kdeplasma-addons-5.18.5.tar.xz";
}; };
}; };
kgamma5 = { kgamma5 = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kgamma5-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kgamma5-5.18.5.tar.xz";
sha256 = "3b8fd1539d035d4d39dcde6ca0dd214e6653c98778ac79b9cbf2f7009b155ca9"; sha256 = "3aa89e361646214fb4910409644b941c83a85505d3d8a1d37984598d3e54269f";
name = "kgamma5-5.17.5.tar.xz"; name = "kgamma5-5.18.5.tar.xz";
}; };
}; };
khotkeys = { khotkeys = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/khotkeys-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/khotkeys-5.18.5.tar.xz";
sha256 = "cf78b5bfb8568fb4eea592b209bdb79aeac92bd08a580c3b6c08d45dd34a2d56"; sha256 = "8f02fdf3bbecdc31c305c276fe2b3b2eca6dc10195e65c723ee9148fed81e766";
name = "khotkeys-5.17.5.tar.xz"; name = "khotkeys-5.18.5.tar.xz";
}; };
}; };
kinfocenter = { kinfocenter = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kinfocenter-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kinfocenter-5.18.5.tar.xz";
sha256 = "679870f10ee6494136d87a897a57a23c2905054d7a83ff11a4e85c204eb9fd9a"; sha256 = "a9679bce4cd2d64e6f471c89de6da410237263b02512768f3acd0a4932b12ec5";
name = "kinfocenter-5.17.5.tar.xz"; name = "kinfocenter-5.18.5.tar.xz";
}; };
}; };
kmenuedit = { kmenuedit = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kmenuedit-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kmenuedit-5.18.5.tar.xz";
sha256 = "59beed03298cd9fd6b05d67844794ed6a77be0d1b25b55d5bbcdf72e15e357de"; sha256 = "59d998972121662d2835d43ff5be36eca7bf62e66e39fd67b7005e8ef8afd5f6";
name = "kmenuedit-5.17.5.tar.xz"; name = "kmenuedit-5.18.5.tar.xz";
}; };
}; };
kscreen = { kscreen = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kscreen-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kscreen-5.18.5.tar.xz";
sha256 = "de8a00b33d0254245a53a5c097347aa86709d415754b3e3c675eef8fb4fe5bc0"; sha256 = "9b6238447a4a38babdff482724ae3d33786b211e8b4224aaadafaad7435f6ba2";
name = "kscreen-5.17.5.tar.xz"; name = "kscreen-5.18.5.tar.xz";
}; };
}; };
kscreenlocker = { kscreenlocker = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kscreenlocker-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kscreenlocker-5.18.5.tar.xz";
sha256 = "078cfaa9f117a985f5c71152bdf4a9f5cb65ef23c0090cfaaccc9539770f138f"; sha256 = "b4269cd027e1fee721760a22ca5d738d3d98622fa222fcf9e57d2da77a4e18d2";
name = "kscreenlocker-5.17.5.tar.xz"; name = "kscreenlocker-5.18.5.tar.xz";
}; };
}; };
ksshaskpass = { ksshaskpass = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/ksshaskpass-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/ksshaskpass-5.18.5.tar.xz";
sha256 = "b09e0d780340fc5a6a65e67a30d08a3f117f31e2dbfbb35579aa4cefb15c3b27"; sha256 = "c483c17d6ce2e3dffd54fc812f97b88c32f5def6e8c5e7a526e23f5e7f208cc5";
name = "ksshaskpass-5.17.5.tar.xz"; name = "ksshaskpass-5.18.5.tar.xz";
}; };
}; };
ksysguard = { ksysguard = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/ksysguard-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/ksysguard-5.18.5.tar.xz";
sha256 = "69bc12311dcf363b168a259139d30456ed395ec03b948bd35e992300c7e7bd82"; sha256 = "4acb352698b612a21a5eccf22042ab46265d50bbf3aa85844bbca762a64c9e2f";
name = "ksysguard-5.17.5.tar.xz"; name = "ksysguard-5.18.5.tar.xz";
}; };
}; };
kwallet-pam = { kwallet-pam = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kwallet-pam-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kwallet-pam-5.18.5.tar.xz";
sha256 = "c829c7a44408e58beb87c71f5c70bccd349d285c3fcefb16df98bf2f29357fe9"; sha256 = "bc4fe3dde503645d6233c3932d3cf74a7f5bf7acefb96bd6dbd224c8919d841a";
name = "kwallet-pam-5.17.5.tar.xz"; name = "kwallet-pam-5.18.5.tar.xz";
}; };
}; };
kwayland-integration = { kwayland-integration = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kwayland-integration-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kwayland-integration-5.18.5.tar.xz";
sha256 = "818b4e14611e26f297ef60427d399edc458a44e113bc092390fa65ecababcedb"; sha256 = "82d6943d79a9a2a9bce10623adb2c9af396a2dcf258a723bb349aafbde20e6d5";
name = "kwayland-integration-5.17.5.tar.xz"; name = "kwayland-integration-5.18.5.tar.xz";
}; };
}; };
kwin = { kwin = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kwin-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kwin-5.18.5.tar.xz";
sha256 = "8517adaf8270d783aea7b3886d86b5abed6a5ec2b5c78b632479597d956baadc"; sha256 = "ca39c63fd740432e95490031fd9d5ac003da034582014fa41c2be2b89627ddf8";
name = "kwin-5.17.5.tar.xz"; name = "kwin-5.18.5.tar.xz";
}; };
}; };
kwrited = { kwrited = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kwrited-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/kwrited-5.18.5.tar.xz";
sha256 = "ca22b1fa3e657fa2e58bf0c9dc1ebff3be8c0e003750223e7a7c5932d5b90823"; sha256 = "45ffa31d3d141ce453fb09fd823d7edd8e6c782b353bce22b8c879ad794fd1fe";
name = "kwrited-5.17.5.tar.xz"; name = "kwrited-5.18.5.tar.xz";
}; };
}; };
libkscreen = { libkscreen = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/libkscreen-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/libkscreen-5.18.5.tar.xz";
sha256 = "aa186e5751287701daec4d036aba776a911e4b84ca7eea44dc5fb531875afd94"; sha256 = "a962319000324200ec1abe3c58b1b8ab71ed4cc7c88a3c7e03a1c8eca86c287c";
name = "libkscreen-5.17.5.tar.xz"; name = "libkscreen-5.18.5.tar.xz";
}; };
}; };
libksysguard = { libksysguard = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/libksysguard-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/libksysguard-5.18.5.tar.xz";
sha256 = "f5d237af554d65740a28360e6d8fa39d4912239c5f21288846b1c934897a7e14"; sha256 = "d4d7030a2869a546a211844aa158dcef3598386cc035a8655529938ba102440b";
name = "libksysguard-5.17.5.tar.xz"; name = "libksysguard-5.18.5.tar.xz";
}; };
}; };
milou = { milou = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/milou-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/milou-5.18.5.tar.xz";
sha256 = "b89796e34cc8b6d6d4196169e814249f7b75c1c15763e0b4c1da5c97ccc2c8cf"; sha256 = "7ec763833c025aa719d1e25f3c5c1c8b6c934a48bf346517e94660e09d8582b2";
name = "milou-5.17.5.tar.xz"; name = "milou-5.18.5.tar.xz";
}; };
}; };
oxygen = { oxygen = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/oxygen-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/oxygen-5.18.5.tar.xz";
sha256 = "58954374a4b9067365ee5d50b32b1986b2e7dd31e73cbf79fda8d978949943be"; sha256 = "479bdfa80b3f2216075470ab4be1e3159a17620870acf276144b9639134609f8";
name = "oxygen-5.17.5.tar.xz"; name = "oxygen-5.18.5.tar.xz";
}; };
}; };
plasma-browser-integration = { plasma-browser-integration = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-browser-integration-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plasma-browser-integration-5.18.5.tar.xz";
sha256 = "07bc4285991ab43830873a12b8c07f60e4faea1ec81121db783c425f18a4f87d"; sha256 = "3a087a836657b5304e2e0ef9ebefb84ce1f896bfbfc5dbf948d4b3eb7b709383";
name = "plasma-browser-integration-5.17.5.tar.xz"; name = "plasma-browser-integration-5.18.5.tar.xz";
}; };
}; };
plasma-desktop = { plasma-desktop = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-desktop-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plasma-desktop-5.18.5.tar.xz";
sha256 = "7f741ab026989bdcc68701955fc290d5ead38bf4bc310f18a2f32c64b411ab04"; sha256 = "aeb106018fd90da79c8a3c444d880282846a842029b1223e7830db2d4b42df9f";
name = "plasma-desktop-5.17.5.tar.xz"; name = "plasma-desktop-5.18.5.tar.xz";
}; };
}; };
plasma-integration = { plasma-integration = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-integration-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plasma-integration-5.18.5.tar.xz";
sha256 = "169206bebd790d2fee49cec621c46f6f64a8e20ee3e56bf16ee7373f61cad959"; sha256 = "c99b987efb2ab965cc2a55793ef94c7ccb2152ca5d75956a40ec99261ad4b870";
name = "plasma-integration-5.17.5.tar.xz"; name = "plasma-integration-5.18.5.tar.xz";
};
};
plasma-nano = {
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-nano-5.18.5.tar.xz";
sha256 = "d2f29b05894573517cb3336088e102d3604b1c2735e9bbe605119f559f0c6341";
name = "plasma-nano-5.18.5.tar.xz";
}; };
}; };
plasma-nm = { plasma-nm = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-nm-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plasma-nm-5.18.5.tar.xz";
sha256 = "2165e47a0654d17735abc97aec287b46b52a2eafccc3591b667ea2755b731255"; sha256 = "1e091d01993708220f89501bb8a289279bf527d0593fd9e4b9223e6e8caf9aaa";
name = "plasma-nm-5.17.5.tar.xz"; name = "plasma-nm-5.18.5.tar.xz";
}; };
}; };
plasma-pa = { plasma-pa = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-pa-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plasma-pa-5.18.5.tar.xz";
sha256 = "933c6ab1fda52b336a157a48b1ea64b81fd1d84ca08a40a52bfae276cca2bf23"; sha256 = "28765c07f584e7688a85c9761155e606440936de2ebb678917dac2c85f5d0209";
name = "plasma-pa-5.17.5.tar.xz"; name = "plasma-pa-5.18.5.tar.xz";
};
};
plasma-phone-components = {
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-phone-components-5.18.5.tar.xz";
sha256 = "d0c091367ae07c71457a0c03d1023ac48d8665385a6a1b0e32f6ae7ad1fa7070";
name = "plasma-phone-components-5.18.5.tar.xz";
}; };
}; };
plasma-sdk = { plasma-sdk = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-sdk-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plasma-sdk-5.18.5.tar.xz";
sha256 = "ff736029b1ae5773991db06f5827d9dcbd8e7a4e9a430c9014c35ddee2c55314"; sha256 = "5f399231d16d62f9880f953891477f74e0b1f7b931448a4b0fbb97f37acd2fe5";
name = "plasma-sdk-5.17.5.tar.xz"; name = "plasma-sdk-5.18.5.tar.xz";
}; };
}; };
plasma-tests = { plasma-tests = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-tests-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plasma-tests-5.18.5.tar.xz";
sha256 = "1b566b7118a5c8d1b25078d331a6bc77f48781010fbd3425d85b137811218982"; sha256 = "3251ea30cb3c62de9bba2deb152370ea9e0e56b7506efd655888f1892c18413a";
name = "plasma-tests-5.17.5.tar.xz"; name = "plasma-tests-5.18.5.tar.xz";
}; };
}; };
plasma-thunderbolt = { plasma-thunderbolt = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-thunderbolt-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plasma-thunderbolt-5.18.5.tar.xz";
sha256 = "3743f9841d269d51f1b1419e24d5cd1b26a0ba5a90e76b531328a8cc43184382"; sha256 = "c61dc7abe350ead15ca4d6111606aaf19773c38a0307ae8a7d8a7c60b82be5d1";
name = "plasma-thunderbolt-5.17.5.tar.xz"; name = "plasma-thunderbolt-5.18.5.tar.xz";
}; };
}; };
plasma-vault = { plasma-vault = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-vault-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plasma-vault-5.18.5.tar.xz";
sha256 = "3e5c6b4dd6c1122b6a221205da506881959ab905e467b74b0536e7f5fe130d71"; sha256 = "cae2713823e8c59c7a2beb96d362a15024fe260cf10419ba037e8a798f3c1b41";
name = "plasma-vault-5.17.5.tar.xz"; name = "plasma-vault-5.18.5.tar.xz";
}; };
}; };
plasma-workspace = { plasma-workspace = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz";
sha256 = "764488e66d52bc3017efb2c1471f57196aa50fbfa3a80637bf48f24955cfba88"; sha256 = "14e82033be745f4db46a70d319e2c86012295ea31056092bc974004189b92354";
name = "plasma-workspace-5.17.5.tar.xz"; name = "plasma-workspace-5.18.5.tar.xz";
}; };
}; };
plasma-workspace-wallpapers = { plasma-workspace-wallpapers = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-wallpapers-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-wallpapers-5.18.5.tar.xz";
sha256 = "8a28ef67b65c340d40ff8f5bfc333ead68e6d8c9e410769c43af847ced9b4ca9"; sha256 = "f8da3bd7b97a9944639ed0860303b8a7a008905246313e1983367810a3a84d6d";
name = "plasma-workspace-wallpapers-5.17.5.tar.xz"; name = "plasma-workspace-wallpapers-5.18.5.tar.xz";
}; };
}; };
plymouth-kcm = { plymouth-kcm = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plymouth-kcm-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/plymouth-kcm-5.18.5.tar.xz";
sha256 = "bbd6994f60ed9d63b4e4dd0abe78bf1f9c14b8ecce8ba4355d16cd52a0a86528"; sha256 = "e8f75dd8c8a45cd706a0a6e62826d1eb4fff9c3912cbaadba8c06e9de915d2e3";
name = "plymouth-kcm-5.17.5.tar.xz"; name = "plymouth-kcm-5.18.5.tar.xz";
}; };
}; };
polkit-kde-agent = { polkit-kde-agent = {
version = "1-5.17.5"; version = "1-5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/polkit-kde-agent-1-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/polkit-kde-agent-1-5.18.5.tar.xz";
sha256 = "a79d76a2f584f6567639228fde6f75b3960484f7a65cfc69b6acb6df1de53f5d"; sha256 = "5e1733cb51c826c6215da4fbbc9c9568240275cf86b9922cd7a643d192a75a91";
name = "polkit-kde-agent-1-5.17.5.tar.xz"; name = "polkit-kde-agent-1-5.18.5.tar.xz";
}; };
}; };
powerdevil = { powerdevil = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/powerdevil-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/powerdevil-5.18.5.tar.xz";
sha256 = "27904361e85e1267d933d8f0a0d3be4dc712099ed2eb3cf90959209a4443dd82"; sha256 = "e000185ee61bff81fe28896a7d6353746c82c7f4d2626792fd22d34b5f49f548";
name = "powerdevil-5.17.5.tar.xz"; name = "powerdevil-5.18.5.tar.xz";
}; };
}; };
sddm-kcm = { sddm-kcm = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/sddm-kcm-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/sddm-kcm-5.18.5.tar.xz";
sha256 = "e85fb9e014439e8c0e73638112139561aff9a9f71f26c3eafedff5a98a07b33b"; sha256 = "cc99c185d701acc7442f33ef17b2396894dcf164f3f583c25105ac3f2528c33b";
name = "sddm-kcm-5.17.5.tar.xz"; name = "sddm-kcm-5.18.5.tar.xz";
}; };
}; };
systemsettings = { systemsettings = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/systemsettings-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/systemsettings-5.18.5.tar.xz";
sha256 = "50fa4d7866639995a6859446fc6a02a73ae05203e8f2ed31221e232ed3491eaf"; sha256 = "cde5b714261aaa54f937887657c3d3e74814c5447448b989159ee6035be4783b";
name = "systemsettings-5.17.5.tar.xz"; name = "systemsettings-5.18.5.tar.xz";
}; };
}; };
user-manager = { user-manager = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/user-manager-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/user-manager-5.18.5.tar.xz";
sha256 = "10ed3196063c7dfed3b3f25dd199a48ca39fa86db5d0126ec84a543b1c212f0d"; sha256 = "741d293947fa3fb3966f047bab121597bf1071be010684daff4a91626cf54484";
name = "user-manager-5.17.5.tar.xz"; name = "user-manager-5.18.5.tar.xz";
}; };
}; };
xdg-desktop-portal-kde = { xdg-desktop-portal-kde = {
version = "5.17.5"; version = "5.18.5";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/xdg-desktop-portal-kde-5.17.5.tar.xz"; url = "${mirror}/stable/plasma/5.18.5/xdg-desktop-portal-kde-5.18.5.tar.xz";
sha256 = "a993bd4b86a44c8237a3f4957c2594aa2ca8916204ad866f8af32f7df34740f6"; sha256 = "807452708a0318b8e21b43f9ec7e016d1de51cac5d8714d70c577bb6f3976224";
name = "xdg-desktop-portal-kde-5.17.5.tar.xz"; name = "xdg-desktop-portal-kde-5.18.5.tar.xz";
}; };
}; };
} }

9
pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
View File

@ -1,15 +1,18 @@
{ {
mkDerivation, mkDerivation,
extra-cmake-modules, gettext, kdoctools, python, extra-cmake-modules, gettext, kdoctools, python,
cups, epoxy, mesa, pcre, pipewire,
kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
cups, pcre, pipewire, kio kirigami2, kdeclarative, plasma-framework, kio
}: }:
mkDerivation { mkDerivation {
name = "xdg-desktop-portal-kde"; name = "xdg-desktop-portal-kde";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [ buildInputs = [
cups pcre pipewire kio cups epoxy mesa pcre pipewire
kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
kirigami2 kdeclarative plasma-framework
]; ];
} }

4
pkgs/development/compilers/go/1.15.nix
View File

@ -31,11 +31,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "go"; pname = "go";
version = "1.15"; version = "1.15.1";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz"; url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "0fmc53pamxxbvmp5bcvh1fhffirpv3gz6y7qz97iacpmsiz8yhv9"; sha256 = "0c2d2ngckcfsgrb7a4p6ag83mk5yd15npiq7q1f1p211li93fx6k";
}; };
# perl is used for testing go vet # perl is used for testing go vet

4
pkgs/development/compilers/ocaml/4.11.nix
View File

@ -1,6 +1,6 @@
import ./generic.nix { import ./generic.nix {
major_version = "4"; major_version = "4";
minor_version = "11"; minor_version = "11";
patch_version = "0"; patch_version = "1";
sha256 = "04b13yfismkqh21ag641q9dl0i602khgh4427g1a7pb77c4skr7z"; sha256 = "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa";
} }

4
pkgs/development/coq-modules/dpdgraph/default.nix
View File

@ -1,6 +1,10 @@
{ stdenv, fetchFromGitHub, autoreconfHook, coq }: { stdenv, fetchFromGitHub, autoreconfHook, coq }:
let params = { let params = {
"8.12" = {
version = "0.6.8";
sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps";
};
"8.11" = { "8.11" = {
version = "0.6.7"; version = "0.6.7";
sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09"; sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09";

2
pkgs/development/interpreters/j/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, readline, libedit, bc { stdenv, fetchFromGitHub, readline, libedit, bc
, avxSupport ? false , avxSupport ? stdenv.hostPlatform.avxSupport
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec stdenv.mkDerivation rec
{ {
pname = "alembic"; pname = "alembic";
version = "1.7.13"; version = "1.7.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alembic"; owner = "alembic";
repo = "alembic"; repo = "alembic";
rev = version; rev = version;
sha256 = "01j4fsq917jckdh16nvmc35xiy11j4g1sc17y6g8qxa00s2sfsa4"; sha256 = "0yri063v7j5jsvqbmlwr0hf2d1a55dgc1nj85rf10sxqhijwzk55";
}; };
outputs = [ "bin" "dev" "out" "lib" ]; outputs = [ "bin" "dev" "out" "lib" ];

43
pkgs/development/libraries/appindicator-sharp/default.nix Normal file
View File

@ -0,0 +1,43 @@
{
autoreconfHook,
fetchFromGitHub,
lib,
libappindicator,
mono,
gtk-sharp-3_0,
pkg-config,
stdenv,
}:
stdenv.mkDerivation rec {
pname = "appindicator-sharp";
version = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37";
src = fetchFromGitHub {
owner = "stsundermann";
repo = "appindicator-sharp";
rev = version;
sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l";
};
nativeBuildInputs = [
autoreconfHook
mono
pkg-config
];
buildInputs = [
gtk-sharp-3_0
libappindicator
];
ac_cv_path_MDOC = "no";
installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"];
meta = {
description = "Bindings for appindicator using gobject-introspection";
homepage = "https://github.com/stsundermann/appindicator-sharp";
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [ kevincox ];
};
}

4
pkgs/development/libraries/ayatana-ido/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ayatana-ido"; pname = "ayatana-ido";
version = "0.4.90"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AyatanaIndicators"; owner = "AyatanaIndicators";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "02vqjryni96zzrpkq5d7kvgw7nf252d2fm2xq8fklvvb2vz3fa0w"; sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc vala ]; nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc vala ];

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

@ -2,7 +2,7 @@
, guiSupport ? false, libX11 , guiSupport ? false, libX11
# see http://dlib.net/compile.html # see http://dlib.net/compile.html
, avxSupport ? true , avxSupport ? stdenv.hostPlatform.avxSupport
, cudaSupport ? true , cudaSupport ? true
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
rm -rf dlib/external rm -rf dlib/external
''; '';
cmakeFlags = [ cmakeFlags = [
"-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}"
"-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ];

24
pkgs/development/libraries/fflas-ffpack/default.nix
View File

@ -31,19 +31,21 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-blas-libs=-lcblas" "--with-blas-libs=-lcblas"
"--with-lapack-libs=-llapacke" "--with-lapack-libs=-llapacke"
] ++ stdenv.lib.optionals stdenv.isx86_64 { ] ++ stdenv.lib.optionals stdenv.isx86_64 [
# disable SIMD instructions (which are enabled *when available* by default) # disable SIMD instructions (which are enabled *when available* by default)
# for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284)
default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
westmere = [ "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
sandybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
ivybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
haswell = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
broadwell = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
skylake = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512f"
skylake-avx512 = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512dq"
}.${stdenv.hostPlatform.platform.gcc.arch or "default"}; "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512vl"
"--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
"--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
];
doCheck = true; doCheck = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {

17
pkgs/development/libraries/g2o/default.nix
View File

@ -27,16 +27,13 @@ mkDerivation rec {
# Detection script is broken # Detection script is broken
"-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer"
"-DG2O_BUILD_EXAMPLES=OFF" "-DG2O_BUILD_EXAMPLES=OFF"
] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { ] ++ lib.optionals stdenv.isx86_64 [
default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; "-DDO_SSE_AUTODETECT=OFF"
westmere = [ "-DDISABLE_SSE4_A=ON" ]; "-DDISABLE_SSE3=${ if stdenv.hostPlatform.sse3Support then "OFF" else "ON"}"
sandybridge = [ "-DDISABLE_SSE4_A=ON" ]; "-DDISABLE_SSE4_1=${if stdenv.hostPlatform.sse4_1Support then "OFF" else "ON"}"
ivybridge = [ "-DDISABLE_SSE4_A=ON" ]; "-DDISABLE_SSE4_2=${if stdenv.hostPlatform.sse4_2Support then "OFF" else "ON"}"
haswell = [ "-DDISABLE_SSE4_A=ON" ]; "-DDISABLE_SSE4_A=${if stdenv.hostPlatform.sse4_aSupport then "OFF" else "ON"}"
broadwell = [ "-DDISABLE_SSE4_A=ON" ]; ];
skylake = [ "-DDISABLE_SSE4_A=ON" ];
skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"});
meta = with lib; { meta = with lib; {
description = "A General Framework for Graph Optimization"; description = "A General Framework for Graph Optimization";

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gensio"; pname = "gensio";
version = "2.1.3"; version = "2.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cminyard"; owner = "cminyard";
repo = "${pname}"; repo = "${pname}";
rev = "v${version}"; rev = "v${version}";
sha256 = "0sdqv4j1jjjc2nxnd9h7r4w66bdjl5ksvfia4i4cjj7jfl0hhynl"; sha256 = "0c44qhhrknjl7sp94q34z7nv7bvnlqs8wzm385661liy4mnfn4dc";
}; };
configureFlags = [ configureFlags = [

20
pkgs/development/libraries/givaro/default.nix
View File

@ -17,17 +17,17 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--disable-optimization" "--disable-optimization"
] ++ stdenv.lib.optionals stdenv.isx86_64 { ] ++ stdenv.lib.optionals stdenv.isx86_64 [
# disable SIMD instructions (which are enabled *when available* by default) # disable SIMD instructions (which are enabled *when available* by default)
default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
haswell = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
broadwell = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
skylake = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
skylake-avx512 = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
}.${stdenv.hostPlatform.platform.gcc.arch or "default"}; ];
# On darwin, tests are linked to dylib in the nix store, so we need to make # On darwin, tests are linked to dylib in the nix store, so we need to make
# sure tests run after installPhase. # sure tests run after installPhase.

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

@ -16,9 +16,6 @@ with stdenv.lib;
assert stdenv.isLinux -> utillinuxMinimal != null; assert stdenv.isLinux -> utillinuxMinimal != null;
# TODO: # TODO:
# * Add gio-module-fam
# Problem: cyclic dependency on gamin
# Possible solution: build as a standalone module, set env. vars
# * Make it build without python # * Make it build without python
# Problem: an example (test?) program needs it. # Problem: an example (test?) program needs it.
# Possible solution: disable compilation of this example somehow # Possible solution: disable compilation of this example somehow

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "goffice"; pname = "goffice";
version = "0.10.47"; version = "0.10.48";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xmigfdzvmlpa0fw79mf3xwchmxc8rlidryn5syv8bz7msmrb215"; sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "itk"; pname = "itk";
version = "5.1.0"; version = "5.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "InsightSoftwareConsortium"; owner = "InsightSoftwareConsortium";
repo = "ITK"; repo = "ITK";
rev = "v${version}"; rev = "v${version}";
sha256 = "0rvkp00xj1js60021jv2ydyl74wvbyb205gm9d7hf8gy2q456hgl"; sha256 = "1z7rmqrhgl7hfb3d0077kvp8vpi05r2zk3qyqzmv7bzbal5sqqhv";
}; };
cmakeFlags = [ cmakeFlags = [

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

@ -112,6 +112,7 @@ let
kitemmodels = callPackage ./kitemmodels.nix {}; kitemmodels = callPackage ./kitemmodels.nix {};
kitemviews = callPackage ./kitemviews.nix {}; kitemviews = callPackage ./kitemviews.nix {};
kplotting = callPackage ./kplotting.nix {}; kplotting = callPackage ./kplotting.nix {};
kquickcharts = callPackage ./kquickcharts.nix {};
kwayland = callPackage ./kwayland.nix {}; kwayland = callPackage ./kwayland.nix {};
kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
kwindowsystem = callPackage ./kwindowsystem {}; kwindowsystem = callPackage ./kwindowsystem {};

15
pkgs/development/libraries/kde-frameworks/kquickcharts.nix Normal file
View File

@ -0,0 +1,15 @@
{
mkDerivation, lib,
extra-cmake-modules,
qtquickcontrols2,
}:
mkDerivation {
name = "kquickcharts";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtquickcontrols2 ];
outputs = [ "out" "dev" ];
}

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

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libfilezilla"; pname = "libfilezilla";
version = "0.23.0"; version = "0.24.0";
src = fetchurl { src = fetchurl {
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0lk84aw5ylrhpy26djdw3byhjbn9qrzx5k98r0i4nwfizckw3smd"; sha256 = "1372i9f501kn8p1vkqdydaqvvi6lzxsnw2yzyxx5j4syqd4p0qa5";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

19
pkgs/development/libraries/libpwquality/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3 }: { stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libpwquality"; pname = "libpwquality";
@ -11,8 +11,21 @@ stdenv.mkDerivation rec {
sha256 = "0n4pjhm7wfivk0wizggaxq4y4mcxic876wcarjabkp5z9k14y36h"; sha256 = "0n4pjhm7wfivk0wizggaxq4y4mcxic876wcarjabkp5z9k14y36h";
}; };
nativeBuildInputs = [ autoreconfHook perl ]; nativeBuildInputs = [ autoreconfHook perl python3 ];
buildInputs = [ cracklib python3 ]; buildInputs = [ cracklib ];
patches = lib.optional stdenv.hostPlatform.isStatic [
(fetchpatch {
name = "static-build.patch";
url = "https://github.com/libpwquality/libpwquality/pull/40.patch";
sha256 = "1ypccq437wxwgddd98cvd330jfm7jscdlzlyxgy05g6yzrr68xyk";
})
];
configureFlags = lib.optional stdenv.hostPlatform.isStatic [
# Python binding generates a shared library which are unavailable with musl build
"--disable-python-bindings"
];
meta = with lib; { meta = with lib; {
description = "Password quality checking and random password generation library"; description = "Password quality checking and random password generation library";

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

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libraw"; pname = "libraw";
version = "0.19.5"; version = "0.20.0";
src = fetchurl { src = fetchurl {
url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
sha256 = "1x827sh6vl8j3ll2ihkcr234y07f31hi1v7sl08jfw3irkbn58j0"; sha256 = "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz";
}; };
outputs = [ "out" "lib" "dev" "doc" ]; outputs = [ "out" "lib" "dev" "doc" ];

0
pkgs/development/libraries/libusb/fix-headers.patch → pkgs/development/libraries/libusb-compat/fix-headers.patch
View File

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

@ -39,18 +39,17 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-blas-libs=-lblas" "--with-blas-libs=-lblas"
"--disable-optimization" "--disable-optimization"
] ++ stdenv.lib.optionals stdenv.isx86_64 { ] ++ stdenv.lib.optionals stdenv.isx86_64 [
# disable SIMD instructions (which are enabled *when available* by default) # disable SIMD instructions (which are enabled *when available* by default)
default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
haswell = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
broadwell = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
skylake = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
skylake-avx512 = [ "--disable-fma4" ]; "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
}.${stdenv.hostPlatform.platform.gcc.arch or "default"} ] ++ stdenv.lib.optionals withSage [
++ stdenv.lib.optionals withSage [
"--enable-sage" "--enable-sage"
]; ];

7
pkgs/development/libraries/notify-sharp/default.nix
View File

@ -1,12 +1,13 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook { stdenv, fetchFromGitLab, pkgconfig, autoreconfHook
, mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "notify-sharp"; pname = "notify-sharp";
version = "3.0.3"; version = "3.0.3";
src = fetchFromGitHub { src = fetchFromGitLab {
owner = "GNOME"; domain = "gitlab.gnome.org";
owner = "Archive";
repo = "notify-sharp"; repo = "notify-sharp";
rev = version; rev = version;

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

@ -4,13 +4,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pcl-1.11.0"; name = "pcl-1.11.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PointCloudLibrary"; owner = "PointCloudLibrary";
repo = "pcl"; repo = "pcl";
rev = name; rev = name;
sha256 = "0nr3j71gh1v8x6wjr7a7xyr0438sw7vf621a5kbw4lmsxbj55k8g"; sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -255,18 +255,18 @@ stdenv.mkDerivation {
"-no-warnings-are-errors" "-no-warnings-are-errors"
] ]
++ ( ++ (
if (!stdenv.hostPlatform.isx86_64) if (!stdenv.hostPlatform.isx86_64) then [
then [ "-no-sse2" ] "-no-sse2"
else lib.optionals (compareVersion "5.9.0" >= 0) { ] else if (compareVersion "5.9.0" >= 0) then [
default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; "-sse2"
westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; "${if stdenv.hostPlatform.sse3Support then "" else "-no"}-sse3"
sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; "${if stdenv.hostPlatform.ssse3Support then "" else "-no"}-ssse3"
ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; "${if stdenv.hostPlatform.sse4_1Support then "" else "-no"}-sse4.1"
haswell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; "${if stdenv.hostPlatform.sse4_2Support then "" else "-no"}-sse4.2"
broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; "${if stdenv.hostPlatform.avxSupport then "" else "-no"}-avx"
skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; "${if stdenv.hostPlatform.avx2Support then "" else "-no"}-avx2"
skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; ] else [
}.${stdenv.hostPlatform.platform.gcc.arch or "default"} ]
) )
++ [ ++ [
"-no-mips_dsp" "-no-mips_dsp"

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, expat, zlib, geos, libspatialite }: { stdenv, fetchurl, expat, zlib, geos, libspatialite }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "readosm-1.1.0"; name = "readosm-1.1.0a";
src = fetchurl { src = fetchurl {
url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz";
sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"; sha256 = "0igif2bxf4dr82glxz9gyx5mmni0r2dsnx9p9k6pxv3c4lfhaz6v";
}; };
buildInputs = [ expat zlib geos libspatialite ]; buildInputs = [ expat zlib geos libspatialite ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "redkite"; pname = "redkite";
version = "1.0.1"; version = "1.0.3";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "iurie-sw"; owner = "iurie-sw";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1qd4r7ps0fg2m1vx3j48chfdh2c5909j4f9wip4af59inrid4w6a"; sha256 = "1m2db7c791fi33snkjwnvlxapmf879g5r8azlkx7sr6vp2s0jq2k";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

111
pkgs/development/libraries/science/math/libtorch/bin.nix Normal file
View File

@ -0,0 +1,111 @@
{ callPackage
, stdenv
, fetchzip
, lib
, addOpenGLRunpath
, patchelf
, fixDarwinDylibNames
, cudaSupport
, nvidia_x11
}:
let
version = "1.6.0";
device = if cudaSupport then "cuda" else "cpu";
srcs = import ./binary-hashes.nix;
unavailable = throw "libtorch is not available for this platform";
in stdenv.mkDerivation {
inherit version;
pname = "libtorch";
src = fetchzip srcs."${stdenv.targetPlatform.system}-${device}" or unavailable;
nativeBuildInputs =
if stdenv.isDarwin then [ fixDarwinDylibNames ]
else [ addOpenGLRunpath patchelf ]
++ stdenv.lib.optionals cudaSupport [ addOpenGLRunpath ];
buildInputs = [
stdenv.cc.cc
] ++ lib.optionals cudaSupport [ nvidia_x11 ];
dontBuild = true;
dontConfigure = true;
dontStrip = true;
installPhase = ''
# Copy headers and CMake files.
install -Dm755 -t $dev/lib lib/*.a
cp -r include $dev
cp -r share $dev
install -Dm755 -t $out/lib lib/*${stdenv.hostPlatform.extensions.sharedLibrary}*
# We do not care about Java support...
rm -f $out/lib/lib*jni* 2> /dev/null || true
'';
postFixup = let
libPaths = [ stdenv.cc.cc.lib ]
++ stdenv.lib.optionals cudaSupport [ nvidia_x11 ];
rpath = stdenv.lib.makeLibraryPath libPaths;
in stdenv.lib.optionalString stdenv.isLinux ''
find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
echo "setting rpath for $lib..."
patchelf --set-rpath "${rpath}:$out/lib" "$lib"
${lib.optionalString cudaSupport ''
addOpenGLRunpath "$lib"
''}
done
'' + stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib
install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib
install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libtorch_python.dylib
install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_python.dylib
install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch.dylib
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch.dylib
install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch.dylib
install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_cpu.dylib
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_cpu.dylib
install_name_tool -change @rpath/libtensorpipe.dylib $out/lib/libtensorpipe.dylib $out/lib/libtorch_cpu.dylib
install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_observers.dylib
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_observers.dylib
install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_observers.dylib
install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_observers.dylib
install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_module_test_dynamic.dylib
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_module_test_dynamic.dylib
install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_module_test_dynamic.dylib
install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_module_test_dynamic.dylib
install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_detectron_ops.dylib
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_detectron_ops.dylib
install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_detectron_ops.dylib
install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_detectron_ops.dylib
install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libshm.dylib
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libshm.dylib
install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libshm.dylib
install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libshm.dylib
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_global_deps.dylib
install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_global_deps.dylib
'';
outputs = [ "out" "dev" ];
passthru.tests = callPackage ./test { };
meta = with stdenv.lib; {
description = "C++ API of the PyTorch machine learning framework";
homepage = "https://pytorch.org/";
license = licenses.unfree; # Includes CUDA and Intel MKL.
platforms = with platforms; linux ++ darwin;
};
}

14
pkgs/development/libraries/science/math/libtorch/binary-hashes.nix Normal file
View File

@ -0,0 +1,14 @@
{
x86_64-darwin-cpu = {
url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.6.0.zip";
sha256 = "0d4n7la31qzl4s9pwvm07la7q6lhcwiww0yjpfz3kw6nvx84p22r";
};
x86_64-linux-cpu = {
url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.6.0%2Bcpu.zip";
sha256 = "1975b4zvyihzh89vnwspw0vf9qr05sxj8939vcrlmv3gzvdspcxz";
};
x86_64-linux-cuda = {
url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.6.0.zip";
sha256 = "127qnfyi1faqbm40sbnsyqxjhrqj82bzwqyz7c1hs2bm0zgrrpya";
};
}

4
pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt Normal file
View File

@ -0,0 +1,4 @@
find_package(Torch REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")
add_executable(test test.cpp)
target_link_libraries(test "${TORCH_LIBRARIES}")

26
pkgs/development/libraries/science/math/libtorch/test/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, cmake, libtorch-bin, symlinkJoin }:
stdenv.mkDerivation {
pname = "libtorch-test";
version = libtorch-bin.version;
src = ./.;
postPatch = ''
cat CMakeLists.txt
'';
makeFlags = [ "VERBOSE=1" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ libtorch-bin ];
installPhase = ''
touch $out
'';
checkPhase = ''
./test
'';
}

7
pkgs/development/libraries/science/math/libtorch/test/test.cpp Normal file
View File

@ -0,0 +1,7 @@
#include <torch/torch.h>
#include <iostream>
int main() {
torch::Tensor tensor = torch::eye(3);
std::cout << tensor << std::endl;
}

4
pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "suitesparse-graphblas"; pname = "suitesparse-graphblas";
version = "3.3.0"; version = "3.3.3";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "DrTimothyAldenDavis"; owner = "DrTimothyAldenDavis";
repo = "GraphBLAS"; repo = "GraphBLAS";
rev = "v${version}"; rev = "v${version}";
sha256 = "1fin9741ild3dv7c9gk07kpizsnnx17ar9cv9lny8vl47pms940h"; sha256 = "1nmygb2yny0mdqp0mc6760gbxklq1jjm0c6s39qkdwzf3n9f8j7p";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sparsehash-2.0.3"; name = "sparsehash-2.0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sparsehash"; owner = "sparsehash";
repo = "sparsehash"; repo = "sparsehash";
rev = name; rev = name;
sha256 = "0m3f0cnpnpf6aak52wn8xbrrdw8p0yhq8csgc8nlvf9zp8c402na"; sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

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