Remove nix-alien

This commit is contained in:
traxys 2023-10-29 17:38:58 +01:00
parent 36f9bc29bc
commit 5825b20d85
3 changed files with 99 additions and 230 deletions

309
flake.lock generated
View file

@ -116,22 +116,6 @@
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1673956053,
@ -181,21 +165,6 @@
}
},
"flake-utils_10": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_11": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
@ -210,9 +179,9 @@
"type": "github"
}
},
"flake-utils_12": {
"flake-utils_11": {
"inputs": {
"systems": "systems_10"
"systems": "systems_9"
},
"locked": {
"lastModified": 1681202837,
@ -269,11 +238,11 @@
"systems": "systems_4"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
@ -287,11 +256,11 @@
"systems": "systems_5"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@ -304,24 +273,6 @@
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_7": {
"inputs": {
"systems": "systems_7"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@ -336,9 +287,9 @@
"type": "github"
}
},
"flake-utils_8": {
"flake-utils_7": {
"inputs": {
"systems": "systems_8"
"systems": "systems_7"
},
"locked": {
"lastModified": 1694529238,
@ -354,9 +305,9 @@
"type": "github"
}
},
"flake-utils_9": {
"flake-utils_8": {
"inputs": {
"systems": "systems_9"
"systems": "systems_8"
},
"locked": {
"lastModified": 1681202837,
@ -372,6 +323,21 @@
"type": "github"
}
},
"flake-utils_9": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -529,7 +495,7 @@
},
"naersk_3": {
"inputs": {
"nixpkgs": "nixpkgs_9"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1694081375,
@ -547,7 +513,7 @@
},
"naersk_4": {
"inputs": {
"nixpkgs": "nixpkgs_12"
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1662220400,
@ -565,7 +531,7 @@
},
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nvim-traxys",
"nixpkgs"
@ -603,47 +569,10 @@
"type": "github"
}
},
"nix-alien": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3",
"nix-filter": "nix-filter",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1698367638,
"narHash": "sha256-8g4HAU+kwTxb/RZBFxJw3wLckMGpKdN+7yDbTIGupVU=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "7b3be1a706c8db4dcca777b6638bdb2ca4849176",
"type": "github"
},
"original": {
"owner": "thiagokokada",
"repo": "nix-alien",
"type": "github"
}
},
"nix-filter": {
"locked": {
"lastModified": 1694857738,
"narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "41fd48e00c22b4ced525af521ead8792402de0ea",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1698541868,
@ -660,24 +589,6 @@
}
},
"nix-index-database": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1697340827,
"narHash": "sha256-XlrR68N7jyaZ0bs8TPrhqcWG0IPG3pbjrKzJMpYOsos=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "29977d0796c058bbcfb2df5b18eb5badf1711007",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nix-index-database",
"type": "github"
}
},
"nix-index-database_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
@ -699,7 +610,7 @@
},
"nix-ld": {
"inputs": {
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1698486730,
@ -799,38 +710,6 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1694948089,
"narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1681358109,
"narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_12": {
"locked": {
"lastModified": 1662096612,
"narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=",
@ -844,7 +723,7 @@
"type": "indirect"
}
},
"nixpkgs_13": {
"nixpkgs_11": {
"locked": {
"lastModified": 1664780719,
"narHash": "sha256-Oxe6la5dSqRfJogjtY4sRzJjDDqvroJIVkcGEOT87MA=",
@ -860,7 +739,7 @@
"type": "github"
}
},
"nixpkgs_14": {
"nixpkgs_12": {
"locked": {
"lastModified": 1659102345,
"narHash": "sha256-Vbzlz254EMZvn28BhpN8JOi5EuKqnHZ3ujFYgFcSGvk=",
@ -876,7 +755,7 @@
"type": "github"
}
},
"nixpkgs_15": {
"nixpkgs_13": {
"locked": {
"lastModified": 1681358109,
"narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
@ -923,38 +802,6 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1697723726,
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1697723726,
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1698336494,
"narHash": "sha256-sO72WDBKyijYD1GcKPlGsycKbMBiTJMBCnmOxLAs880=",
@ -970,7 +817,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_5": {
"locked": {
"lastModified": 1686752049,
"narHash": "sha256-GtSbXZ6ia/o+f/I5O/5ee8HGmKuwQWZhtyd2u5y5TOk=",
@ -985,7 +832,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_6": {
"locked": {
"lastModified": 1698318101,
"narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
@ -1001,7 +848,7 @@
"type": "github"
}
},
"nixpkgs_9": {
"nixpkgs_7": {
"locked": {
"lastModified": 1694948089,
"narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=",
@ -1015,10 +862,42 @@
"type": "indirect"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1694948089,
"narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1681358109,
"narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"beautysh": "beautysh",
"flake-utils": "flake-utils_6",
"flake-utils": "flake-utils_5",
"nixpkgs": [
"nvim-traxys",
"nixpkgs"
@ -1056,7 +935,7 @@
},
"nvim-traxys": {
"inputs": {
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"neovim-flake": "neovim-flake",
"new-plugin:vim-headerguard": "new-plugin:vim-headerguard",
"nixfiles": [],
@ -1892,8 +1771,8 @@
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_7",
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_6",
"gitignore": "gitignore",
"nixpkgs": [
"nvim-traxys",
@ -1918,10 +1797,10 @@
},
"raclette": {
"inputs": {
"flake-utils": "flake-utils_8",
"flake-utils": "flake-utils_7",
"hyperfine": "hyperfine",
"naersk": "naersk_3",
"nixpkgs": "nixpkgs_10",
"nixpkgs": "nixpkgs_8",
"rust-overlay": "rust-overlay_2"
},
"locked": {
@ -1940,9 +1819,9 @@
},
"roaming_proxy": {
"inputs": {
"flake-utils": "flake-utils_10",
"flake-utils": "flake-utils_9",
"naersk": "naersk_4",
"nixpkgs": "nixpkgs_13",
"nixpkgs": "nixpkgs_11",
"rust-overlay": "rust-overlay_3"
},
"locked": {
@ -1968,11 +1847,10 @@
"meson-syntax": "meson-syntax",
"mujmap": "mujmap",
"naersk": "naersk_2",
"nix-alien": "nix-alien",
"nix-gaming": "nix-gaming",
"nix-index-database": "nix-index-database_2",
"nix-index-database": "nix-index-database",
"nix-ld": "nix-ld",
"nixpkgs": "nixpkgs_8",
"nixpkgs": "nixpkgs_6",
"nixpkgs-traxys": "nixpkgs-traxys",
"nur": "nur",
"nvim-traxys": "nvim-traxys",
@ -2013,8 +1891,8 @@
},
"rust-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_9",
"nixpkgs": "nixpkgs_11"
"flake-utils": "flake-utils_8",
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1694916722,
@ -2032,8 +1910,8 @@
},
"rust-overlay_3": {
"inputs": {
"flake-utils": "flake-utils_11",
"nixpkgs": "nixpkgs_14"
"flake-utils": "flake-utils_10",
"nixpkgs": "nixpkgs_12"
},
"locked": {
"lastModified": 1664938250,
@ -2051,8 +1929,8 @@
},
"rust-overlay_4": {
"inputs": {
"flake-utils": "flake-utils_12",
"nixpkgs": "nixpkgs_15"
"flake-utils": "flake-utils_11",
"nixpkgs": "nixpkgs_13"
},
"locked": {
"lastModified": 1698545594,
@ -2099,21 +1977,6 @@
"type": "github"
}
},
"systems_10": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,

View file

@ -9,7 +9,6 @@
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-alien.url = "github:thiagokokada/nix-alien";
nix-ld.url = "github:Mic92/nix-ld/main";
nvim-traxys = {
url = "github:traxys/nvim-flake";
@ -67,7 +66,18 @@
}
// (nixpkgs.legacyPackages."${system}".callPackage ./_sources/generated.nix {});
pkgList = system: callPackage:
# TODO: track nixos/nixpkgs#263599
pkgList = system: callPackage: let
nixpkgs-freecad =
import (nixpkgs.legacyPackages.${system}.fetchFromGitHub {
owner = "andir";
repo = "nixpkgs";
rev = "084890f7f50d23eb48a9a4b75b8a7893d5a01026";
hash = "sha256-q7Y/KNKsny6Ey5kMIdXS1xhV2R9u94qTek2Uy7HzN+U=";
}) {
inherit system;
};
in
(import ./pkgs/default.nix {
inherit callPackage;
sources = sources system;
@ -77,6 +87,7 @@
raclette = inputs.raclette.defaultPackage."${system}";
neovimTraxys = inputs.nvim-traxys.packages."${system}".nvim;
roaming_proxy = inputs.roaming_proxy.defaultPackage."${system}";
inherit (nixpkgs-freecad) freecad;
inherit (nixpkgs-traxys.legacyPackages."${system}") groovy-language-server;
inherit (inputs.mujmap.packages."${system}") mujmap;
};
@ -137,7 +148,6 @@
nixpkgs.overlays = [
inputs.nur.overlay
inputs.rust-overlay.overlays.default
inputs.nix-alien.overlays.default
inputs.comma.overlays.default
(final: prev: pkgList system prev.callPackage)
(final: prev: inputs.nix-gaming.packages."${system}")
@ -184,7 +194,6 @@
nixpkgs.overlays = [
inputs.nur.overlay
inputs.rust-overlay.overlays.default
inputs.nix-alien.overlays.default
inputs.comma.overlays.default
(final: prev: pkgList system prev.callPackage)
(final: prev: inputs.nix-gaming.packages."${system}")
@ -232,7 +241,6 @@
nixpkgs.overlays = [
inputs.nur.overlay
inputs.rust-overlay.overlays.default
inputs.nix-alien.overlays.default
inputs.comma.overlays.default
(final: prev: pkgList system prev.callPackage)
(final: prev: inputs.nix-gaming.packages."${system}")
@ -283,7 +291,6 @@
overlays = [
inputs.nur.overlay
inputs.rust-overlay.overlays.default
inputs.nix-alien.overlays.default
inputs.comma.overlays.default
(final: prev: pkgList system prev.callPackage)
(final: prev: inputs.nix-gaming.packages."${system}")

View file

@ -3,7 +3,6 @@
bitwarden-cli
hbw
kabalist_cli
nix-alien
tokei
xdg-ninja
zk