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

Jump to bottom

Haskell override clean up #62407

Closed
wants to merge 86 commits into from
Closed

Haskell override clean up #62407

wants to merge 86 commits into from

Conversation

infinisil
Copy link
Member

Ping @peti, specifically for the first point on jailbreak-cabal:

  • jailbreak-cabal override isn't needed, shared executables are disabled
    by default (or is this precautionary?)
  • Removed and added some infinite recursion overrides, moved them to
    configuration-nix.nix
  • Unbreak zstd and attparsec-varword
  • mysql override is already in configuration-nix.nix
  • Move some overrides for disabling tests due to internet connectivity
    to configuration-nix.nix
Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

peti and others added 30 commits May 26, 2019 02:30
@peti
hackage-packages.nix: automatic Haskell package set update
734a07e 
This update was generated by hackage2nix v2.14.3-4-g5a23331 from Hackage revision
commercialhaskell/all-cabal-hashes@aa073d9.
@peti
hackage-packages.nix: automatic Haskell package set update
11b501e 
This update was generated by hackage2nix v2.14.3-4-g5a23331 from Hackage revision
commercialhaskell/all-cabal-hashes@13027e9.
@c0bw3b @peti
axel: update meta.homepage
088b981 
alioth.debian.org is gone
@mschneiderwng @peti
added mschneider to maintainers
e040c7e
@mschneiderwng @peti
leftwm: init at 0.1.9
15638bf
@mschneiderwng @peti
leftwm: enable service
a6cafdf
@peti
maintainer-list.nix: email update
266b8c6
@c0bw3b @peti
perlPackages.Po4a: 0.47 -> 0.55 (NixOS#62060)
ad316d7 
+ refresh meta.homepage
@suhr @peti
kvirc: init at 5.0.0
bcbb8e9
@abbradar @peti
pythonPackages.python-axolotl: 0.2.2 -> 0.2.3
3908b5e 
Fixes corrupted OMEMO messages from Gajim.
@abbradar @peti
gajim: 1.1.2 -> 1.1.3
dba5880
@mmahut @peti
evince: CVE-2019-11459
7a75668
@risicle @peti
ghostscript: add patches for CVE-2019-3839
5792c7f
@MostAwesomeDude @peti
services.tahoe: Use networking.hostName.
8cca466 
Previously we used nothing, leading to NixOS#25273.

Big thanks to @t184256 for developing and testing this fix.

Fixes NixOS#25273.
@MostAwesomeDude @peti
services.tahoe: Use 1.13-compatible invocations.
1f668df
@tadeokondrak @peti
l-smash: init at 2.4.15
71d8a7c
@primeos @peti
androidStudioPackages.{dev,canary}: 3.5.0.14 -> 3.6.0.1
e333748
@timokau @peti
python.pkgs.annoy: init at 1.15.2
3a59ea7
@timokau @peti
python.pkgs.rl-coach: init at 0.12.0
841fc0a
@peti
multipath-tools: fix download URL
c7d0fb7 
The URL was mistakenly truncated in the following commit:
    57bccb3 treewide: http -> https sources (NixOS#42676)
@peti
multipath-tools: download URL points to tag for easier package updates
7140e21
@romildo @peti
enlightenment.terminology: 1.4.0 -> 1.4.1
08da280
@Ma27 @peti
w3m-nox: fix build
fef4082 
In the latest version (0.5.3+git20190105), `<X11/xlib.h>` isn't directly
included in `fb_imlib2.c` anymore, however it's used by `<Imlib.h>`
which broke our patch which disables X11 here.

Hydra build failure: https://hydra.nixos.org/build/93730733
See also tats/w3m@2266d1b
@cresh @peti
riemann: 0.3.1 -> 0.3.2
bc433c8
@bignaux @peti
xcpc: move libsdk and lesstiff as optional
15ff7da
@thumphries @peti
autorandr: use official package description
af1c164 
Use the description from the manpage / upstream repository.
@eadwu @peti
weasyprint: 45 -> 47
04f1817
@rvolosatovs @peti
go-tools: 2017.2.2 -> 2019.1.1
bb5a0d1
@marzipankaiser @peti
maintainers: add marzipankaiser
64a1f3a
@marzipankaiser @peti
pythonPackages.setproctitle: 1.1.9 -> 1.1.10
fa91dfd
rvolosatovs and others added 14 commits May 27, 2019 12:38
@rvolosatovs @peti
kitty: Remove integrated patches
ed31960
@rvolosatovs @peti
kitty: Adapt patches to upstream changes
788c6a4
@langston-barrett @peti
dropbox: 63.4.107 -> 73.4.118
f58a39f
@matthiasbeyer @peti
mutt: 1.11.4 -> 1.12.0
7fea5d7 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@peti
slack: 3.4.0 -> 3.4.2
d3cbb4c
@peti
LTS Haskell 13.23
657b161
@peti
hackage-packages.nix: automatic Haskell package set update
616f040 
This update was generated by hackage2nix v2.14.3-4-g5a23331 from Hackage revision
commercialhaskell/all-cabal-hashes@18a6236.
@peti
hackage-packages.nix: automatic Haskell package set update
6a5a89c 
This update was generated by hackage2nix v2.14.3-4-g5a23331 from Hackage revision
commercialhaskell/all-cabal-hashes@5cb0245.
@peti
hackage-packages.nix: automatic Haskell package set update
1c69a7e 
This update was generated by hackage2nix v2.14.3-4-g5a23331 from Hackage revision
commercialhaskell/all-cabal-hashes@3ef6ab6.
@peti
hackage-packages.nix: automatic Haskell package set update
297db79 
This update was generated by hackage2nix v2.14.3-4-g5a23331 from Hackage revision
commercialhaskell/all-cabal-hashes@ee223e1.
@peti
hackage-packages.nix: automatic Haskell package set update
cb2c324 
This update was generated by hackage2nix v2.14.3-6-g315012a from Hackage revision
commercialhaskell/all-cabal-hashes@5a3c3ef.
@peti
hackage-packages.nix: automatic Haskell package set update
dd5616a 
This update was generated by hackage2nix v2.14.3-6-g315012a from Hackage revision
commercialhaskell/all-cabal-hashes@f488db6.
@infinisil
haskellPackages.heap: Fix build
d466a76
@infinisil
haskellPackages: Clean up some overrides
4d922c8 
- jailbreak-cabal override isn't needed, shared executables are disabled
by default (or is this precautionary?)
- Removed and added some infinite recursion overrides, moved them to
configuration-nix.nix
- Unbreak zstd and attparsec-varword
- mysql override is already in configuration-nix.nix
- Move some overrides for disabling tests due to internet connectivity
to configuration-nix.nix
@peti peti force-pushed the haskell-updates branch 2 times, most recently from a940900 to 0cca754 Compare June 4, 2019 08:15
@peti
Copy link
Member

peti commented Jun 4, 2019

I merged the heap fix directly into master as 45d7270.

@peti peti force-pushed the haskell-updates branch 2 times, most recently from 2250de3 to 6f19c99 Compare June 4, 2019 08:33
peti pushed a commit that referenced this pull request Jun 4, 2019
@infinisil @peti
haskellPackages: clean up some overrides
6f19c99 
- jailbreak-cabal override isn't needed, shared executables are disabled
  by default (or is this precautionary?)

- Removed and added some infinite recursion overrides, moved them to
  configuration-nix.nix

- Unbreak zstd and attparsec-varword

- mysql override is already in configuration-nix.nix

- Move some overrides for disabling tests due to internet connectivity
  to configuration-nix.nix

Closes #62407.
@peti
Copy link
Member

peti commented Jun 4, 2019

6f19c99 merged to haskell-updates.

@peti peti closed this Jun 4, 2019
peti pushed a commit that referenced this pull request Jun 7, 2019
@infinisil @peti
haskellPackages: clean up some overrides
1d512f5 
- jailbreak-cabal override isn't needed, shared executables are disabled
  by default (or is this precautionary?)

- Removed and added some infinite recursion overrides, moved them to
  configuration-nix.nix

- Unbreak zstd and attparsec-varword

- mysql override is already in configuration-nix.nix

- Move some overrides for disabling tests due to internet connectivity
  to configuration-nix.nix

Closes #62407.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@basvandijk basvandijk Awaiting requested review from basvandijk

Assignees
No one assigned
Labels
6.topic: haskell 10.rebuild-darwin: 501+ 10.rebuild-darwin: 2501-5000 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet