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

Commits on Oct 8, 2019

  1. maintainers: add alva

    Alva committed Oct 8, 2019
    Copy the full SHA
    4c0b3ca View commit details

  2. oil: add alva as maintainer

    Alva committed Oct 8, 2019

    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
    d63593b View commit details

  3. Merge pull request #70730 from fjallarefur/oil 

    Add myself as a maintainer of the oil package
    @lheckemann
    lheckemann authored Oct 8, 2019
    Copy the full SHA
    60b2fe6 View commit details
Showing with 11 additions and 1 deletion.
  1. +10 −0 maintainers/maintainer-list.nix
  2. +1 −1 pkgs/shells/oil/default.nix
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -356,6 +356,16 @@
github = "alunduil";
name = "Alex Brandt";
};
alva = {
email = "alva@skogen.is";
github = "fjallarefur";
githubId = 42881386;
name = "Alva";
keys = [{
longkeyid = "ed25519/0xF53E323342F7A6D3";
fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A";
}];
};
amar1729 = {
email = "amar.paul16@gmail.com";
github = "amar1729";
2 changes: 1 addition & 1 deletion pkgs/shells/oil/default.nix
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
asl20 # Licence for Oil itself
];

maintainers = with lib.maintainers; [ lheckemann ];
maintainers = with lib.maintainers; [ lheckemann alva ];
};

passthru = {