From 77e83c420cf2cc33615ed02364beeacaad767661 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sat, 7 Dec 2024 20:57:45 +0000 Subject: [PATCH] chore(deps): lock file maintenance (#421) Reviewed-on: https://gitea.hillion.co.uk/JakeHillion/nixos/pulls/421 Co-authored-by: Jake Hillion Co-committed-by: Jake Hillion --- flake.lock | 44 +++++++++++++++++----------------- modules/sched_ext.nix | 2 -- modules/services/downloads.nix | 8 +++++++ 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 2c26a8d..7040fa5 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1732324260, - "narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1732284644, - "narHash": "sha256-REGLarOB5McRMmFtOgNihEXXQILY6+2UBAY8lw8CJCI=", + "lastModified": 1733168902, + "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "owner": "nix-community", "repo": "disko", - "rev": "abc8baff333ac9dca930fc4921a26a8fc248e442", + "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1732319136, - "narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=", + "lastModified": 1733482664, + "narHash": "sha256-ZD+h1fwvZs+Xvg46lzTWveAqyDe18h9m7wZnTIJfFZ4=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8831cc700030e11fc91da9ef6270593e6440edc", + "rev": "e38d3dd1d355a003cc63e8fe6ff66ef2257509ed", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1732303962, - "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -159,11 +159,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732141811, - "narHash": "sha256-hLuH8SmdcUy8Ypq68PBJbHfJy/06diDz+n1F0Md8GkM=", - "rev": "6306f51fa5d409f1e9b60edbe9bd6a1255181e5a", + "lastModified": 1733481109, + "narHash": "sha256-4v20F3/vRN4znQygwbXW7FsYPG7zeZpqdkbs22hfxMg=", + "rev": "8132917b012bed7a876f63250001e3a2921adc40", "type": "tarball", - "url": "https://gitea.hillion.co.uk/api/v1/repos/JakeHillion/nixpkgs/archive/6306f51fa5d409f1e9b60edbe9bd6a1255181e5a.tar.gz" + "url": "https://gitea.hillion.co.uk/api/v1/repos/JakeHillion/nixpkgs/archive/8132917b012bed7a876f63250001e3a2921adc40.tar.gz" }, "original": { "type": "tarball", diff --git a/modules/sched_ext.nix b/modules/sched_ext.nix index da5ded7..6443a29 100644 --- a/modules/sched_ext.nix +++ b/modules/sched_ext.nix @@ -19,8 +19,6 @@ in else if pkgs.linuxPackages_latest.kernelAtLeast "6.12" then pkgs.linuxPackages_latest else if pkgs.unstable.linuxPackages_latest.kernelAtLeast "6.12" then pkgs.unstable.linuxPackages_latest else pkgs.unstable.linuxPackages_testing; - - environment.systemPackages = with pkgs; [ unstable.scx.layered unstable.scx.lavd ]; }; } diff --git a/modules/services/downloads.nix b/modules/services/downloads.nix index 51962ab..accdcd2 100644 --- a/modules/services/downloads.nix +++ b/modules/services/downloads.nix @@ -120,6 +120,14 @@ in config = (hostConfig: ({ config, pkgs, ... }: { config = { + # TODO: remove me as soon as the Arrs are compatible with a newer version + nixpkgs.config.permittedInsecurePackages = [ + "aspnetcore-runtime-6.0.36" + "aspnetcore-runtime-wrapped-6.0.36" + "dotnet-sdk-wrapped-6.0.428" + "dotnet-sdk-6.0.428" + ]; + system.stateVersion = "23.05"; ids = hostConfig.ids;