From 3fd519822f0247b199afb1fdc850ac345e151f0a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Jun 2014 08:09:04 +0200 Subject: [PATCH 1/2] agda-stdlib: upgrade to 0.8 (they keep changing the version scheme) Conflicts: pkgs/development/compilers/agda/stdlib-0.8.nix pkgs/top-level/haskell-packages.nix --- .../agda/{stdlib-2.4.0.nix => stdlib-0.8.nix} | 12 ++++++------ pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/compilers/agda/{stdlib-2.4.0.nix => stdlib-0.8.nix} (70%) diff --git a/pkgs/development/compilers/agda/stdlib-2.4.0.nix b/pkgs/development/compilers/agda/stdlib-0.8.nix similarity index 70% rename from pkgs/development/compilers/agda/stdlib-2.4.0.nix rename to pkgs/development/compilers/agda/stdlib-0.8.nix index faa55d379b1..d3b848d73b5 100644 --- a/pkgs/development/compilers/agda/stdlib-2.4.0.nix +++ b/pkgs/development/compilers/agda/stdlib-0.8.nix @@ -1,12 +1,12 @@ { cabal, fetchurl, filemanip, Agda }: -cabal.mkDerivation (self: { - pname = "Agda-lib-ffi"; - version = "2.4.0"; +cabal.mkDerivation (self: rec { + pname = "Agda-stdlib"; + version = "0.8"; src = fetchurl { - url = "https://github.com/agda/agda-stdlib/archive/v2.4.0.tar.gz"; - sha256 = "1rz0jrkm1b8d8aj9hbj3yl2k219c57r0cizfx98qqf1b9mwixzbf"; + url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz"; + sha256 = "03gdcy2gar46qlmd6w91y05cm1x304ig6bda90ryww9qn05kif78"; }; buildDepends = [ filemanip Agda ]; @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { mkdir -p $out/share cd .. runhaskell GenerateEverything - ${Agda}/bin/agda -i . -i src Everything.agda + agda -i . -i src Everything.agda cp -pR src $out/share/agda ''; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f2334b9e6a8..e07d3396f82 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2607,7 +2607,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix { Agda = self.Agda_2_3_2_2; }; - AgdaStdlib_2_4_0 = callPackage ../development/compilers/agda/stdlib-2.4.0.nix { + AgdaStdlib_0_8 = callPackage ../development/compilers/agda/stdlib-0.8.nix { Agda = self.Agda_2_4_0_1; }; AgdaStdlib = self.AgdaStdlib_0_7; From 2d92adcc1a882fea5f92fdbdce2a25eee4c2732a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Jun 2014 08:19:46 +0200 Subject: [PATCH 2/2] agda: change defaults to latest version --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e07d3396f82..76ba858e768 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2602,7 +2602,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {}; Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix {}; - Agda = self.Agda_2_3_2_2; + Agda = self.Agda_2_4_0_1; AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix { Agda = self.Agda_2_3_2_2; @@ -2610,7 +2610,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in AgdaStdlib_0_8 = callPackage ../development/compilers/agda/stdlib-0.8.nix { Agda = self.Agda_2_4_0_1; }; - AgdaStdlib = self.AgdaStdlib_0_7; + AgdaStdlib = self.AgdaStdlib_0_8; uhc = callPackage ../development/compilers/uhc {};