about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Djubek <envy1988@gmail.com>2019-12-19 14:21:34 +0000
committerPeter Simons <simons@cryp.to>2019-12-27 20:37:13 +0100
commit0787a562c462d39b4bd6aa4ca3b30fc20db6a2bc (patch)
tree82b2e3cbcee8b8d3be6b636057b8708a7c30e59f /pkgs
parent42e51bd42edda14b3bc44909d7a3405f7580c1e5 (diff)
downloadnixlib-0787a562c462d39b4bd6aa4ca3b30fc20db6a2bc.tar
nixlib-0787a562c462d39b4bd6aa4ca3b30fc20db6a2bc.tar.gz
nixlib-0787a562c462d39b4bd6aa4ca3b30fc20db6a2bc.tar.bz2
nixlib-0787a562c462d39b4bd6aa4ca3b30fc20db6a2bc.tar.lz
nixlib-0787a562c462d39b4bd6aa4ca3b30fc20db6a2bc.tar.xz
nixlib-0787a562c462d39b4bd6aa4ca3b30fc20db6a2bc.tar.zst
nixlib-0787a562c462d39b4bd6aa4ca3b30fc20db6a2bc.zip
glirc: init at 2.33.1
haskellPackages.glirc is a "Console IRC Client." I've added a doJailbreak
to fix the build (thanks @infinisil) and added it to top-level/all-packages.nix
so people can find and install it as they would normally.

Would be nice to make this build in a way that allows the OTR extension to be
enabled. One thing at a time....
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml3
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0ba6dbf64908..c424669f9895 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1318,4 +1318,8 @@ self: super: {
   haskell-lsp_0_18_0_0 = super.haskell-lsp_0_18_0_0.override { haskell-lsp-types = self.haskell-lsp-types_0_18_0_0; };
   lsp-test_0_8_2_0 = (dontCheck super.lsp-test_0_8_2_0).override { haskell-lsp = self.haskell-lsp_0_18_0_0; };
 
+  # 2019-12-19 - glirc wants regex-tdfa >=1.3 which results in errors with regex-base which errors more
+  # hoping to make a proper derivation with plugins enabled and more reliable building -- kiwi
+  glirc = doJailbreak super.glirc;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 541f902f4ffa..ef6eada4c2d6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2576,6 +2576,8 @@ package-maintainers:
     - elm-export-persistent
     - pipes-mongodb
     - streaming-wai
+  kiwi:
+    - glirc
   psibi:
     - path-pieces
     - persistent
@@ -5081,7 +5083,6 @@ broken-packages:
   - gli
   - glicko
   - glider-nlp
-  - glirc
   - GLMatrix
   - glob-posix
   - global
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1ca9847cd87..b68c58ce42ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11663,6 +11663,8 @@ in
 
   glib-networking = callPackage ../development/libraries/glib-networking {};
 
+  glirc = haskell.lib.justStaticExecutables haskellPackages.glirc;
+
   gom = callPackage ../development/libraries/gom { };
 
   ace = callPackage ../development/libraries/ace { };