mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-09 16:18:34 +01:00
Compare commits
6 commits
17a7acbb6c
...
9726bd3404
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9726bd3404 | ||
|
|
0ae9686523 | ||
|
|
8957ff57e7 | ||
|
|
41f4c53a9c | ||
|
|
5693b116fa | ||
|
|
203cb5dcd4 |
|
|
@ -24,7 +24,7 @@ symlinkJoin {
|
||||||
inherit (qgis-unwrapped) version src;
|
inherit (qgis-unwrapped) version src;
|
||||||
pname = "qgis";
|
pname = "qgis";
|
||||||
|
|
||||||
paths = [ qgis-unwrapped ];
|
paths = qgis-unwrapped.all;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
makeWrapper
|
makeWrapper
|
||||||
|
|
@ -53,5 +53,5 @@ symlinkJoin {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = qgis-unwrapped.meta;
|
meta = builtins.removeAttrs qgis-unwrapped.meta [ "outputsToInstall" ];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -84,6 +84,10 @@ in
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
version = "3.44.3";
|
version = "3.44.3";
|
||||||
pname = "qgis-unwrapped";
|
pname = "qgis-unwrapped";
|
||||||
|
outputs = [
|
||||||
|
"out"
|
||||||
|
"man"
|
||||||
|
];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qgis";
|
owner = "qgis";
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,10 @@ let
|
||||||
cross = stdenv.hostPlatform != stdenv.buildPlatform;
|
cross = stdenv.hostPlatform != stdenv.buildPlatform;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
outputs = [
|
||||||
|
"out"
|
||||||
|
"man"
|
||||||
|
];
|
||||||
src =
|
src =
|
||||||
if overrideSrc != { } then
|
if overrideSrc != { } then
|
||||||
overrideSrc
|
overrideSrc
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@ let
|
||||||
pythonEnv = unwrapped.python.withPackages (ps: pythonPkgs);
|
pythonEnv = unwrapped.python.withPackages (ps: pythonPkgs);
|
||||||
|
|
||||||
pname = unwrapped.pname + "-wrapped";
|
pname = unwrapped.pname + "-wrapped";
|
||||||
inherit (unwrapped) version;
|
inherit (unwrapped) outputs version;
|
||||||
makeWrapperArgs = builtins.concatStringsSep " " (
|
makeWrapperArgs = builtins.concatStringsSep " " (
|
||||||
[
|
[
|
||||||
]
|
]
|
||||||
|
|
@ -214,15 +214,21 @@ let
|
||||||
self =
|
self =
|
||||||
if doWrap then
|
if doWrap then
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
inherit pname version passthru;
|
inherit
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
pname
|
||||||
buildInputs = [
|
outputs
|
||||||
|
version
|
||||||
|
passthru
|
||||||
|
;
|
||||||
|
nativeBuildInputs = [
|
||||||
|
makeWrapper
|
||||||
xorg.lndir
|
xorg.lndir
|
||||||
];
|
];
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
cd $out
|
cd $out
|
||||||
lndir -silent ${unwrapped}
|
lndir -silent ${unwrapped.out}
|
||||||
|
lndir -silent ${unwrapped.man}
|
||||||
${lib.optionalString (extraPackages != [ ]) (
|
${lib.optionalString (extraPackages != [ ]) (
|
||||||
builtins.concatStringsSep "\n" (
|
builtins.concatStringsSep "\n" (
|
||||||
map (pkg: ''
|
map (pkg: ''
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
|
"man"
|
||||||
"tex"
|
"tex"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,10 @@ buildGoModule (finalAttrs: {
|
||||||
passthru.updateScript = nix-update-script {
|
passthru.updateScript = nix-update-script {
|
||||||
# the main repository does not have the releases feed enabled, so use the
|
# the main repository does not have the releases feed enabled, so use the
|
||||||
# codeberg mirror
|
# codeberg mirror
|
||||||
url = "https://codeberg.org/gone/go-away";
|
extraArgs = [
|
||||||
|
"--url"
|
||||||
|
"https://codeberg.org/gone/go-away"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,10 @@
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ipython";
|
pname = "ipython";
|
||||||
version = "9.5.0";
|
version = "9.5.0";
|
||||||
|
outputs = [
|
||||||
|
"out"
|
||||||
|
"man"
|
||||||
|
];
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,10 @@ symlinkJoin {
|
||||||
allowSubstitutes = false;
|
allowSubstitutes = false;
|
||||||
|
|
||||||
buildInputs = [ R ] ++ recommendedPackages ++ packages;
|
buildInputs = [ R ] ++ recommendedPackages ++ packages;
|
||||||
paths = [ R ];
|
paths = [
|
||||||
|
R
|
||||||
|
R.man
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
|
@ -29,7 +32,7 @@ symlinkJoin {
|
||||||
# Make the list of recommended R packages accessible to other packages such as rpy2
|
# Make the list of recommended R packages accessible to other packages such as rpy2
|
||||||
passthru = { inherit recommendedPackages; };
|
passthru = { inherit recommendedPackages; };
|
||||||
|
|
||||||
meta = R.meta // {
|
meta = (builtins.removeAttrs R.meta [ "outputsToInstall" ]) // {
|
||||||
# To prevent builds on hydra
|
# To prevent builds on hydra
|
||||||
hydraPlatforms = [ ];
|
hydraPlatforms = [ ];
|
||||||
# prefer wrapper over the package
|
# prefer wrapper over the package
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,10 @@
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "lilypond";
|
pname = "lilypond";
|
||||||
version = "2.24.4";
|
version = "2.24.4";
|
||||||
|
outputs = [
|
||||||
|
"out"
|
||||||
|
"man"
|
||||||
|
];
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
|
url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
lib.appendToName "with-fonts" (symlinkJoin {
|
lib.appendToName "with-fonts" (symlinkJoin {
|
||||||
inherit (lilypond) meta name version;
|
inherit (lilypond) name version;
|
||||||
|
|
||||||
paths = [ lilypond ] ++ openlilylib-fonts.all;
|
paths = [ lilypond ] ++ openlilylib-fonts.all;
|
||||||
|
|
||||||
|
|
@ -18,4 +18,6 @@ lib.appendToName "with-fonts" (symlinkJoin {
|
||||||
wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}"
|
wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
meta = builtins.removeAttrs lilypond.meta [ "outputsToInstall" ];
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue