Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e9010b43aace
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: df7e62ad4e78
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 9, 2021

  1. haskellPackages.Frames-streamly: fix build 

    - use relude_1_0_0_1 to satisfy bounds
- add missing file example_data/acs100k.csv [upstream issue](adamConnerSax/Frames-streamly#1)

https://hydra.nixos.org/build/142525099/nixlog/1

ZHF: #122042
    @divanorama @maralorn
    divanorama authored and maralorn committed May 9, 2021
    Copy the full SHA
    df7e62a View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −0 pkgs/development/haskell-modules/configuration-common.nix
  2. +0 −1 pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
9 changes: 9 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1870,4 +1870,13 @@ self: super: {
ShellCheck = self.ShellCheck_0_7_1;
};

Frames-streamly = overrideCabal (super.Frames-streamly.override { relude = super.relude_1_0_0_1; }) (drv: {
# https://github.com/adamConnerSax/Frames-streamly/issues/1
patchPhase = ''
cat > example_data/acs100k.csv <<EOT
"YEAR","REGION","STATEFIP","DENSITY","METRO","PUMA","PERWT","SEX","AGE","RACE","RACED","HISPAN","HISPAND","CITIZEN","LANGUAGE","LANGUAGED","SPEAKENG","EDUC","EDUCD","GRADEATT","GRADEATTD","EMPSTAT","EMPSTATD","INCTOT","INCSS","POVERTY"
2006,32,1,409.6,3,2300,87.0,1,47,1,100,0,0,0,1,100,3,6,65,0,0,1,12,36000,0,347
EOT
''; });

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file
Original file line number Diff line number Diff line change
@@ -1406,7 +1406,6 @@ broken-packages:
- fraction
- frag
- Frames-map-reduce
- Frames-streamly
- franchise
- fraxl
- freddy