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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-26 00:02:26 +00:00 committed by GitHub
commit 19fd1d7e90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 920 additions and 902 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/doc/manual/from_md/installation/building-nixos.chapter.xml
View File

@ -33,9 +33,14 @@
</para>
<section xml:id="sec-building-image-instructions">
<title>Practical Instructions</title>
<para>
To build an ISO image for the channel
<literal>nixos-unstable</literal>:
</para>
<programlisting>
$ git clone https://github.com/NixOS/nixpkgs.git
$ cd nixpkgs/nixos
$ git switch nixos-unstable
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix
</programlisting>
<para>

3
nixos/doc/manual/installation/building-nixos.chapter.md
View File

@ -18,9 +18,12 @@ enforced values with `mkForce`.
## Practical Instructions {#sec-building-image-instructions}
To build an ISO image for the channel `nixos-unstable`:
```ShellSession
$ git clone https://github.com/NixOS/nixpkgs.git
$ cd nixpkgs/nixos
$ git switch nixos-unstable
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix
```

2
nixos/modules/services/web-servers/nginx/vhost-options.nix
View File

@ -60,7 +60,7 @@ with lib;
Note: This option overrides <literal>enableIPv6</literal>
'';
default = [];
example = [ "127.0.0.1" "::1" ];
example = [ "127.0.0.1" "[::1]" ];
};
enableACME = mkOption {

3
nixos/modules/tasks/filesystems.nix
View File

@ -280,7 +280,8 @@ in
environment.etc.fstab.text =
let
fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" ];
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
isBindMount = fs: builtins.elem "bind" fs.options;
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs;
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
swapOptions = sw: concatStringsSep "," (

1
pkgs/applications/blockchains/chia/default.nix
View File

@ -87,6 +87,7 @@ let chia = python3Packages.buildPythonApplication rec {
meta = with lib; {
homepage = "https://www.chia.net/";
description = "Chia is a modern cryptocurrency built from scratch, designed to be efficient, decentralized, and secure.";
knownVulnerabilities = [ "CVE-2022-36447" ];
license = with licenses; [ asl20 ];
maintainers = teams.chia.members;
platforms = platforms.all;

4
pkgs/applications/misc/mediainfo-gui/default.nix
View File

@ -2,11 +2,11 @@
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
version = "22.03";
version = "22.06";
pname = "mediainfo-gui";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q=";
sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

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

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
version = "22.03";
version = "22.06";
pname = "mediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q=";
sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

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

File diff suppressed because it is too large Load Diff

786
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

20
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -1011,10 +1011,10 @@
"owner": "scaleway",
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.2.3",
"sha256": "sha256-XiGc6MU0TrpaZL0SRKez2IUFM7MZIu8tGMFIUQJzbv4=",
"rev": "v2.2.4",
"sha256": "sha256-tFU1OzixWipQvMHdwViOk8svlhqhPjOTPPkCpWam4DQ=",
"vendorSha256": "sha256-pDDk4cGCZEotOfL1OLEVJVQ35lI/fdNh2NNjAkIHTZ0=",
"version": "2.2.3"
"version": "2.2.4"
},
"secret": {
"owner": "numtide",
@ -1092,10 +1092,10 @@
"owner": "spotinst",
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.79.0",
"sha256": "sha256-UOqXUUqbZ7qVlqFI1YABahfW4+ghyMS7n2Yc9Lfd6cc=",
"vendorSha256": "sha256-AJfQhIsh7a1WVQ//oT6P12H/sqmGtKD7jwW3JthvVNQ=",
"version": "1.79.0"
"rev": "v1.80.0",
"sha256": "sha256-3Wq3jKpSVm3sIUoumd7v26JsSWMdmzdhtUKq/ztrt9M=",
"vendorSha256": "sha256-NeXkvdO6ODAhNdVfP4laTht6oIrx2QYbhTILFXwPCbU=",
"version": "1.80.0"
},
"stackpath": {
"owner": "stackpath",
@ -1128,10 +1128,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.76.2",
"sha256": "sha256-dtymdUggjQk3v8FWWBktMe2kPoeEn3FBsXSZ12JneRw=",
"rev": "v1.76.3",
"sha256": "sha256-Tc6GfFWksxrr61rNFVZrHMHTeo4JsU8Gc1S7roMnj4Y=",
"vendorSha256": null,
"version": "1.76.2"
"version": "1.76.3"
},
"tfe": {
"owner": "hashicorp",

2
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -33,7 +33,7 @@ buildGoModule {
inherit rubyEnv;
};
ldflags = "-X ${gitaly_package}/internal/version.version=${version} -X ${gitaly_package}/internal/version.moduleVersion=${version}";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
tags = [ "static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ];

10
pkgs/data/misc/papirus-folders/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchFromGitHub, getent }:
stdenv.mkDerivation rec {
pname = "papirus-folders";
@ -11,8 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ZZMEZCWO+qW76eqa+TgxWGVz69VkSCPcttLoCrH7ppY=";
};
buildInputs = [
getent
];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
patchPhase = ''
substituteInPlace ./papirus-folders --replace "getent" "${getent}/bin/getent"
'';
meta = with lib; {
description = "A tool to change papirus icon theme color";
longDescription = ''

2
pkgs/desktops/gnome/core/sushi/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
libepoxy
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
];

24
pkgs/development/embedded/svdtools/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib
, rustPlatform
, fetchCrate
}:
rustPlatform.buildRustPackage rec {
pname = "svdtools";
version = "0.2.5";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-tN1GC4tQXyaA8bgq7wB/NZEdO14p/0f8BXtgTk6aOzg=";
};
cargoSha256 = "sha256-puaveP9a11rlGgsguCfueYXfYSd7Xew8ZRGeDP8WrSI=";
meta = with lib; {
description = "Tools to handle vendor-supplied, often buggy SVD files";
homepage = "https://github.com/stm32-rs/svdtools";
changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-rust.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ newam ];
};
}

10
pkgs/development/interpreters/micropython/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "micropython";
version = "1.18";
version = "1.19";
src = fetchFromGitHub {
owner = "micropython";
repo = "micropython";
rev = "v${version}";
sha256 = "sha256-roskIDyY3ehasOm8Yn4braLNZtaeuItb9ZOUgF4CXww=";
owner = "micropython";
repo = "micropython";
rev = "v${version}";
sha256 = "sha256-M3cKNuRKOcB1lF9M1rDOpp3sPdx/I60ooLtOYmBWe7c=";
fetchSubmodules = true;
};

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

@ -36,14 +36,14 @@
stdenv.mkDerivation rec {
pname = "gegl";
version = "0.4.36";
version = "0.4.38";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-b9WKDNzHcCJYra7/tXOjiSKK6PDv9HV479ojCbYbLKY=";
sha256 = "sha256-5KM8hDClBC+6hDm1lTSOcYcPDZX7+IX/VT+QIMG+11A=";
};
nativeBuildInputs = [

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

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }:
stdenv.mkDerivation rec {
version = "22.03";
version = "22.06";
pname = "libmediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "sha256-/FC6u2KOnPumVSiNrgbVw0Kw1+aUGjLWT7uxEySMgLk=";
sha256 = "sha256-snmoTy87s1NmTE59X+7brJix/Q1NQTGrczF1Qff+wvY=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

27
pkgs/development/ocaml-modules/omd/default.nix
View File

@ -1,32 +1,21 @@
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild }:
{ lib, buildDunePackage, fetchurl }:
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-omd";
version = "1.3.1";
buildDunePackage rec {
pname = "omd";
version = "1.3.2";
minimalOCamlVersion = "4.03";
src = fetchurl {
url = "https://github.com/Chris00/omd/releases/download/${version}/omd-${version}.tar.gz";
sha256 = "1sgdgzpx96br7npj8mh91cli5mqmzsjpngwm7x4212n3k1d0ivwa";
url = "https://github.com/ocaml/omd/releases/download/${version}/omd-${version}.tbz";
sha256 = "sha256-YCPhZCYx8I9njrVyWCCHnte7Wj/+53fN7evCjB+F+ts=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
strictDeps = true;
createFindlibDestdir = true;
configurePhase = ''
runHook preConfigure
ocaml setup.ml -configure --prefix $out
runHook postConfigure
'';
meta = {
description = "Extensible Markdown library and tool in OCaml";
homepage = "https://github.com/ocaml/omd";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
mainProgram = "omd";
inherit (ocaml.meta) platforms;
};
}

4
pkgs/development/python-modules/pywayland/default.nix
View File

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pywayland";
version = "0.4.13";
version = "0.4.14";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-x075CncvfjzbIsGMj2EwFpigpwlysqBZpoK08DW9iBo=";
hash = "sha256-CXJidzwFvS1ewqYyfpJhwQtqh4TtUfhO9O0iYJpOCy0=";
};
nativeBuildInputs = [ pkg-config ];

5
pkgs/development/python-modules/scrapy/default.nix
View File

@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "scrapy";
version = "2.6.1";
version = "2.6.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -38,7 +38,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "Scrapy";
sha256 = "56fd55a59d0f329ce752892358abee5a6b50b4fc55a40420ea317dc617553827";
sha256 = "55e21181165f25337105fff1efc8393296375cea7de699a7e703bbd265595f26";
};
nativeBuildInputs = [
@ -111,6 +111,7 @@ buildPythonPackage rec {
] ++ lib.optionals stdenv.isDarwin [
"test_xmliter_encoding"
"test_download"
"test_reactor_default_twisted_reactor_select"
];
postInstall = ''

46
pkgs/development/python-modules/svdtools/default.nix
View File

@ -1,46 +0,0 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, braceexpand
, click
, pyyaml
, lxml
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "svdtools";
version = "0.1.23";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit version pname;
hash = "sha256-LuursRuUZEDLbk9Wbnq/S0dsZHbzIJo1YCSVFMUoiog=";
};
propagatedBuildInputs = [
braceexpand
click
pyyaml
lxml
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"svdtools"
];
meta = with lib; {
description = "Python package to handle vendor-supplied, often buggy SVD files";
homepage = "https://github.com/stm32-rs/svdtools";
changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-python.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ newam ];
};
}

26
pkgs/development/tools/hclfmt/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "hclfmt";
version = "2.13.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "hcl";
rev = "v${version}";
hash = "sha256-ENvXFOdsv3PL4jH7OfI3ZIY6ekj7ywgNOYl1uRQjypM=";
};
vendorSha256 = "sha256-9IGHILgByNFviQcHJCFoEX9cZif1uuHCu4xvmGZYoXk=";
# The code repository includes other tools which are not useful. Only build
# hclfmt.
subPackages = [ "cmd/hclfmt" ];
meta = with lib; {
description = "a code formatter for the Hashicorp Configuration Language (HCL) format";
homepage = "https://github.com/hashicorp/hcl/tree/main/cmd/hclfmt";
license = licenses.mpl20;
maintainers = with maintainers; [ zimbatm ];
};
}

14
pkgs/development/web/bun/default.nix
View File

@ -4,25 +4,31 @@ let
aarch64-darwin = {
arch = "aarch64";
shortName = "darwin";
sha256 = "sha256-6mi1I8dga16dQLFy2+qa4dzDzlW6J0fdiv104Re3cZ0=";
sha256 = "80304f6cf43c6be3db0303bdcb4de4995ace1a394ac6068bbe1e2b6fba32b2e5";
};
aarch64-linux = {
arch = "aarch64";
shortName = "linux";
sha256 = "6b22b6221014fed9e6b6cb432505424e618ef095b2060945ad119cd8f2155fae";
};
x86_64-darwin = {
arch = "x64";
shortName = "darwin";
sha256 = "sha256-RGlpwRKLo4Y6uPvwubclIg3wJWePgKTDJvuzdxOrtfM=";
sha256 = "33f4c420467af85584ba444606651a0352906c9135d952b266bb6da100ef95bf";
};
x86_64-linux = {
arch = "x64";
shortName = "linux";
sha256 = "sha256-Xjm+1wkAsC5Mn6Fm4MRdGyL4gpw2L++N0nKo7ofXLXs=";
sha256 = "524a2d7e51ddda4786799552ae1c18ab8e6173bb30f158f26cae899a7e74f22f";
};
};
dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
in
stdenvNoCC.mkDerivation rec {
version = "0.1.2";
version = "0.1.5";
pname = "bun";
src = fetchurl {

8
pkgs/os-specific/linux/kernel/zen-kernels.nix
View File

@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "5.18.13"; #zen
version = "5.18.14"; #zen
suffix = "zen1"; #zen
sha256 = "0m5wwiaasv49f50qxv7kydmxzfry2w6gl6489hba4i4xl7h8k8nj"; #zen
sha256 = "019v1ryzg5fq6xwvb8anmfxh0zpy8wd0qfiszfqxkqw7cnqc6wf1"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "5.18.13"; #lqx
version = "5.18.14"; #lqx
suffix = "lqx1"; #lqx
sha256 = "12fzls0rmq2zlfdlx81f44hylmfk0j2nsxbg9s3iyakyhkwynvvk"; #lqx
sha256 = "1k1if1w1fiislj85311f5c6nw7w2l4lgkjk0m3b2nja05vy5i5gk"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

4
pkgs/servers/metabase/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
version = "0.43.1";
version = "0.43.3";
src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar";
hash = "sha256-WGbIsmCWsSxgE7Ktr539qTt/o5cJrYi0yu3ZkfbxOV0=";
hash = "sha256-XUJNnyzBGYC3jMi1pVvdMNRo8zxkFcxzdHjytmCAVqM=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/misc/os-prober/default.nix
View File

@ -11,14 +11,14 @@ lvm2 # lvs
}:
stdenv.mkDerivation rec {
version = "1.79";
version = "1.81";
pname = "os-prober";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = pname;
rev = version;
sha256 = "sha256-ntwH5TIA18IOgYPkHMLU0EVykkHs6Z0wseYEPsU0KvQ=";
sha256 = "sha256-3FXfGadIcmKp4qn6ZDcOSQHYsUNP2ObL1cJesNle+8A=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/networking/mu/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mu";
version = "1.8.6";
version = "1.8.7";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
sha256 = "u3MN7MrfHt/ylxDoNnfwnAOKdOAbVZwvIukje0EYgOo=";
sha256 = "/RGq/q0N623RR4HuAmyfFx1/OYZBrmK1ddhiT4bgy3k=";
};
postPatch = ''

8
pkgs/top-level/all-packages.nix
View File

@ -14389,7 +14389,7 @@ with pkgs;
svd2rust = callPackage ../development/tools/rust/svd2rust { };
svdtools = with python3Packages; toPythonApplication svdtools;
svdtools = callPackage ../development/embedded/svdtools { };
swift = callPackage ../development/compilers/swift { };
@ -16082,6 +16082,8 @@ with pkgs;
hcloud = callPackage ../development/tools/hcloud { };
hclfmt = callPackage ../development/tools/hclfmt { };
help2man = callPackage ../development/tools/misc/help2man { };
heroku = callPackage ../development/tools/heroku { };
@ -21783,8 +21785,8 @@ with pkgs;
libzra = callPackage ../development/libraries/libzra { };
zig = callPackage ../development/compilers/zig {
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
# requires a newer Apple SDK
zig = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig {
llvmPackages = llvmPackages_13;
};

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

@ -10326,8 +10326,6 @@ in {
suseapi = callPackage ../development/python-modules/suseapi { };
svdtools = callPackage ../development/python-modules/svdtools { };
svg2tikz = callPackage ../development/python-modules/svg2tikz { };
svglib = callPackage ../development/python-modules/svglib { };