From 3f45fe100a33a66432e051bd0b08e13f4ea72736 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Mar 2015 11:39:44 +0100 Subject: [PATCH] haskell-bindings-GLFW is broken (and has been for quite a while). --- .../haskell-modules/configuration-common.nix | 14 ++++++- .../haskell-modules/hackage-packages.nix | 38 ------------------- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5a7eff594d1..14b0e1104d8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -292,7 +292,6 @@ self: super: { aws = dontCheck super.aws; # needs aws credentials aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw - bindings-GLFW = dontCheck super.bindings-GLFW; # requires an active X11 display bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; buildwrapper = dontCheck super.buildwrapper; @@ -325,7 +324,6 @@ self: super: { ghc-parmake = dontCheck super.ghc-parmake; gitlib-cmdline = dontCheck super.gitlib-cmdline; git-vogue = dontCheck super.git-vogue; - GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; @@ -630,6 +628,18 @@ self: super: { # https://github.com/tych0/xcffib/issues/37 xcffib = dontCheck super.xcffib; + # https://github.com/bsl/bindings-GLFW/issues/25 + bindings-GLFW = markBroken super.bindings-GLFW; + dynamic-graph = dontDistribute super.dynamic-graph; + fwgl-glfw = dontDistribute super.fwgl-glfw; + glapp = dontDistribute super.glapp; + GLFW-b-demo = dontDistribute super.GLFW-b-demo; + GLFW-b = dontDistribute super.GLFW-b; + GLFW = dontDistribute super.GLFW; + lambdacube-samples = dontDistribute super.lambdacube-samples; + nehe-tuts = dontDistribute super.nehe-tuts; + netwire-input-glfw = dontDistribute super.netwire-input-glfw; + } // { # Not on Hackage. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f0c8f4d6ae2..63aaa0a11cf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4796,22 +4796,6 @@ self: { inherit (pkgs.xlibs) libXrandr;}; "GLFW-b" = callPackage - ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "GLFW-b"; - version = "1.4.6"; - sha256 = "1d9vacb9nsf5cqqwxhn49wsfbhmw1263kgimk5qxpqpg1jiy35hy"; - buildDepends = [ base bindings-GLFW ]; - testDepends = [ - base bindings-GLFW HUnit test-framework test-framework-hunit - ]; - description = "Bindings to GLFW OpenGL library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "GLFW-b_1_4_7_1" = callPackage ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework , test-framework-hunit }: @@ -4823,7 +4807,6 @@ self: { testDepends = [ base bindings-GLFW HUnit test-framework test-framework-hunit ]; - jailbreak = true; description = "Bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -23305,27 +23288,6 @@ self: { }) { esound = null;}; "bindings-GLFW" = callPackage - ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXext - , libXfixes, libXi, libXrandr, libXxf86vm, mesa, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "bindings-GLFW"; - version = "3.0.3.3"; - sha256 = "0w6vqshlk0c4k4q81xw7kg4j62h3wpccpy8qbiq5ks69w7z13fy4"; - buildDepends = [ base bindings-DSL ]; - testDepends = [ base HUnit test-framework test-framework-hunit ]; - extraLibraries = [ - libX11 libXext libXfixes libXi libXrandr libXxf86vm mesa - ]; - description = "Low-level bindings to GLFW OpenGL library"; - license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; - inherit (pkgs.xlibs) libXfixes; inherit (pkgs.xlibs) libXi; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; - inherit (pkgs) mesa;}; - - "bindings-GLFW_3_1_1" = callPackage ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXext , libXfixes, libXi, libXrandr, libXxf86vm, mesa, test-framework , test-framework-hunit