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

Commits on Apr 19, 2020

  1. Add myself (turion) to the maintainers list for several packages 

    Following nh2's advice, I want to be more involved in nixpkgs,
and I'll start to review changes to programs that are important to me,
and that didn't have a long list of maintainers yet.
    @turion
    turion committed Apr 19, 2020
    Copy the full SHA
    f253da4 View commit details

  2. Merge pull request #85548 from turion/master 

    Add myself (turion) to the maintainers list for several packages
    @Ma27
    Ma27 authored Apr 19, 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
    beb9b1a View commit details
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -7816,6 +7816,12 @@
githubId = 563054;
name = "Thomas Tuegel";
};
turion = {
email = "programming@manuelbaerenz.de";
github = "turion";
githubId = 303489;
name = "Manuel Bärenz";
};
tv = {
email = "tv@krebsco.de";
github = "4z3";
2 changes: 1 addition & 1 deletion pkgs/applications/audio/musescore/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ mkDerivation rec {
description = "Music notation and composition software";
homepage = "https://musescore.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ vandenoever ];
maintainers = with maintainers; [ vandenoever turion ];
platforms = platforms.linux;
repositories.git = "https://github.com/musescore/MuseScore";
};
2 changes: 1 addition & 1 deletion pkgs/applications/editors/vscode/vscodium.nix
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ in
homepage = "https://github.com/VSCodium/vscodium";
downloadPage = "https://github.com/VSCodium/vscodium/releases";
license = licenses.mit;
maintainers = with maintainers; [ synthetica ];
maintainers = with maintainers; [ synthetica turion ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/kde/konsole.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ mkDerivation {
name = "konsole";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
maintainers = with lib.maintainers; [ ttuegel turion ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
2 changes: 1 addition & 1 deletion pkgs/applications/kde/okular.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ mkDerivation {
meta = with lib; {
homepage = "http://www.kde.org";
license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
maintainers = with maintainers; [ ttuegel ];
maintainers = with maintainers; [ ttuegel turion ];
platforms = lib.platforms.linux;
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/misc/keepassx/community.nix
View file
Original file line number Diff line number Diff line change
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser).";
homepage = "https://keepassxc.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ jonafato ];
maintainers = with maintainers; [ jonafato turion ];
platforms = platforms.linux ++ platforms.darwin;
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/misc/krusader/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ in mkDerivation rec {
description = "Norton/Total Commander clone for KDE";
license = licenses.gpl2;
homepage = "http://www.krusader.org";
maintainers = with maintainers; [ sander ];
maintainers = with maintainers; [ sander turion ];
};

nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];