0
/
chan-delorean
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move http-conduit nix build script into Common

This commit is contained in:
towards-a-new-leftypol 2024-03-22 20:29:24 -04:00
parent ac32f29c83
commit 02d35a051d
3 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
nix-support/http-conduit.nix
View File

@ -1,35 +0,0 @@
{ nixpkgs ? import <nixpkgs> {} }:
let
haskellPackages = nixpkgs.haskellPackages;
src = nixpkgs.fetchFromGitHub {
owner = "towards-a-new-leftypol";
repo = "http-client";
rev = "a32d92fff9171a8beb948b430e274a1667b3ca35";
sha256 = "sha256-LfBTsB2fHZ1z+wvt3mowowXL+Ta7jesj+L3Y8NqSmfI=";
};
http-client = haskellPackages.callCabal2nix "http-client" (src + "/http-client") {};
conduitPackages = nixpkgs.haskellPackages.override {
overrides = self: super: {
http-client = http-client;
};
};
http-conduit = conduitPackages.callCabal2nix "http-conduit" (src + "/http-conduit") {};
env = http-client.env.overrideAttrs (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [
haskellPackages.cabal-install
];
});
in
{
http-conduit = http-conduit;
http-client = http-client;
env = env;
}

2
shell.nix
View File

@ -4,7 +4,7 @@ let
inherit (nixpkgs) pkgs; inherit (nixpkgs) pkgs;
perceptual-hash = import ./nix-support/perceptual-hash.nix { inherit nixpkgs; }; perceptual-hash = import ./nix-support/perceptual-hash.nix { inherit nixpkgs; };
http-conduit = import ./nix-support/http-conduit.nix { inherit nixpkgs; }; http-conduit = import ./src/Common/nix-support/http-conduit.nix { inherit nixpkgs; };
f = { mkDerivation, base, stdenv, cabal-install, f = { mkDerivation, base, stdenv, cabal-install,
aeson, safe-exceptions, bytestring, cmdargs, aeson, safe-exceptions, bytestring, cmdargs,

2
src/Common

@ -1 +1 @@
Subproject commit eb624edd0e0be526f7ccfda080b437d7a365f466 Subproject commit 62a23581e786f8564653406845c4b2a07d73deb6