From 2d1925d0c5f7ae7cbf2b4fcefc7087adee618b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com> Date: Sun, 18 May 2025 15:53:03 +0200 Subject: [PATCH] fix(system): remove nix-alien again Does not work with custom nixpkgs, and I do not want to add another nixpkgs input just for nix-alien. --- flake.lock | 65 +++-------------------------------------------- flake.nix | 5 ---- system/nix-ld.nix | 6 +---- 3 files changed, 4 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index d96343c..cb3b0a6 100644 --- a/flake.lock +++ b/flake.lock @@ -155,21 +155,6 @@ } }, "flake-compat_3": { - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "flake": false, "locked": { "lastModified": 1746162366, @@ -185,7 +170,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -346,49 +331,6 @@ "type": "gitlab" } }, - "nix-alien": { - "inputs": { - "flake-compat": "flake-compat_3", - "nix-index-database": "nix-index-database", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747293822, - "narHash": "sha256-1R3Ro+RQCUUnIFZDObP9/2QBLk3xvgbXU67Qii+YZ8s=", - "owner": "thiagokokada", - "repo": "nix-alien", - "rev": "ea7eb3a76520fa8d92879afb819756ffc0bc629e", - "type": "github" - }, - "original": { - "owner": "thiagokokada", - "repo": "nix-alien", - "type": "github" - } - }, - "nix-index-database": { - "inputs": { - "nixpkgs": [ - "nix-alien", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746934494, - "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", - "owner": "nix-community", - "repo": "nix-index-database", - "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index-database", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1643502816, @@ -406,7 +348,7 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ], @@ -530,7 +472,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -560,7 +502,6 @@ "flake-utils": "flake-utils", "home-manager": "home-manager_2", "matrix-appservices": "matrix-appservices", - "nix-alien": "nix-alien", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index d2c1853..7d68912 100644 --- a/flake.nix +++ b/flake.nix @@ -28,11 +28,6 @@ rec { flake-utils.url = "github:numtide/flake-utils"; - nix-alien = { - url = "github:thiagokokada/nix-alien"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/system/nix-ld.nix b/system/nix-ld.nix index d7f77ab..aaab925 100644 --- a/system/nix-ld.nix +++ b/system/nix-ld.nix @@ -1,9 +1,5 @@ -{ inputs, pkgs, ... }: +{ ... }: { - environment.systemPackages = [ - inputs.nix-alien.packages.${pkgs.system}.nix-alien - ]; - programs.nix-ld.enable = true; }