JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkgs/development: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob 2021-01-24 00:15:07 +07:00
parent ec334a1b01
commit 2f78ee7e81
121 changed files with 324 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
View File

@ -1,4 +1,4 @@
{ stdenv { lib, stdenv
, makeWrapper , makeWrapper
, runCommand, wrapBintoolsWith, wrapCCWith , runCommand, wrapBintoolsWith, wrapCCWith
, buildAndroidndk, androidndk, targetAndroidndkPkgs , buildAndroidndk, androidndk, targetAndroidndkPkgs
@ -48,7 +48,7 @@ let
hostInfo = ndkInfoFun stdenv.hostPlatform; hostInfo = ndkInfoFun stdenv.hostPlatform;
targetInfo = ndkInfoFun stdenv.targetPlatform; targetInfo = ndkInfoFun stdenv.targetPlatform;
prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); prefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
in in
rec { rec {

4
pkgs/development/androidndk-pkgs/default.nix
View File

@ -1,4 +1,4 @@
{ androidenv, buildPackages, pkgs, targetPackages { lib, androidenv, buildPackages, pkgs, targetPackages
}: }:
{ {
@ -17,6 +17,7 @@
}; };
in in
import ./androidndk-pkgs.nix { import ./androidndk-pkgs.nix {
inherit lib;
inherit (buildPackages) inherit (buildPackages)
makeWrapper; makeWrapper;
inherit (pkgs) inherit (pkgs)
@ -46,6 +47,7 @@
}; };
in in
import ./androidndk-pkgs.nix { import ./androidndk-pkgs.nix {
inherit lib;
inherit (buildPackages) inherit (buildPackages)
makeWrapper; makeWrapper;
inherit (pkgs) inherit (pkgs)

2
pkgs/development/beam-modules/build-erlang-mk.nix
View File

@ -15,7 +15,7 @@
, buildFlags ? [] , buildFlags ? []
, ... }@attrs: , ... }@attrs:
with stdenv.lib; with lib;
let let
debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info"; debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info";

4
pkgs/development/beam-modules/build-hex.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildRebar3, fetchHex }: { lib, stdenv, buildRebar3, fetchHex }:
{ name, version, sha256 { name, version, sha256
, builder ? buildRebar3 , builder ? buildRebar3
, hexPkg ? name , hexPkg ? name
, ... }@attrs: , ... }@attrs:
with stdenv.lib; with lib;
let let
pkg = self: builder (attrs // { pkg = self: builder (attrs // {

2
pkgs/development/beam-modules/build-mix.nix
View File

@ -15,7 +15,7 @@
, enableDebugInfo ? false , enableDebugInfo ? false
, ... }@attrs: , ... }@attrs:
with stdenv.lib; with lib;
let let

2
pkgs/development/beam-modules/build-rebar3.nix
View File

@ -14,7 +14,7 @@
, enableDebugInfo ? false , enableDebugInfo ? false
, ... }@attrs: , ... }@attrs:
with stdenv.lib; with lib;
let let
debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info";

22
pkgs/development/beam-modules/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, pkgs, erlang }: { lib, stdenv, pkgs, erlang }:
let let
inherit (stdenv.lib) makeExtensible; inherit (lib) makeExtensible;
lib = pkgs.callPackage ./lib.nix {}; lib' = pkgs.callPackage ./lib.nix {};
# FIXME: add support for overrideScope # FIXME: add support for overrideScope
callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args; callPackageWithScope = scope: drv: args: lib'.callPackageWith scope drv args;
mkScope = scope: pkgs // scope; mkScope = scope: pkgs // scope;
packages = self: packages = self:
@ -38,27 +38,27 @@ let
# BEAM-based languages. # BEAM-based languages.
elixir = elixir_1_11; elixir = elixir_1_11;
elixir_1_11 = lib.callElixir ../interpreters/elixir/1.11.nix { elixir_1_11 = lib'.callElixir ../interpreters/elixir/1.11.nix {
inherit erlang; inherit erlang;
debugInfo = true; debugInfo = true;
}; };
elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix { elixir_1_10 = lib'.callElixir ../interpreters/elixir/1.10.nix {
inherit erlang; inherit erlang;
debugInfo = true; debugInfo = true;
}; };
elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix { elixir_1_9 = lib'.callElixir ../interpreters/elixir/1.9.nix {
inherit erlang; inherit erlang;
debugInfo = true; debugInfo = true;
}; };
elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix {
inherit erlang; inherit erlang;
debugInfo = true; debugInfo = true;
}; };
elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { elixir_1_7 = lib'.callElixir ../interpreters/elixir/1.7.nix {
inherit erlang; inherit erlang;
debugInfo = true; debugInfo = true;
}; };
@ -67,8 +67,8 @@ let
# https://hexdocs.pm/elixir/compatibility-and-deprecations.html # https://hexdocs.pm/elixir/compatibility-and-deprecations.html
lfe = lfe_1_3; lfe = lfe_1_3;
lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; lfe_1_2 = lib'.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
lfe_1_3 = lib.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; };
# Non hex packages. Examples how to build Rebar/Mix packages with and # Non hex packages. Examples how to build Rebar/Mix packages with and
# without helper functions buildRebar3 and buildMix. # without helper functions buildRebar3 and buildMix.

4
pkgs/development/beam-modules/fetch-hex.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl }: { lib, stdenv, fetchurl }:
{ pkg, version, sha256 { pkg, version, sha256
, meta ? {} , meta ? {}
}: }:
with stdenv.lib; with lib;
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "hex-source-${pkg}-${version}"; name = "hex-source-${pkg}-${version}";

6
pkgs/development/beam-modules/fetch-rebar-deps.nix
View File

@ -1,10 +1,10 @@
{ stdenv, rebar3 }: { lib, stdenv, rebar3 }:
{ name, version, sha256, src { name, version, sha256, src
, meta ? {} , meta ? {}
}: }:
with stdenv.lib; with lib;
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "rebar-deps-${name}-${version}"; name = "rebar-deps-${name}-${version}";
@ -28,6 +28,6 @@ stdenv.mkDerivation ({
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = sha256; outputHash = sha256;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; impureEnvVars = lib.fetchers.proxyImpureEnvVars;
inherit meta; inherit meta;
}) })

6
pkgs/development/beam-modules/hex/default.nix
View File

@ -45,13 +45,13 @@ let
meta = { meta = {
description = "Package manager for the Erlang VM https://hex.pm"; description = "Package manager for the Erlang VM https://hex.pm";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
homepage = "https://github.com/hexpm/hex"; homepage = "https://github.com/hexpm/hex";
maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; maintainers = with lib.maintainers; [ ericbmerritt ];
}; };
passthru = { passthru = {
env = shell self; env = shell self;
}; };
}; };
in stdenv.lib.fix pkg in lib.fix pkg

4
pkgs/development/beam-modules/lib.nix
View File

@ -1,4 +1,4 @@
{ pkgs, stdenv }: { pkgs, lib, stdenv }:
rec { rec {
@ -7,7 +7,7 @@ rec {
callPackageWith = autoArgs: fn: args: callPackageWith = autoArgs: fn: args:
let let
f = if pkgs.lib.isFunction fn then fn else import fn; f = if pkgs.lib.isFunction fn then fn else import fn;
auto = builtins.intersectAttrs (stdenv.lib.functionArgs f) autoArgs; auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
in f (auto // args); in f (auto // args);
callPackage = callPackageWith pkgs; callPackage = callPackageWith pkgs;

2
pkgs/development/beam-modules/pc/default.nix
View File

@ -7,7 +7,7 @@ buildHex {
meta = { meta = {
description = "a rebar3 port compiler for native code"; description = "a rebar3 port compiler for native code";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
homepage = "https://github.com/blt/port_compiler"; homepage = "https://github.com/blt/port_compiler";
}; };
} }

6
pkgs/development/beam-modules/pgsql/default.nix
View File

@ -21,9 +21,9 @@ let
meta = { meta = {
description = "Erlang PostgreSQL Driver"; description = "Erlang PostgreSQL Driver";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
homepage = "https://github.com/semiocast/pgsql"; homepage = "https://github.com/semiocast/pgsql";
maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; maintainers = with lib.maintainers; [ ericbmerritt ];
}; };
passthru = { passthru = {
@ -31,4 +31,4 @@ let
}; };
}; };
in stdenv.lib.fix pkg in lib.fix pkg

2
pkgs/development/beam-modules/rebar3-release.nix
View File

@ -15,7 +15,7 @@
, enableDebugInfo ? false , enableDebugInfo ? false
, ... }@attrs: , ... }@attrs:
with stdenv.lib; with lib;
let let
shell = drv: stdenv.mkDerivation { shell = drv: stdenv.mkDerivation {

6
pkgs/development/beam-modules/webdriver/default.nix
View File

@ -27,9 +27,9 @@ let
meta = { meta = {
description = "WebDriver implementation in Erlang"; description = "WebDriver implementation in Erlang";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
homepage = "https://github.com/Quviq/webdrv"; homepage = "https://github.com/Quviq/webdrv";
maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; maintainers = with lib.maintainers; [ ericbmerritt ];
}; };
passthru = { passthru = {
@ -37,4 +37,4 @@ let
}; };
}; };
in stdenv.lib.fix pkg in lib.fix pkg

4
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -610,12 +610,12 @@ self: super: builtins.intersectAttrs super {
git-annex = with pkgs; git-annex = with pkgs;
if (!stdenv.isLinux) then if (!stdenv.isLinux) then
let path = stdenv.lib.makeBinPath [ coreutils ]; let path = lib.makeBinPath [ coreutils ];
in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: { in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: {
# This is an instance of https://github.com/NixOS/nix/pull/1085 # This is an instance of https://github.com/NixOS/nix/pull/1085
# Fails with: # Fails with:
# gpg: can't connect to the agent: File name too long # gpg: can't connect to the agent: File name too long
postPatch = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Test.hs \ substituteInPlace Test.hs \
--replace ', testCase "crypto" test_crypto' "" --replace ', testCase "crypto" test_crypto' ""
''; '';

40
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPackages, buildHaskellPackages, ghc { lib, stdenv, buildPackages, buildHaskellPackages, ghc
, jailbreak-cabal, hscolour, cpphs, nodejs , jailbreak-cabal, hscolour, cpphs, nodejs
, ghcWithHoogle, ghcWithPackages , ghcWithHoogle, ghcWithPackages
}: }:
@ -22,10 +22,10 @@ in
, buildFlags ? [] , buildFlags ? []
, haddockFlags ? [] , haddockFlags ? []
, description ? null , description ? null
, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doCheck ? !isCross && lib.versionOlder "7.4" ghc.version
, doBenchmark ? false , doBenchmark ? false
, doHoogle ? true , doHoogle ? true
, doHaddockQuickjump ? doHoogle && stdenv.lib.versionAtLeast ghc.version "8.6" , doHaddockQuickjump ? doHoogle && lib.versionAtLeast ghc.version "8.6"
, editedCabalFile ? null , editedCabalFile ? null
# aarch64 outputs otherwise exceed 2GB limit # aarch64 outputs otherwise exceed 2GB limit
, enableLibraryProfiling ? !(ghc.isGhcjs or stdenv.targetPlatform.isAarch64 or false) , enableLibraryProfiling ? !(ghc.isGhcjs or stdenv.targetPlatform.isAarch64 or false)
@ -36,14 +36,14 @@ in
, enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) , enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false)
, enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin
, enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm) , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm)
, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && lib.versionAtLeast ghc.version "8.4"
, extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
# On macOS, statically linking against system frameworks is not supported; # On macOS, statically linking against system frameworks is not supported;
# see https://developer.apple.com/library/content/qa/qa1118/_index.html # see https://developer.apple.com/library/content/qa/qa1118/_index.html
# They must be propagated to the environment of any executable linking with the library # They must be propagated to the environment of any executable linking with the library
, libraryFrameworkDepends ? [], executableFrameworkDepends ? [] , libraryFrameworkDepends ? [], executableFrameworkDepends ? []
, homepage ? "https://hackage.haskell.org/package/${pname}" , homepage ? "https://hackage.haskell.org/package/${pname}"
, platforms ? with stdenv.lib.platforms; all # GHC can cross-compile , platforms ? with lib.platforms; all # GHC can cross-compile
, hydraPlatforms ? null , hydraPlatforms ? null
, hyperlinkSource ? true , hyperlinkSource ? true
, isExecutable ? false, isLibrary ? !isExecutable , isExecutable ? false, isLibrary ? !isExecutable
@ -71,7 +71,7 @@ in
, shellHook ? "" , shellHook ? ""
, coreSetup ? false # Use only core packages to build Setup.hs. , coreSetup ? false # Use only core packages to build Setup.hs.
, useCpphs ? false , useCpphs ? false
, hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all" , hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
, enableSeparateBinOutput ? false , enableSeparateBinOutput ? false
, enableSeparateDataOutput ? false , enableSeparateDataOutput ? false
, enableSeparateDocOutput ? doHaddock , enableSeparateDocOutput ? doHaddock
@ -95,7 +95,7 @@ assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false;
let let
inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast inherit (lib) optional optionals optionalString versionOlder versionAtLeast
concatStringsSep enableFeature optionalAttrs; concatStringsSep enableFeature optionalAttrs;
isGhcjs = ghc.isGhcjs or false; isGhcjs = ghc.isGhcjs or false;
@ -182,7 +182,7 @@ let
parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS"; parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS";
crossCabalFlagsString = crossCabalFlagsString =
stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); lib.optionalString isCross (" " + lib.concatStringsSep " " crossCabalFlags);
buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags); buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
@ -213,7 +213,7 @@ let
(enableFeature doBenchmark "benchmarks") (enableFeature doBenchmark "benchmarks")
"--enable-library-vanilla" # TODO: Should this be configurable? "--enable-library-vanilla" # TODO: Should this be configurable?
(enableFeature enableLibraryForGhci "library-for-ghci") (enableFeature enableLibraryForGhci "library-for-ghci")
] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [ ] ++ optionals (enableDeadCodeElimination && (lib.versionOlder "8.0.1" ghc.version)) [
"--ghc-option=-split-sections" "--ghc-option=-split-sections"
] ++ optionals dontStrip [ ] ++ optionals dontStrip [
"--disable-library-stripping" "--disable-library-stripping"
@ -283,7 +283,7 @@ let
continue continue
fi fi
''; '';
in stdenv.lib.fix (drv: in lib.fix (drv:
assert allPkgconfigDepends != [] -> pkg-config != null; assert allPkgconfigDepends != [] -> pkg-config != null;
@ -423,7 +423,7 @@ stdenv.mkDerivation ({
echo configureFlags: $configureFlags echo configureFlags: $configureFlags
${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log" ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
${stdenv.lib.optionalString (!allowInconsistentDependencies) '' ${lib.optionalString (!allowInconsistentDependencies) ''
if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
echo >&2 "*** abort because of serious configure-time warning from Cabal" echo >&2 "*** abort because of serious configure-time warning from Cabal"
exit 1 exit 1
@ -455,7 +455,7 @@ stdenv.mkDerivation ({
${optionalString doHoogle "--hoogle"} \ ${optionalString doHoogle "--hoogle"} \
${optionalString doHaddockQuickjump "--quickjump"} \ ${optionalString doHaddockQuickjump "--quickjump"} \
${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \ ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \
${stdenv.lib.concatStringsSep " " haddockFlags} ${lib.concatStringsSep " " haddockFlags}
''} ''}
runHook postHaddock runHook postHaddock
''; '';
@ -492,7 +492,7 @@ stdenv.mkDerivation ({
done done
''} ''}
${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"}
${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && lib.versionOlder ghc.version "7.10") ''
for exe in "${binDir}/"* ; do for exe in "${binDir}/"* ; do
install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
done done
@ -535,7 +535,7 @@ stdenv.mkDerivation ({
pkg-configDepends pkg-configDepends
setupHaskellDepends setupHaskellDepends
; ;
} // stdenv.lib.optionalAttrs doCheck { } // lib.optionalAttrs doCheck {
inherit inherit
testDepends testDepends
testFrameworkDepends testFrameworkDepends
@ -544,7 +544,7 @@ stdenv.mkDerivation ({
testSystemDepends testSystemDepends
testToolDepends testToolDepends
; ;
} // stdenv.lib.optionalAttrs doBenchmark { } // lib.optionalAttrs doBenchmark {
inherit inherit
benchmarkDepends benchmarkDepends
benchmarkFrameworkDepends benchmarkFrameworkDepends
@ -561,7 +561,7 @@ stdenv.mkDerivation ({
inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends; inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends;
haskellBuildInputs = isHaskellPartition.right; haskellBuildInputs = isHaskellPartition.right;
systemBuildInputs = isHaskellPartition.wrong; systemBuildInputs = isHaskellPartition.wrong;
isHaskellPartition = stdenv.lib.partition isHaskellPartition = lib.partition
isHaskellPkg isHaskellPkg
(propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs); (propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs);
}; };
@ -608,13 +608,13 @@ stdenv.mkDerivation ({
ghcEnv = withPackages (_: ghcEnv = withPackages (_:
otherBuildInputsHaskell ++ otherBuildInputsHaskell ++
propagatedBuildInputs ++ propagatedBuildInputs ++
stdenv.lib.optionals (!isCross) setupHaskellDepends); lib.optionals (!isCross) setupHaskellDepends);
ghcCommandCaps = stdenv.lib.toUpper ghcCommand'; ghcCommandCaps = lib.toUpper ghcCommand';
in stdenv.mkDerivation ({ in stdenv.mkDerivation ({
inherit name shellHook; inherit name shellHook;
depsBuildBuild = stdenv.lib.optional isCross ghcEnvForBuild; depsBuildBuild = lib.optional isCross ghcEnvForBuild;
nativeBuildInputs = nativeBuildInputs =
[ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++ [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++
collectedToolDepends; collectedToolDepends;
@ -623,7 +623,7 @@ stdenv.mkDerivation ({
phases = ["installPhase"]; phases = ["installPhase"];
installPhase = "echo $nativeBuildInputs $buildInputs > $out"; installPhase = "echo $nativeBuildInputs $buildInputs > $out";
LANG = "en_US.UTF-8"; LANG = "en_US.UTF-8";
LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; LOCALE_ARCHIVE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
"NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}"; "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
"NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg"; "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
# TODO: is this still valid? # TODO: is this still valid?

4
pkgs/development/haskell-modules/hoogle.nix
View File

@ -120,7 +120,7 @@ buildPackages.stdenv.mkDerivation {
meta = { meta = {
description = "A local Hoogle database"; description = "A local Hoogle database";
platforms = ghc.meta.platforms; platforms = ghc.meta.platforms;
hydraPlatforms = with stdenv.lib.platforms; none; hydraPlatforms = with lib.platforms; none;
maintainers = with stdenv.lib.maintainers; [ ttuegel ]; maintainers = with lib.maintainers; [ ttuegel ];
}; };
} }

8
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -41,7 +41,7 @@ self:
let let
inherit (stdenv) buildPlatform hostPlatform; inherit (stdenv) buildPlatform hostPlatform;
inherit (stdenv.lib) fix' extends makeOverridable; inherit (lib) fix' extends makeOverridable;
inherit (haskellLib) overrideCabal; inherit (haskellLib) overrideCabal;
mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
@ -84,8 +84,8 @@ let
# lost on `.override`) but determine the auto-args based on `drv` (the problem here # lost on `.override`) but determine the auto-args based on `drv` (the problem here
# is that nix has no way to "passthrough" args while preserving the reflection # is that nix has no way to "passthrough" args while preserving the reflection
# info that callPackage uses to determine the arguments). # info that callPackage uses to determine the arguments).
drv = if stdenv.lib.isFunction fn then fn else import fn; drv = if lib.isFunction fn then fn else import fn;
auto = builtins.intersectAttrs (stdenv.lib.functionArgs drv) scope; auto = builtins.intersectAttrs (lib.functionArgs drv) scope;
# this wraps the `drv` function to add a `overrideScope` function to the result. # this wraps the `drv` function to add a `overrideScope` function to the result.
drvScope = allArgs: drv allArgs // { drvScope = allArgs: drv allArgs // {
@ -98,7 +98,7 @@ let
# nothing. # nothing.
in callPackageWithScope newScope drv manualArgs; in callPackageWithScope newScope drv manualArgs;
}; };
in stdenv.lib.makeOverridable drvScope (auto // manualArgs); in lib.makeOverridable drvScope (auto // manualArgs);
mkScope = scope: let mkScope = scope: let
ps = pkgs.__splicedPackages; ps = pkgs.__splicedPackages;

6
pkgs/development/java-modules/build-maven-package.nix
View File

@ -1,11 +1,11 @@
{ stdenv, maven, pkgs }: { lib, stdenv, maven, pkgs }:
{ mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }: { mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }:
with builtins; with builtins;
with stdenv.lib; with lib;
let let
mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv; }; mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs stdenv; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
inherit mavenDeps src name meta m2Path; inherit mavenDeps src name meta m2Path;

8
pkgs/development/java-modules/junit/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, pkgs, mavenbuild, fetchMaven }: { lib, stdenv, pkgs, mavenbuild, fetchMaven }:
with pkgs.javaPackages; with pkgs.javaPackages;
@ -21,9 +21,9 @@ in rec {
meta = { meta = {
homepage = "https://junit.org/junit4/"; homepage = "https://junit.org/junit4/";
description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks"; description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks";
license = stdenv.lib.licenses.epl10; license = lib.licenses.epl10;
platforms = stdenv.lib.platforms.all; platforms = lib.platforms.all;
maintainers = with stdenv.lib.maintainers; maintainers = with lib.maintainers;
[ nequissimus ]; [ nequissimus ];
}; };
}; };

8
pkgs/development/java-modules/maven-hello/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, pkgs, mavenbuild }: { lib, stdenv, pkgs, mavenbuild }:
with pkgs.javaPackages; with pkgs.javaPackages;
@ -20,9 +20,9 @@ in rec {
meta = { meta = {
homepage = "https://github.com/NeQuissimus/maven-hello/"; homepage = "https://github.com/NeQuissimus/maven-hello/";
description = "Maven Hello World"; description = "Maven Hello World";
license = stdenv.lib.licenses.unlicense; license = lib.licenses.unlicense;
platforms = stdenv.lib.platforms.all; platforms = lib.platforms.all;
maintainers = with stdenv.lib.maintainers; maintainers = with lib.maintainers;
[ nequissimus ]; [ nequissimus ];
}; };
}; };

4
pkgs/development/java-modules/maven-minimal.nix
View File

@ -1,6 +1,6 @@
{ stdenv, pkgs }: { lib, stdenv, pkgs }:
with stdenv.lib; with lib;
with pkgs.javaPackages; with pkgs.javaPackages;
let let

2
pkgs/development/libraries/SDL/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv { lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, openglSupport ? libGLSupported, libGL, libGLU , openglSupport ? libGLSupported, libGL, libGLU
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid

2
pkgs/development/libraries/SDL2/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, config, fetchurl, pkg-config { lib, stdenv, config, fetchurl, pkg-config
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, openglSupport ? libGLSupported, libGL , openglSupport ? libGLSupported, libGL
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid

2
pkgs/development/libraries/aravis/default.nix
View File

@ -20,7 +20,7 @@
let let
gstreamerAtLeastVersion1 = gstreamerAtLeastVersion1 =
lib.all lib.all
(pkg: pkg != null && lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0") (pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0")
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
in in
assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];

2
pkgs/development/libraries/atk/default.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.lgpl2Plus; license = lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ raskin ]; maintainers = with lib.maintainers; [ raskin ];
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

4
pkgs/development/libraries/cairo/default.nix
View File

@ -3,7 +3,7 @@
, x11Support? !stdenv.isDarwin, libXext, libXrender , x11Support? !stdenv.isDarwin, libXext, libXrender
, gobjectSupport ? true, glib , gobjectSupport ? true, glib
, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) , glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux)
, libGL ? null # libGLU libGL is no longer a big dependency , libGL ? null # libGLU libGL is no longer a big dependency
, pdfSupport ? true , pdfSupport ? true
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
inherit version; inherit version;
src = fetchurl { src = fetchurl {
url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
}; };

2
pkgs/development/libraries/clutter-gst/default.nix
View File

@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.lgpl2Plus; license = lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ lethalman ]; maintainers = with lib.maintainers; [ lethalman ];
platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
}; };
} }

2
pkgs/development/libraries/clutter-gtk/default.nix
View File

@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.clutter-project.org/"; homepage = "http://www.clutter-project.org/";
license = lib.licenses.lgpl2Plus; license = lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ lethalman ]; maintainers = with lib.maintainers; [ lethalman ];
platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
}; };
} }

2
pkgs/development/libraries/gts/default.nix
View File

@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
''; '';
maintainers = [ lib.maintainers.viric ]; maintainers = [ lib.maintainers.viric ];
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

2
pkgs/development/libraries/irrlicht/default.nix
View File

@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = "http://irrlicht.sourceforge.net/"; homepage = "http://irrlicht.sourceforge.net/";
license = lib.licenses.zlib; license = lib.licenses.zlib;
description = "Open source high performance realtime 3D engine written in C++"; description = "Open source high performance realtime 3D engine written in C++";
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

2
pkgs/development/libraries/java/hsqldb/default.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hsqldb"; pname = "hsqldb";
version = "2.5.1"; version = "2.5.1";
underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version); underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version);
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";

2
pkgs/development/libraries/java/junixsocket/default.nix
View File

@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
description = "A Java/JNI library for using Unix Domain Sockets from Java"; description = "A Java/JNI library for using Unix Domain Sockets from Java";
homepage = "https://github.com/kohlschutter/junixsocket"; homepage = "https://github.com/kohlschutter/junixsocket";
license = lib.licenses.asl20; license = lib.licenses.asl20;
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

2
pkgs/development/libraries/libgpod/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
homepage = "https://gtkpod.sourceforge.net/"; homepage = "https://gtkpod.sourceforge.net/";
description = "Library used by gtkpod to access the contents of an ipod"; description = "Library used by gtkpod to access the contents of an ipod";
license = "LGPL"; license = "LGPL";
platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; platforms = lib.platforms.gnu ++ lib.platforms.linux;
maintainers = [ ]; maintainers = [ ];
}; };
} }

2
pkgs/development/libraries/libre/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib openssl ]; buildInputs = [ zlib openssl ];
makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
; ;
meta = { meta = {
description = "A library for real-time communications with async IO support and a complete SIP stack"; description = "A library for real-time communications with async IO support and a complete SIP stack";

4
pkgs/development/libraries/librem/default.nix
View File

@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
"LIBRE_INC=${libre}/include/re" "LIBRE_INC=${libre}/include/re"
''PREFIX=$(out)'' ''PREFIX=$(out)''
] ]
++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.lib.getDev stdenv.cc.cc}" ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}"
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
; ;
meta = { meta = {
description = " A library for real-time audio and video processing"; description = " A library for real-time audio and video processing";

2
pkgs/development/libraries/libsmartcols/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "smart column output alignment library"; description = "smart column output alignment library";
homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols; homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols;
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [ rb2k ]; maintainers = with lib.maintainers; [ rb2k ];
}; };
} }

2
pkgs/development/libraries/libsmi/default.nix
View File

@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
description = "A Library to Access SMI MIB Information"; description = "A Library to Access SMI MIB Information";
homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html";
license = licenses.free; license = licenses.free;
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

2
pkgs/development/libraries/libsnark/default.nix
View File

@ -24,6 +24,6 @@ in stdenv.mkDerivation rec {
description = "C++ library for zkSNARKs"; description = "C++ library for zkSNARKs";
homepage = "https://github.com/scipr-lab/libsnark"; homepage = "https://github.com/scipr-lab/libsnark";
license = licenses.mit; license = licenses.mit;
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

2
pkgs/development/libraries/libvirt/default.nix
View File

@ -92,7 +92,7 @@ in stdenv.mkDerivation rec {
--replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
patchShebangs . # fixes /usr/bin/python references patchShebangs . # fixes /usr/bin/python references
'' ''
+ (lib.concatStringsSep "\n" (stdenv.lib.mapAttrsToList patchBuilder overrides)); + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides));
mesonAutoFeatures = "auto"; mesonAutoFeatures = "auto";

2
pkgs/development/libraries/libxmi/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
description = "Library for rasterizing 2-D vector graphics"; description = "Library for rasterizing 2-D vector graphics";
homepage = "https://www.gnu.org/software/libxmi/"; homepage = "https://www.gnu.org/software/libxmi/";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
maintainers = [ ]; maintainers = [ ];
}; };
} }

2
pkgs/development/libraries/muparser/default.nix
View File

@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = "http://muparser.sourceforge.net"; homepage = "http://muparser.sourceforge.net";
description = "An extensible high performance math expression parser library written in C++"; description = "An extensible high performance math expression parser library written in C++";
license = lib.licenses.mit; license = lib.licenses.mit;
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

4
pkgs/development/libraries/qt-3/default.nix
View File

@ -6,8 +6,8 @@
, cursorSupport ? true, libXcursor ? null , cursorSupport ? true, libXcursor ? null
, threadSupport ? true , threadSupport ? true
, mysqlSupport ? false, libmysqlclient ? null , mysqlSupport ? false, libmysqlclient ? null
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, openglSupport ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, libGL ? null, libGLU ? null, libXmu ? null , libGL ? null, libGLU ? null, libXmu ? null
, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which , xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which
}: }:

2
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -4,7 +4,7 @@
, libmng, which, libGLU, openssl, dbus, cups, pkg-config , libmng, which, libGLU, openssl, dbus, cups, pkg-config
, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
, alsaLib , alsaLib
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, flashplayerFix ? false, gdk-pixbuf , flashplayerFix ? false, gdk-pixbuf
, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs

8
pkgs/development/libraries/qt-5/5.12/default.nix
View File

@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
{ {
newScope, newScope,
stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
bison, cups ? null, harfbuzz, libGL, perl, bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf, gstreamer, gst-plugins-base, gtk3, dconf,
llvmPackages_5, llvmPackages_5,
@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
debug ? false, debug ? false,
}: }:
with stdenv.lib; with lib;
let let
@ -119,7 +119,7 @@ let
import ../qtModule.nix import ../qtModule.nix
{ {
inherit perl; inherit perl;
inherit (stdenv) lib; inherit lib;
# Use a variant of mkDerivation that does not include wrapQtApplications # Use a variant of mkDerivation that does not include wrapQtApplications
# to avoid cyclic dependencies between Qt modules. # to avoid cyclic dependencies between Qt modules.
mkDerivation = mkDerivation =
@ -136,7 +136,7 @@ let
mkDerivationWith = mkDerivationWith =
import ../mkDerivation.nix import ../mkDerivation.nix
{ inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
mkDerivation = mkDerivationWith stdenvActual.mkDerivation; mkDerivation = mkDerivationWith stdenvActual.mkDerivation;

4
pkgs/development/libraries/qt-5/5.14/default.nix
View File

@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
{ {
newScope, newScope,
stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
bison, cups ? null, harfbuzz, libGL, perl, bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf, gstreamer, gst-plugins-base, gtk3, dconf,
llvmPackages_5, llvmPackages_5,
@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
debug ? false, debug ? false,
}: }:
with stdenv.lib; with lib;
let let

4
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
{ {
newScope, newScope,
stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
bison, cups ? null, harfbuzz, libGL, perl, bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf, gstreamer, gst-plugins-base, gtk3, dconf,
llvmPackages_5, llvmPackages_5,
@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
debug ? false, debug ? false,
}: }:
with stdenv.lib; with lib;
let let

4
pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
View File

@ -1,8 +1,8 @@
{ qtModule, stdenv, qtbase, qtdeclarative, bluez }: { qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }:
qtModule { qtModule {
name = "qtconnectivity"; name = "qtconnectivity";
qtInputs = [ qtbase qtdeclarative ]; qtInputs = [ qtbase qtdeclarative ];
buildInputs = stdenv.lib.optional stdenv.isLinux bluez; buildInputs = lib.optional stdenv.isLinux bluez;
outputs = [ "out" "dev" "bin" ]; outputs = [ "out" "dev" "bin" ];
} }

4
pkgs/development/libraries/qt-5/modules/qtlocation.nix
View File

@ -1,10 +1,10 @@
{ stdenv, qtModule, qtbase, qtmultimedia }: { lib, stdenv, qtModule, qtbase, qtmultimedia }:
qtModule { qtModule {
name = "qtlocation"; name = "qtlocation";
qtInputs = [ qtbase qtmultimedia ]; qtInputs = [ qtbase qtmultimedia ];
outputs = [ "bin" "out" "dev" ]; outputs = [ "bin" "out" "dev" ];
qmakeFlags = stdenv.lib.optional stdenv.isDarwin [ qmakeFlags = lib.optional stdenv.isDarwin [
# boost uses std::auto_ptr which has been disabled in clang with libcxx # boost uses std::auto_ptr which has been disabled in clang with libcxx
# This flag re-enables this feature # This flag re-enables this feature
# https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros

4
pkgs/development/libraries/qt-5/modules/qtmacextras.nix
View File

@ -1,9 +1,9 @@
{ stdenv, qtModule, qtbase }: { lib, stdenv, qtModule, qtbase }:
qtModule { qtModule {
name = "qtmacextras"; name = "qtmacextras";
qtInputs = [ qtbase ]; qtInputs = [ qtbase ];
meta = with stdenv.lib; { meta = with lib; {
maintainers = with maintainers; [ periklis ]; maintainers = with maintainers; [ periklis ];
platforms = platforms.darwin; platforms = platforms.darwin;
}; };

4
pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
View File

@ -1,8 +1,8 @@
{ qtModule, stdenv, qtbase, qtdeclarative, pkg-config { qtModule, lib, stdenv, qtbase, qtdeclarative, pkg-config
, alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland , alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland
}: }:
with stdenv.lib; with lib;
qtModule { qtModule {
name = "qtmultimedia"; name = "qtmultimedia";

2
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View File

@ -18,7 +18,7 @@
, lib, stdenv, fetchpatch , lib, stdenv, fetchpatch
}: }:
with stdenv.lib; with lib;
qtModule { qtModule {
name = "qtwebengine"; name = "qtwebengine";

4
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
View File

@ -43,7 +43,7 @@ qtModule {
# QtWebKit overrides qmake's default_pre and default_post features, # QtWebKit overrides qmake's default_pre and default_post features,
# so its custom qmake files must be found first at the front of QMAKEPATH. # so its custom qmake files must be found first at the front of QMAKEPATH.
preConfigure = stdenv.lib.optionalString (!usingAnnulenWebkitFork) '' preConfigure = lib.optionalString (!usingAnnulenWebkitFork) ''
QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
fixQtBuiltinPaths . '*.pr?' fixQtBuiltinPaths . '*.pr?'
# Fix hydra's "Log limit exceeded" # Fix hydra's "Log limit exceeded"
@ -72,6 +72,6 @@ qtModule {
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
meta = { meta = {
maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; maintainers = with lib.maintainers; [ abbradar periklis ];
}; };
} }

4
pkgs/development/libraries/qt-5/modules/qtwebview.nix
View File

@ -1,6 +1,6 @@
{ darwin, stdenv, qtModule, qtdeclarative, qtwebengine }: { darwin, lib, stdenv, qtModule, qtdeclarative, qtwebengine }:
with stdenv.lib; with lib;
qtModule { qtModule {
name = "qtwebview"; name = "qtwebview";

2
pkgs/development/libraries/tokyo-tyrant/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
maintainers = [ ]; maintainers = [ ];
}; };
} }

2
pkgs/development/libraries/wiredtiger/default.nix
View File

@ -14,7 +14,7 @@ let
mkEnable = mkFlag "enable-" "disable-"; mkEnable = mkFlag "enable-" "disable-";
mkWith = mkFlag "with-" "without-"; mkWith = mkFlag "with-" "without-";
shouldUsePkg = pkg: if pkg != null && lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
optLz4 = shouldUsePkg lz4; optLz4 = shouldUsePkg lz4;
optSnappy = shouldUsePkg snappy; optSnappy = shouldUsePkg snappy;

4
pkgs/development/libraries/wxwidgets/2.8/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto { lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
, libX11, cairo , libX11, cairo
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, libGLU ? null, libGL ? null , libGLU ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true, , compat24 ? false, compat26 ? true, unicode ? true,
}: }:

4
pkgs/development/libraries/wxwidgets/2.9/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto { lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
, setfile , setfile
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, libGLU ? null, libGL ? null , libGLU ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true , compat24 ? false, compat26 ? true, unicode ? true
, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null

2
pkgs/development/libraries/wxwidgets/3.0/default.nix
View File

@ -2,7 +2,7 @@
, libXinerama, libSM, libXxf86vm , libXinerama, libSM, libXxf86vm
, gtk2, gtk3 , gtk2, gtk3
, xorgproto, gst_all_1, setfile , xorgproto, gst_all_1, setfile
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, withMesa ? libGLSupported , withMesa ? libGLSupported
, libGLU ? null, libGL ? null , libGLU ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true , compat24 ? false, compat26 ? true, unicode ? true

2
pkgs/development/libraries/wxwidgets/3.1/default.nix
View File

@ -12,7 +12,7 @@
, xorgproto , xorgproto
, gst_all_1 , gst_all_1
, setfile , setfile
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, withMesa ? libGLSupported , withMesa ? libGLSupported
, libGLU ? null , libGLU ? null
, libGL ? null , libGL ? null

2
pkgs/development/libraries/xalanc/default.nix
View File

@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
homepage = "http://xalan.apache.org/"; homepage = "http://xalan.apache.org/";
description = "A XSLT processor for transforming XML documents"; description = "A XSLT processor for transforming XML documents";
license = lib.licenses.asl20; license = lib.licenses.asl20;
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = [ lib.maintainers.jagajaga ]; maintainers = [ lib.maintainers.jagajaga ];
}; };
} }

2
pkgs/development/libraries/xercesc/default.nix
View File

@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
homepage = "https://xerces.apache.org/xerces-c/"; homepage = "https://xerces.apache.org/xerces-c/";
description = "Validating XML parser written in a portable subset of C++"; description = "Validating XML parser written in a portable subset of C++";
license = lib.licenses.asl20; license = lib.licenses.asl20;
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

2
pkgs/development/misc/avr8-burn-omat/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "GUI tool for avrdude"; description = "GUI tool for avrdude";
homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html"; homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html";
license = stdenv.lib.licenses.gpl3; license = lib.licenses.gpl3;
platforms = platforms.all; platforms = platforms.all;
}; };
} }

6
pkgs/development/misc/google-clasp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, pkgs }: { lib, stdenv, pkgs }:
let let
version = "2.2.1"; version = "2.2.1";
in in
@ -12,8 +12,8 @@ in
meta = { meta = {
description = "Command Line tool for Google Apps Script Projects"; description = "Command Line tool for Google Apps Script Projects";
homepage = "https://developers.google.com/apps-script/guides/clasp"; homepage = "https://developers.google.com/apps-script/guides/clasp";
license = stdenv.lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = [ stdenv.lib.maintainers.michojel ]; maintainers = [ lib.maintainers.michojel ];
priority = 100; priority = 100;
}; };
} }

4
pkgs/development/misc/haskell/hasura/ci-info/default.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, aeson, aeson-casing, base, fetchgit, hashable { mkDerivation, aeson, aeson-casing, base, fetchgit, hashable
, hpack, stdenv, template-haskell, text, th-lift-instances , hpack, lib, stdenv, template-haskell, text, th-lift-instances
, unordered-containers , unordered-containers
}: }:
mkDerivation { mkDerivation {
@ -18,5 +18,5 @@ mkDerivation {
libraryToolDepends = [ hpack ]; libraryToolDepends = [ hpack ];
prePatch = "hpack"; prePatch = "hpack";
homepage = "https://github.com/hasura/ci-info-hs#readme"; homepage = "https://github.com/hasura/ci-info-hs#readme";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
} }

6
pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
View File

@ -13,7 +13,7 @@
, optparse-applicative, pem, pg-client, postgresql-binary , optparse-applicative, pem, pg-client, postgresql-binary
, postgresql-libpq, process, profunctors, psqueues, QuickCheck , postgresql-libpq, process, profunctors, psqueues, QuickCheck
, regex-tdfa, safe, scientific, semver, shakespeare, split , regex-tdfa, safe, scientific, semver, shakespeare, split
, Spock-core, stdenv, stm, stm-containers, template-haskell, text , Spock-core, lib, stdenv, stm, stm-containers, template-haskell, text
, text-builder, text-conversions, th-lift-instances, these, time , text-builder, text-conversions, th-lift-instances, these, time
, transformers, transformers-base, unix, unordered-containers , transformers, transformers-base, unix, unordered-containers
, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets , uri-encode, uuid, vector, wai, wai-websockets, warp, websockets
@ -68,8 +68,8 @@ mkDerivation {
doCheck = false; doCheck = false;
homepage = "https://www.hasura.io"; homepage = "https://www.hasura.io";
description = "GraphQL API over Postgres"; description = "GraphQL API over Postgres";
license = stdenv.lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ offline ]; maintainers = with lib.maintainers; [ offline ];
hydraPlatforms = []; hydraPlatforms = [];
broken = true; broken = true;
} }

4
pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
View File

@ -1,6 +1,6 @@
{ mkDerivation, aeson, attoparsec, base, bytestring, containers { mkDerivation, aeson, attoparsec, base, bytestring, containers
, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter , criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter
, protolude, regex-tdfa, scientific, stdenv, template-haskell, text , protolude, regex-tdfa, scientific, lib, stdenv, template-haskell, text
, text-builder, th-lift-instances, unordered-containers, vector , text-builder, th-lift-instances, unordered-containers, vector
}: }:
mkDerivation { mkDerivation {
@ -32,5 +32,5 @@ mkDerivation {
doCheck = false; doCheck = false;
prePatch = "hpack"; prePatch = "hpack";
homepage = "https://github.com/hasura/graphql-parser-hs#readme"; homepage = "https://github.com/hasura/graphql-parser-hs#readme";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
} }

4
pkgs/development/misc/haskell/hasura/pg-client/default.nix
View File

@ -2,7 +2,7 @@
, criterion, fetchgit, file-embed, hashable, hashtables, hasql , criterion, fetchgit, file-embed, hashable, hashtables, hasql
, hasql-pool, hasql-transaction, monad-control, mtl , hasql-pool, hasql-transaction, monad-control, mtl
, postgresql-binary, postgresql-libpq, resource-pool, retry , postgresql-binary, postgresql-libpq, resource-pool, retry
, scientific, stdenv, template-haskell, text, text-builder, th-lift , scientific, lib, stdenv, template-haskell, text, text-builder, th-lift
, th-lift-instances, time, transformers-base, uuid, vector , th-lift-instances, time, transformers-base, uuid, vector
}: }:
mkDerivation { mkDerivation {
@ -26,5 +26,5 @@ mkDerivation {
hasql-transaction mtl postgresql-libpq text text-builder hasql-transaction mtl postgresql-libpq text text-builder
]; ];
homepage = "https://github.com/hasura/platform"; homepage = "https://github.com/hasura/platform";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
} }

4
pkgs/development/misc/loc/default.nix
View File

@ -18,8 +18,8 @@ buildRustPackage rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/cgag/loc"; homepage = "https://github.com/cgag/loc";
description = "Count lines of code quickly"; description = "Count lines of code quickly";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ ]; maintainers = with lib.maintainers; [ ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

18
pkgs/development/misc/msp430/mspdebug.nix
View File

@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config nativeBuildInputs = lib.optional stdenv.isDarwin pkg-config
++ stdenv.lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; ++ lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook;
buildInputs = [ libusb-compat-0_1 ] buildInputs = [ libusb-compat-0_1 ]
++ stdenv.lib.optional stdenv.isDarwin hidapi ++ lib.optional stdenv.isDarwin hidapi
++ stdenv.lib.optional enableReadline readline; ++ lib.optional enableReadline readline;
postPatch = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''
# TODO: remove once a new 0.26+ release is made # TODO: remove once a new 0.26+ release is made
substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary} substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary}
@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
''; '';
# TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+ # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+
runtimeDependencies = stdenv.lib.optional enableMspds mspds; runtimeDependencies = lib.optional enableMspds mspds;
postFixup = stdenv.lib.optionalString (enableMspds && stdenv.isDarwin) '' postFixup = lib.optionalString (enableMspds && stdenv.isDarwin) ''
# autoPatchelfHook only works on linux so... # autoPatchelfHook only works on linux so...
for dep in $runtimeDependencies; do for dep in $runtimeDependencies; do
install_name_tool -add_rpath $dep/lib $out/bin/$pname install_name_tool -add_rpath $dep/lib $out/bin/$pname
@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; installFlags = [ "PREFIX=$(out)" "INSTALL=install" ];
makeFlags = [ "UNAME_S=$(unameS)" ] ++ makeFlags = [ "UNAME_S=$(unameS)" ] ++
stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1"; lib.optional (!enableReadline) "WITHOUT_READLINE=1";
unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin"; unameS = lib.optionalString stdenv.isDarwin "Darwin";
meta = with lib; { meta = with lib; {
description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs"; description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs";

6
pkgs/development/misc/resholve/deps.nix generated
View File

@ -1,4 +1,4 @@
{ stdenv { lib, stdenv
, python27Packages , python27Packages
, fetchFromGitHub , fetchFromGitHub
, makeWrapper , makeWrapper
@ -106,12 +106,12 @@ rec {
_NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}"; _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}";
# See earlier note on glibcLocales # See earlier note on glibcLocales
LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
meta = { meta = {
description = "A new unix shell"; description = "A new unix shell";
homepage = "https://www.oilshell.org/"; homepage = "https://www.oilshell.org/";
license = with stdenv.lib.licenses; [ license = with lib.licenses; [
psfl # Includes a portion of the python interpreter and standard library psfl # Includes a portion of the python interpreter and standard library
asl20 # Licence for Oil itself asl20 # Licence for Oil itself
]; ];

2
pkgs/development/misc/yelp-tools/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.38.0"; version = "3.38.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30"; sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30";
}; };

10
pkgs/development/pharo/vm/build-vm-legacy.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
inherit name src; inherit name src;
pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; }; pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; };
hardeningDisable = [ "format" "pic" ]; hardeningDisable = [ "format" "pic" ];
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [ bash glibc openssl libGLU libGL freetype buildInputs = [ bash glibc openssl libGLU libGL freetype
xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath LD_LIBRARY_PATH = lib.makeLibraryPath
[ cairo libGLU libGL freetype openssl libuuid alsaLib [ cairo libGLU libGL freetype openssl libuuid alsaLib
xorg.libICE xorg.libSM ]; xorg.libICE xorg.libSM ];
@ -89,9 +89,9 @@ stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.lukego ]; maintainers = [ maintainers.lukego ];
# Pharo VM sources are packaged separately for darwin (OS X) # Pharo VM sources are packaged separately for darwin (OS X)
platforms = stdenv.lib.filter platforms = lib.filter
(system: with stdenv.lib.systems.elaborate { inherit system; }; (system: with lib.systems.elaborate { inherit system; };
isUnix && !isDarwin) isUnix && !isDarwin)
stdenv.lib.platforms.mesaPlatforms; lib.platforms.mesaPlatforms;
}; };
} }

4
pkgs/development/pharo/vm/build-vm.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
else throw "Unsupported platform: only Linux/Darwin x86/x64 are supported."; else throw "Unsupported platform: only Linux/Darwin x86/x64 are supported.";
# Shared data (for the sources file) # Shared data (for the sources file)
pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; }; pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; };
# Note: -fPIC causes the VM to segfault. # Note: -fPIC causes the VM to segfault.
hardeningDisable = [ "format" "pic" hardeningDisable = [ "format" "pic"
@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
mkdir -p "$out/bin" mkdir -p "$out/bin"
# Note: include ELF rpath in LD_LIBRARY_PATH for finding libc. # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc.
libs=$out:$(patchelf --print-rpath "$out/pharo"):${stdenv.lib.makeLibraryPath libs} libs=$out:$(patchelf --print-rpath "$out/pharo"):${lib.makeLibraryPath libs}
# Create the script # Create the script
cat > "$out/bin/${cmd}" <<EOF cat > "$out/bin/${cmd}" <<EOF

4
pkgs/development/pharo/vm/share.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip }: { lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0"; version = "1.0";
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Shared files for Pharo"; description = "Shared files for Pharo";
homepage = "https://pharo.org"; homepage = "https://pharo.org";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ ]; maintainers = [ ];
}; };
} }

12
pkgs/development/pharo/wrapper/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }: { lib, stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pharo"; name = "pharo";
@ -50,13 +50,13 @@ stdenv.mkDerivation rec {
''; '';
homepage = "http://pharo.org"; homepage = "http://pharo.org";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.lukego ]; maintainers = [ lib.maintainers.lukego ];
# Pharo VM sources are packaged separately for darwin (OS X) # Pharo VM sources are packaged separately for darwin (OS X)
platforms = stdenv.lib.filter platforms = lib.filter
(system: with stdenv.lib.systems.elaborate { inherit system; }; (system: with lib.systems.elaborate { inherit system; };
isUnix && !isDarwin) isUnix && !isDarwin)
stdenv.lib.platforms.mesaPlatforms; lib.platforms.mesaPlatforms;
}; };
} }

8
pkgs/development/pure-modules/audio/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }: { lib, stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "audio"; baseName = "audio";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A digital audio interface for the Pure programming language"; description = "A digital audio interface for the Pure programming language";
homepage = "http://puredocs.bitbucket.org/pure-audio.html"; homepage = "http://puredocs.bitbucket.org/pure-audio.html";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/avahi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, avahi }: { lib, stdenv, fetchurl, pkg-config, pure, avahi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "avahi"; baseName = "avahi";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A digital audio interface for the Pure programming language"; description = "A digital audio interface for the Pure programming language";
homepage = "http://puredocs.bitbucket.org/pure-avahi.html"; homepage = "http://puredocs.bitbucket.org/pure-avahi.html";
license = stdenv.lib.licenses.lgpl3Plus; license = lib.licenses.lgpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/csv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure }: { lib, stdenv, fetchurl, pkg-config, pure }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "csv"; baseName = "csv";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Comma Separated Value Interface for the Pure Programming Language"; description = "Comma Separated Value Interface for the Pure Programming Language";
homepage = "http://puredocs.bitbucket.org/pure-csv.html"; homepage = "http://puredocs.bitbucket.org/pure-csv.html";
license = stdenv.lib.licenses.free; license = lib.licenses.free;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/doc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure }: { lib, stdenv, fetchurl, pkg-config, pure }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "doc"; baseName = "doc";
@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A simple utility for literate programming and documenting source code written in the Pure programming language"; description = "A simple utility for literate programming and documenting source code written in the Pure programming language";
homepage = "http://puredocs.bitbucket.org/pure-doc.html"; homepage = "http://puredocs.bitbucket.org/pure-doc.html";
license = stdenv.lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/fastcgi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, fcgi }: { lib, stdenv, fetchurl, pkg-config, pure, fcgi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "fastcgi"; baseName = "fastcgi";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Lets you write FastCGI scripts with Pure, to be run by web servers like Apache"; description = "Lets you write FastCGI scripts with Pure, to be run by web servers like Apache";
homepage = "http://puredocs.bitbucket.org/pure-fastcgi.html"; homepage = "http://puredocs.bitbucket.org/pure-fastcgi.html";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/faust/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, faust, libtool }: { lib, stdenv, fetchurl, pkg-config, pure, faust, libtool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "faust"; baseName = "faust";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Lets you load and run Faust-generated signal processing modules in Pure"; description = "Lets you load and run Faust-generated signal processing modules in Pure";
homepage = "http://puredocs.bitbucket.org/pure-faust.html"; homepage = "http://puredocs.bitbucket.org/pure-faust.html";
license = stdenv.lib.licenses.lgpl3Plus; license = lib.licenses.lgpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/ffi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, libffi }: { lib, stdenv, fetchurl, pkg-config, pure, libffi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "ffi"; baseName = "ffi";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Provides an interface to libffi which enables you to call C functions from Pure and vice versa"; description = "Provides an interface to libffi which enables you to call C functions from Pure and vice versa";
homepage = "http://puredocs.bitbucket.org/pure-ffi.html"; homepage = "http://puredocs.bitbucket.org/pure-ffi.html";
license = stdenv.lib.licenses.lgpl3Plus; license = lib.licenses.lgpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/gen/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, { lib, stdenv, fetchurl,
pkg-config, pure, haskellPackages }: pkg-config, pure, haskellPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Pure interface generator"; description = "Pure interface generator";
homepage = "http://puredocs.bitbucket.org/pure-gen.html"; homepage = "http://puredocs.bitbucket.org/pure-gen.html";
license = stdenv.lib.licenses.free; license = lib.licenses.free;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
hydraPlatforms = []; hydraPlatforms = [];
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/gl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }: { lib, stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "gl"; baseName = "gl";
@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Fairly complete Pure bindings for the OpenGL graphics library, which allow you to do 2D and 3D graphics programming with Pure"; description = "Fairly complete Pure bindings for the OpenGL graphics library, which allow you to do 2D and 3D graphics programming with Pure";
homepage = "http://puredocs.bitbucket.org/pure-gl.html"; homepage = "http://puredocs.bitbucket.org/pure-gl.html";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

6
pkgs/development/pure-modules/glpk/default.nix
View File

@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "GLPK interface for the Pure Programming Language"; description = "GLPK interface for the Pure Programming Language";
homepage = "http://puredocs.bitbucket.org/pure-glpk.html"; homepage = "http://puredocs.bitbucket.org/pure-glpk.html";
license = stdenv.lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/gplot/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, gnuplot }: { lib, stdenv, fetchurl, pkg-config, pure, gnuplot }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "gplot"; baseName = "gplot";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A pure binding to gnuplot"; description = "A pure binding to gnuplot";
homepage = "http://puredocs.bitbucket.org/pure-gplot.html"; homepage = "http://puredocs.bitbucket.org/pure-gplot.html";
license = stdenv.lib.licenses.lgpl3Plus; license = lib.licenses.lgpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/gsl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pure, pkg-config, gsl }: { lib, stdenv, fetchurl, pure, pkg-config, gsl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "gsl"; baseName = "gsl";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "GNU Scientific Library interface for Pure"; description = "GNU Scientific Library interface for Pure";
homepage = "http://puredocs.bitbucket.org/pure-gsl.html"; homepage = "http://puredocs.bitbucket.org/pure-gsl.html";
license = stdenv.lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/gtk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }: { lib, stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "gtk"; baseName = "gtk";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A collection of bindings to use the GTK GUI toolkit version 2.x with Pure"; description = "A collection of bindings to use the GTK GUI toolkit version 2.x with Pure";
homepage = "http://puredocs.bitbucket.org/pure-gtk.html"; homepage = "http://puredocs.bitbucket.org/pure-gtk.html";
license = stdenv.lib.licenses.lgpl3Plus; license = lib.licenses.lgpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/liblo/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, liblo }: { lib, stdenv, fetchurl, pkg-config, pure, liblo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "liblo"; baseName = "liblo";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A quick and dirty Pure wrapper for the liblo library, which implements Berkeley’s Open Sound Control (OSC) protocol"; description = "A quick and dirty Pure wrapper for the liblo library, which implements Berkeley’s Open Sound Control (OSC) protocol";
homepage = "http://puredocs.bitbucket.org/pure-liblo.html"; homepage = "http://puredocs.bitbucket.org/pure-liblo.html";
license = stdenv.lib.licenses.lgpl3Plus; license = lib.licenses.lgpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/lilv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }: { lib, stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "lilv"; baseName = "lilv";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A Pure module for David Robillard’s Lilv, a library for LV2 plugin host writers"; description = "A Pure module for David Robillard’s Lilv, a library for LV2 plugin host writers";
homepage = "http://puredocs.bitbucket.org/pure-lilv.html"; homepage = "http://puredocs.bitbucket.org/pure-lilv.html";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/lv2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, lv2 }: { lib, stdenv, fetchurl, pkg-config, pure, lv2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "lv2"; baseName = "lv2";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A generic LV2 plugin wrapper for Pure which can be linked with batch-compiled Pure scripts to obtain LV2 plugin modules"; description = "A generic LV2 plugin wrapper for Pure which can be linked with batch-compiled Pure scripts to obtain LV2 plugin modules";
homepage = "http://puredocs.bitbucket.org/pure-lv2.html"; homepage = "http://puredocs.bitbucket.org/pure-lv2.html";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/midi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, portmidi }: { lib, stdenv, fetchurl, pkg-config, pure, portmidi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "midi"; baseName = "midi";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A MIDI interface for the Pure programming language"; description = "A MIDI interface for the Pure programming language";
homepage = "http://puredocs.bitbucket.org/pure-midi.html"; homepage = "http://puredocs.bitbucket.org/pure-midi.html";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/mpfr/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure }: { lib, stdenv, fetchurl, pkg-config, pure }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "mpfr"; baseName = "mpfr";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "This module makes the MPFR multiprecision floats available in Pure"; description = "This module makes the MPFR multiprecision floats available in Pure";
homepage = "http://puredocs.bitbucket.org/pure-mpfr.html"; homepage = "http://puredocs.bitbucket.org/pure-mpfr.html";
license = stdenv.lib.licenses.lgpl3Plus; license = lib.licenses.lgpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/octave/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, octave }: { lib, stdenv, fetchurl, pkg-config, pure, octave }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "octave"; baseName = "octave";
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "An Octave module for the Pure programming language"; description = "An Octave module for the Pure programming language";
homepage = "http://puredocs.bitbucket.org/pure-octave.html"; homepage = "http://puredocs.bitbucket.org/pure-octave.html";
license = stdenv.lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
# This is set to none for now because it does not work with the # This is set to none for now because it does not work with the
# current stable version of Octave. # current stable version of Octave.
platforms = stdenv.lib.platforms.none; platforms = lib.platforms.none;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/odbc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, libiodbc }: { lib, stdenv, fetchurl, pkg-config, pure, libiodbc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "odbc"; baseName = "odbc";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A simple ODBC interface for the Pure programming language"; description = "A simple ODBC interface for the Pure programming language";
homepage = "http://puredocs.bitbucket.org/pure-odbc.html"; homepage = "http://puredocs.bitbucket.org/pure-odbc.html";
license = stdenv.lib.licenses.lgpl3Plus; license = lib.licenses.lgpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/pandoc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }: { lib, stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "pandoc"; baseName = "pandoc";
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Converts Sphinx-formatted Pure documentation files to Markdown and other formats using Pandoc"; description = "Converts Sphinx-formatted Pure documentation files to Markdown and other formats using Pandoc";
homepage = "http://puredocs.bitbucket.org/pure-pandoc.html"; homepage = "http://puredocs.bitbucket.org/pure-pandoc.html";
license = stdenv.lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/rational/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure }: { lib, stdenv, fetchurl, pkg-config, pure }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "rational"; baseName = "rational";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A collection of utility functions for rational numbers, and a module for doing interval arithmetic in Pure"; description = "A collection of utility functions for rational numbers, and a module for doing interval arithmetic in Pure";
homepage = "http://puredocs.bitbucket.org/pure-rational.html"; homepage = "http://puredocs.bitbucket.org/pure-rational.html";
license = stdenv.lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

8
pkgs/development/pure-modules/readline/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, pure, readline }: { lib, stdenv, fetchurl, pkg-config, pure, readline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "readline"; baseName = "readline";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A trivial wrapper around GNU readline, which gives Pure scripts access to the most important facilities of the readline interface"; description = "A trivial wrapper around GNU readline, which gives Pure scripts access to the most important facilities of the readline interface";
homepage = "http://puredocs.bitbucket.org/pure-readline.html"; homepage = "http://puredocs.bitbucket.org/pure-readline.html";
license = stdenv.lib.licenses.free; license = lib.licenses.free;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ asppsa ]; maintainers = with lib.maintainers; [ asppsa ];
}; };
} }

Some files were not shown because too many files have changed in this diff Show More