cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #247838 from Gerg-L/mainProgram

Browse source
This commit is contained in:
Franz Pletz 2023-08-08 04:39:24 +02:00 committed by GitHub
commit 3a030589d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/window-managers/picom/default.nix
View file

@ -30,14 +30,14 @@
, withDebug ? false , withDebug ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "picom"; pname = "picom";
version = "10.2"; version = "10.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yshui"; owner = "yshui";
repo = "picom"; repo = "picom";
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-C+icJXTkE+XMaU7N6JupsP8xhmRVggX9hY1P7za0pO0="; hash = "sha256-C+icJXTkE+XMaU7N6JupsP8xhmRVggX9hY1P7za0pO0=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -113,5 +113,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/yshui/picom"; homepage = "https://github.com/yshui/picom";
maintainers = with maintainers; [ ertes twey thiagokokada ]; maintainers = with maintainers; [ ertes twey thiagokokada ];
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "picom";
}; };
} })

9
pkgs/misc/screensavers/xautolock/default.nix
View file

@ -2,7 +2,7 @@
, imake, gccmakedep, libX11, libXext, libXScrnSaver, xorgproto , imake, gccmakedep, libX11, libXext, libXScrnSaver, xorgproto
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "xautolock"; pname = "xautolock";
version = "2.2-7-ga23dd5c"; version = "2.2-7-ga23dd5c";
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "peti"; owner = "peti";
repo = "xautolock"; repo = "xautolock";
rev = "v${version}"; rev = "v${finalAttrs.version}";
sha256 = "10j61rl0sx9sh84rjyfyddl73xb5i2cpb17fyrli8kwj39nw0v2g"; hash = "sha256-T2zAbRqSTxRp9u6EdZmIZfVxaGveeZkJgjp1DWgORoI=";
}; };
nativeBuildInputs = [ imake gccmakedep ]; nativeBuildInputs = [ imake gccmakedep ];
@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ peti ]; maintainers = with maintainers; [ peti ];
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl2; license = licenses.gpl2;
mainProgram = "xautolock";
}; };
} })

27
pkgs/shells/dash/default.nix
View file

@ -8,13 +8,13 @@
, dash , dash
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "dash"; pname = "dash";
version = "0.5.12"; version = "0.5.12";
src = fetchurl { src = fetchurl {
url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz";
sha256 = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo="; hash = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo=";
}; };
strictDeps = true; strictDeps = true;
@ -31,22 +31,23 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; {
homepage = "http://gondor.apana.org.au/~herbert/dash/";
description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible";
platforms = platforms.unix;
license = with licenses; [ bsd3 gpl2 ];
};
passthru = { passthru = {
shellPath = "/bin/dash"; shellPath = "/bin/dash";
tests = { tests = {
"execute-simple-command" = runCommand "${pname}-execute-simple-command" { } '' "execute-simple-command" = runCommand "dash-execute-simple-command" { } ''
mkdir $out mkdir $out
${dash}/bin/dash -c 'echo "Hello World!" > $out/success' ${lib.getExe dash} -c 'echo "Hello World!" > $out/success'
[ -s $out/success ] [ -s $out/success ]
grep -q "Hello World" $out/success grep -q "Hello World" $out/success
''; '';
}; };
}; };
}
meta = with lib; {
homepage = "http://gondor.apana.org.au/~herbert/dash/";
description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible";
platforms = platforms.unix;
license = with licenses; [ bsd3 gpl2 ];
mainProgram = "dash";
};
})