Browse Source

Rewire dependencies so they see one another

master
Peter J. Jones 1 month ago
parent
commit
f87de6afeb
Signed by: Peter Jones <pjones@devalot.com> GPG Key ID: 9DAFAA8D01941E49
8 changed files with 53 additions and 8 deletions
  1. 9
    2
      default.nix
  2. 7
    0
      nix/playlists-http.json
  3. 12
    0
      nix/playlists-http.nix
  4. 7
    0
      nix/playlists.json
  5. 12
    0
      nix/playlists.nix
  6. 2
    2
      nix/xmonad-contrib.nix
  7. 2
    2
      nix/xmonad.nix
  8. 2
    2
      xmonadrc.cabal

+ 9
- 2
default.nix View File

@@ -4,8 +4,15 @@
4 4
 let
5 5
   # Use my copy of some packages:
6 6
   overrides = self: super: with pkgs.haskell.lib; {
7
-    xmonad = import ./nix/xmonad.nix { inherit pkgs; };
8
-    xmonad-contrib = import ./nix/xmonad-contrib.nix { inherit pkgs; };
7
+    playlists = import ./nix/playlists.nix { inherit pkgs haskell; };
8
+    playlists-http = import ./nix/playlists-http.nix { inherit pkgs haskell; };
9
+
10
+    xmonad = import ./nix/xmonad.nix { inherit pkgs haskell; };
11
+    xmonad-contrib = import ./nix/xmonad-contrib.nix { inherit pkgs haskell; };
12
+
13
+    http-client = if super ? http-client_0_6_2
14
+      then super.http-client_0_6_2
15
+      else super.http-client;
9 16
   };
10 17
 
11 18
   # Apply the overrides from above:

+ 7
- 0
nix/playlists-http.json View File

@@ -0,0 +1,7 @@
1
+{
2
+  "url": "https://code.devalot.com/open/playlists-http.git",
3
+  "rev": "30cd1944dda87ba147d9e589e6b30a76476679f3",
4
+  "date": "2019-04-16T13:37:18-07:00",
5
+  "sha256": "1jyrry0brc6yd6dpid6jxcckl5spg836lk9pd8h92pj9b42z9xw4",
6
+  "fetchSubmodules": false
7
+}

+ 12
- 0
nix/playlists-http.nix View File

@@ -0,0 +1,12 @@
1
+{ pkgs
2
+, haskell
3
+}:
4
+
5
+with pkgs.lib;
6
+
7
+let
8
+  src = pkgs.fetchgit (removeAttrs (importJSON ./playlists-http.json) ["date"]);
9
+  withSrc = args: haskell.mkDerivation (args // { inherit src; });
10
+in
11
+
12
+haskell.callPackage "${src}/playlists-http.nix" { mkDerivation = withSrc; }

+ 7
- 0
nix/playlists.json View File

@@ -0,0 +1,7 @@
1
+{
2
+  "url": "https://code.devalot.com/open/playlists.git",
3
+  "rev": "e2dd4208bb6ce9090401f56d23b7899dfbc7e38d",
4
+  "date": "2018-03-20T17:07:56-07:00",
5
+  "sha256": "090w2l0s4x1wfhya9m160nlw86bd2222sc81xcdg7fhqwbiaqr52",
6
+  "fetchSubmodules": false
7
+}

+ 12
- 0
nix/playlists.nix View File

@@ -0,0 +1,12 @@
1
+{ pkgs
2
+, haskell
3
+}:
4
+
5
+with pkgs.lib;
6
+
7
+let
8
+  src = pkgs.fetchgit (removeAttrs (importJSON ./playlists.json) ["date"]);
9
+  withSrc = args: haskell.mkDerivation (args // { inherit src; });
10
+in
11
+
12
+haskell.callPackage "${src}/playlists.nix" { mkDerivation = withSrc; }

+ 2
- 2
nix/xmonad-contrib.nix View File

@@ -1,12 +1,12 @@
1 1
 # Pull in xmonad-contrib from my mirror:
2
-{ pkgs ? import <nixpkgs> { }
2
+{ pkgs
3
+, haskell
3 4
 }:
4 5
 
5 6
 with pkgs.lib;
6 7
 
7 8
 let
8 9
   src = pkgs.fetchgit (removeAttrs (importJSON ./xmonad-contrib.json) ["date"]);
9
-  haskell = pkgs.haskellPackages;
10 10
   withSrc = args: haskell.mkDerivation (args // { inherit src; });
11 11
 in
12 12
 

+ 2
- 2
nix/xmonad.nix View File

@@ -1,12 +1,12 @@
1 1
 # Pull in xmonad from my mirror:
2
-{ pkgs ? import <nixpkgs> { }
2
+{ pkgs
3
+, haskell
3 4
 }:
4 5
 
5 6
 with pkgs.lib;
6 7
 
7 8
 let
8 9
   src = pkgs.fetchgit (removeAttrs (importJSON ./xmonad.json) ["date"]);
9
-  haskell = pkgs.haskellPackages;
10 10
   withSrc = args: haskell.mkDerivation (args // { inherit src; });
11 11
 in
12 12
 

+ 2
- 2
xmonadrc.cabal View File

@@ -32,11 +32,11 @@ common dependencies
32 32
                , either         >= 4.4  && < 6.0
33 33
                , filepath       >= 1.3  && < 1.5
34 34
                , hostname       >= 1.0  && < 1.1
35
-               , http-client    >= 0.4  && < 0.6
35
+               , http-client    >= 0.6  && < 0.7
36 36
                , libmpd         >= 0.8  && < 0.10
37 37
                , mtl            >= 2.2  && < 3.0
38 38
                , parsec         >= 3.1  && < 3.2
39
-               , playlists      >= 0.4  && < 1.0
39
+               , playlists      >= 0.1  && < 1.0
40 40
                , playlists-http >= 0.1  && < 1.0
41 41
                , setlocale      >= 1.0  && < 1.1
42 42
                , text           >= 0.11 && < 1.3

Loading…
Cancel
Save