Skip to content

Comments

haskellPackages.xmonad: drop upstreamed Nix compat patch#191169

Merged
sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom
sternenseemann:xmonad-0.17.1
Sep 14, 2022
Merged

haskellPackages.xmonad: drop upstreamed Nix compat patch#191169
sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom
sternenseemann:xmonad-0.17.1

Conversation

@sternenseemann
Copy link
Member

We had a long standing downstream patch for XMonad allowing us to override the ghc and xmessage binaries used. That has been upstreamed and released in 0.17.1 and we can drop it!

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Sep 14, 2022
@sternenseemann
Copy link
Member Author

@ofborg build xmonad xmonadctl haskellPackages.xmonad-contrib

@sternenseemann
Copy link
Member Author

sternenseemann commented Sep 14, 2022

@ofborg test xmonad Edit: ran out of disk space :(

We had a long standing downstream patch for XMonad allowing us to
override the ghc and xmessage binaries used. That has been upstreamed
and released in 0.17.1 and we can drop it!

* patch upstreamed in xmonad/xmonad#409
* downstream patch adjusted in NixOS#184784
Copy link
Member

@ivanbrennan ivanbrennan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@SuperSandro2000
Copy link
Member

@ofborg eval

Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@sternenseemann sternenseemann merged commit 75f79c2 into NixOS:haskell-updates Sep 14, 2022
@sternenseemann sternenseemann deleted the xmonad-0.17.1 branch September 14, 2022 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants