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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2022-12-14 06:01:42 +00:00
committed by GitHub
parent a37c3a6b94 747e072692
commit c0b33aa433
28 changed files with 2213 additions and 2157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/networking/unifi.nix
+2 -2
View File
@@ -24,8 +24,8 @@ in
services.unifi.jrePackage = mkOption {
type = types.package;
default = pkgs.jre8;
defaultText = literalExpression "pkgs.jre8";
default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8;
defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8'';
description = lib.mdDoc ''
The JRE package to use. Check the release notes to ensure it is supported.
'';
nixos/modules/services/x11/desktop-managers/plasma5.nix
+8
View File
@@ -384,6 +384,11 @@ in
++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]
++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet;
# Extra services for D-Bus activation
services.dbus.packages = [
plasma5.kactivitymanagerd
];
environment.pathsToLink = [
# FIXME: modules should link subdirs of `/share` rather than relying on this
"/share"
@@ -446,6 +451,9 @@ in
xdg.portal.enable = true;
xdg.portal.extraPortals = [ plasma5.xdg-desktop-portal-kde ];
# xdg-desktop-portal-kde expects PipeWire to be running.
# This does not, by default, replace PulseAudio.
services.pipewire.enable = mkDefault true;
# Update the start menu for each user that is currently logged in
system.userActivationScripts.plasmaSetup = activationScript;
pkgs/tools/misc/colord-kde/default.nix → pkgs/applications/kde/colord-kde.nix
-6
View File
@@ -7,12 +7,6 @@
mkDerivation rec {
pname = "colord-kde";
version = "0.5.0";
src = fetchurl {
url = "http://download.kde.org/stable/colord-kde/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
};
nativeBuildInputs = [ extra-cmake-modules ];
pkgs/applications/kde/default.nix
+1
View File
@@ -81,6 +81,7 @@ let
bomber = callPackage ./bomber.nix {};
bovo = callPackage ./bovo.nix {};
calendarsupport = callPackage ./calendarsupport.nix {};
colord-kde = callPackage ./colord-kde.nix {};
dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {};
dragon = callPackage ./dragon.nix {};
pkgs/applications/kde/fetch.sh
+1 -1
View File
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/22.08.3/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.0/src -A '*.tar.xz' )
pkgs/applications/kde/kalendar.nix
+9
View File
@@ -35,6 +35,10 @@
, akonadi-contacts
, akonadi-calendar-tools
, kdepim-runtime
, gpgme
, pimcommon
, mailcommon
, messagelib
}:
mkDerivation rec {
@@ -76,6 +80,11 @@ mkDerivation rec {
akonadi-contacts
akonadi-calendar-tools
kdepim-runtime
gpgme
pimcommon
mailcommon
messagelib
];
propagatedUserEnvPkgs = [ akonadi kdepim-runtime akonadi-search ];
pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
+1 -1
View File
@@ -15,7 +15,7 @@ index 83c2bcb..5f6d47c 100644
REQUIRED_HEADERS KSMTP_HEADERS
)
-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
pkgs/applications/kde/srcs.nix
+940 -932
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+393 -393
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+393 -393
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+393 -393
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox/common.nix
+2 -2
View File
@@ -220,7 +220,7 @@ buildStdenv.mkDerivation ({
"profilingPhase"
];
patches = lib.optionals (lib.versionOlder version "103") [
patches = lib.optionals (lib.versionOlder version "102.6.0") [
(fetchpatch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
name = "rust-cbindgen-0.24.2-compat.patch";
@@ -234,7 +234,7 @@ buildStdenv.mkDerivation ({
postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu
patchShebangs mach
patchShebangs mach build
''
+ extraPostPatch;
pkgs/applications/networking/browsers/firefox/packages.nix
+4 -4
View File
@@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "107.0.1";
version = "108.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "e57e4bfcecbcc6dbe73f23577a14a2998c8c3f3d602f85ea06f99e0974e78481b9f7bdb019cb4e9733e59f56be1407edd64a2adb7b284bb4a87b46b1e2295dea";
sha512 = "fa800f62cca395a51b9a04373a27be48fc3860208e34ecf74d908127638d1eb8c41cf9898be6896777d408127d5c4b7104d9ee89c97da923b2dc6ea32186187e";
};
meta = {
@@ -29,11 +29,11 @@ rec {
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102";
version = "102.5.0esr";
version = "102.6.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "f4e105209c61e9537ddc90afdb05ede0a31caceb9b164d96276c811abbd646d14bc246c00caa386c0b0561055096d30b298329c69270dd085b943bdbc3a91a13";
sha512 = "c0f0160bea612d0ae74c29dd44beb7fd9a1c292694b8cd5c4faf2e54feb5c27684eee821b67dd40df714d69866a4e3a8b19e22182d9bc3023050d2d96b02d308";
};
meta = {
pkgs/applications/science/math/weka/default.nix
+7 -6
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "weka";
version = "3.9.2";
version = "3.9.6";
src = fetchurl {
url = "mirror://sourceforge/weka/${lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip";
sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
sha256 = "sha256-8fVN4MXYqXNEmyVtXh1IrauHTBZWgWG8AvsGI5Y9Aj0=";
};
nativeBuildInputs = [ makeWrapper unzip ];
@@ -21,11 +21,12 @@ stdenv.mkDerivation rec {
--add-flags "-Xmx1000M -jar $out/share/weka/weka.jar"
'';
meta = {
meta = with lib; {
homepage = "http://www.cs.waikato.ac.nz/ml/weka/";
description = "Collection of machine learning algorithms for data mining tasks";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.mimame ];
platforms = lib.platforms.unix;
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl2Plus;
maintainers = [ maintainers.mimame ];
platforms = platforms.unix;
};
}
pkgs/desktops/cinnamon/mint-themes/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-themes";
version = "2.0.7";
version = "2.0.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-3DwD1JVzl7446Fn+XMxwh2WA72ks4esnrLpyYBF9xWc=";
hash = "sha256-4aBFK3cxcUfzaTIBAsZ+l4rvdF2AV+oPMB8oP8/KcvI=";
};
nativeBuildInputs = [
pkgs/development/compilers/ocaml/5.0.nix
+3 -3
View File
@@ -1,9 +1,9 @@
import ./generic.nix {
major_version = "5";
minor_version = "0";
patch_version = "0-beta2";
patch_version = "0-rc1";
src = fetchTarball {
url = "https://caml.inria.fr/pub/distrib/ocaml-5.0/ocaml-5.0.0~beta2.tar.xz";
sha256 = "sha256:1r76a3wadidca9306wkkcxdh5l0rk93pc6xmbs46cc1jfm6pgwas";
url = "https://caml.inria.fr/pub/distrib/ocaml-5.0/ocaml-5.0.0~rc1.tar.xz";
sha256 = "sha256:1ql9rmh2g9fhfv99vk9sdca1biiin32vi4idgdgl668n0vb8blw8";
};
}
pkgs/development/libraries/mlt/qt-5.nix
+2 -2
View File
@@ -27,13 +27,13 @@
mkDerivation rec {
pname = "mlt";
version = "7.8.0";
version = "7.12.0";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "sha256-r8lvzz083WWlDtjvlsPwvOgplx2lPPkDDf3t0G9PqAQ=";
sha256 = "sha256-Y7lbfwA0lkQB3PjYQIQaQ0BeXGcgyCmMnDqqZJ8zUaA=";
};
buildInputs = [
pkgs/development/libraries/proj/default.nix
+4 -2
View File
@@ -5,6 +5,7 @@
, cmake
, pkg-config
, buildPackages
, callPackage
, sqlite
, libtiff
, curl
@@ -13,7 +14,7 @@
, python3
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: rec {
pname = "proj";
version = "9.1.1";
@@ -62,6 +63,7 @@ stdenv.mkDerivation rec {
passthru.tests = {
python = python3.pkgs.pyproj;
proj = callPackage ./tests.nix { proj = finalAttrs.finalPackage; };
};
meta = with lib; {
@@ -71,4 +73,4 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ dotlambda ];
};
}
})
pkgs/development/libraries/proj/tests.nix
+11
View File
@@ -0,0 +1,11 @@
{ runCommand, proj }:
let
inherit (proj) pname;
in
runCommand "${pname}-tests" { meta.timeout = 60; }
''
${proj}/bin/projinfo EPSG:4326 \
| grep '+proj=longlat +datum=WGS84 +no_defs +type=crs'
touch $out
''
pkgs/development/libraries/s2n-tls/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "s2n-tls";
version = "1.3.29";
version = "1.3.30";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MKrZP81PrpOsVhS+kAjcd1Eumhq7F4HWWbFnypZttuY=";
sha256 = "sha256-gDbQky2tNhtgdHmbMqnB6uIkJp2JhqyOMjPiW6EakK0=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/python-modules/foolscap/default.nix
+9
View File
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, mock
, pyopenssl
, pytestCheckHook
@@ -17,6 +18,14 @@ buildPythonPackage rec {
sha256 = "sha256-6dGFU4YNk1joXXZi2c2L84JtUbTs1ICgXfv0/EU2P4Q=";
};
patches = [
(fetchpatch {
name = "fix-tests-with-twisted-22.10.0.patch";
url = "https://github.com/warner/foolscap/commit/c04202eb5d4cf052e650ec2985ea6037605fd79e.patch";
hash = "sha256-RldDc18n3WYHdYg0ZmM8PBffIuiGa1NIfdoHs3mEEfc=";
})
];
propagatedBuildInputs = [
mock
twisted
pkgs/development/python-modules/pyproj/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyproj";
version = "3.4.0";
version = "3.4.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pyproj4";
repo = "pyproj";
rev = "refs/tags/${version}";
hash = "sha256-EXPeDNGr6eAAsLXCkV9mmkNDO1KScjZYgmBPzt+A1OU=";
hash = "sha256-SbuamcVXvbV5eGm08jhbp1yBno60vkniHrH5xrPej2A=";
};
# force pyproj to use ${proj}
pkgs/development/tools/ruff/default.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.177";
version = "0.0.179";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-4X4dEVcKjcgww0JnqXkuSbK+VEF4C4/0QLfFrfAoRJ8=";
sha256 = "sha256-vc4gYTsA4bbrbn1NMf4ixIrDRS1Abak0FyXkGKUX8Eo=";
};
cargoSha256 = "sha256-JnIvSIiJC3eR7vDrkIfElxM79dZAHrdcvtNw26zKoqw=";
cargoSha256 = "sha256-etuiSRAXoWPZwsZxFVTE0PG+TK6HlRTQG4WkLWdCg0M=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices
pkgs/servers/unifi/default.nix
+2 -2
View File
@@ -66,7 +66,7 @@ in rec {
};
unifi7 = generic {
version = "7.2.95";
sha256 = "sha256-lZrOB8Xrl2/LvDJhtGsQ7Cn5YJ+/hnHuq8ODlOg3R6s=";
version = "7.3.76";
sha256 = "sha256-/g/gCAhCT+8eyYDiIkF8WnTIWgEzneiAYHXj1pYj/dA=";
};
}
pkgs/tools/text/d2/default.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "d2";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "terrastruct";
repo = pname;
rev = "v${version}";
hash = "sha256-QRgHmQOrw1ZdZffjVnqY3epNkVvCNtR06fyQgKVXoRk=";
hash = "sha256-3cglQEJo2rkIJ+ogqliE/JK4SfoeKwB2bNrHRBgDJSU=";
};
vendorHash = "sha256-SO3ZeAJu4XOPDlJ2gUSYFPNG8RcOHfCsn2RKPT+FZy4=";
vendorHash = "sha256-MyvLHWg7GFSzYMtzgba7Bi7QEijDvK3B+NC84ZU/Jvs=";
ldflags = [
"-s"
pkgs/tools/virtualization/reg/default.nix
+15
View File
@@ -1,4 +1,5 @@
{ lib
, fetchpatch
, fetchFromGitHub
, buildGoModule
}:
@@ -14,6 +15,20 @@ buildGoModule rec {
sha256 = "1jlza1czfssssi3y9zi6kr8k9msfa7vp215ibhwbz4h97av5xw5m";
};
patches = [
# https://github.com/genuinetools/reg/pull/218
(fetchpatch {
name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch";
url = "https://github.com/genuinetools/reg/commit/f37b04ad8be47f1e68ef9b2c5906324d7096231e.patch";
hash = "sha256-wmBjPdrpNpxx//I+d+k8DNR11TmyXxb84vXR/MrYHKA=";
})
(fetchpatch {
name = "update-vendored-dependencies.patch";
url = "https://github.com/genuinetools/reg/commit/8bb04bc3fd41c089716e65ee905c6feac8bda5a0.patch";
hash = "sha256-5nZaayy0xu7sOJHVCp6AotINiF7vXk2Jic8SR8ZrH/g=";
})
];
vendorSha256 = null;
doCheck = false;
pkgs/top-level/aliases.nix
+1 -1
View File
@@ -1772,7 +1772,7 @@ mapAliases ({
inherit (plasma5Packages)
akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk
breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa falkon
breeze-icons breeze-plymouth breeze-qt5 colord-kde discover dolphin dragon elisa falkon
ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook
kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config
pkgs/top-level/all-packages.nix
-2
View File
@@ -3890,8 +3890,6 @@ with pkgs;
coloredlogs = with python3Packages; toPythonApplication coloredlogs;
colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {};
colpack = callPackage ../applications/science/math/colpack { };
cz-cli = callPackage ../applications/version-management/cz-cli {};