chore(3p/sources): bump nixpkgs channels & overlays
* 3p/buzz: delete package This is unused, old, and uses an insecure version of OpenSSL which broke eval. * 3p/overlays: remove nvd patch Newer versions of nvd are compatible with Nix 2.3 by default. * users/grfn/system/home: remove explicit rust-analyser package This conflicts with `rustup`, causing eval failures, as the wrapper seems to now be included in `rustup` by default. * users/grfn/system: temporarily disable ISO builds They were broken upstream in nixpkgs by a change to stdenv/setup.sh, being fixed in https://github.com/NixOS/nixpkgs/pull/234883 Change-Id: I0eea99ec98f4e73e615c012ffae1d0e37122e73b Reviewed-on: https://cl.tvl.fyi/c/depot/+/8585 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Autosubmit: tazjin <tazjin@tvl.su>
This commit is contained in:
Vincent Ambo
clbot
parent
48b66a8982
commit
e3c5eb3313
6 changed files with 25 additions and 71 deletions
30
third_party/buzz/default.nix
vendored
30
third_party/buzz/default.nix
vendored
|
|
@ -1,30 +0,0 @@
|
|||
{ depot, pkgs, ... }:
|
||||
|
||||
depot.third_party.naersk.buildPackage {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "jonhoo";
|
||||
repo = "buzz";
|
||||
rev = "02479643ed1b0325050245dbb3b70411b8cffb7a";
|
||||
sha256 = "1spklfv02qlinlail5rmhh1c4926gyrkr2ydd9g6z919rxkl0ywk";
|
||||
};
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
pkg-config
|
||||
dbus
|
||||
glib
|
||||
openssl_1_1
|
||||
cairo
|
||||
pango
|
||||
atk
|
||||
gdk-pixbuf
|
||||
gtk3
|
||||
dbus-glib
|
||||
libappindicator-gtk3
|
||||
llvmPackages.llvm
|
||||
llvmPackages.bintools
|
||||
llvmPackages.clang
|
||||
llvmPackages.libclang
|
||||
];
|
||||
|
||||
LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib/libclang.so";
|
||||
}
|
||||
12
third_party/overlays/patches/nvd-nix-2.3.patch
vendored
12
third_party/overlays/patches/nvd-nix-2.3.patch
vendored
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/src/nvd b/src/nvd
|
||||
index 4caf646..793fc60 100755
|
||||
--- a/src/nvd
|
||||
+++ b/src/nvd
|
||||
@@ -440,7 +440,6 @@ def query_closure_disk_usage_bytes(target: Path) -> Optional[int]:
|
||||
stdout = subprocess.run(
|
||||
[
|
||||
make_nix_bin_path("nix"), "path-info",
|
||||
- "--extra-experimental-features", "nix-command",
|
||||
"--closure-size", target_str,
|
||||
],
|
||||
stdout=PIPE,
|
||||
6
third_party/overlays/tvl.nix
vendored
6
third_party/overlays/tvl.nix
vendored
|
|
@ -39,12 +39,6 @@ depot.nix.readTree.drvTargets {
|
|||
nix = self.nix_2_3;
|
||||
nix_latest = super.nix;
|
||||
|
||||
nvd = super.nvd.overrideAttrs (old: {
|
||||
patches = old.patches or [ ] ++ [
|
||||
./patches/nvd-nix-2.3.patch
|
||||
];
|
||||
});
|
||||
|
||||
# Too match telega in emacs-overlay or wherever
|
||||
tdlib = super.tdlib.overrideAttrs (_: {
|
||||
version = "1.8.12";
|
||||
|
|
|
|||
42
third_party/sources/sources.json
vendored
42
third_party/sources/sources.json
vendored
|
|
@ -5,10 +5,10 @@
|
|||
"homepage": "https://matrix.to/#/#agenix:nixos.org",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "92197270a1eedd142a4aff853e4cc6d1e838c22f",
|
||||
"sha256": "1nph97k9qci53ngxsghw82mzqw5szjbkz9viswf43bx33nxc8rik",
|
||||
"rev": "db5637d10f797bb251b94ef9040b237f4702cde3",
|
||||
"sha256": "07f60gvrc2ianxa3s4lzjmlpps1vbi8scjiyz45813dbgavxcmix",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/ryantm/agenix/archive/92197270a1eedd142a4aff853e4cc6d1e838c22f.tar.gz",
|
||||
"url": "https://github.com/ryantm/agenix/archive/db5637d10f797bb251b94ef9040b237f4702cde3.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"emacs-overlay": {
|
||||
|
|
@ -17,10 +17,10 @@
|
|||
"homepage": "",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "ed6438672d7f9fcb2b11df7c0a626c24cc5f93d4",
|
||||
"sha256": "1wmz632sk3clnqj938ncjckn05l907an2mqziclgqi0pmsfjgzb5",
|
||||
"rev": "77269bb9a0c99fdc5f356eac10b41172775194fc",
|
||||
"sha256": "1m7qzrg7cgsf7l4caz71q1yjngyr48z9n8z701ppbdzk66ydfjfm",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/ed6438672d7f9fcb2b11df7c0a626c24cc5f93d4.tar.gz",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/77269bb9a0c99fdc5f356eac10b41172775194fc.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"home-manager": {
|
||||
|
|
@ -29,10 +29,10 @@
|
|||
"homepage": "https://nix-community.github.io/home-manager/",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "cc9f65d104e5227d103a529a9fc3687ef4ccb117",
|
||||
"sha256": "1cpbb84rv8g6ds301hs9s6r8n9zhss0yym5br03ddl10g2hp9c8h",
|
||||
"rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd",
|
||||
"sha256": "1851n81s5z5gliq9ymcw1k1z46rhgb3q3q8b7qiim2y8phbmdbhy",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/cc9f65d104e5227d103a529a9fc3687ef4ccb117.tar.gz",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/2d963854ae2499193c0c72fd67435fee34d3e4fd.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"impermanence": {
|
||||
|
|
@ -41,10 +41,10 @@
|
|||
"homepage": "",
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"rev": "df1692e2d9f1efc4300b1ea9201831730e0b817d",
|
||||
"sha256": "0nnp5g40lkkmfpvmc7sfws48fji3i0nz1k6pav8vkfk8pd1wl810",
|
||||
"rev": "89253fb1518063556edd5e54509c30ac3089d5e6",
|
||||
"sha256": "095q3c1kyj7lpnn1i53c0158jh02avsm6xmkvql045xppkxfnk1b",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/impermanence/archive/df1692e2d9f1efc4300b1ea9201831730e0b817d.tar.gz",
|
||||
"url": "https://github.com/nix-community/impermanence/archive/89253fb1518063556edd5e54509c30ac3089d5e6.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"naersk": {
|
||||
|
|
@ -77,10 +77,10 @@
|
|||
"homepage": "",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
|
||||
"sha256": "0i9j45jwmqhiv7v8i4dmigaras3iw4hmrds2vvd5x8riln3hyizn",
|
||||
"rev": "4e37b4e55b60fb7d43d2b62deb51032a489bcbe8",
|
||||
"sha256": "11a6j8kkk54518lncic5wa88fa5rski3rq6m9s7qlfngkqsihr0q",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/897876e4c484f1e8f92009fd11b7d988a121a4e7.tar.gz",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/4e37b4e55b60fb7d43d2b62deb51032a489bcbe8.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
|
|
@ -101,10 +101,10 @@
|
|||
"homepage": "",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "4e7fba3f37f5e184ada0ef3cf1e4d8ef450f240b",
|
||||
"sha256": "043iba6g3pmrj9r6cvwr4lcdj9n8ji76wfmqywbkbssc9khmh9d7",
|
||||
"rev": "d6ac24aa7ff658552ce57913df4b0cb823cf15ab",
|
||||
"sha256": "0f7a6p5137vfl03qngksf9j0lqgj1scjhj40ixbdsjiv0bjnw8cr",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/oxalica/rust-overlay/archive/4e7fba3f37f5e184ada0ef3cf1e4d8ef450f240b.tar.gz",
|
||||
"url": "https://github.com/oxalica/rust-overlay/archive/d6ac24aa7ff658552ce57913df4b0cb823cf15ab.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"rustsec-advisory-db": {
|
||||
|
|
@ -113,10 +113,10 @@
|
|||
"homepage": "https://rustsec.org",
|
||||
"owner": "RustSec",
|
||||
"repo": "advisory-db",
|
||||
"rev": "50bed3ba4066e6255dab434dc845e7f655812ce1",
|
||||
"sha256": "0cg8xpk1ywp50zd0n9qbns6yglwqzi5d0sra04g80pbw4rnijx71",
|
||||
"rev": "e162556b9e8c1542c187290453cbd322e8905f0c",
|
||||
"sha256": "18s1zn7wyqw902lyi6r9k726mb6pj475gw4n4ng2danwsmfdnm9i",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/RustSec/advisory-db/archive/50bed3ba4066e6255dab434dc845e7f655812ce1.tar.gz",
|
||||
"url": "https://github.com/RustSec/advisory-db/archive/e162556b9e8c1542c187290453cbd322e8905f0c.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ in
|
|||
|
||||
home.packages = with pkgs; [
|
||||
rustup
|
||||
rust-analyzer
|
||||
cargo-edit
|
||||
cargo-expand
|
||||
cargo-rr
|
||||
|
|
|
|||
|
|
@ -30,7 +30,10 @@ rec {
|
|||
|
||||
yerenSystem = (depot.ops.nixos.nixosFor yeren).system;
|
||||
|
||||
iso = import ./iso.nix args;
|
||||
# TODO(grfn): reenable after
|
||||
# https://github.com/NixOS/nixpkgs/pull/234883 has propagated
|
||||
# through to our channel
|
||||
# iso = import ./iso.nix args;
|
||||
|
||||
meta.ci.targets = [
|
||||
"mugwumpSystem"
|
||||
|
|
|
|||
Loading…
Reference in a new issue