b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-01-21 12:01:24 +00:00 committed by GitHub
parent 69b5682348 23e67cc7fd
commit e156d59d2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 121 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
nixos/modules/services/web-apps/nextcloud.nix
View file

@ -505,6 +505,12 @@ in {
The nextcloud-occ program preconfigured to target this Nextcloud instance.
'';
};
nginx.recommendedHttpHeaders = mkOption {
type = types.bool;
default = true;
description = "Enable additional recommended HTTP response headers";
};
};
config = mkIf cfg.enable (mkMerge [
@ -904,14 +910,16 @@ in {
};
extraConfig = ''
index index.php index.html /index.php$request_uri;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;
add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none;
add_header X-Frame-Options sameorigin;
add_header Referrer-Policy no-referrer;
add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
${optionalString (cfg.nginx.recommendedHttpHeaders) ''
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;
add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none;
add_header X-Frame-Options sameorigin;
add_header Referrer-Policy no-referrer;
add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
''}
client_max_body_size ${cfg.maxUploadSize};
fastcgi_buffers 64 4K;
fastcgi_hide_header X-Powered-By;

11
nixos/tests/xmonad.nix
View file

@ -52,7 +52,7 @@ let
in {
name = "xmonad";
meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
maintainers = [ nequissimus ivanbrennan ];
};
machine = { pkgs, ... }: {
@ -90,8 +90,7 @@ in {
# original config has a keybinding that creates somefile
machine.send_key("alt-ctrl-t")
machine.sleep(1)
machine.succeed("stat /tmp/somefile")
machine.wait_for_file("/tmp/somefile")
# set up the new config
machine.succeed("mkdir -p ${user.home}/.xmonad")
@ -103,15 +102,13 @@ in {
# new config has a keybinding that deletes somefile
machine.send_key("alt-ctrl-r")
machine.sleep(1)
machine.fail("stat /tmp/somefile")
machine.wait_until_fails("stat /tmp/somefile", timeout=30)
# restart with the old config, and confirm the old keybinding is back
machine.succeed("rm /tmp/oldXMonad")
machine.send_key("alt-q")
machine.wait_for_file("/tmp/oldXMonad")
machine.send_key("alt-ctrl-t")
machine.sleep(1)
machine.succeed("stat /tmp/somefile")
machine.wait_for_file("/tmp/somefile")
'';
})

4
pkgs/applications/editors/cudatext/default.nix
View file

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
version = "1.153.0";
version = "1.155.0";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
sha256 = "sha256-3p5wb3buZtd1gnNoEJOclNO8xEYJBZYc86HfrkFrBWU=";
sha256 = "sha256-k6ALTbA2PhMZscinXKceM7MSzgr759Y6GxMrQAXMgwM=";
};
postPatch = ''

8
pkgs/applications/editors/cudatext/deps.json
View file

@ -16,8 +16,8 @@
},
"ATSynEdit": {
"owner": "Alexey-T",
"rev": "2022.01.07",
"sha256": "sha256-KxeaTXv0qig3O2hqjJ5HG1KCN0TTQdnd3g9jBsEc0a4="
"rev": "2022.01.20",
"sha256": "sha256-4UJ6t8j8uHB27jprqnlsGB8ytOMQLe4ZzSaYKiw4y70="
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
@ -31,8 +31,8 @@
},
"ATSynEdit_Ex": {
"owner": "Alexey-T",
"rev": "2022.01.07",
"sha256": "sha256-7QDHf0PYGMc611qrk+a8pNJHF1v1DFMWlt5hbaU/oD8="
"rev": "2022.01.20",
"sha256": "sha256-CaGo38NV+mbwekzkgw0DxM4TZf2xwHtYFnC6RbWH+ts="
},
"Python-for-Lazarus": {
"owner": "Alexey-T",

14
pkgs/applications/graphics/geeqie/default.nix
View file

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool
, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida
, wrapGAppsHook, fetchpatch
, wrapGAppsHook, fetchpatch, bash, doxygen
}:
stdenv.mkDerivation rec {
pname = "geeqie";
version = "1.6";
version = "1.7.1";
src = fetchFromGitHub {
owner = "BestImageViewer";
repo = "geeqie";
rev = "v${version}";
sha256 = "sha256-fvqpimrtzNy2UStOw3qLfC8i8V1fSrmTTsvc1ihqPsU=";
sha256 = "sha256-0E1TeAhkiK+hFJ4oMoeZLvfRehTzdGF3AtEVwf/MaF8=";
};
patches = [
@ -23,11 +23,15 @@ stdenv.mkDerivation rec {
})
];
postPatch = ''
patchShebangs .
'';
preConfigure = "./autogen.sh";
nativeBuildInputs =
[ pkg-config autoconf automake gettext intltool
wrapGAppsHook
wrapGAppsHook bash doxygen
];
buildInputs = [
@ -59,7 +63,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
homepage = "http://geeqie.sourceforge.net";
homepage = "https://www.geeqie.org/";
maintainers = with maintainers; [ jfrankenau pSub markus1189 ];
platforms = platforms.gnu ++ platforms.linux;

8
pkgs/applications/graphics/inkscape/default.nix
View file

@ -88,7 +88,13 @@ stdenv.mkDerivation rec {
url = "https://gitlab.com/inkscape/inkscape/-/commit/b3dabef2245d4e4e977ee9d6776be9a134493515.patch";
sha256 = "YhqUlRBKL1vJ/iCM/DvdwbmPIsAHQpcgf4TPpjlnBng=";
})
# Fix build against gcc-12
# https://gitlab.com/inkscape/inkscape/-/merge_requests/3683
(fetchpatch {
name = "gcc-12.patch";
url = "https://gitlab.com/inkscape/inkscape/-/commit/3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch";
sha256 = "sha256-VzKrWCkcVA1Co/xBTyh28Zhm2zFE/2jfZ3LveK0raO4=";
})
];
postPatch = ''

4
pkgs/applications/misc/remarkable/rmview/default.nix
View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "rmview";
version = "3.0";
version = "3.1";
src = fetchFromGitHub {
owner = "bordaigorl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zEl2uduSJvqhO5YPrH5ixps+IR5A0CIDwXHI+KvoT4Q=";
sha256 = "11p62dglxnvml3x95mi2sfai1k0gmvzwixzijr3gls2ss73maffw";
};
nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ];

4
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
version = "96.0.1";
version = "96.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "c0d2ccf9ca930def63dcb9dc269e47f60fd4bbbdcbc01463df0c30e11109a543e310fb36f2334d17b90cb9c96b8dcdd97d0e2d6c589a779de5e4f197c052f9a5";
sha512 = "5ceb1f023a9217c6a9c08b6525882d4091f989859cf209cc1d0ea22c846d05a967e1c47102ae052f7a5029d18118a558dd96da00437ee2c6fbf2896caf99d9dd";
};
meta = {

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmfile";
version = "0.142.0";
version = "0.143.0";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
sha256 = "sha256-kz5U9MPpN+14Eb1D1hjwDfvTOygzg0unyIgrFTFhE0Q=";
sha256 = "sha256-3Kuj3umyD7fooa4alNJAm7Adu+7EQvoB7Gt/LRjgW94=";
};
vendorSha256 = "sha256-HKHMeDnIDmQ7AjuS2lYCMphTHGD1JgQuBYDJe2+PEk4=";
vendorSha256 = "sha256-/MbKYPcZ7cOPQKT+nYQaaCiahKLcesrSVKNo8hKFlf0=";
doCheck = false;

2
pkgs/applications/networking/cluster/terraform-providers/default.nix
View file

@ -53,7 +53,6 @@ let
# mkisofs needed to create ISOs holding cloud-init data,
# and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
teleport = callPackage ./teleport { };
};
# Put all the providers we not longer support in this list.
@ -94,6 +93,7 @@ let
segment = removed "2022/01";
softlayer = archived "2022/01";
telefonicaopencloud = archived "2022/01";
teleport = removed "2022/01";
terraform = archived "2022/01";
ultradns = archived "2022/01";
vthunder = throw "provider was renamed to thunder on 2022/01";

33
pkgs/applications/networking/cluster/terraform-providers/teleport/default.nix
View file

@ -1,33 +0,0 @@
{ lib, fetchFromGitHub, buildGoModule, teleport }:
buildGoModule rec {
pname = "terraform-provider-teleport";
version = "8.0.6";
src = fetchFromGitHub {
owner = "gravitational";
repo = "teleport-plugins";
rev = "v${version}";
sha256 = "1rhvpbw4dga256dp2cr5f912d2j7rh8pd1v88dlgq3mmw8n5c7vy";
};
vendorSha256 = null;
checkInputs = [ teleport ];
sourceRoot = "source/terraform";
# Terraform allow checking the provider versions, but this breaks
# if the versions are not provided via file paths.
postBuild = ''
mv $NIX_BUILD_TOP/go/bin/{terraform,terraform-provider-teleport_v${version}}
'';
passthru.provider-source-address = "gravitational.com/teleport/teleport";
meta = with lib; {
description = "Provider for managing resources in Teleport access plane";
homepage = "https://github.com/gravitational/teleport-plugins";
license = licenses.asl20;
maintainers = with maintainers; [ justinas ];
};
}

4
pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix
View file

@ -4,11 +4,11 @@ let
in
stdenv.mkDerivation rec {
pname = "rocketchat-desktop";
version = "3.7.4";
version = "3.7.6";
src = fetchurl {
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb";
sha256 = "sha256-yYUMVMSGUMAXbBm40jNCaFusWsWxoIgLDeAwNqSewX8=";
sha256 = "sha256-lOiYj0eC/Mw2icdizK7wvBG2xuIBRkCF0aBJ24qzyK8=";
};
nativeBuildInputs = [

4
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
View file

@ -5,13 +5,13 @@ let
in buildPythonApplication rec {
pname = "git-cola";
version = "3.11.0";
version = "3.12.0";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
sha256 = "1s58wlpnndypx1q0m9fx8jmcd6hzqvrwdaxxrk7gn5nf423wq4xv";
sha256 = "1f8jpfa916nszj431cmp41bxj2m76k2n8qnscqgxrc0k3pnnp3wc";
};
buildInputs = [ git gettext ];

4
pkgs/development/interpreters/supercollider/default.nix
View file

@ -9,11 +9,11 @@ let
in
mkDerivation rec {
pname = "supercollider";
version = "3.12.1";
version = "3.12.2";
src = fetchurl {
url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2";
sha256 = "sha256-neYId2hJRAMx4+ZFm+5TzYuUbMRfa9icyqm2UYac/Cs=";
sha256 = "sha256-1QYorCgSwBK+SVAm4k7HZirr1j+znPmVicFmJdvO3g4=";
};
hardeningDisable = [ "stackprotector" ];

4
pkgs/development/python-modules/mailchecker/default.nix
View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "mailchecker";
version = "4.1.8";
version = "4.1.9";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-RLZunjRX7lljKQl+sJ/py8bTR/YZsDewTJao9IBuLbE=";
hash = "sha256-vr70AB8EiOmb8lgwrq78iTnHdrp14Ppyh57Trh8SQ8Q=";
};
# Module has no tests

4
pkgs/development/python-modules/msoffcrypto-tool/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "msoffcrypto-tool";
version = "4.12.0";
version = "5.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "nolze";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EBEwldh2Ct/4oxnAF1hWeW/uRrVsCYEi0cJaZubofFk=";
sha256 = "sha256-A5A578JZrxRXX6ewkFzittGTOebeNb99fuKsEm5QGoI=";
};
nativeBuildInputs = [

44
pkgs/development/python-modules/mutmut/default.nix Normal file
View file

@ -0,0 +1,44 @@
{ lib
, fetchFromGitHub
, buildPythonApplication
, click
, glob2
, parso
, pony
, junit-xml
, pythonOlder
, testVersion
}:
let self = buildPythonApplication rec {
pname = "mutmut";
version = "2.2.0";
src = fetchFromGitHub {
repo = pname;
owner = "boxed";
rev = version;
hash = "sha256-G+OL/9km2iUeZ1QCpU73CIWVWMexcs3r9RdCnAsESnY=";
};
postPatch = ''
substituteInPlace requirements.txt --replace 'junit-xml==1.8' 'junit-xml==1.9'
'';
disabled = pythonOlder "3.7";
doCheck = false;
propagatedBuildInputs = [ click glob2 parso pony junit-xml ];
passthru.tests.version = testVersion { package = self; };
meta = with lib; {
description = "mutation testing system for Python, with a strong focus on ease of use";
homepage = "https://github.com/boxed/mutmut";
changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ synthetica ];
};
};
in self

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

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "packer";
version = "1.7.8";
version = "1.7.9";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
sha256 = "sha256-VLHibkyuB8H2zfUCAuk7lBKbW5bl2kJOkwpo/iqsdm8=";
sha256 = "sha256-e2G4kxcizE2lfdryS4S04OwWxseyUqGS0SAaBdiXax0=";
};
vendorSha256 = "sha256-7E1QxlMpLNj9l3L+/gSLl6dGe/MeyKH+htsPxnocHj4=";
vendorSha256 = "sha256-5YcDaGbvw6xo5J8mtJ3CUS8JNCqKUD7kdUyfYIkQ6aE=";
subPackages = [ "." ];

6
pkgs/development/web/deno/default.nix
View file

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.17.3";
version = "1.18.0";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-S4Dt6SrSE/TLGhjAkTrIdvNR71A6ykxSxq72aiyWUX8=";
sha256 = "sha256-ov2zCINh4uH5pvhML1fgpnxFhWs680bdv9oqUESFkpw=";
};
cargoSha256 = "1ph392jxkln2ihq3x4hhjb1k3fsd2g54m37qgqkza4abvmc7adns";
cargoSha256 = "sha256-qYz5p+3QNA/zir2M9/aWxKYOMYI01OsIWZCJ4njjFPc=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];

10
pkgs/development/web/deno/librusty_v8.nix
View file

@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.36.0";
version = "0.38.1";
shas = {
x86_64-linux = "sha256-Ala3aT5oXrY+xwzXfB+pLr6gxfoSHcMen9elCbdS9mU=";
aarch64-linux = "sha256-BQn/gsNnnuzEzmUzEvGZ8twP0QElgOiTgHe++o4OVCI=";
x86_64-darwin = "sha256-YNgGgkrMdiVMe960LHz7BOB+mb/tIXBwGTveT7zrRMs=";
aarch64-darwin = "sha256-g2bpxeBVVlsT87jR5VWBArM7yQ/F/MDLeiKHt4u5C5M=";
x86_64-linux = "sha256-vRkb5ZrIOYSKa84UbsJD+Oua0wve7f1Yf3kMg/kkYSY=";
aarch64-linux = "sha256-o9btdXct/HpUTXlJc2Ydzj2yo2lSV87uo/VyxaxN0fk=";
x86_64-darwin = "sha256-/J/MpXnzvBv70o8Zjc46yPzBrY309o4kDQ9kZzDfhb4=";
aarch64-darwin = "sha256-y4MJIA2HKPm9iLJSxDw43VHsoY5v2WGp7zEsll/EHhI=";
};
}

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

@ -496,8 +496,8 @@ let
mktplcRef = {
name = "languagetool-linter";
publisher = "davidlday";
version = "0.18.0";
sha256 = "sha256-AYINgq1BMfh7p4xhwSC2Www6dQvyQAGTA45HJsmMGDg=";
version = "0.19.0";
sha256 = "sha256-crq6CTXpzwHJL8FPIBneAGjDgUUNdpBt6rIaMCr1F1U=";
};
meta = with lib; {
description = "LanguageTool integration for VS Code";

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "bash_unit";
version = "1.8.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "pgrange";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QWZnzliiqUfg6kXq1VGTNczupxNCgz1gFURrB/K2b4A=";
sha256 = "sha256-TtpVldIAqyv+apXmbI+1L0NgZxoKdc6Ffrl4WOqRI9c=";
};
installPhase = ''

2
pkgs/top-level/python-packages.nix
View file

@ -5195,6 +5195,8 @@ in {
mutf8 = callPackage ../development/python-modules/mutf8 { };
mutmut = callPackage ../development/python-modules/mutmut { };
mujson = callPackage ../development/python-modules/mujson { };
mwclient = callPackage ../development/python-modules/mwclient { };