diff options
| author | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
| commit | 1c0d15b90ef67363f798d67d12dd31ed5fccb411 (patch) | |
| tree | 3693dd49b591dbbba261e95fc4b78650f1675578 /pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix | |
| parent | bb61b45d92bad2435e80dcac855a78bda57ec7e8 (diff) | |
| parent | 2fc76ea05417671306d27f9ba83ef1b8d4049f3d (diff) | |
| download | nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.gz nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.bz2 nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.lz nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.xz nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.zst nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.zip | |
Merge branch 'origin/master' into staging.
Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix')
| -rw-r--r-- | pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix index 3dded2dcb44..7a53fb456f7 100644 --- a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix +++ b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-html-conduit-lens"; - version = "0.3.2.0"; - sha256 = "150b772wkl2k8xcrcbqj3qhndjkl35qzwqdjbgs9mxp867aihiv0"; + version = "0.3.2.1"; + sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12"; buildDepends = [ htmlConduit lens text xmlConduit ]; testDepends = [ doctest hspec hspecExpectationsLens lens xmlConduit @@ -17,7 +17,5 @@ cabal.mkDerivation (self: { description = "Optics for xml-conduit and html-conduit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) |