From 24379ebc82eccd3343cbaf51410dd96d4ce88645 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 25 Jan 2023 06:42:40 +0900 Subject: [PATCH 01/15] awsebcli: fix up, requests and future dependencies (cherry picked from commit 4fbe3e450bb2b8a0d3cbc99d634f080ca8d57cef) --- pkgs/tools/virtualization/awsebcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index e9c4a6e40ebb..77013fd331f8 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -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" ''; From 113147669de8cc776466ebc2c01b4f9d20baaee4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 13:53:59 +0000 Subject: [PATCH 02/15] netbird: 0.12.0 -> 0.13.0 (cherry picked from commit c0380c7bff694c7102c7425d7869901a4d40d628) --- pkgs/tools/networking/netbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index c1becc886a59..4301f606a402 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -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="; From 566b60d4a5a0648ab4a72bfc65d2de9ca17133f7 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 11 Feb 2023 09:15:43 +0000 Subject: [PATCH 03/15] gitlab-runner: 15.8.0 -> 15.8.2 https://gitlab.com/gitlab-org/gitlab-runner/blob/v15.8.2/CHANGELOG.md (cherry picked from commit a7f5d1cb32cb00790ae831aed25c019e65dbfa35) --- .../tools/continuous-integration/gitlab-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 14984ba9519e..29d9412137a9 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -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 = [ From 3b731fc745c323d54a79b1d595c0af79abc45143 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 10 Feb 2023 11:41:22 +0100 Subject: [PATCH 04/15] linux: 5.15.92 -> 5.15.93 (cherry picked from commit 2b45841a0cfeacbcbba0c820014f7aed7119bbdb) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 668f2d8f5df0..d95a5ac8b457 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -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 { })) From cb65abd87d56b63eaf3ec09f94d8342b9e920a9c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 10 Feb 2023 11:41:32 +0100 Subject: [PATCH 05/15] linux: 6.1.10 -> 6.1.11 (cherry picked from commit e684fcd4842991c1dc29cb15b8ef0edc67d342a9) --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 586ae7a0f1eb..c63e7acd196b 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -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 { })) From e9cbddbd0d5bad2486ffed2f9c875c855b4687e2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 10 Feb 2023 11:42:11 +0100 Subject: [PATCH 06/15] linux_latest-libre: 19044 -> 19049 (cherry picked from commit b43216c9230c8f0eb69f343032206f7bd4a18a07) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index e0290a2aec64..7e3ffb4720a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -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"; } , ... }: From 97bfd2544355213e04539805e1d978151cd634eb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 10 Feb 2023 11:42:30 +0100 Subject: [PATCH 07/15] linux/hardened/patches/4.14: 4.14.304-hardened1 -> 4.14.305-hardened1 (cherry picked from commit e094af5a4c89a510d30b393e9984271d5f620481) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index db4c5b76c413..6933d79a655a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "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": { From 8f078aaecc904a96aac57ad192b7babcaea90bd4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 10 Feb 2023 11:42:37 +0100 Subject: [PATCH 08/15] linux/hardened/patches/4.19: 4.19.271-hardened1 -> 4.19.272-hardened1 (cherry picked from commit aa27dcf0cbb23dd6193fe8fb7f6428e26f1861d0) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 6933d79a655a..e1be55b1f32b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "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": { From b8b9300e66f69607dd6336c45125511560df3c39 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 10 Feb 2023 11:42:45 +0100 Subject: [PATCH 09/15] linux/hardened/patches/5.10: 5.10.166-hardened1 -> 5.10.167-hardened1 (cherry picked from commit b1033b4ae4c6fc9dfa315befa3434c78fce6aa69) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index e1be55b1f32b..fb35ebf9d3ad 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "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": { From 524962171b3eff94bae2a61510f4731e3b44ec9e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 10 Feb 2023 11:42:52 +0100 Subject: [PATCH 10/15] linux/hardened/patches/5.15: 5.15.91-hardened1 -> 5.15.92-hardened1 (cherry picked from commit 2acd1ca6dc84e44919a6e73ae0bd154a91dac8d1) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index fb35ebf9d3ad..7384b142f03e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "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": { From e1927b6cc0b490871de2cfcbb217f39835e97a22 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 10 Feb 2023 11:42:59 +0100 Subject: [PATCH 11/15] linux/hardened/patches/5.4: 5.4.230-hardened1 -> 5.4.231-hardened1 (cherry picked from commit 85947aa9dd7c1e20cc8ec590f0d8681054e3ae8d) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 7384b142f03e..332b5b643507 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "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": { From da547781e56efb18054cb62ec91dd85c5e8f94b3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 10 Feb 2023 11:43:08 +0100 Subject: [PATCH 12/15] linux/hardened/patches/6.1: 6.1.8-hardened1 -> 6.1.10-hardened1 (cherry picked from commit 98e4c1f8cf7af271edecc60f0b5f7a8236068d49) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 332b5b643507..88fad3e8aa62 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "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" } } From 6fa1c18381356e98ae318084f3da849e9fe7e04f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 02:43:28 +0000 Subject: [PATCH 13/15] tilt: 0.30.9 -> 0.30.13 (cherry picked from commit 70227a2bc73b65a3f2e095d4f6d80030eea4446d) --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 339564f52a04..19aaa36c7eb6 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -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.30.13"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vZthFaIsgpZ2aap9kRSH//AHHnOpekPIkwpz9Tt0lI4="; + sha256 = "sha256-W67aQIXp2TOtZuccjQUGC9gNtvdyUNWuU7VM2LOFkCg="; }; vendorSha256 = null; From 7b6cc8561c97df63900edbc4697a8af388d3fa43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20=C5=BDlender?= Date: Sun, 12 Feb 2023 10:09:34 +0000 Subject: [PATCH 14/15] tilt: 0.30.13 -> 0.31.2 (cherry picked from commit 3a672c775e0fd20df63c8370522b67a6e9445430) --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 19aaa36c7eb6..ebb28798f55e 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -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.13"; + version = "0.31.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W67aQIXp2TOtZuccjQUGC9gNtvdyUNWuU7VM2LOFkCg="; + sha256 = "sha256-Wn7e2g1KPnFgFuRPUh3g0FW/m0qRHV5reO+AZbhbaC8="; }; vendorSha256 = null; From 38b81240fc7b2edad94951993f1e4f9f5cedb563 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 12 Feb 2023 14:33:23 +0000 Subject: [PATCH 15/15] v8_8_x: restrict compiler version check to GCC Fixes: 519f9b3d298 ("v8_8_x: mark broken with GCC 12") (cherry picked from commit a302856aaac3023c2be10ea4632b90cf146ad9ee) --- pkgs/development/libraries/v8/8_x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/v8/8_x.nix b/pkgs/development/libraries/v8/8_x.nix index b467bd83e2d4..d55d87f32164 100644 --- a/pkgs/development/libraries/v8/8_x.nix +++ b/pkgs/development/libraries/v8/8_x.nix @@ -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"; }; }