Browse Source

this is broken

Shaun Kerr 4 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 @@
1
+{ mkDerivation, base, filepath, hakyll, hakyll-favicon, stdenv }:
2
+mkDerivation {
3
+  pname = "rf";
4
+  version = "0.1.3.1";
5
+  src = ./.;
6
+  isLibrary = false;
7
+  isExecutable = true;
8
+  executableHaskellDepends = [ base filepath hakyll hakyll-favicon ];
9
+  homepage = "regularflolloping.com";
10
+  description = "tA's blog";
11
+  license = stdenv.lib.licenses.bsd3;
12
+}

+ 1
- 12
default.nix View File

@@ -1,12 +1 @@
1
-{ mkDerivation, base, filepath, hakyll, hakyll-favicon, stdenv }:
2
-mkDerivation {
3
-  pname = "rf";
4
-  version = "0.1.3.1";
5
-  src = ./.;
6
-  isLibrary = false;
7
-  isExecutable = true;
8
-  executableHaskellDepends = [ base filepath hakyll hakyll-favicon ];
9
-  homepage = "regularflolloping.com";
10
-  description = "tA's blog";
11
-  license = stdenv.lib.licenses.bsd3;
12
-}
1
+with import ./rf.nix; rfBuilt

+ 3
- 1
rf.nix View File

@@ -9,7 +9,7 @@ let
9 9
          haskellPackages = pkgs.haskellPackages.override {
10 10
             overrides = haskellPackagesNew: haskellPackagesOld: rec {
11 11
                rf =
12
-                  haskellPackagesNew.callPackage ./default.nix { };
12
+                  haskellPackagesNew.callPackage ./cabal.nix { };
13 13
             };
14 14
          };
15 15
       };
@@ -19,4 +19,6 @@ in
19 19
    rec {
20 20
       inherit pkgs;
21 21
       rf = pkgs.haskellPackages.rf;
22
+      rfBuilt = pkgs.runCommand { buildInputs = [rf]; }
23
+        "mkdir $out; cd $out; touch TEST; site rebuild";
22 24
    }

+ 2
- 0
robots.txt View File

@@ -1,6 +1,8 @@
1 1
 User-agent: *
2 2
 Disallow:
3 3
 
4
+#TESTE TESTE
5
+
4 6
 # robots are our pals
5 7
 # a robot helped deploy this blog!
6 8
 # i hope we can be friends :)

+ 7
- 6
shell.nix View File

@@ -1,8 +1,9 @@
1 1
 let
2 2
    stuff = import ./rf.nix;
3
-in stuff.rf.env.overrideAttrs (drv: {
4
-  buildInputs = drv.buildInputs ++ [
5
-     stuff.pkgs.imagemagick
6
-     stuff.pkgs.inconsolata  
7
-  ];
8
-})
3
+in 
4
+  stuff.rf.env.overrideAttrs (drv: {
5
+    buildInputs = drv.buildInputs ++ [
6
+       stuff.pkgs.imagemagick
7
+       stuff.pkgs.inconsolata  
8
+    ];
9
+  })

Loading…
Cancel
Save