Browse Source

this is broken

master
Shaun Kerr 8 months ago
parent
commit
f437eec404
5 changed files with 25 additions and 19 deletions
  1. 12
    0
      cabal.nix
  2. 1
    12
      default.nix
  3. 3
    1
      rf.nix
  4. 2
    0
      robots.txt
  5. 7
    6
      shell.nix

+ 12
- 0
cabal.nix View File

@@ -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;
}

+ 1
- 12
default.nix View File

@@ -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

+ 3
- 1
rf.nix View File

@@ -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";
}

+ 2
- 0
robots.txt View File

@@ -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 :)

+ 7
- 6
shell.nix View File

@@ -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
];
})

Loading…
Cancel
Save