nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 21:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-22.05 into staging-22.05

Browse Source
This commit is contained in:
github-actions[bot]
2022-08-17 00:15:13 +00:00
committed by GitHub
parent 68eea912ce 9ac08ed478
commit d0c4ddd63e
16 changed files with 77 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/doc/manual/from_md/installation/installing.chapter.xml
View File

@@ -177,17 +177,17 @@ OK
the boot partition.
</para>
<programlisting>
# parted /dev/sda -- mkpart primary 512MiB -8GiB
# parted /dev/sda -- mkpart primary 512MB -8GB
</programlisting>
</listitem>
<listitem>
<para>
Next, add a <emphasis>swap</emphasis> partition. The size
required will vary according to needs, here a 8GiB one is
required will vary according to needs, here a 8GB one is
created.
</para>
<programlisting>
# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
# parted /dev/sda -- mkpart primary linux-swap -8GB 100%
</programlisting>
<note>
<para>
@@ -204,7 +204,7 @@ OK
reserved 512MiB at the start of the disk.
</para>
<programlisting>
# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
# parted /dev/sda -- mkpart ESP fat32 1MB 512MB
# parted /dev/sda -- set 3 esp on
</programlisting>
</listitem>
@@ -242,7 +242,7 @@ OK
live.
</para>
<programlisting>
# parted /dev/sda -- mkpart primary 1MiB -8GiB
# parted /dev/sda -- mkpart primary 1MB -8GB
</programlisting>
</listitem>
<listitem>
@@ -252,7 +252,7 @@ OK
created.
</para>
<programlisting>
# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
# parted /dev/sda -- mkpart primary linux-swap -8GB 100%
</programlisting>
<note>
<para>

12
nixos/doc/manual/installation/installing.chapter.md
View File

@@ -133,14 +133,14 @@ update /etc/fstab.
which will be used by the boot partition.
```ShellSession
# parted /dev/sda -- mkpart primary 512MiB -8GiB
# parted /dev/sda -- mkpart primary 512MB -8GB
```
3. Next, add a *swap* partition. The size required will vary according
to needs, here a 8GiB one is created.
to needs, here a 8GB one is created.
```ShellSession
# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
# parted /dev/sda -- mkpart primary linux-swap -8GB 100%
```
::: {.note}
@@ -153,7 +153,7 @@ update /etc/fstab.
reserved 512MiB at the start of the disk.
```ShellSession
# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
# parted /dev/sda -- mkpart ESP fat32 1MB 512MB
# parted /dev/sda -- set 3 esp on
```
@@ -180,14 +180,14 @@ update /etc/fstab.
end part, where the swap will live.
```ShellSession
# parted /dev/sda -- mkpart primary 1MiB -8GiB
# parted /dev/sda -- mkpart primary 1MB -8GB
```
3. Finally, add a *swap* partition. The size required will vary
according to needs, here a 8GiB one is created.
```ShellSession
# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
# parted /dev/sda -- mkpart primary linux-swap -8GB 100%
```
::: {.note}

34
nixos/modules/services/backup/syncoid.nix
View File

@@ -16,11 +16,11 @@ let
lib.concatMapStrings (s: if lib.isList s then "-" else s)
(builtins.split "[^a-zA-Z0-9_.\\-]+" name);
# Function to build "zfs allow" commands for the filesystems we've
# delegated permissions to. It also checks if the target dataset
# exists before delegating permissions, if it doesn't exist we
# delegate it to the parent dataset. This should solve the case of
# provisoning new datasets.
# Function to build "zfs allow" commands for the filesystems we've delegated
# permissions to. It also checks if the target dataset exists before
# delegating permissions, if it doesn't exist we delegate it to the parent
# dataset (if it exists). This should solve the case of provisoning new
# datasets.
buildAllowCommand = permissions: dataset: (
"-+${pkgs.writeShellScript "zfs-allow-${dataset}" ''
# Here we explicitly use the booted system to guarantee the stable API needed by ZFS
@@ -38,15 +38,17 @@ let
(concatStringsSep "," permissions)
dataset
]}
else
${lib.escapeShellArgs [
"/run/booted-system/sw/bin/zfs"
"allow"
cfg.user
(concatStringsSep "," permissions)
# Remove the last part of the path
(builtins.dirOf dataset)
]}
${lib.optionalString ((builtins.dirOf dataset) != ".") ''
else
${lib.escapeShellArgs [
"/run/booted-system/sw/bin/zfs"
"allow"
cfg.user
(concatStringsSep "," permissions)
# Remove the last part of the path
(builtins.dirOf dataset)
]}
''}
fi
''}"
);
@@ -67,14 +69,14 @@ let
(concatStringsSep "," permissions)
dataset
]}
${lib.escapeShellArgs [
${lib.optionalString ((builtins.dirOf dataset) != ".") (lib.escapeShellArgs [
"/run/booted-system/sw/bin/zfs"
"unallow"
cfg.user
(concatStringsSep "," permissions)
# Remove the last part of the path
(builtins.dirOf dataset)
]}
])}
''}"
);
in

6
nixos/tests/sanoid.nix
View File

@@ -48,6 +48,9 @@ in {
};
# Take snapshot and sync
"pool/syncoid".target = "root@target:pool/syncoid";
# Test pool without parent (regression test for https://github.com/NixOS/nixpkgs/pull/180111)
"pool".target = "root@target:pool/full-pool";
};
};
};
@@ -105,6 +108,9 @@ in {
source.systemctl("start --wait syncoid-pool-syncoid.service")
target.succeed("cat /mnt/pool/syncoid/test.txt")
source.systemctl("start --wait syncoid-pool.service")
target.succeed("[[ -d /mnt/pool/full-pool/syncoid ]]")
assert len(source.succeed("zfs allow pool")) == 0, "Pool shouldn't have delegated permissions set after syncing snapshots"
assert len(source.succeed("zfs allow pool/sanoid")) == 0, "Sanoid dataset shouldn't have delegated permissions set after syncing snapshots"
assert len(source.succeed("zfs allow pool/syncoid")) == 0, "Syncoid dataset shouldn't have delegated permissions set after syncing snapshots"

12
pkgs/applications/editors/vscode/vscodium.nix
View File

@@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0kvmnayrwpz82jxhvi69r45nyq74v5qyx5nn8b6kz23ma02nm4y6";
x86_64-darwin = "0w6qbybzvpb886z1y5w7q36xy176f5hagzgqddzgwbzlv3lc9i9j";
aarch64-linux = "194bnz4rg6lpi1pcl3yknap2n1p9vyi86wd5rq4m0h8kmqg1i21w";
aarch64-darwin = "1vhb85zbpp399qxn7b7gdvsij174x5nzp84xw57kw9pzs5dkw12g";
armv7l-linux = "1cr3vqxl0h8a4mg920a90ykdvb3vzf8cyxls1w8m84k3b53m5qdi";
x86_64-linux = "0vwnx7fs46fkas75pnhjc81wy3hr24k2gs82i30ailaxw5r63j81";
x86_64-darwin = "0bxc74vfkw9zhxfahzhcghlnybvj8k15jbni489lf636a45xrlcc";
aarch64-linux = "10z6nv67yjd15ilxgfpjf07qbdp0cbd5761a5gcymiam4r22l6hq";
aarch64-darwin = "133nccm0hcgcd2503psxwaaq4v4l16q7w7kbcz1y5lynlvwazjrx";
armv7l-linux = "1sx3l42ls62v3apjap25ccg4mcbi71spfj5xh7y6rffzi65xwdrv";
}.${system} or throwSystem;
sourceRoot = if stdenv.isDarwin then "" else ".";
@@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.69.2";
version = "1.70.0";
pname = "vscodium";
executableName = "codium";

2
pkgs/applications/misc/archivebox/default.nix
View File

@@ -9,7 +9,7 @@ let
version = "3.1.14";
src = old.src.override {
inherit version;
sha256 = "72a4a5a136a214c39cf016ccdd6b69e2aa08c7479c66d93f3a9b5e4bb9d8a347";
hash = "sha256-cqSloTaiFMOc8BbM3Wtp4qoIx0ecZtk/OpteS7nYo0c=";
};
meta = old.meta // {
knownVulnerabilities = [

6
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
View File

@@ -8,6 +8,7 @@
, vala
, glib
, libgee
, libhandy
, granite
, gexiv2
, gnome-settings-daemon
@@ -24,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
version = "6.2.0";
version = "6.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-s7EMs8jeBFkDlLqOLtKuyQmCFNgXYMzKOKW/dVR2eqA=";
sha256 = "sha256-xaMoemI87uSlTN6qkxMiC26mdoU7nHTTCRnJgjQFtF4=";
};
nativeBuildInputs = [
@@ -53,6 +54,7 @@ stdenv.mkDerivation rec {
granite
gtk3
libgee
libhandy
switchboard
wingpanel
];

12
pkgs/development/libraries/irrlichtmt/default.nix
View File

@@ -16,13 +16,13 @@
}:
stdenv.mkDerivation rec {
pname = "irrlichtmt";
version = "1.9.0mt5";
version = "1.9.0mt7";
src = fetchFromGitHub {
owner = "minetest";
repo = "irrlicht";
rev = version;
sha256 = "sha256-ocsO4nKab2YxHY1qqZbF4OErpBKmG4V+psgC40APs8s=";
sha256 = "sha256-Eu7zW3mXl7GPRmLnKjt/dPoZ64HPYulI7MO1dJfj+10=";
};
nativeBuildInputs = [
@@ -30,9 +30,11 @@ stdenv.mkDerivation rec {
];
# https://github.com/minetest/minetest/pull/10729
postPatch = lib.optionalString withTouchSupport ''
substituteInPlace include/IrrCompileConfig.h \
--replace '//#define _IRR_LINUX_X11_XINPUT2_' '#define _IRR_LINUX_X11_XINPUT2_'
postPatch = lib.optionalString (!withTouchSupport) ''
sed -i '1i #define NO_IRR_LINUX_X11_XINPUT2_' include/IrrCompileConfig.h
# HACK: Fix mistake in build script
sed -i '/''${X11_Xi_LIB}/d' source/Irrlicht/CMakeLists.txt
'';
buildInputs = [

6
pkgs/development/python-modules/devito/default.nix
View File

@@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "devito";
version = "unstable-2022-04-22";
version = "4.7.1";
src = fetchFromGitHub {
owner = "devitocodes";
repo = "devito";
rev = "7cb52eded4038c1a0ee92cfd04d3412c48f2fb7c";
sha256 = "sha256-75hkkufQK9Nv65DBz8cmYTfkxH/UUWDQK/rGUDULvjM=";
rev = "v${version}";
sha256 = "sha256-crKTxlueE8NGjAqu625iFvp35UK2U7+9kl8rpbzf0gs=";
};
postPatch = ''

2
pkgs/development/python-modules/pywinrm/default.nix
View File

@@ -2,7 +2,6 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, kerberos
, mock
, pytestCheckHook
, requests
@@ -27,7 +26,6 @@ buildPythonPackage rec {
requests
requests_ntlm
six
kerberos
xmltodict
];

4
pkgs/development/tools/misc/universal-ctags/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "universal-ctags";
version = "5.9.20220710.0";
version = "5.9.20220814.0";
src = fetchFromGitHub {
owner = "universal-ctags";
repo = "ctags";
rev = "p${version}";
sha256 = "sha256-/7g1AGLbl49s8hbwy3IGwshKAGKRJrdbECau2acMtjE=";
sha256 = "sha256-U1PjmBb99v7N+Dd7n2r1Xx09yflf0OxRlb4f1Sg0UvI=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

12
pkgs/games/minetest/default.nix
View File

@@ -132,12 +132,14 @@ let
};
v5 = {
version = "5.5.1";
sha256 = "sha256-ssaDy6tYxhXGZ1+05J5DwoKYnfhKIKtZj66DOV84WxA=";
dataSha256 = "sha256-SI6I1wXbB0CgTmIemm3VY9DNnWMoI5bt/hqRwHlUl4k=";
version = "5.6.0";
sha256 = "sha256-wcbYcVHs4L0etOwUBjKvzsmZtnpOxpFgLV8nx3UfJQI=";
dataSha256 = "sha256-TVaDHYstFEuT0nBExwLE1PtM1CZh71t9CRxC9rEYTd4=";
};
mkClient = version: generic (version // { buildClient = true; buildServer = false; });
mkServer = version: generic (version // { buildClient = false; buildServer = true; });
in {
minetestclient_5 = generic (v5 // { buildClient = true; buildServer = false; });
minetestserver_5 = generic (v5 // { buildClient = false; buildServer = true; });
minetestclient_5 = mkClient v5;
minetestserver_5 = mkServer v5;
}

8
pkgs/servers/nextcloud/default.nix
View File

@@ -46,13 +46,13 @@ in {
'';
nextcloud23 = generic {
version = "23.0.7";
sha256 = "89a53d3447d1dcb7ea382d18accf52223040336d08899f0b7568c6dd8a36cd50";
version = "23.0.8";
sha256 = "ac3d042253399be25a2aa01c799dec75a1459b6ae453874414f6528cc2ee5061";
};
nextcloud24 = generic {
version = "24.0.3";
sha256 = "320c81f9b902922b4bcef3eacf858596a14347fd45bddd26dac198562d212439";
version = "24.0.4";
sha256 = "d107426f8e1c193db882a04c844f9bc7e7eeb7c21e46c46197e5154d6d6ac28e";
};
# tip: get the sha with:

4
pkgs/tools/X11/xprintidle/default.nix
View File

@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "xprintidle";
version = "0.2.4";
version = "0.2.5";
src = fetchFromGitHub {
owner = "g0hl1n";
repo = "xprintidle";
rev = version;
sha256 = "sha256-CgjHTvwQKR/TPQyEWKxN5j97Sh2iec0BQPhC96sfyoI=";
sha256 = "sha256-bafDUZoSFsJ3g6mtLCRechGizfrWg2qW2vnlfIzj7mQ=";
};
nativeBuildInputs = [

11
pkgs/tools/backup/duplicity/default.nix
View File

@@ -19,13 +19,13 @@ let
in
pythonPackages.buildPythonApplication rec {
pname = "duplicity";
version = "0.8.20";
version = "0.8.23";
src = fetchFromGitLab {
owner = "duplicity";
repo = "duplicity";
rev = "rel.${version}";
sha256 = "13ghra0myq6h6yx8qli55bh8dg91nf1hpd8l7d7xamgrw6b188sm";
sha256 = "0my015zc8751smjgbsysmca7hvdm96cjw5zilqn3zq971nmmrksb";
};
patches = [
@@ -35,13 +35,6 @@ pythonPackages.buildPythonApplication rec {
# Our Python infrastructure runs test in installCheckPhase so we need
# to make the testing code stop assuming it is run from the source directory.
./use-installed-scripts-in-test.patch
# https://gitlab.com/duplicity/duplicity/-/merge_requests/64
# remove on next release
(fetchpatch {
url = "https://gitlab.com/duplicity/duplicity/-/commit/5c229a9b42f67257c747fbc0022c698fec405bbc.patch";
sha256 = "05v931rnawfv11cyxj8gykmal8rj5vq2ksdysyr2mb4sl81mi7v0";
})
] ++ lib.optionals stdenv.isLinux [
# Broken on Linux in Nix' build environment
./linux-disable-timezone-test.patch

8
pkgs/tools/misc/fzf/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fzf";
version = "0.30.0";
version = "0.31.0";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
sha256 = "sha256-7E6fj/Sjew+zz+iMFkiSJjVn2rymKRvZtEJZH65INxk=";
sha256 = "sha256-HKwf/ogNx+jCNSVHI8rt6WYRbuyT18V4nnMyZ6TmwVQ=";
};
vendorSha256 = "sha256-omvCzM5kH3nAE57S33NV0OFRJmU+Ty7hhriaG/Dc0o0=";
vendorSha256 = "sha256-3ry93xV3KKtFoFGt2yxzMd4jx3QG2+8TBrEEywj7HPQ=";
outputs = [ "out" "man" ];
@@ -34,8 +34,6 @@ buildGoModule rec {
# Has a sneaky dependency on perl
# Include first args to make sure we're patching the right thing
substituteInPlace shell/key-bindings.zsh \
--replace " perl -ne " " ${perl}/bin/perl -ne "
substituteInPlace shell/key-bindings.bash \
--replace " perl -n " " ${perl}/bin/perl -n "
'';