diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
commit | 215a07c1a9d6d208c1ba0037eccaaba7de9d6b68 (patch) | |
tree | f31e835b16c30957eb4ae3710cbfa922e8a64fbd /pkgs/development/compilers/idris | |
parent | b31c67e24d56c90a6732d3a310ff13684b73e200 (diff) | |
parent | 4e3dcd925499547314567107366cae26a99c4ef7 (diff) | |
download | nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.gz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.bz2 nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.lz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.xz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.zst nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.zip |
svn merge ^/nixpkgs/trunk
Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
Diffstat (limited to 'pkgs/development/compilers/idris')
-rw-r--r-- | pkgs/development/compilers/idris/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 56d5060662b..4e491ffde0d 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.0"; - sha256 = "03zbdcl3v90zv0ibzq9fa8z2qrrdsilh5m509mczwrcmlzbzsmrl"; + version = "0.9.1"; + sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr"; isLibrary = false; isExecutable = true; buildDepends = [ binary epic haskeline mtl parsec transformers ]; @@ -12,7 +12,7 @@ cabal.mkDerivation (self: { noHaddock = true; meta = { homepage = "http://www.idris-lang.org/"; - description = "Dependently Typed Functional Programming Language"; + description = "Functional Programming Language with Dependent Types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ |