remove nix stuff
Added when Sean was testing his persistent patch, but if this is wanted to be added to git-annex it would need to be presented separately.
This commit is contained in:
Joey Hess
parent
635b0b1df6
commit
78e57fc208
5 changed files with 0 additions and 191 deletions
|
|
@ -1,4 +0,0 @@
|
|||
{ compiler ? "ghc844" }:
|
||||
|
||||
(import ./release.nix {inherit compiler;}).git-annex
|
||||
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
{ mkDerivation, aeson, async, attoparsec, base, bloomfilter, bup
|
||||
, byteable, bytestring, Cabal, case-insensitive, concurrent-output
|
||||
, conduit, connection, containers, crypto-api, cryptonite, curl
|
||||
, data-default, DAV, dbus, directory, disk-free-space, dlist
|
||||
, edit-distance, exceptions, fdo-notify, feed, filepath, free, git
|
||||
, gnupg, hinotify, hslogger, http-client, http-client-tls
|
||||
, http-conduit, http-types, IfElse, lsof, magic, memory, microlens
|
||||
, monad-control, monad-logger, mountpoints, mtl, network
|
||||
, network-info, network-multicast, network-uri, old-locale, openssh
|
||||
, optparse-applicative, perl, persistent, persistent-sqlite
|
||||
, persistent-template, process, QuickCheck, random, regex-tdfa
|
||||
, resourcet, rsync, SafeSemaphore, sandi, securemem, socks, split
|
||||
, stdenv, stm, stm-chans, tagsoup, tasty, tasty-hunit
|
||||
, tasty-quickcheck, tasty-rerun, text, time, torrent, transformers
|
||||
, unix, unix-compat, unordered-containers, utf8-string, uuid
|
||||
, vector, wget, which
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "git-annex";
|
||||
version = "7.20181031";
|
||||
src = ./..;
|
||||
configureFlags = [
|
||||
"-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
|
||||
"-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
|
||||
"-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-f-webapp"
|
||||
"-f-webapp-secure" "-fwebdav" "-fxmpp"
|
||||
];
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
setupHaskellDepends = [
|
||||
base bytestring Cabal data-default directory exceptions filepath
|
||||
hslogger IfElse process split transformers unix-compat utf8-string
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
aeson async attoparsec base bloomfilter byteable bytestring
|
||||
case-insensitive concurrent-output conduit connection containers
|
||||
crypto-api cryptonite data-default DAV dbus directory
|
||||
disk-free-space dlist edit-distance exceptions fdo-notify feed
|
||||
filepath free hinotify hslogger http-client http-client-tls
|
||||
http-conduit http-types IfElse magic memory microlens monad-control
|
||||
monad-logger mountpoints mtl network network-info network-multicast
|
||||
network-uri old-locale optparse-applicative persistent
|
||||
persistent-sqlite persistent-template process QuickCheck random
|
||||
regex-tdfa resourcet SafeSemaphore sandi securemem socks split stm
|
||||
stm-chans tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun
|
||||
text time torrent transformers unix unix-compat
|
||||
unordered-containers utf8-string uuid vector
|
||||
];
|
||||
executableSystemDepends = [
|
||||
bup curl git gnupg lsof openssh perl rsync wget which
|
||||
];
|
||||
preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
|
||||
installPhase = "make PREFIX=$out BUILDER=: install";
|
||||
checkPhase = ''
|
||||
ln -sf dist/build/git-annex/git-annex git-annex
|
||||
ln -sf git-annex git-annex-shell
|
||||
export PATH+=":$PWD"
|
||||
git-annex test
|
||||
'';
|
||||
enableSharedExecutables = false;
|
||||
homepage = "http://git-annex.branchable.com/";
|
||||
description = "manage files with git, without checking their contents into git";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"url": "https://github.com/NixOS/nixpkgs.git",
|
||||
"rev": "848f2f3d0dbc79fbe21c6b52a9e5628e02ed3bcf",
|
||||
"date": "2018-11-03T14:38:39+01:00",
|
||||
"sha256": "0wsifg08jx794mmvhx833x3wf0hq0hpgh8wlkkxx9s2yn2j0d233",
|
||||
"fetchSubmodules": true
|
||||
}
|
||||
80
release.nix
80
release.nix
|
|
@ -1,80 +0,0 @@
|
|||
{ compiler ? "ghc844" }:
|
||||
|
||||
let
|
||||
# Disable tests for these packages
|
||||
dontCheckPackages = [
|
||||
];
|
||||
|
||||
# Jailbreak these packages
|
||||
doJailbreakPackages = [
|
||||
];
|
||||
|
||||
# Disable haddocks for these packages
|
||||
dontHaddockPackages = [
|
||||
];
|
||||
|
||||
generatedOverrides = haskellPackagesNew: haskellPackagesOld:
|
||||
let
|
||||
toPackage = file: _: {
|
||||
name = builtins.replaceStrings [ ".nix" ] [ "" ] file;
|
||||
value = haskellPackagesNew.callPackage (./. + "/nix/${file}") { };
|
||||
};
|
||||
in
|
||||
pkgs.lib.mapAttrs' toPackage (builtins.readDir ./nix);
|
||||
|
||||
makeOverrides =
|
||||
function: names: haskellPackagesNew: haskellPackagesOld:
|
||||
let
|
||||
toPackage = name: {
|
||||
inherit name;
|
||||
value = function haskellPackagesOld.${name};
|
||||
};
|
||||
in
|
||||
builtins.listToAttrs (map toPackage names);
|
||||
|
||||
composeExtensionsList =
|
||||
pkgs.lib.fold pkgs.lib.composeExtensions (_: _: {});
|
||||
|
||||
# More exotic overrides go here
|
||||
manualOverrides = haskellPackagesNew: haskellPackagesOld: {
|
||||
git-annex = haskellPackagesNew.callPackage ./nix/git-annex.nix {
|
||||
inherit (pkgs) bup curl git gnupg lsof openssh perl rsync wget which;
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
packageOverrides = pkgs: rec {
|
||||
haskell = pkgs.haskell // {
|
||||
packages = pkgs.haskell.packages // {
|
||||
"${compiler}" = pkgs.haskell.packages."${compiler}".override {
|
||||
overrides = composeExtensionsList [
|
||||
generatedOverrides
|
||||
(makeOverrides pkgs.haskell.lib.dontCheck dontCheckPackages )
|
||||
(makeOverrides pkgs.haskell.lib.doJailbreak doJailbreakPackages)
|
||||
(makeOverrides pkgs.haskell.lib.dontHaddock dontHaddockPackages)
|
||||
manualOverrides
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
bootstrap = import <nixpkgs> { };
|
||||
nixpkgs = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
|
||||
nixpkgssrc = bootstrap.fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nixpkgs";
|
||||
inherit (nixpkgs) rev sha256;
|
||||
};
|
||||
pkgs = import nixpkgssrc { inherit config; };
|
||||
|
||||
haskell-packages = pkgs.haskell.packages.${compiler};
|
||||
|
||||
in
|
||||
{ git-annex = haskell-packages.git-annex;
|
||||
haskell-packages = haskell-packages;
|
||||
cabal = pkgs.haskellPackages.cabal-install;
|
||||
pkgs = pkgs;
|
||||
}
|
||||
36
shell.nix
36
shell.nix
|
|
@ -1,36 +0,0 @@
|
|||
{ compiler ? "ghc844" }:
|
||||
|
||||
let
|
||||
release = (import ./release.nix {inherit compiler;});
|
||||
pkgs = release.pkgs;
|
||||
scripts = [
|
||||
(pkgs.writeScriptBin "rebuild-nix" ''
|
||||
#!/usr/bin/env bash
|
||||
cd $(${pkgs.git}/bin/git rev-parse --show-toplevel)/nix
|
||||
${pkgs.haskellPackages.cabal2nix}/bin/cabal2nix .. > git-annex.nix
|
||||
'')
|
||||
(pkgs.writeScriptBin "ghcid-watch" ''
|
||||
#!/usr/bin/env bash
|
||||
${pkgs.haskellPackages.ghcid}/bin/ghcid --command 'cabal new-repl all'
|
||||
'')
|
||||
];
|
||||
shell = release.haskell-packages.shellFor { packages = p: [p.git-annex p.magic]; };
|
||||
in pkgs.stdenv.lib.overrideDerivation shell (oldAttrs: rec {
|
||||
LD_LIBRARY_PATH = (oldAttrs.LD_LIBRARY_PATH or []) ++ [
|
||||
"${pkgs.file}/lib/"
|
||||
];
|
||||
nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [
|
||||
(pkgs.stdenv.mkDerivation {
|
||||
name = "scripts";
|
||||
phases = "installPhase";
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
'' + (builtins.concatStringsSep "" (builtins.map (script: ''
|
||||
for f in $(ls -d ${script}/bin/*); do ln -s $f $out/bin; done
|
||||
'') scripts));
|
||||
})
|
||||
release.cabal
|
||||
pkgs.watchexec
|
||||
pkgs.haskellPackages.cabal2nix
|
||||
];
|
||||
})
|
||||
Loading…
Reference in a new issue