diff options
| author | Tony Zorman <soliditsallgood@mailbox.org> | 2023-11-14 12:24:40 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-11-16 18:49:39 +0100 |
| commit | 13a5e59195f556bd723578be22a3fd01d6766e0a (patch) | |
| tree | 463c49ad0fb7a5d9c472708e1d6f85f33fcdd749 /pkgs/development/haskell-modules | |
| parent | d1e968b8f03c1451de56c4a62c1258b75c831dd4 (diff) | |
haskellPackages.kmonad: unbreak
Version 0.4.2 was released on hackage, which builds correctly. Closes: https://github.com/NixOS/nixpkgs/issues/266186 Closes: https://github.com/NixOS/nixpkgs/issues/224190
Diffstat (limited to 'pkgs/development/haskell-modules')
3 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e9b8cbf5e1357..92e793c27a4fa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2691,4 +2691,9 @@ self: super: { sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx; sdl2-ttf = overrideCabal { __onlyPropagateKnownPkgConfigModules = true; } super.sdl2-ttf; + # Needs git for compile-time insertion of commit hash into --version string. + kmonad = overrideCabal (drv: { + libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.buildPackages.git]; + }) super.kmonad; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ebf411e277844..0a5dc26a8b245 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3050,7 +3050,6 @@ broken-packages: - kind-integer # failure in job https://hydra.nixos.org/build/233250066 at 2023-09-02 - kleene-list # failure in job https://hydra.nixos.org/build/233237651 at 2023-09-02 - kmn-programming # failure in job https://hydra.nixos.org/build/233258328 at 2023-09-02 - - kmonad # failure in job https://hydra.nixos.org/build/233239997 at 2023-09-02 - kmp-dfa # failure in job https://hydra.nixos.org/build/233237266 at 2023-09-02 - knots # failure in job https://hydra.nixos.org/build/233209153 at 2023-09-02 - koellner-phonetic # failure in job https://hydra.nixos.org/build/233217750 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a21de62ceeaf4..5bff86424539e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -179904,9 +179904,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "kmonad"; - broken = true; }) {}; "kmp-dfa" = callPackage |