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: adf16b1b9f7f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e5b27337b07a
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on May 24, 2020

  1. maintainers: Add maralorn

    @maralorn
    maralorn committed May 24, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 226A2D41EF5378C9
    Learn about vigilant mode
    Copy the full SHA
    f6775d1 View commit details

  2. configuration-hackage2nix: Add maralorn as a maintainer for a number … 

    …of haskellPackages
    @maralorn
    maralorn committed May 24, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 226A2D41EF5378C9
    Learn about vigilant mode
    Copy the full SHA
    bb2babc View commit details

Commits on May 25, 2020

  1. Merge pull request #88834 from maralorn/maintainer-maralorn 

    [haskell-updates] Add maralorn as maintainer for same haskell packages
    @cdepillabout
    cdepillabout authored May 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e5b2733 View commit details
Showing with 15 additions and 0 deletions.
  1. +6 −0 maintainers/maintainer-list.nix
  2. +9 −0 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -4695,6 +4695,12 @@
githubId = 3507;
name = "Michael Fellinger";
};
maralorn = {
email = "malte.brandy@maralorn.de";
github = "maralorn";
githubId = 1651325;
name = "Malte Brandy";
};
marcweber = {
email = "marco-oweber@gmx.de";
github = "marcweber";
9 changes: 9 additions & 0 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -2495,6 +2495,15 @@ package-maintainers:
- icepeak
terlar:
- nix-diff
maralorn:
- ghcide
- cabal-fmt
- neuron
- shh
- brittany
- hlint
- releaser
- taskwarrior

unsupported-platforms:
alsa-mixer: [ x86_64-darwin ]