awesome-emacs/nix-doom-emacs
1
0
Fork 0
mirror of https://github.com/nix-community/nix-doom-emacs synced 2025-08-07 12:47:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
László Vaskó
2020-04-27 01:08:55 +02:00
parent 0a1121331a c7217357bb
commit a0ba041e26
2 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
nix/sources.json
View File

@ -5,10 +5,10 @@
"homepage": "", "homepage": "",
"owner": "hlissner", "owner": "hlissner",
"repo": "doom-emacs", "repo": "doom-emacs",
"rev": "afcdae4fff28ab385da93d28cb819c9cd1769597", "rev": "30dea4bf0c3854f991d02efa73c3d38c5d9a7640",
"sha256": "0sg3glhziavrmsf45s4nip8846i67bxdc5b4vw87k4hf3h0jl1if", "sha256": "1kdl10dc91mfxlwac6v16393ysamd2csi2mfw91yr72k82slp898",
"type": "tarball", "type": "tarball",
"url": "https://github.com/hlissner/doom-emacs/archive/afcdae4fff28ab385da93d28cb819c9cd1769597.tar.gz", "url": "https://github.com/hlissner/doom-emacs/archive/30dea4bf0c3854f991d02efa73c3d38c5d9a7640.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"doom-snippets": { "doom-snippets": {
@ -17,10 +17,10 @@
"homepage": "", "homepage": "",
"owner": "hlissner", "owner": "hlissner",
"repo": "doom-snippets", "repo": "doom-snippets",
"rev": "feaedeb5505dedecf0a971b40ac30a1b7b785e52", "rev": "422f683adfbec1b01fe00524690b64dc9e702ae0",
"sha256": "1jwfxx6mlj4zc6lmrk3vrvnsasmaxqnm5pzp9lr60qpf571z90s6", "sha256": "1n1n2hid0cn1dkkivxl5p4c06mvdcnfpyv94f2gw8333bb3hyihc",
"type": "tarball", "type": "tarball",
"url": "https://github.com/hlissner/doom-snippets/archive/feaedeb5505dedecf0a971b40ac30a1b7b785e52.tar.gz", "url": "https://github.com/hlissner/doom-snippets/archive/422f683adfbec1b01fe00524690b64dc9e702ae0.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"emacs-overlay": { "emacs-overlay": {
@ -29,10 +29,10 @@
"homepage": "", "homepage": "",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "edf8dfaea171b245052e110a74d93ef8d5ffc138", "rev": "7dbb74ccb0dccc8e0c67b819871932da27e0376d",
"sha256": "046qadky5vmxrsrj8h5d55dgkl7dwh2kbwrigkgjx77xdhphi5r5", "sha256": "1fnhhvdir1ip5a6ggx6vzjzw915la216bwrhmsbkm9hx8l4jhjhi",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/emacs-overlay/archive/edf8dfaea171b245052e110a74d93ef8d5ffc138.tar.gz", "url": "https://github.com/nix-community/emacs-overlay/archive/7dbb74ccb0dccc8e0c67b819871932da27e0376d.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"emacs-so-long": { "emacs-so-long": {
@ -113,10 +113,10 @@
"homepage": "https://code.orgmode.org/bzg/org-mode", "homepage": "https://code.orgmode.org/bzg/org-mode",
"owner": "emacs-straight", "owner": "emacs-straight",
"repo": "org-mode", "repo": "org-mode",
"rev": "c990d43a64ae8df2834367557fc1c709bcab5218", "rev": "14d6f95bec975d882d5d0a047e81c74a1cd89edc",
"sha256": "014l8fifz4acgjighiic3r95iz18n0nrnfm8bs2hv7wpfibkl7mg", "sha256": "1yyh7y08qcg9bh8s63i2x623vbdjp8ld9arxvznddabyiff431w8",
"type": "tarball", "type": "tarball",
"url": "https://github.com/emacs-straight/org-mode/archive/c990d43a64ae8df2834367557fc1c709bcab5218.tar.gz", "url": "https://github.com/emacs-straight/org-mode/archive/14d6f95bec975d882d5d0a047e81c74a1cd89edc.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"org-yt": { "org-yt": {

66
nix/sources.nix
View File

@ -6,13 +6,13 @@ let
# The fetchers. fetch_<type> fetches specs of type <type>. # The fetchers. fetch_<type> fetches specs of type <type>.
# #
fetch_file = spec: fetch_file = pkgs: spec:
if spec.builtin or true then if spec.builtin or true then
builtins_fetchurl { inherit (spec) url sha256; } builtins_fetchurl { inherit (spec) url sha256; }
else else
pkgs.fetchurl { inherit (spec) url sha256; }; pkgs.fetchurl { inherit (spec) url sha256; };
fetch_tarball = spec: fetch_tarball = pkgs: spec:
if spec.builtin or true then if spec.builtin or true then
builtins_fetchTarball { inherit (spec) url sha256; } builtins_fetchTarball { inherit (spec) url sha256; }
else else
@ -43,46 +43,36 @@ let
'' ''
(builtins_fetchurl { inherit (spec) url sha256; }); (builtins_fetchurl { inherit (spec) url sha256; });
#
# The sources to fetch.
#
sources = builtins.fromJSON (builtins.readFile ./sources.json);
# #
# Various helpers # Various helpers
# #
# The set of packages used when specs are fetched using non-builtins. # The set of packages used when specs are fetched using non-builtins.
pkgs = mkPkgs = sources:
if hasNixpkgsPath let
then sourcesNixpkgs =
if hasThisAsNixpkgsPath import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
then import (builtins_fetchTarball { inherit (sources_nixpkgs) url sha256; }) {} hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
else import <nixpkgs> {} hasThisAsNixpkgsPath = <nixpkgs> == ./.;
else in
import (builtins_fetchTarball { inherit (sources_nixpkgs) url sha256; }) {};
sources_nixpkgs =
if builtins.hasAttr "nixpkgs" sources if builtins.hasAttr "nixpkgs" sources
then sources.nixpkgs then sourcesNixpkgs
else abort else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
import <nixpkgs> {}
else
abort
'' ''
Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
add a package called "nixpkgs" to your sources.json. add a package called "nixpkgs" to your sources.json.
''; '';
hasNixpkgsPath = (builtins.tryEval <nixpkgs>).success;
hasThisAsNixpkgsPath =
(builtins.tryEval <nixpkgs>).success && <nixpkgs> == ./.;
# The actual fetching function. # The actual fetching function.
fetch = name: spec: fetch = pkgs: name: spec:
if ! builtins.hasAttr "type" spec then if ! builtins.hasAttr "type" spec then
abort "ERROR: niv spec ${name} does not have a 'type' attribute" abort "ERROR: niv spec ${name} does not have a 'type' attribute"
else if spec.type == "file" then fetch_file spec else if spec.type == "file" then fetch_file pkgs spec
else if spec.type == "tarball" then fetch_tarball spec else if spec.type == "tarball" then fetch_tarball pkgs spec
else if spec.type == "git" then fetch_git spec else if spec.type == "git" then fetch_git spec
else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
else if spec.type == "builtin-url" then fetch_builtin-url spec else if spec.type == "builtin-url" then fetch_builtin-url spec
@ -117,12 +107,28 @@ let
else else
fetchurl attrs; fetchurl attrs;
in # Create the final "sources" from the config
mkSources = config:
mapAttrs ( mapAttrs (
name: spec: name: spec:
if builtins.hasAttr "outPath" spec if builtins.hasAttr "outPath" spec
then abort then abort
"The values in sources.json should not have an 'outPath' attribute" "The values in sources.json should not have an 'outPath' attribute"
else else
spec // { outPath = fetch name spec; } spec // { outPath = fetch config.pkgs name spec; }
) sources ) config.sources;
# The "config" used by the fetchers
mkConfig =
{ sourcesFile ? ./sources.json
, sources ? builtins.fromJSON (builtins.readFile sourcesFile)
, pkgs ? mkPkgs sources
}: rec {
# The sources, i.e. the attribute set of spec name to spec
inherit sources;
# The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
inherit pkgs;
};
in
mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }