diff options
Diffstat (limited to 'pkgs/development/libraries')
16 files changed, 35 insertions, 77 deletions
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index dd8e607f3b72e..173ddc3149525 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "RSA"; - version = "1.0.6.2"; - sha256 = "0sabvwzgjg6nv5m3x9cjpk5q62r8vhi3kn858ask15frsi7lzhwk"; + version = "1.0.6.3"; + sha256 = "0lk3nsh6nvacv1xzrg2pxxhd5gglmy40dkb8a47c9r9px0q6yjpj"; isLibrary = true; isExecutable = true; buildDepends = [ binary pureMD5 random SHA ]; diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index 7aaf6c51321a5..d1eff38c0d705 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SHA"; - version = "1.5.0.0"; - sha256 = "12sz1dblmpiy8bg45fwndp1g9gf7494vqqbvbd1hwr5qzyfwyqck"; + version = "1.5.0.1"; + sha256 = "1nyj50hyka2fnk9nnidygl8d52xgvmj9m8aywjzbzdaxxrmdab8g"; isLibrary = true; isExecutable = true; buildDepends = [ binary ]; diff --git a/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix b/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix deleted file mode 100644 index a08f09b550340..0000000000000 --- a/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, failure }: - -cabal.mkDerivation (self: { - pname = "attempt"; - version = "0.3.1.1"; - sha256 = "0yfn8mh7gy6nh689ic6sygf9d7lk44kpj2wahnljl53k6vw7smv5"; - buildDepends = [ failure ]; - meta = { - homepage = "http://github.com/snoyberg/attempt/tree/master"; - description = "Concrete data type for handling extensible exceptions as failures"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/attempt/0.4.0.nix b/pkgs/development/libraries/haskell/attempt/default.nix index c000002d4998b..c000002d4998b 100644 --- a/pkgs/development/libraries/haskell/attempt/0.4.0.nix +++ b/pkgs/development/libraries/haskell/attempt/default.nix diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 7820566e42d68..e4772a1f51cf6 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.4.3.2"; - sha256 = "1mqfvkmjfqy777h4skvgm9nxjgyi12k8alg7mvsk0aj1i80gvkki"; + version = "0.4.3.3"; + sha256 = "0a3g4s4k85h2qvs2kcalv83ma4z5arqdydla64q5d1qlk9c99mzg"; buildDepends = [ blazeBuilder text ]; meta = { homepage = "http://jaspervdj.be/blaze"; diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix index a4590926272b7..705b462a6d52b 100644 --- a/pkgs/development/libraries/haskell/bmp/default.nix +++ b/pkgs/development/libraries/haskell/bmp/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bmp"; - version = "1.2.0.2"; - sha256 = "0y1fjbhk73dj260wd1jhcf12fkh4maba4iwkzdg2087s9saxvljk"; + version = "1.2.1.1"; + sha256 = "0s5srqkaccrwh9gsxn9kmyh4jf0qf40ix8ipi0b70fbbffr97hmk"; buildDepends = [ binary ]; meta = { homepage = "http://code.ouroborus.net/bmp"; diff --git a/pkgs/development/libraries/haskell/convertible-text/default.nix b/pkgs/development/libraries/haskell/convertible-text/default.nix deleted file mode 100644 index 7d8b40654eca5..0000000000000 --- a/pkgs/development/libraries/haskell/convertible-text/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, attempt, text, time }: - -cabal.mkDerivation (self: { - pname = "convertible-text"; - version = "0.4.0.2"; - sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz"; - isLibrary = true; - isExecutable = true; - buildDepends = [ attempt text time ]; - meta = { - homepage = "http://github.com/snoyberg/convertible/tree/text"; - description = "Typeclasses and instances for converting between types (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index b6c560f70acb5..bbaa68fdcf74f 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.6"; - sha256 = "1ckxm6s2y9dvlj1785b27a2zvah4radypxjpq7sxn970r6m5dv0h"; + version = "2.5.7"; + sha256 = "1a6nz0a7axgdghljcb87h4bhisjfsnpxpdbqlrxymw4zqislg9p3"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/failure/0.1.2.nix b/pkgs/development/libraries/haskell/failure/0.1.2.nix deleted file mode 100644 index 51212385922ae..0000000000000 --- a/pkgs/development/libraries/haskell/failure/0.1.2.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "failure"; - version = "0.1.2"; - sha256 = "14pwj0zb5kk2wadpddanxv3kr0hzklxhzbprmkh40yn1dbwgdas4"; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Failure"; - description = "A simple type class for success/failure computations"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/failure/0.2.0.nix b/pkgs/development/libraries/haskell/failure/default.nix index 3ed3ad704ada3..bc2821e3e8c58 100644 --- a/pkgs/development/libraries/haskell/failure/0.2.0.nix +++ b/pkgs/development/libraries/haskell/failure/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "failure"; - version = "0.2.0"; - sha256 = "1z7q2ldgfm0khar3vx7paz0jigzd720xjq2s0x02qf2m3iv0ilcv"; + version = "0.2.0.1"; + sha256 = "05k62sb2xj4ddjwsbfldxkap7v5kmv04qzic4sszx5i3ykbf20fd"; buildDepends = [ transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Failure"; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 31b2c4fdafb86..1d75a0e00e017 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.6.2"; - sha256 = "07l2igpmr4kd47zk88hz2salzzc92dh7wpny6xr5pw5xf95lpx7p"; + version = "3.2.7.0"; + sha256 = "1jx4csfdr7icjrg9hvlw5pyi29qf3yyx0sjaw7nchz8jk43ikr2b"; buildDepends = [ binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup time diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index 28a4459f3b003..089905fd620a8 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happstack-hamlet"; - version = "6.2.4"; - sha256 = "1m03r1wk34lx9b2bmcrakcaaq701vcdkw2shxmqwk6fsbgh7qjp0"; + version = "7.0.0"; + sha256 = "15r6xpyg193iwqin96mn7c9x5w7l8q9m3vbgiwv7bxvhdrl1dp7j"; buildDepends = [ hamlet happstackServer text ]; meta = { homepage = "http://www.happstack.com/"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 0525ee78e36f6..a01055f47c57f 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.3.1"; - sha256 = "0nz1rz0nrs693hfav687rci3rhrhsmnjb93949mxgyd0ka5pw90l"; + version = "0.3.2"; + sha256 = "0vaygw17cfx2y2lv32lmr7x0vch58dh19jmh8j7mcj11qy5v0nz8"; buildDepends = [ liftedBase monadControl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix b/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix index a396a3eaa4da3..d5557eae3906b 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-bindings"; - version = "0.1.0"; - sha256 = "0jjkrn72hkakdq4n300fk5422sy1q46p019554lvplqmyqr8bkac"; + version = "0.1.0.1"; + sha256 = "0r1hjmmxb9kz5fvfrjvzjd0pnhb87vyldqvb73yjq35s16bj4vlc"; buildDepends = [ zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix new file mode 100644 index 0000000000000..0e582c903c594 --- /dev/null +++ b/pkgs/development/libraries/libicns/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, libpng, jasper }: + +stdenv.mkDerivation { + name = "libicns-0.8.0"; + + src = fetchurl { + url = mirror://sourceforge/icns/libicns-0.8.0.tar.gz; + sha256 = "0jh67nm07jr1nfkfjid3jjw7fyw5hvj6a2fqan1bhg6gyr2hswla"; + }; + + buildInputs = [ libpng jasper ]; +} diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index f4c6d7367f62e..575d580faf650 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,21 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "openjpeg-1.2"; + name = "openjpeg-1.5.0"; src = fetchurl { - url = http://www.openjpeg.org/openjpeg_v1_2.tar.gz; - sha256 = "1i72i0hhssgg6vfkaw3gpwf5ld65g9s77ay8pxd4any1xy54qa90"; + url = http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz; + sha256 = "1kja6s9dk0hh7p9064kg69y6vninwyvpqi8cap92waj38jmqz469"; }; - patchPhase = '' - sed -i -e 's/-o root -g [^ ]\+//' Makefile Makefile.osx - ''; - - preInstall = '' - export installFlags="PREFIX=$out" - ''; - meta = { homepage = http://www.openjpeg.org/; description = "Open-source JPEG 2000 codec written in C language"; |