From 4e73a56db6ccd343a96910054d07dcd514bb820a Mon Sep 17 00:00:00 2001 From: Julien Marquet Date: Wed, 27 Apr 2022 21:46:36 +0200 Subject: [PATCH] flakes --- flake.lock | 41 +++++++++++++++++++++++++++++++++++++++++ flake.nix | 12 ++++++++++++ release.nix | 6 ------ ssg/default.nix | 3 +-- ssg/ssg.nix | 11 +++++++++++ 5 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix delete mode 100644 release.nix create mode 100644 ssg/ssg.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..d5dc9c0 --- /dev/null +++ b/flake.lock @@ -0,0 +1,41 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1651024496, + "narHash": "sha256-uKSrrw/neSkxX6TXPSaMyfu7iKzFrK7F6HOt6vQefGY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d9e593ed5889f3906dc72811c45bf684be8865cf", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..95ac7b6 --- /dev/null +++ b/flake.nix @@ -0,0 +1,12 @@ +{ + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let site = import ./default.nix { pkgs = nixpkgs.legacyPackages.${system}; }; + in { + hydraJobs.site = site; + }); +} diff --git a/release.nix b/release.nix deleted file mode 100644 index 84b8cfc..0000000 --- a/release.nix +++ /dev/null @@ -1,6 +0,0 @@ -let - pkgs = import {}; - site = (import ./default.nix { inherit pkgs; }).site; -in { - site = site; -} diff --git a/ssg/default.nix b/ssg/default.nix index 0033d1a..1cb3a5b 100644 --- a/ssg/default.nix +++ b/ssg/default.nix @@ -1,3 +1,2 @@ { pkgs ? import {} }: -pkgs.haskellPackages.callCabal2nix "ssg" - (pkgs.lib.sourceByRegex ./. [ "^ssg\.cabal$" "^src.*" ]) {} +pkgs.haskellPackages.callPackage ./ssg.nix {} diff --git a/ssg/ssg.nix b/ssg/ssg.nix new file mode 100644 index 0000000..06d6047 --- /dev/null +++ b/ssg/ssg.nix @@ -0,0 +1,11 @@ +{ mkDerivation, base, hakyll, lib, pandoc }: +mkDerivation { + pname = "ssg"; + version = "0.1.0.0"; + src = ./.; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base hakyll pandoc ]; + license = "unknown"; + hydraPlatforms = lib.platforms.none; +}