diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | build.nix | 6 | ||||
| -rw-r--r-- | default.nix | 27 | ||||
| -rw-r--r-- | shell.nix | 9 |
5 files changed, 31 insertions, 27 deletions
@@ -1,7 +1 @@ -/public/ -/dependencies.svg -/paku.html -/README.*.md -/CHANGELOG.*.md -/vagrant/ -/FIXME +/result @@ -2,8 +2,12 @@ -all: EuAndreh.key all-packages all-services +all: EuAndreh.key guix nix +guix: all-packages all-services + +nix: + nix-build build.nix all-packages: guix build -v3 -Lsrc/ -K \ @@ -19,6 +23,8 @@ refresh: check: clean: + rm -rf \ + result public: diff --git a/build.nix b/build.nix new file mode 100644 index 0000000..1c578ad --- /dev/null +++ b/build.nix @@ -0,0 +1,6 @@ +{ pkgs ? + import <nixpkgs> { overlays = [ (import ./default.nix { inherit pkgs; }) ]; } +}: + +map (name: pkgs.org-euandre."${name}") + (builtins.attrNames pkgs.org-euandre) diff --git a/default.nix b/default.nix index a361043..016f4d6 100644 --- a/default.nix +++ b/default.nix @@ -1,26 +1,33 @@ { pkgs }: self: super: { - xyz-euandreh = { - td-latest = pkgs.stdenv.mkDerivation rec { - name = "td"; - version = "7a1d07c1051ff48f17c915f99e20b629ed0a6a70"; + org-euandre = { + guile-heredoc-latest = pkgs.stdenv.mkDerivation rec { + name = "guile-heredoc"; + version = "065435cdce609604e33b879b9be3e81ab89f3e7b"; src = fetchTarball { url = - "https://euandreh.xyz/${name}.git/snapshot/${name}-${version}.tar.gz"; - sha256 = "0nfawz4bs5rihgz7943z3w4izxb4isx8k2ixkzv8977f1v3swj6j"; + "https://euandre.org/git/${name}/snapshot/${name}-${version}.tar.gz"; + sha256 = "179qq17mgi4kakhj9w1dk26afljh5yad4j9ih9d8wms70x6h211m"; }; + nativeBuildInputs = with pkgs; [ + texinfo + ]; + buildInputs = with pkgs; [ + guile + ]; makeFlags = [ "PREFIX=$(out)" ]; doCheck = true; + enableParallelBuilding = true; meta = with pkgs.lib; { - description = readFile "${src}/description"; + description = readFile "${src}/description"; # FIXME longDescription = readFile "${src}/long-description"; - homepage = "https://euandreh.xyz/td/"; - changelog = "https://euandreh.xyz/td/CHANGELOG.html"; - downloadPage = "https://euandreh.xyz/td/#releases"; + homepage = "https://euandre.org/projects/guile-heredoc/"; + changelog = "https://euandre.org/projects/guile-heredoc/CHANGELOG.html"; + downloadPage = "https://euandre.org/projects/guile-heredoc/#releases"; license = licenses.agpl3; platforms = platforms.unix; }; diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 8f5434c..0000000 --- a/shell.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs ? - import <nixpkgs> { overlays = [ (import ./default.nix { inherit pkgs; }) ]; } -}: - -with pkgs; -mkShell { - buildInputs = - map (name: xyz-euandreh."${name}") (builtins.attrNames xyz-euandreh); -} |