diff options
| author | Robert Djubek <envy1988@gmail.com> | 2020-01-19 15:19:57 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-01-24 21:02:42 +0100 |
| commit | 8e5d5bac2ec91fa4c019bb8d686373c90a1b1830 (patch) | |
| tree | abdea9e6e8a186593f7fd52d4c0ecda1546ac63c /pkgs/development | |
| parent | d8440b802eda7d8d14848e81d368fa42f9a61cfa (diff) | |
| download | nixpkgs-8e5d5bac2ec91fa4c019bb8d686373c90a1b1830.tar nixpkgs-8e5d5bac2ec91fa4c019bb8d686373c90a1b1830.tar.gz nixpkgs-8e5d5bac2ec91fa4c019bb8d686373c90a1b1830.tar.bz2 nixpkgs-8e5d5bac2ec91fa4c019bb8d686373c90a1b1830.tar.lz nixpkgs-8e5d5bac2ec91fa4c019bb8d686373c90a1b1830.tar.xz nixpkgs-8e5d5bac2ec91fa4c019bb8d686373c90a1b1830.tar.zst nixpkgs-8e5d5bac2ec91fa4c019bb8d686373c90a1b1830.zip | |
glirc: 2.33.1 -> 2.34
Really this is a fix of the build because of the automatic version bump
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5605af97ddc..8d7d2fbfd8f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1337,7 +1337,15 @@ self: super: { # 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; + # 2020-01-17 - as of recently the basic doJailbreak is not enough and have to override regex-tdfa which needs an override for regex-base + + glirc = doJailbreak (super.glirc.override { + regex-tdfa = self.regex-tdfa_1_3_1_0; + }); + + regex-tdfa_1_3_1_0 = doJailbreak (super.regex-tdfa_1_3_1_0.override { + regex-base = self.regex-base_0_94_0_0; + }); # apply patches from https://github.com/snapframework/snap-server/pull/126 # manually until they are accepted upstream |