From eaf518c2971d7b1264bb5c471d0d9e371e764c26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Oct 2014 10:22:30 +0200 Subject: [PATCH] haskell-vty: update to version 5.2.4 (and remove obsolete version 4.x) This change breaks vty-ui, which appears to be unmaintained by upstream. https://github.com/jtdaugherty/vty-ui/issues/55 --- .../libraries/haskell/vty-ui/default.nix | 1 + .../libraries/haskell/vty/4.7.5.nix | 29 ------------------- .../haskell/vty/{5.2.3.nix => default.nix} | 4 +-- pkgs/top-level/haskell-packages.nix | 8 ++--- 4 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/vty/4.7.5.nix rename pkgs/development/libraries/haskell/vty/{5.2.3.nix => default.nix} (93%) diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index e8775c7d112..0e419afdfbf 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -19,5 +19,6 @@ cabal.mkDerivation (self: { description = "An interactive terminal user interface library for Vty"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/vty/4.7.5.nix b/pkgs/development/libraries/haskell/vty/4.7.5.nix deleted file mode 100644 index 1eccdd58fef..00000000000 --- a/pkgs/development/libraries/haskell/vty/4.7.5.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, deepseq, mtl, parallel, parsec, QuickCheck, random -, stringQq, terminfo, utf8String, vector -}: - -cabal.mkDerivation (self: { - pname = "vty"; - version = "4.7.5"; - sha256 = "0ahd5qjszfw1xbl5jxhzfw31mny8hp8clw9qciv15xn442prvvpr"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - deepseq mtl parallel parsec stringQq terminfo utf8String vector - ]; - testDepends = [ - Cabal deepseq mtl parallel parsec QuickCheck random terminfo - utf8String vector - ]; - jailbreak = true; - doCheck = false; - meta = { - homepage = "https://github.com/coreyoconnor/vty"; - description = "A simple terminal UI library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/vty/5.2.3.nix b/pkgs/development/libraries/haskell/vty/default.nix similarity index 93% rename from pkgs/development/libraries/haskell/vty/5.2.3.nix rename to pkgs/development/libraries/haskell/vty/default.nix index f4685d3e50c..c5b7ffa6c0e 100644 --- a/pkgs/development/libraries/haskell/vty/5.2.3.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.2.3"; - sha256 = "0afgysliv7bi3x46cj8bcmahfc1lz2niyfmvnzrf9brhxf7l9y76"; + version = "5.2.4"; + sha256 = "0dqp54sf6pl7magjhd91k87z50zi83x6w27kmyzp55112aiy7bf6"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ec7b783bf8e..42ca62dc1bf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2774,13 +2774,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in void = callPackage ../development/libraries/haskell/void {}; - vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; - vty_5_2_3 = callPackage ../development/libraries/haskell/vty/5.2.3.nix {}; - vty = self.vty_5_2_3; + vty = callPackage ../development/libraries/haskell/vty {}; - vtyUi = callPackage ../development/libraries/haskell/vty-ui { - vty = self.vty_4_7_5; - }; + vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; wai = callPackage ../development/libraries/haskell/wai {};