Browse Source

Rewire dependencies so they see one another

master
Peter J. Jones 6 months 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 @@
let
# Use my copy of some packages:
overrides = self: super: with pkgs.haskell.lib; {
xmonad = import ./nix/xmonad.nix { inherit pkgs; };
xmonad-contrib = import ./nix/xmonad-contrib.nix { inherit pkgs; };
playlists = import ./nix/playlists.nix { inherit pkgs haskell; };
playlists-http = import ./nix/playlists-http.nix { inherit pkgs haskell; };

xmonad = import ./nix/xmonad.nix { inherit pkgs haskell; };
xmonad-contrib = import ./nix/xmonad-contrib.nix { inherit pkgs haskell; };

http-client = if super ? http-client_0_6_2
then super.http-client_0_6_2
else super.http-client;
};

# Apply the overrides from above:

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

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

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

@@ -0,0 +1,12 @@
{ pkgs
, haskell
}:

with pkgs.lib;

let
src = pkgs.fetchgit (removeAttrs (importJSON ./playlists-http.json) ["date"]);
withSrc = args: haskell.mkDerivation (args // { inherit src; });
in

haskell.callPackage "${src}/playlists-http.nix" { mkDerivation = withSrc; }

+ 7
- 0
nix/playlists.json View File

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

+ 12
- 0
nix/playlists.nix View File

@@ -0,0 +1,12 @@
{ pkgs
, haskell
}:

with pkgs.lib;

let
src = pkgs.fetchgit (removeAttrs (importJSON ./playlists.json) ["date"]);
withSrc = args: haskell.mkDerivation (args // { inherit src; });
in

haskell.callPackage "${src}/playlists.nix" { mkDerivation = withSrc; }

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

@@ -1,12 +1,12 @@
# Pull in xmonad-contrib from my mirror:
{ pkgs ? import <nixpkgs> { }
{ pkgs
, haskell
}:

with pkgs.lib;

let
src = pkgs.fetchgit (removeAttrs (importJSON ./xmonad-contrib.json) ["date"]);
haskell = pkgs.haskellPackages;
withSrc = args: haskell.mkDerivation (args // { inherit src; });
in


+ 2
- 2
nix/xmonad.nix View File

@@ -1,12 +1,12 @@
# Pull in xmonad from my mirror:
{ pkgs ? import <nixpkgs> { }
{ pkgs
, haskell
}:

with pkgs.lib;

let
src = pkgs.fetchgit (removeAttrs (importJSON ./xmonad.json) ["date"]);
haskell = pkgs.haskellPackages;
withSrc = args: haskell.mkDerivation (args // { inherit src; });
in


+ 2
- 2
xmonadrc.cabal View File

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

Loading…
Cancel
Save