aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--flake.lock12
-rw-r--r--flake.nix8
-rw-r--r--org/config_nix.org8
3 files changed, 14 insertions, 14 deletions
diff --git a/flake.lock b/flake.lock
index 020648b..13821c5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1709126324,
- "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+ "lastModified": 1710146030,
+ "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+ "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1709968316,
- "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=",
+ "lastModified": 1710889954,
+ "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0e7f98a5f30166cbed344569426850b21e4091d4",
+ "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index b1be7ea..a1d7495 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,8 +9,8 @@
} @ inputs: let
pname = "spine";
version = "0.14.0";
- shell = ./shell.nix; # ./default.nix;
- devEnv = ./nixDevEnv.sh; # ./shell.nix; # ./default.nix; # ./.envrc;
+ shell = ./shell.nix;
+ devEnv = ./nixDevEnv.sh;
supportedSystems = ["x86_64-linux"]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); # nixpkgs instantiated for supported system types
@@ -22,8 +22,8 @@
localOverlay = (final: prev: {
ldc = prev.callPackage ./nix-overlays/ldc { };
dmd = prev.callPackage ./nix-overlays/dmd { };
- dub = prev.callPackage ./nix-overlays/dub { }; # -> ?
- #gdc = prev.callPackage ./nix-overlays/gdc { }; # empty
+ dub = prev.callPackage ./nix-overlays/dub { };
+ #gdc = prev.callPackage ./nix-overlays/gdc { };
});
pkgsForSystem = system: import nixpkgs {
overlays = [
diff --git a/org/config_nix.org b/org/config_nix.org
index f1073bd..345a1b3 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -32,8 +32,8 @@
} @ inputs: let
pname = "spine";
version = "0.14.0";
- shell = ./shell.nix; # ./default.nix;
- devEnv = ./nixDevEnv.sh; # ./shell.nix; # ./default.nix; # ./.envrc;
+ shell = ./shell.nix;
+ devEnv = ./nixDevEnv.sh;
supportedSystems = ["x86_64-linux"]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); # nixpkgs instantiated for supported system types
@@ -45,8 +45,8 @@
localOverlay = (final: prev: {
ldc = prev.callPackage ./nix-overlays/ldc { };
dmd = prev.callPackage ./nix-overlays/dmd { };
- dub = prev.callPackage ./nix-overlays/dub { }; # -> ?
- #gdc = prev.callPackage ./nix-overlays/gdc { }; # empty
+ dub = prev.callPackage ./nix-overlays/dub { };
+ #gdc = prev.callPackage ./nix-overlays/gdc { };
});
pkgsForSystem = system: import nixpkgs {
overlays = [