From 581fcc2ad208a05a464e87b0bb639821e43e5085 Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Fri, 5 Dec 2014 16:08:39 +0800 Subject: [PATCH 1/3] Added linear-opengl --- .../haskell/linear-opengl/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/linear-opengl/default.nix diff --git a/pkgs/development/libraries/haskell/linear-opengl/default.nix b/pkgs/development/libraries/haskell/linear-opengl/default.nix new file mode 100644 index 000000000000..0c36155687e0 --- /dev/null +++ b/pkgs/development/libraries/haskell/linear-opengl/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, distributive, lens, linear, OpenGL, OpenGLRaw, tagged }: + +cabal.mkDerivation (self: { + pname = "linear-opengl"; + version = "0.2.0.3"; + sha256 = "1fkx5qbimkw2z6nv1jrqb1s0pixlb7l54wxvlhx0nx1kw299dbnd"; + buildDepends = [ + distributive lens linear OpenGL OpenGLRaw tagged + ]; + meta = { + homepage = "http://www.github.com/bgamari/linear-opengl"; + description = "Isomorphisms between linear and OpenGL types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 748bb8336438..1c2502d0dd1c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1538,6 +1538,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in linear = callPackage ../development/libraries/haskell/linear {}; + linearOpenGL = callPackage ../development/libraries/haskell/linear-opengl {}; + linuxInotify = callPackage ../development/libraries/haskell/linux-inotify {}; List = callPackage ../development/libraries/haskell/List {}; From d779ff5d5c3feaef915babf6da9d237c7a250b60 Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Fri, 5 Dec 2014 16:17:03 +0800 Subject: [PATCH 2/3] Jailbreak --- pkgs/development/libraries/haskell/linear-opengl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/linear-opengl/default.nix b/pkgs/development/libraries/haskell/linear-opengl/default.nix index 0c36155687e0..0d2da3445a6f 100644 --- a/pkgs/development/libraries/haskell/linear-opengl/default.nix +++ b/pkgs/development/libraries/haskell/linear-opengl/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ distributive lens linear OpenGL OpenGLRaw tagged ]; + jailbreak = true; meta = { homepage = "http://www.github.com/bgamari/linear-opengl"; description = "Isomorphisms between linear and OpenGL types"; From e9a24c96be31412b009b950a8dbe7e37380b3f1b Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Fri, 5 Dec 2014 22:52:35 +0800 Subject: [PATCH 3/3] Jailbreak fixed upstream. Bumping to 0.2.0.4 --- pkgs/development/libraries/haskell/linear-opengl/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/linear-opengl/default.nix b/pkgs/development/libraries/haskell/linear-opengl/default.nix index 0d2da3445a6f..a10489a6006c 100644 --- a/pkgs/development/libraries/haskell/linear-opengl/default.nix +++ b/pkgs/development/libraries/haskell/linear-opengl/default.nix @@ -4,12 +4,11 @@ cabal.mkDerivation (self: { pname = "linear-opengl"; - version = "0.2.0.3"; - sha256 = "1fkx5qbimkw2z6nv1jrqb1s0pixlb7l54wxvlhx0nx1kw299dbnd"; + version = "0.2.0.4"; + sha256 = "11pdif2w730jqknajr2si77a0z4v4k5spm5zdks642i25ya135ba"; buildDepends = [ distributive lens linear OpenGL OpenGLRaw tagged ]; - jailbreak = true; meta = { homepage = "http://www.github.com/bgamari/linear-opengl"; description = "Isomorphisms between linear and OpenGL types";