Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

alex: drop patch #73693

Merged
merged 1 commit into from Nov 19, 2019
Merged

alex: drop patch #73693

merged 1 commit into from Nov 19, 2019

Conversation

@toonn
Copy link
Contributor

toonn commented Nov 18, 2019

simonmar/alex#140 was merged and the patch has been applied in alex
version 3.2.5 so the build is broken trying to re-apply the patch.

Motivation for this change

Build is currently broken:

toonn@terra ~/s/nixpkgs> nix-shell -p haskell.packages.ghc881.alex
warning: Nix search path entry '/nix/var/nix/profiles/per-user/root/channels' does not exist, ignoring
these derivations will be built:
  /nix/store/m1kpjzmnknjj3id1z99vxm6n2vgjaj94-alex-3.2.5.drv
building '/nix/store/m1kpjzmnknjj3id1z99vxm6n2vgjaj94-alex-3.2.5.drv'...
setupCompilerEnvironmentPhase
Build with /nix/store/w80d6hkln8677c0rs8adn69bydmblf24-ghc-8.8.1.
unpacking sources
unpacking source archive /nix/store/x90v6grkvnasfb4k6x529vi993yghv14-alex-3.2.5.tar.gz
source root is alex-3.2.5
setting SOURCE_DATE_EPOCH to timestamp 1000000000 of file alex-3.2.5/tests/unicode.x
patching sources
applying patch /nix/store/zd1s3kb85vkry8wfz21x8yccwx1xmpyr-deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch
patching file tests/default_typeclass.x
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file tests/default_typeclass.x.rej
builder for '/nix/store/m1kpjzmnknjj3id1z99vxm6n2vgjaj94-alex-3.2.5.drv' failed with exit code 1
error: build of '/nix/store/m1kpjzmnknjj3id1z99vxm6n2vgjaj94-alex-3.2.5.drv' failed
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

simonmar/alex#140 was merged and the patch has been applied in alex
version 3.2.5 so the build is broken trying to re-apply the patch.
@cdepillabout

This comment has been minimized.

Copy link
Member

cdepillabout commented Nov 19, 2019

@toonn Thanks for catching this!

@GrahamcOfBorg build haskell.packages.ghc881.alex

@cdepillabout

This comment has been minimized.

Copy link
Member

cdepillabout commented Nov 19, 2019

I've confirmed that this fixed the alex build, so I'm merging in.

@peti I'm merging this in even though it is to the master branch (and not haskell-updates) because it is only touching ghc881 stuff, so I don't think it should affect running things like hackage2nix. If I am incorrect in this assumption, please let me know.

@cdepillabout cdepillabout merged commit 5f3b21f into NixOS:master Nov 19, 2019
14 checks passed
14 checks passed
haskell.packages.ghc881.alex on aarch64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
haskell.packages.ghc881.alex on x86_64-linux Success
Details
@toonn

This comment has been minimized.

Copy link
Contributor Author

toonn commented Nov 19, 2019

If I should be making haskell PRs like this one to the haskell-updates branch instead, please let me know.

@peti

This comment has been minimized.

Copy link
Member

peti commented Nov 19, 2019

I prefer them to be directed towards haskell-updates, but master is fine, too, since these changes don't affect the primary package set, e.g. the one for ghc-8.6.5.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.