From 8bebf8d044c3ce0673abafda01825b0877b4253d Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Wed, 6 Nov 2024 11:36:16 +0100 Subject: [PATCH] pkgs: move permittedInsecurePackages to pkgs for bolt-launcher --- flake.lock | 118 ++++++++++++++++---------------- flake.nix | 2 +- home/programs/games/default.nix | 10 +-- pkgs/default.nix | 15 +++- 4 files changed, 75 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index 27980a4..658f043 100644 --- a/flake.lock +++ b/flake.lock @@ -134,11 +134,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1730013417, - "narHash": "sha256-nZ6ylS3/FAjsi9wwdZJpzIV0+bgJDAurZAi0w9q1Nxw=", + "lastModified": 1730865784, + "narHash": "sha256-6kJYNjVCyf1tYgpqm7QOYcMkkD/RsaSfrsC2+ojmFAI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "e9ec8d2766bbe4d242c9255247197372ac64f885", + "rev": "b8d22442e09a02eb8b830d41726ac371be21b7cd", "type": "gitlab" }, "original": { @@ -240,11 +240,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -327,11 +327,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -424,11 +424,11 @@ ] }, "locked": { - "lastModified": 1730016908, - "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "e83414058edd339148dc142a8437edb9450574c8", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -555,11 +555,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1730021052, - "narHash": "sha256-AnCitOqPs+gCGEUKl2lBX2cfd59aUKOz592Bs2pAw1A=", + "lastModified": 1730875971, + "narHash": "sha256-VpTY0Urm0tebIndEP3qCsfAEjh8IB0d9j7XRZkNLRrw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ac40d2eb544d4e3a4d601a265533ecdf0e946305", + "rev": "563b10c27839d0b08353d4cd3563e0f9beb3468d", "type": "github" }, "original": { @@ -588,11 +588,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1729744939, - "narHash": "sha256-QbfaNQa93yt4KKg5XNi1tUIfGoDIohxFp/PmHi8sruU=", + "lastModified": 1730871742, + "narHash": "sha256-wK7UD90LxLr8oELIYPhUS6+IPU32JGESaHd/tny5/ig=", "owner": "YaLTeR", "repo": "niri", - "rev": "c8044a9b5dbdb3e0648c86a00bfb63acfc06a559", + "rev": "8867a4f84c4bd07235abd37828b0d724321facbe", "type": "github" }, "original": { @@ -608,11 +608,11 @@ ] }, "locked": { - "lastModified": 1729999765, - "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", + "lastModified": 1730604744, + "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", + "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", "type": "github" }, "original": { @@ -623,11 +623,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729742320, - "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", + "lastModified": 1730886862, + "narHash": "sha256-wCZtRGM1NGxq6VG4+TMzfsa4cuG2VJVtowtYuWW5W3g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", + "rev": "90642a0deae927fa911d49d4f7c5616257105141", "type": "github" }, "original": { @@ -666,14 +666,14 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs-lib_3": { @@ -706,11 +706,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -754,11 +754,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -770,11 +770,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -977,11 +977,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1728378979, - "narHash": "sha256-CW/5Cs9m8HupL+6iRMpdHE88OmK9MXH2h3BcXCQw440=", + "lastModified": 1730289819, + "narHash": "sha256-GYEgdCLzNODbMNEeYbMa5EWgEwTEMxdSSPTz8uEwZdQ=", "owner": "notashelf", "repo": "nvf", - "rev": "0947ab38c0bc79780eec599161306157b8de74a3", + "rev": "8ff50562d7203a2b87bc6409e806f13b115d6b48", "type": "github" }, "original": { @@ -1000,11 +1000,11 @@ ] }, "locked": { - "lastModified": 1729710171, - "narHash": "sha256-2sVt2hbL+G0FzEESm/EZBewPOmNtZ6MTnYhsvHJW6Rs=", + "lastModified": 1730635861, + "narHash": "sha256-Npp3pl9aeAiq+wZPDbw2ZxybNuZWyuN7AY6fik56DCo=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "247a8e677b51f053ca89dcf67059e24f85e47391", + "rev": "293668587937daae1df085ee36d2b2d0792b7a0f", "type": "github" }, "original": { @@ -2776,11 +2776,11 @@ ] }, "locked": { - "lastModified": 1726280639, - "narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=", + "lastModified": 1729477859, + "narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e9f8641c92f26fd1e076e705edb12147c384171d", + "rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1", "type": "github" }, "original": { @@ -2914,11 +2914,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1730025913, - "narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { @@ -2974,11 +2974,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1729006311, - "narHash": "sha256-1xtKJHu6CFnOhp4snof+WSTwcdPgwIaD6mBODP/cv3w=", + "lastModified": 1730734444, + "narHash": "sha256-lNgCAphrq3/bYGjgDxEl2rVcer6GnmfWXDhxc+kdYOk=", "owner": "wez", "repo": "wezterm", - "rev": "9ddca7bde92090792dbcdc65c1e9897c362196d7", + "rev": "51c794ac500a2033b9dc570c71810518bfa667a9", "type": "github" }, "original": { @@ -2992,16 +2992,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1718165778, - "narHash": "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI=", + "lastModified": 1730166465, + "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b6d281967cb0b7bf1dfdb8d0f597b517dc4aa5c5", + "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.4", + "ref": "v0.5", "repo": "xwayland-satellite", "type": "github" } @@ -3009,11 +3009,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1729838433, - "narHash": "sha256-o9D859STqawTSe6mkXpm3xR/gitYgOHy32xOhOfT3vw=", + "lastModified": 1730258684, + "narHash": "sha256-E+69sdxUhPSNI8+JlTL6KKbNv5qVD3L1y8hdVO37A44=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "67efa2c559b53d3ca90c131c06c247278783880d", + "rev": "b0ee6db9fa9901c675b3c7e952c2a8ce987a0f58", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 028b60f..3729456 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper); nixosModules = import ./modules; nixosConfigurations = import ./hosts {inherit self inputs;}; - packages = eachSystem (pkgs: import ./pkgs pkgs); + packages = eachSystem (pkgs: import ./pkgs {inherit inputs pkgs;}); deploy.nodes = import ./nodes {inherit self inputs;}; }; inputs = { diff --git a/home/programs/games/default.nix b/home/programs/games/default.nix index 7c0571b..f0d61d2 100644 --- a/home/programs/games/default.nix +++ b/home/programs/games/default.nix @@ -11,17 +11,11 @@ pkgs.protonplus pkgs.r2modman - pkgs - . # steamtinkerlaunch dependencies - pkgs - .xdotool + # steamtinkerlaunch dependencies + pkgs.xdotool pkgs.xorg.xwininfo pkgs.yad inputs.self.packages.${pkgs.system}.bolt-launcher - # this is really ugly but needed since packages uses its own version of nixpkgs and i dont want to override flake-level nixpkgs - (pkgs.callPackage - ../../../pkgs/bolt-launcher.nix - {}) ]; } diff --git a/pkgs/default.nix b/pkgs/default.nix index 876d93b..babc1be 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,15 @@ -pkgs: { +{ + inputs, + pkgs, + ... +}: { mcuxpresso = import ./mcuxpresso pkgs; - bolt-launcher = pkgs.callPackage ./bolt-launcher.nix {}; + # unfortunately needed since bolt-launcher uses openssl-1.1.1w (as this is a flake output, it cannot use the host's nixpkgs instance so we have to override it here) + bolt-launcher = + (import inputs.nixpkgs { + config.permittedInsecurePackages = ["openssl-1.1.1w"]; + inherit (pkgs) system; + }) + .callPackage + ./bolt-launcher.nix {}; }