mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 11:40:45 +00:00
Code Issues Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-09-21 06:01:04 +00:00 committed by GitHub
parent bf4c9d6b39 69a9d335f6
commit fa2601f3b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 1022 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/module-list.nix
View file

@ -343,6 +343,7 @@
./services/desktops/accountsservice.nix
./services/desktops/bamf.nix
./services/desktops/blueman.nix
./services/desktops/cpupower-gui.nix
./services/desktops/dleyna-renderer.nix
./services/desktops/dleyna-server.nix
./services/desktops/pantheon/files.nix

56
nixos/modules/services/desktops/cpupower-gui.nix Normal file
View file

@ -0,0 +1,56 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.cpupower-gui;
in {
options = {
services.cpupower-gui = {
enable = mkOption {
type = lib.types.bool;
default = false;
example = true;
description = ''
Enables dbus/systemd service needed by cpupower-gui.
These services are responsible for retrieving and modifying cpu power
saving settings.
'';
};
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.cpupower-gui ];
services.dbus.packages = [ pkgs.cpupower-gui ];
systemd.user = {
services.cpupower-gui-user = {
description = "Apply cpupower-gui config at user login";
wantedBy = [ "graphical-session.target" ];
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.cpupower-gui}/bin/cpupower-gui config";
};
};
};
systemd.services = {
cpupower-gui = {
description = "Apply cpupower-gui config at boot";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.cpupower-gui}/bin/cpupower-gui config";
};
};
cpupower-gui-helper = {
description = "cpupower-gui system helper";
aliases = [ "dbus-org.rnd2.cpupower_gui.helper.service" ];
serviceConfig = {
Type = "dbus";
BusName = "org.rnd2.cpupower_gui.helper";
ExecStart = "${pkgs.cpupower-gui}/lib/cpupower-gui/cpupower-gui-helper";
};
};
};
};
}

6
pkgs/applications/backup/pika-backup/default.nix
View file

@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "pika-backup";
version = "0.3.2";
version = "0.3.5";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "pika-backup";
rev = "v${version}";
sha256 = "sha256-dKVyvB4s1MZHri0dFJDBUXQKsi2KgP30ZhsJ486M+og=";
sha256 = "sha256-8jT3n+bTNjhm64AMS24Ju+San75ytfqFXloH/TOgO1g=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "1vsh8vqgmfady82d7wfxkknmrp7mq7nizpif2zwg3kqbl964mp3y";
sha256 = "198bs4z7l22sh8ck7v46s45mj8zpfbg03n1xzc6pnafdd8hf3q15";
};
patches = [

4
pkgs/applications/misc/index-fm/default.nix
View file

@ -17,14 +17,14 @@
mkDerivation rec {
pname = "index";
version = "1.2.2";
version = "2.0.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "index-fm";
rev = "v${version}";
sha256 = "sha256-N9/Jt18QRqDMWtEfxWn22e5Ud3YMwJ9B7OQRwTvwX8g=";
sha256 = "sha256-aY8JBCIh6VyCDOGQIMWhO6asGMo6I6ZTgzpDnnDy9eo=";
};
nativeBuildInputs = [

6
pkgs/applications/networking/cluster/fluxcd/default.nix
View file

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.17.1";
version = "0.17.2";
manifests = fetchzip {
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
@ -19,10 +19,10 @@ buildGoModule rec {
owner = "fluxcd";
repo = "flux2";
rev = "v${version}";
sha256 = "1jglv30q6vicdzb2f8amdw9s6wdx8y5jmyr8pzl1psqn8zh0dagb";
sha256 = "0kcdx4ldnshk4pqq37a7p08xr5cpsjrbrifk9fc3jbiw39m09mhf";
};
vendorSha256 = "sha256-uyajP7nLrRXLJcI/sBUEf4PPqz55I/ikCxVe4eAYqGA=";
vendorSha256 = "sha256-glifJ0V3RwS7E6EWZsCa88m0MK883RhPSXCsAmMggVs=";
nativeBuildInputs = [ installShellFiles ];

2
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file

@ -176,6 +176,6 @@ mkDerivation rec {
platforms = platforms.linux;
homepage = "https://desktop.telegram.org/";
changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}";
maintainers = with maintainers; [ oxalica primeos ];
maintainers = with maintainers; [ oxalica primeos vanilla ];
};
}

30
pkgs/applications/networking/sniffers/sngrep/default.nix
View file

@ -1,4 +1,13 @@
{ lib, stdenv, autoconf, automake, fetchFromGitHub, libpcap, ncurses, openssl, pcre }:
{ lib
, stdenv
, autoconf
, automake
, fetchFromGitHub
, libpcap
, ncurses
, openssl
, pcre
}:
stdenv.mkDerivation rec {
pname = "sngrep";
@ -11,12 +20,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-92wPRDFSoIOYFv3XKdsuYH8j3D8kXyg++q6VpIIMGDg=";
};
buildInputs = [
libpcap ncurses pcre openssl ncurses
nativeBuildInputs = [
autoconf
automake
];
nativeBuildInputs = [
autoconf automake
buildInputs = [
libpcap
ncurses
ncurses
openssl
pcre
];
configureFlags = [
@ -26,12 +40,14 @@ stdenv.mkDerivation rec {
"--enable-eep"
];
preConfigure = "./bootstrap.sh";
preConfigure = ''
./bootstrap.sh
'';
meta = with lib; {
description = "A tool for displaying SIP calls message flows from terminal";
homepage = "https://github.com/irontec/sngrep";
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ jorise ];
};

6
pkgs/applications/radio/noaa-apt/default.nix
View file

@ -13,13 +13,13 @@
rustPlatform.buildRustPackage rec {
pname = "noaa-apt";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "martinber";
repo = "noaa-apt";
rev = "v${version}";
sha256 = "0fmbg6lw7lmm402hzddpzgi7y9mc6kic14x8rif7fampk20mv3ms";
sha256 = "sha256-A78O5HkD/LyfvjLJjf7PpJDuftkNbaxq7Zs5kNUaULk=";
};
nativeBuildInputs = [
@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
pango
];
cargoSha256 = "167q9w45lh05l27cdssg8sfz3qfskfaxayzjy6q1cj50jrn0gq13";
cargoSha256 = "sha256-o39RvJkaJ8ZPOfLWDqykCLadwHhgBbmOWGQ4hZ6/6BI=";
preBuild = ''
# Used by macro pointing to resource location at compile time.

6
pkgs/development/libraries/cdo/default.nix
View file

@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "cdo";
version = "1.9.7.1";
version = "1.9.10";
# Dependencies
buildInputs = [ curl netcdf hdf5 ];
src = fetchurl {
url = "https://code.mpimet.mpg.de/attachments/download/20124/${pname}-${version}.tar.gz";
sha256 = "0b4n8dwxfsdbz4jflsx0b75hwapdf1rp14p48dfr7ksv0qp9aw9p";
url = "https://code.mpimet.mpg.de/attachments/download/24638/${pname}-${version}.tar.gz";
sha256 = "sha256-zDnIm7tIHXs5RaBsVqhJIEcjX0asNjxPDZgPzN3mZ34=";
};
# Configure phase

4
pkgs/development/libraries/mauikit-filebrowsing/default.nix
View file

@ -10,14 +10,14 @@
mkDerivation rec {
pname = "mauikit-filebrowsing";
version = "1.2.2";
version = "2.0.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-filebrowsing";
rev = "v${version}";
sha256 = "1m56lil7w884wn8qycl7y55abvw2vanfy8c4g786200p6acsh3kl";
sha256 = "sha256-hiR0RbZTduH0noyzpewsNJAtSdCtiSmTP8SLMBgK3uA=";
};
nativeBuildInputs = [

6
pkgs/development/libraries/mauikit/default.nix
View file

@ -6,20 +6,21 @@
, kconfig
, kcoreaddons
, ki18n
, knotifications
, qtbase
, qtquickcontrols2
}:
mkDerivation rec {
pname = "mauikit";
version = "1.2.2";
version = "2.0.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit";
rev = "v${version}";
sha256 = "1jz0a65bbznjg7aaq19rdyp956wn6xc1x4xigfkhj6mwsvnb49av";
sha256 = "sha256-qz/MePMvyGR8lzR2xB2f9QENx04UHu0Xef7v0xcKovo=";
};
nativeBuildInputs = [
@ -31,6 +32,7 @@ mkDerivation rec {
kconfig
kcoreaddons
ki18n
knotifications
qtquickcontrols2
];

4
pkgs/development/libraries/s2n-tls/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "s2n-tls";
version = "1.0.16";
version = "1.0.17";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gF4VhNEq/gpxXqOKvBtWZ5iZ3Jf98vSuSZYUu8r1jKA=";
sha256 = "sha256-6XqBpNURU8fzGkTt4jsijgMiOkzMebmLmPAq8yQsTg4=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/tools/kube-prompt/default.nix
View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "kube-prompt";
version = "1.0.5";
version = "1.0.11";
rev = "v${version}";
goPackagePath = "github.com/c-bata/kube-prompt";
@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "c-bata";
repo = "kube-prompt";
sha256 = "1c1y0n1yxcaxvhlsj7b0wvhi934b5g0s1mi46hh5amb9j3dhgq1c";
sha256 = "sha256-9OWsITbC7YO51QzsRwDWvojU54DiuGJhkSGwmesEj9w=";
};
subPackages = ["."];

884
pkgs/development/tools/kube-prompt/deps.nix generated
View file

File diff suppressed because it is too large Load diff

6
pkgs/development/tools/misc/terraform-ls/default.nix
View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "terraform-ls";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-x1HPr1xzByyNnuNr8B4vqdxw+EeFJsqse/FG1I/b0+g=";
sha256 = "sha256-sfAn9FkOs9/yA7ciRD9gWbx5VwZveqPMYBQhSBkzYlo=";
};
vendorSha256 = "sha256-f/y2i/aPeiUBiUaoCyehO8835qtxJkJsSh9/RAowsLI=";
vendorSha256 = "sha256-egv2+4esvfYccwmyHm23bec/QN6dGWvJVLG19959LPY=";
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];

6
pkgs/development/tools/wrangler/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "wrangler";
version = "1.19.2";
version = "1.19.3";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RnnmhdfYAmqfi2aM2oYrieFNOkiae4WGfR5RoHeNfmw=";
sha256 = "sha256-2LtjaxDClVYPcsCA7v+5GN3MY5VkTJ8TDxz5l0Oq4sQ=";
};
cargoSha256 = "sha256-sneNRs4DPrNA84K73DVSxAAmZ2fqX6VyQhF8bKgIbaQ=";
cargoSha256 = "sha256-f/nYBBfxl9JHhdo00smm6rYYH2kfgJKaCw/wflVgABc=";
nativeBuildInputs = [ pkg-config ];

6
pkgs/misc/emulators/proton-caller/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "proton-caller";
version = "2.3.1";
version = "2.3.2";
src = fetchFromGitHub {
owner = "caverym";
repo = pname;
rev = version;
sha256 = "sha256-GFZX+ss6LRosCsOuzjLu15BCdImhxH2D2kZQzF8zA90=";
sha256 = "sha256-k+cH86atuVoLCQ+I1zu08f4T+y0u8vnjo3VA+Otg+a4=";
};
cargoSha256 = "sha256-8HaMmvSUI5Zttlsx5tewwIR+iKBlp4w8XlRfI0tyBas=";
cargoSha256 = "sha256-rkgg96IdIhVXZ5y/ECUxNPyPV9Nv5XGAtlxAkILry2s=";
meta = with lib; {
description = "Run Windows programs with Proton";

17
pkgs/misc/vscode-extensions/default.nix
View file

@ -104,8 +104,8 @@ let
mktplcRef = {
name = "ng-template";
publisher = "Angular";
version = "12.1.2";
sha256 = "sha256-fIHh1eRmu4zSgrtZr0XwLB+1Ad6a/0ABC55akGr0DOA=";
version = "12.2.0";
sha256 = "sha256-CChkWKiLi/OcOm268d45pNwiyrKhztqYsQvJV/9z+Ag=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";
@ -1501,11 +1501,16 @@ let
mktplcRef = {
name = "errorlens";
publisher = "usernamehw";
version = "3.2.4";
sha256 = "0caxmf6v0s5kgp6cp3j1kk7slhspjv5kzhn4sq3miyl5jkrn95kx";
version = "3.4.0";
sha256 = "1x9rkyhbp15dwp6dikzpk9lzjnh9cnxac89gzx533681zld906m8";
};
meta = {
license = lib.licenses.mit;
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";
description = "Improve highlighting of errors, warnings and other language diagnostics.";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=usernamehw.errorlens";
homepage = "https://github.com/usernamehw/vscode-error-lens";
license = licenses.mit;
maintainers = with maintainers; [ imgabe ];
};
};

93
pkgs/os-specific/linux/cpupower-gui/default.nix Normal file
View file

@ -0,0 +1,93 @@
{ lib
, stdenv
, fetchFromGitHub
, buildPythonApplication
, appstream-glib
, dbus-python
, desktop-file-utils
, gettext
, glib
, gobject-introspection
, gtk3
, hicolor-icon-theme
, libappindicator
, libhandy
, meson
, ninja
, pkg-config
, pygobject3
, pyxdg
, systemd
, wrapGAppsHook
}:
buildPythonApplication rec {
pname = "cpupower-gui";
version = "1.0.0";
# This packages doesn't have a setup.py
format = "other";
src = fetchFromGitHub {
owner = "vagnum08";
repo = pname;
rev = "v${version}";
sha256 = "05lvpi3wgyi741sd8lgcslj8i7yi3wz7jwl7ca3y539y50hwrdas";
};
nativeBuildInputs = [
appstream-glib
desktop-file-utils # needed for update-desktop-database
gettext
glib # needed for glib-compile-schemas
gobject-introspection # need for gtk namespace to be available
hicolor-icon-theme # needed for postinstall script
meson
ninja
pkg-config
wrapGAppsHook
# Python packages
dbus-python
libappindicator
pygobject3
pyxdg
];
buildInputs = [
glib
gtk3
libhandy
];
propagatedBuildInputs = [
dbus-python
libappindicator
pygobject3
pyxdg
];
mesonFlags = [
"-Dsystemddir=${placeholder "out"}/lib/systemd"
];
preConfigure = ''
patchShebangs build-aux/meson/postinstall.py
'';
strictDeps = false;
dontWrapGApps = true;
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
postFixup = ''
wrapPythonProgramsIn $out/lib "$out $propagatedBuildInputs"
'';
meta = with lib; {
description = "Change the frequency limits of your cpu and its governor";
homepage = "https://github.com/vagnum08/cpupower-gui/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ unode ];
};
}

6
pkgs/servers/http/nginx/generic.nix
View file

@ -119,15 +119,15 @@ stdenv.mkDerivation {
./nix-skip-check-logs-path.patch
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
(fetchpatch {
url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/102-sizeof_test_fix.patch";
url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/102-sizeof_test_fix.patch";
sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a";
})
(fetchpatch {
url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/101-feature_test_fix.patch";
url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/101-feature_test_fix.patch";
sha256 = "0v6890a85aqmw60pgj3mm7g8nkaphgq65dj4v9c6h58wdsrc6f0y";
})
(fetchpatch {
url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch";
url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/103-sys_nerr.patch";
sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd";
})
] ++ mapModules "patches");

6
pkgs/servers/monitoring/mackerel-agent/default.nix
View file

@ -2,20 +2,20 @@
buildGoModule rec {
pname = "mackerel-agent";
version = "0.72.1";
version = "0.72.2";
src = fetchFromGitHub {
owner = "mackerelio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pUbZY+TjSZNOrmRarYVUDI0HoIUMY0LacdFSdqQ/7D4=";
sha256 = "sha256-oiY3L4aBF+QhpZDTkwTmWPLoTgm+RUYCov5+gOxJqew=";
};
nativeBuildInputs = [ makeWrapper ];
checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];
vendorSha256 = "sha256-trVfF4voye6CQ5WK78yBT86fgSUFyxaCtsZx6kXgYGE=";
vendorSha256 = "sha256-dfBJXA1Lc4+TL1nIk4bZ4m4QEO1r29GPyGtZrE+LrZc=";
subPackages = [ "." ];

14
pkgs/servers/sslh/default.nix
View file

@ -1,17 +1,19 @@
{ lib, stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre, nixosTests }:
{ lib, stdenv, fetchFromGitHub, libcap, libconfig, perl, tcp_wrappers, pcre2, nixosTests }:
stdenv.mkDerivation rec {
pname = "sslh";
version = "1.21c";
version = "1.22c";
src = fetchurl {
url = "https://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz";
sha256 = "01p7w74ppszxgz6n41lqd6xqvc7bjk2dsc769dd1yb7q4qvpiziv";
src = fetchFromGitHub {
owner = "yrutschle";
repo = pname;
rev = "v${version}";
sha256 = "sha256-A+nUWiOPoz/T5afZUzt5In01e049TgHisTF8P5Vj180=";
};
postPatch = "patchShebangs *.sh";
buildInputs = [ libcap libconfig perl tcp_wrappers pcre ];
buildInputs = [ libcap libconfig perl tcp_wrappers pcre2 ];
makeFlags = [ "USELIBCAP=1" "USELIBWRAP=1" ];

4
pkgs/tools/misc/pspg/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
version = "5.3.4";
version = "5.3.5";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
sha256 = "sha256-wju69kC6koYy2yABjx7/rWsuJXV1vjwSBztNlu13TJs=";
sha256 = "sha256-xJ7kgEvIsTufAZa5x3YpElTc74nEs9C+baVjbheHySM=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/top-level/all-packages.nix
View file

@ -21137,6 +21137,10 @@ with pkgs;
cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
cpupower-gui = python3Packages.callPackage ../os-specific/linux/cpupower-gui {
inherit (pkgs) meson;
};
cpuset = callPackage ../os-specific/linux/cpuset {
pythonPackages = python3Packages;
};