pkgs/development: stdenv.lib -> lib

this takes care of the following folders in pkgs/development:
* arduino
* chez-modules
* go-packages
* guile-modules
* idris-modules
* perl-modules
* r-modules
* ruby-modules
This commit is contained in:
Pavol Rusnak
2021-01-17 19:11:59 +01:00
parent 979e6e67d3
commit cf2a67fef3
18 changed files with 57 additions and 59 deletions
@@ -2,7 +2,7 @@
let
runtimePath = stdenv.lib.makeBinPath [
runtimePath = lib.makeBinPath [
arduino-cli
python3 # required by the esp8266 core
];
@@ -21,7 +21,7 @@ let
buildFlagsArray = [
"-ldflags=-s -w -X github.com/arduino/arduino-cli/version.versionString=${version} -X github.com/arduino/arduino-cli/version.commit=unknown"
] ++ stdenv.lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
meta = with lib; {
inherit (src.meta) homepage;
@@ -47,7 +47,7 @@ let
;
# abiVersion 6 is default, but we need 5 for `avrdude_bin` executable
ncurses5 = ncurses.override { abiVersion = "5"; };
teensy_libpath = stdenv.lib.makeLibraryPath [
teensy_libpath = lib.makeLibraryPath [
atk
cairo
expat
@@ -76,7 +76,7 @@ let
else throw "${stdenv.hostPlatform.system} is not supported in teensy";
flavor = (if withTeensyduino then "teensyduino" else "arduino")
+ stdenv.lib.optionalString (!withGui) "-core";
+ lib.optionalString (!withGui) "-core";
in
stdenv.mkDerivation rec {
version = "1.8.13";
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
zlib
ncurses5
readline
] ++ stdenv.lib.optionals withTeensyduino [ upx ];
] ++ lib.optionals withTeensyduino [ upx ];
downloadSrcList = builtins.attrValues externalDownloads;
downloadDstList = builtins.attrNames externalDownloads;
@@ -165,7 +165,7 @@ stdenv.mkDerivation rec {
cp -r ./build/linux/work/* "$out/share/arduino/"
echo -n ${version} > $out/share/arduino/lib/version.txt
${stdenv.lib.optionalString withGui ''
${lib.optionalString withGui ''
mkdir -p $out/bin
substituteInPlace $out/share/arduino/arduino \
--replace "JAVA=java" "JAVA=$javaPath/java" \
@@ -180,7 +180,7 @@ stdenv.mkDerivation rec {
--replace '<ICON_NAME>' "$out/share/arduino/icons/128x128/apps/arduino.png"
''}
${stdenv.lib.optionalString withTeensyduino ''
${lib.optionalString withTeensyduino ''
# Back up the original jars
mv $out/share/arduino/lib/arduino-core.jar $out/share/arduino/lib/arduino-core.jar.bak
mv $out/share/arduino/lib/pde.jar $out/share/arduino/lib/pde.jar.bak
@@ -235,7 +235,7 @@ stdenv.mkDerivation rec {
mkdir $out/lib/
ln -s ${lib.makeLibraryPath [ ncurses5 ]}/libtinfo.so.5 $out/lib/libtinfo.so.5
${stdenv.lib.optionalString withTeensyduino ''
${lib.optionalString withTeensyduino ''
# Patch the Teensy loader binary
patchelf --debug \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python3Packages, installShellFiles }:
{ stdenv, lib, fetchFromGitHub, python3Packages, installShellFiles }:
stdenv.mkDerivation rec {
version = "1.6.0";
@@ -22,12 +22,11 @@ stdenv.mkDerivation rec {
wrapPythonPrograms
'';
meta = {
meta = with lib; {
description = "Makefile for Arduino sketches";
homepage = "https://github.com/sudar/Arduino-Makefile";
license = stdenv.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.eyjhb ];
platforms = stdenv.lib.platforms.unix;
license = licenses.lgpl21;
maintainers = [ maintainers.eyjhb ];
platforms = platforms.unix;
};
}
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python2Packages, picocom
{ stdenv, lib, fetchurl, python2Packages, picocom
, avrdude, arduino-core }:
python2Packages.buildPythonApplication rec {
@@ -36,11 +36,11 @@ python2Packages.buildPythonApplication rec {
--replace "'-C', self.e['avrdude.conf']," ""
'';
meta = {
meta = with lib; {
description = "Command line toolkit for working with Arduino hardware";
homepage = "http://inotool.org/";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ antono ];
platforms = stdenv.lib.platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ antono ];
platforms = platforms.linux;
};
}