eriedaberrie/shapefile-thing
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Stop importing nixpkgs

Browse source
This commit is contained in:
eriedaberrie 2024-04-16 10:18:09 -07:00
parent 959488f9c6
commit fab8f67b82
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1710806803, "lastModified": 1712963716,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github" "type": "github"
}, },
"original": { "original": {

21
flake.nix
View file

@ -6,16 +6,13 @@
nixpkgs, nixpkgs,
}: let }: let
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
genSystems = lib.genAttrs [ forSystems = f: lib.genAttrs [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
]; ] (system: f nixpkgs.legacyPackages.${system});
pkgsFor = system: import nixpkgs {inherit system;};
in {
packages = genSystems (
system: let
pkgs = pkgsFor system;
in { in {
packages = forSystems (
pkgs: {
default = pkgs.callPackage ./. {}; default = pkgs.callPackage ./. {};
static = pkgs.pkgsStatic.callPackage ./. { static = pkgs.pkgsStatic.callPackage ./. {
strip = true; strip = true;
@ -23,13 +20,11 @@
} }
); );
devShells = genSystems ( devShells = forSystems (
system: let pkgs: {
pkgs = pkgsFor system;
in {
default = pkgs.mkShell { default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [clang-tools]; nativeBuildInputs = with pkgs; [clang-tools];
inputsFrom = [self.packages.${system}.default]; inputsFrom = [self.packages.${pkgs.system}.default];
}; };
pyShell = pkgs.mkShell { pyShell = pkgs.mkShell {
nativeBuildInputs = [(pkgs.python3.withPackages (ps: with ps; [geopandas]))]; nativeBuildInputs = [(pkgs.python3.withPackages (ps: with ps; [geopandas]))];
@ -37,6 +32,6 @@
} }
); );
formatter = genSystems (system: (pkgsFor system).alejandra); formatter = forSystems (pkgs: pkgs.alejandra);
}; };
} }