diff options
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | org/config_nix.org | 34 |
3 files changed, 40 insertions, 8 deletions
@@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677534593, - "narHash": "sha256-PuZSAHeq4/9pP/uYH1FcagQ3nLm/DrDrvKi/xC9glvw=", + "lastModified": 1678875422, + "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ad64d9e2d5bf80c877286102355b1625891ae9a", + "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459", "type": "github" }, "original": { @@ -1,6 +1,6 @@ { description = "a sisu like parser & document generator"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # "github:nixos/nixpkgs"; "github:NixOS/nixpkgs/nixpkgs-unstable"; "nixpkgs/nixos-unstable"; "nixpkgs/nixos-21.11"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils } @inputs: let diff --git a/org/config_nix.org b/org/config_nix.org index 9c68f88..b01a5e5 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -88,7 +88,7 @@ export SpineSQLdb='spine.search.db' #+BEGIN_SRC nix { description = "a sisu like parser & document generator"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # "github:nixos/nixpkgs"; "github:NixOS/nixpkgs/nixpkgs-unstable"; "nixpkgs/nixos-unstable"; "nixpkgs/nixos-21.11"; + inputs.nixpkgs.url = "<<nixpkgs_url>>"; inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils } @inputs: let @@ -330,6 +330,16 @@ export SpineSQLdb='spine.search.db' } #+END_SRC +#+BEGIN_SRC nix +pname = "spine"; +version = "<<spine_version_set>>"; +shell = ./shell.nix; # ./default.nix; +devEnv = ./.envrc; # ./shell.nix; # ./default.nix; +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. +#+END_SRC + *** flake :flake: **** notes? @@ -1065,6 +1075,28 @@ git #+END_SRC ** variables +*** nixpkgs path +**** selected + +#+NAME: nixpkgs_url +#+BEGIN_SRC sh +<<nixpkgs_url_github>> +#+END_SRC + +**** github official + +#+NAME: nixpkgs_url_github +#+BEGIN_SRC sh +github:NixOS/nixpkgs/nixpkgs-unstable +#+END_SRC + +**** localhost + +#+NAME: nixpkgs_url_local +#+BEGIN_SRC sh +/srv/nix/nixpkgs +#+END_SRC + *** spine version SET VERSION :version:set:project: #+NAME: spine_version_set |