nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 11:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-22.11 into staging-next-22.11

Browse Source
This commit is contained in:
github-actions[bot]
2023-02-13 00:14:31 +00:00
committed by GitHub
parent 8c47346029 38b81240fc
commit 97b223e7b4
9 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/cluster/tilt/default.nix
View File

@@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
version = "0.30.9";
version = "0.31.2";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vZthFaIsgpZ2aap9kRSH//AHHnOpekPIkwpz9Tt0lI4=";
sha256 = "sha256-Wn7e2g1KPnFgFuRPUh3g0FW/m0qRHV5reO+AZbhbaC8=";
};
vendorSha256 = null;

2
pkgs/development/libraries/v8/8_x.nix
View File

@@ -167,6 +167,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ];
platforms = platforms.unix;
license = licenses.bsd3;
broken = lib.versionAtLeast stdenv.cc.version "12";
broken = stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12";
};
}

4
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
let
version = "15.8.0";
version = "15.8.2";
in
buildGoModule rec {
inherit version;
@@ -23,7 +23,7 @@ buildGoModule rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "sha256-U7yVlnEzwqcgTX8WjXe2i4SQ0KyW7PgSM3UyuGkjm9g=";
sha256 = "sha256-kb1xDvU2aP6bI9oziAlUfxbmIq8CgFXPs04hRUmaPyE=";
};
patches = [

60
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@@ -2,61 +2,61 @@
"4.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.304-hardened1.patch",
"sha256": "099fqlfl9p57pfh5jr7cv30476q2cbhrqs6w63cy3mkwj7l4jwln",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.304-hardened1/linux-hardened-4.14.304-hardened1.patch"
"name": "linux-hardened-4.14.305-hardened1.patch",
"sha256": "05zcfy7dh8vlbvf9iw99m2xi7d9df254lg3a77hhb8cb264yn6z0",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.305-hardened1/linux-hardened-4.14.305-hardened1.patch"
},
"sha256": "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4",
"version": "4.14.304"
"sha256": "16lmhxqpbhyqmgmlyicjadzz3axhl5smfrr230x45ahkdghwsnx3",
"version": "4.14.305"
},
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.271-hardened1.patch",
"sha256": "0xvd9n2fqmr863a4vljki2saa85dccj7mflcfwaslj9g2ygbrf93",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.271-hardened1/linux-hardened-4.19.271-hardened1.patch"
"name": "linux-hardened-4.19.272-hardened1.patch",
"sha256": "1qimbp19mimy6dqv4rc8hb6966sq7l1y72hp0s0vy682qx556zwg",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.272-hardened1/linux-hardened-4.19.272-hardened1.patch"
},
"sha256": "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3",
"version": "4.19.271"
"sha256": "1y8kyc48v8bsl53zc6dsy5xhazv0vyna98fycj181aypicvbk7s8",
"version": "4.19.272"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.166-hardened1.patch",
"sha256": "1ygxald6mq47n7i6x80mv9d5idfpwk6gpcijci8bsazhndwvi7qy",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.166-hardened1/linux-hardened-5.10.166-hardened1.patch"
"name": "linux-hardened-5.10.167-hardened1.patch",
"sha256": "0i74kjzilsgyjidz7p9jjxpjx3yqx5gsh7nwlw6zclxg1a82fw24",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.167-hardened1/linux-hardened-5.10.167-hardened1.patch"
},
"sha256": "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80",
"version": "5.10.166"
"sha256": "1iprbgwdgnylzw4dc8jgims54x8dkq070c9vs4642rp529wgj1yq",
"version": "5.10.167"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.91-hardened1.patch",
"sha256": "041yigcqzp7m6cibl9h3jgsz20xhxc9y7y5pay9c7fkh2ypy9zgz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.91-hardened1/linux-hardened-5.15.91-hardened1.patch"
"name": "linux-hardened-5.15.92-hardened1.patch",
"sha256": "0wwi15r51jb0396vc4nbwjh9kxh68jvcbdw72pllwsgkhijgzkhg",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.92-hardened1/linux-hardened-5.15.92-hardened1.patch"
},
"sha256": "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56",
"version": "5.15.91"
"sha256": "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz",
"version": "5.15.92"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.230-hardened1.patch",
"sha256": "0xk80i6wddd909wzhcp7b64sbsjjqpwyjr8gknpc83zcdzv3y892",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.230-hardened1/linux-hardened-5.4.230-hardened1.patch"
"name": "linux-hardened-5.4.231-hardened1.patch",
"sha256": "1fximwmcp0205i3jxmglf0jawgy1knrc9cnjpz05am8yi7ndikmd",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.231-hardened1/linux-hardened-5.4.231-hardened1.patch"
},
"sha256": "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7",
"version": "5.4.230"
"sha256": "1a1nbyvkf6iaj5lz6ahg7kk9pyrx7j77jmaj92fyihdl3mzyml4d",
"version": "5.4.231"
},
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.1.8-hardened1.patch",
"sha256": "1ry0cb1dsq84n6cxn8ndx47qz1g69kqlfkb16rrlgk49w81i8y8z",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.8-hardened1/linux-hardened-6.1.8-hardened1.patch"
"name": "linux-hardened-6.1.10-hardened1.patch",
"sha256": "0v0w4phc02ghylqnyhzkl1frmjkxwkxgadf2ycyzm8ckl73q8lr5",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.10-hardened1/linux-hardened-6.1.10-hardened1.patch"
},
"sha256": "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn",
"version": "6.1.8"
"sha256": "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb",
"version": "6.1.10"
}
}

4
pkgs/os-specific/linux/kernel/linux-5.15.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.92";
version = "5.15.93";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz";
sha256 = "1baxkkd572110p95ah1wv0b4i2hfbkf8vyncb08y3w0bd7r29vg7";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-6.1.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.1.10";
version = "6.1.11";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb";
sha256 = "18gpkaa030g8mgmyprl05h4i8y5rjgyvbh0jcl8waqvq0xh0a6sq";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-libre.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19044";
sha256 = "1xiykp6lwvlz8x48i7f1f3izra2hfz75iihw3y4w5f1jlji6y56m";
rev = "19049";
sha256 = "0873qyk69p8hr91qjaq5rd9z2i6isd3yq3slh1my5y33gc7d3bj2";
}
, ...
}:

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

@@ -14,13 +14,13 @@ let
in
buildGoModule rec {
pname = "netbird";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "netbirdio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ajfNHkdYNJCuDhFmww1X0d9F0dmo2/h0GlfLYWvTHKc=";
sha256 = "sha256-Afj2pllGPL86hhSNDSbvO+GkA62CI8V5dnUa0mjEMCg=";
};
vendorHash = "sha256-3uEcb0nVHrfHZTZ/j/9l6zR1zMfLR0mVaN/Hydyam4Q=";

4
pkgs/tools/virtualization/awsebcli/default.nix
View File

@@ -16,7 +16,6 @@ let
self = localPython;
packageOverrides = self: super: {
cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7";
future = changeVersion super.future.overridePythonAttrs "0.16.0" "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773";
wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf";
semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54";
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
@@ -48,10 +47,11 @@ with localPython.pkgs; buildPythonApplication rec {
preConfigure = ''
substituteInPlace setup.py \
--replace "six>=1.11.0,<1.15.0" "six==1.16.0" \
--replace "requests>=2.20.1,<=2.26" "requests==2.28.1" \
--replace "requests>=2.20.1,<=2.26" "requests<3" \
--replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.76" \
--replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \
--replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \
--replace "future>=0.16.0,<0.17.0" "future" \
--replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.1.0"
'';