diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2017-01-12 19:36:28 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2017-01-12 19:36:28 +0300 |
commit | 1a3509822131a921cce3c4a75109950b714eefcb (patch) | |
tree | 1e174f13852732113b944420deed249625d32192 | |
parent | 4613aee934a0d6349f3778c97f1b45ad481c2158 (diff) | |
download | nixsap-1a3509822131a921cce3c4a75109950b714eefcb.tar.gz |
ldapply: 0.1.0 -> 0.2.0
-rw-r--r-- | modules/pkgs/ldapply/default.nix | 2 | ||||
-rw-r--r-- | modules/pkgs/ldapply/ldap.nix | 13 | ||||
-rw-r--r-- | modules/pkgs/ldapply/main.nix | 13 |
3 files changed, 10 insertions, 18 deletions
diff --git a/modules/pkgs/ldapply/default.nix b/modules/pkgs/ldapply/default.nix index f37f910..85f0184 100644 --- a/modules/pkgs/ldapply/default.nix +++ b/modules/pkgs/ldapply/default.nix @@ -2,7 +2,7 @@ let myHaskellPkgs = haskellPackages.override { overrides = self: super: { - LDAP = self.callPackage ./ldap.nix { inherit openldap; }; # Version with ldapTrivialExternalSaslBind + LDAP = self.callPackage ./ldap.nix { inherit openldap; }; # Version with ldapExternalSaslBind ldif = haskell.lib.dontCheck super.ldif; # requires ancient HUnit == 1.2.* }; }; diff --git a/modules/pkgs/ldapply/ldap.nix b/modules/pkgs/ldapply/ldap.nix index 75b5f64..03a5fd3 100644 --- a/modules/pkgs/ldapply/ldap.nix +++ b/modules/pkgs/ldapply/ldap.nix @@ -1,14 +1,11 @@ -{ mkDerivation, base, fetchgit, HUnit, openldap, stdenv }: +{ mkDerivation, base, HUnit, cyrus_sasl, openldap, stdenv }: mkDerivation { pname = "LDAP"; - version = "0.7.0"; - src = fetchgit { - url = "https://github.com/ip1981/ldap-haskell.git"; - sha256 = "1lb746ifqz216cxgxli30r30bx49f8l1an4k4w7sa87gdchjka4y"; - rev = "1d47f5712fc09bbf00c49bb58907aaf355fdf2e2"; - }; + version = "0.6.11"; + doCheck = false; # XXX: missing file in tarball + sha256 = "1cwh3272zi5r0zznmixghf87vskz7s35bmz6ifyky0xk3s04ijq1"; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ openldap ]; + librarySystemDepends = [ cyrus_sasl openldap ]; testHaskellDepends = [ base HUnit ]; testSystemDepends = [ openldap ]; homepage = "https://github.com/ezyang/ldap-haskell"; diff --git a/modules/pkgs/ldapply/main.nix b/modules/pkgs/ldapply/main.nix index 7c6f075..3a69576 100644 --- a/modules/pkgs/ldapply/main.nix +++ b/modules/pkgs/ldapply/main.nix @@ -1,15 +1,10 @@ -{ mkDerivation, base, bytestring, docopt, fetchgit -, interpolatedstring-perl6, LDAP, ldif, stdenv -, unordered-containers +{ mkDerivation, base, bytestring, docopt, interpolatedstring-perl6 +, LDAP, ldif, stdenv, unordered-containers }: mkDerivation { pname = "ldapply"; - version = "0.1.0"; - src = fetchgit { - url = "https://github.com/ip1981/ldapply.git"; - sha256 = "0vmq6l49hiyc20rv6xqj518m6bn7291ampjd1yf2b6w79isx3zfg"; - rev = "cdddf52e87b0b7a84b9b664df29004340f99ec20"; - }; + version = "0.2.0"; + sha256 = "0qgpb22k9krdhwjydzyfhjf85crxc49ss7x74mrqj8ivkzg5hl28"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ |