b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #121170 from samuelgrf/add-mainProgram-to-packages

Browse source
This commit is contained in:
Sandro 2021-04-30 01:20:37 +02:00 committed by GitHub
parent ecaf5e946c 1e77642558
commit 75a24a5bc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/graphics/ImageMagick/7.0.nix
View file

@ -78,5 +78,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ erictapen ];
license = licenses.asl20;
mainProgram = "magick";
};
}

3
pkgs/applications/networking/browsers/google-chrome/default.nix
View file

@ -161,5 +161,8 @@ in stdenv.mkDerivation {
# will try to merge PRs and respond to issues but I'm not actually using
# Google Chrome.
platforms = [ "x86_64-linux" ];
mainProgram =
if (channel == "dev") then "google-chrome-unstable"
else "google-chrome-${channel}";
};
}

1
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file

@ -402,6 +402,7 @@ stdenv.mkDerivation rec {
changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
platforms = attrNames srcs;
maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 cap KarlJoad ];
mainProgram = "tor-browser";
hydraPlatforms = [];
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
# the compound is "libre" in a strict sense (some components place certain

1
pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
View file

@ -49,6 +49,7 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
maintainers = with lib.maintainers; [ taku0 ];
inherit knownVulnerabilities;
mainProgram = "java";
};
}; in result

1
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
View file

@ -108,6 +108,7 @@ let result = stdenv.mkDerivation rec {
platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
maintainers = with lib.maintainers; [ taku0 ];
inherit knownVulnerabilities;
mainProgram = "java";
};
}; in result

1
pkgs/development/compilers/openjdk/11.nix
View file

@ -142,6 +142,7 @@ let
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo asbachb ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
passthru = {

1
pkgs/development/compilers/openjdk/12.nix
View file

@ -151,6 +151,7 @@ let
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
passthru = {

1
pkgs/development/compilers/openjdk/13.nix
View file

@ -151,6 +151,7 @@ let
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
passthru = {

1
pkgs/development/compilers/openjdk/14.nix
View file

@ -147,6 +147,7 @@ let
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
passthru = {

1
pkgs/development/compilers/openjdk/15.nix
View file

@ -147,6 +147,7 @@ let
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
passthru = {

1
pkgs/development/compilers/openjdk/16.nix
View file

@ -153,6 +153,7 @@ let
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
passthru = {

1
pkgs/development/compilers/openjdk/8.nix
View file

@ -262,6 +262,7 @@ let
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
mainProgram = "java";
};
passthru = {

1
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View file

@ -184,6 +184,7 @@ let result = stdenv.mkDerivation rec {
meta = with lib; {
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
mainProgram = "java";
};
}; in result

1
pkgs/development/compilers/zulu/8.nix
View file

@ -105,5 +105,6 @@ in stdenv.mkDerivation {
'';
maintainers = with maintainers; [ fpletz ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
mainProgram = "java";
};
}

1
pkgs/development/compilers/zulu/default.nix
View file

@ -108,5 +108,6 @@ in stdenv.mkDerivation {
'';
maintainers = with maintainers; [ fpletz ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
mainProgram = "java";
};
}

1
pkgs/development/python-modules/adb-enhanced/default.nix
View file

@ -30,5 +30,6 @@ buildPythonPackage rec {
homepage = "https://github.com/ashishb/adb-enhanced";
license = licenses.asl20;
maintainers = with maintainers; [ vtuan10 ];
mainProgram = "adbe";
};
}

1
pkgs/misc/emulators/pcsx2/default.nix
View file

@ -102,6 +102,7 @@ stdenv.mkDerivation {
'';
homepage = "https://pcsx2.net";
maintainers = with maintainers; [ hrdinka govanify ];
mainProgram = "PCSX2";
# PCSX2's source code is released under LGPLv3+. It However ships
# additional data files and code that are licensed differently.

1
pkgs/misc/emulators/wine/base.nix
View file

@ -151,5 +151,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
license = with lib.licenses; [ lgpl21Plus ];
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
maintainers = with lib.maintainers; [ avnik raskin bendlas ];
mainProgram = "wine";
};
})

1
pkgs/os-specific/linux/lm-sensors/default.nix
View file

@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
license = with licenses; [ lgpl21Plus gpl2Plus ];
maintainers = with maintainers; [ pengmeiyu ];
platforms = platforms.linux;
mainProgram = "sensors";
};
}

1
pkgs/tools/X11/libstrangle/default.nix
View file

@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ aske ];
mainProgram = "strangle";
};
}

1
pkgs/tools/archivers/p7zip/default.nix
View file

@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)";
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.raskin ];
mainProgram = "7z";
# RAR code is under non-free UnRAR license, but we remove it
license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus;
};

1
pkgs/tools/misc/trash-cli/default.nix
View file

@ -30,5 +30,6 @@ python3Packages.buildPythonApplication rec {
maintainers = [ maintainers.rycee ];
platforms = platforms.unix;
license = licenses.gpl2;
mainProgram = "trash";
};
}