From f437eec404ffb723270d6cbb596feea35665c043 Mon Sep 17 00:00:00 2001 From: Shaun Kerr Date: Thu, 13 Dec 2018 15:22:16 +1300 Subject: [PATCH] this is broken --- cabal.nix | 12 ++++++++++++ default.nix | 13 +------------ rf.nix | 4 +++- robots.txt | 2 ++ shell.nix | 13 +++++++------ 5 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 cabal.nix diff --git a/cabal.nix b/cabal.nix new file mode 100644 index 0000000..53261cc --- /dev/null +++ b/cabal.nix @@ -0,0 +1,12 @@ +{ mkDerivation, base, filepath, hakyll, hakyll-favicon, stdenv }: +mkDerivation { + pname = "rf"; + version = "0.1.3.1"; + src = ./.; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base filepath hakyll hakyll-favicon ]; + homepage = "regularflolloping.com"; + description = "tA's blog"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/default.nix b/default.nix index 53261cc..6b9cad1 100644 --- a/default.nix +++ b/default.nix @@ -1,12 +1 @@ -{ mkDerivation, base, filepath, hakyll, hakyll-favicon, stdenv }: -mkDerivation { - pname = "rf"; - version = "0.1.3.1"; - src = ./.; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base filepath hakyll hakyll-favicon ]; - homepage = "regularflolloping.com"; - description = "tA's blog"; - license = stdenv.lib.licenses.bsd3; -} +with import ./rf.nix; rfBuilt diff --git a/rf.nix b/rf.nix index 37e1ccd..c314334 100644 --- a/rf.nix +++ b/rf.nix @@ -9,7 +9,7 @@ let haskellPackages = pkgs.haskellPackages.override { overrides = haskellPackagesNew: haskellPackagesOld: rec { rf = - haskellPackagesNew.callPackage ./default.nix { }; + haskellPackagesNew.callPackage ./cabal.nix { }; }; }; }; @@ -19,4 +19,6 @@ in rec { inherit pkgs; rf = pkgs.haskellPackages.rf; + rfBuilt = pkgs.runCommand { buildInputs = [rf]; } + "mkdir $out; cd $out; touch TEST; site rebuild"; } diff --git a/robots.txt b/robots.txt index e1256cb..c51750c 100644 --- a/robots.txt +++ b/robots.txt @@ -1,6 +1,8 @@ User-agent: * Disallow: +#TESTE TESTE + # robots are our pals # a robot helped deploy this blog! # i hope we can be friends :) diff --git a/shell.nix b/shell.nix index 5ab5d0b..0b00d7a 100644 --- a/shell.nix +++ b/shell.nix @@ -1,8 +1,9 @@ let stuff = import ./rf.nix; -in stuff.rf.env.overrideAttrs (drv: { - buildInputs = drv.buildInputs ++ [ - stuff.pkgs.imagemagick - stuff.pkgs.inconsolata - ]; -}) +in + stuff.rf.env.overrideAttrs (drv: { + buildInputs = drv.buildInputs ++ [ + stuff.pkgs.imagemagick + stuff.pkgs.inconsolata + ]; + })