+1
-1
pkgs/development/arduino/arduino-ci/default.nix
+1
-1
pkgs/development/arduino/arduino-ci/default.nix
+1
-1
pkgs/development/arduino/arduino-cli/default.nix
+1
-1
pkgs/development/arduino/arduino-cli/default.nix
···
21
21
22
22
buildFlagsArray = [
23
23
"-ldflags=-s -w -X github.com/arduino/arduino-cli/version.versionString=${version} -X github.com/arduino/arduino-cli/version.commit=unknown"
24
-
] ++ stdenv.lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
24
+
] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
25
25
26
26
meta = with lib; {
27
27
inherit (src.meta) homepage;
+6
-6
pkgs/development/arduino/arduino-core/default.nix
+6
-6
pkgs/development/arduino/arduino-core/default.nix
···
47
47
;
48
48
# abiVersion 6 is default, but we need 5 for `avrdude_bin` executable
49
49
ncurses5 = ncurses.override { abiVersion = "5"; };
50
-
teensy_libpath = stdenv.lib.makeLibraryPath [
50
+
teensy_libpath = lib.makeLibraryPath [
51
51
atk
52
52
cairo
53
53
expat
···
76
76
else throw "${stdenv.hostPlatform.system} is not supported in teensy";
77
77
78
78
flavor = (if withTeensyduino then "teensyduino" else "arduino")
79
-
+ stdenv.lib.optionalString (!withGui) "-core";
79
+
+ lib.optionalString (!withGui) "-core";
80
80
in
81
81
stdenv.mkDerivation rec {
82
82
version = "1.8.13";
···
125
125
zlib
126
126
ncurses5
127
127
readline
128
-
] ++ stdenv.lib.optionals withTeensyduino [ upx ];
128
+
] ++ lib.optionals withTeensyduino [ upx ];
129
129
downloadSrcList = builtins.attrValues externalDownloads;
130
130
downloadDstList = builtins.attrNames externalDownloads;
131
131
···
165
165
cp -r ./build/linux/work/* "$out/share/arduino/"
166
166
echo -n ${version} > $out/share/arduino/lib/version.txt
167
167
168
-
${stdenv.lib.optionalString withGui ''
168
+
${lib.optionalString withGui ''
169
169
mkdir -p $out/bin
170
170
substituteInPlace $out/share/arduino/arduino \
171
171
--replace "JAVA=java" "JAVA=$javaPath/java" \
···
180
180
--replace '<ICON_NAME>' "$out/share/arduino/icons/128x128/apps/arduino.png"
181
181
''}
182
182
183
-
${stdenv.lib.optionalString withTeensyduino ''
183
+
${lib.optionalString withTeensyduino ''
184
184
# Back up the original jars
185
185
mv $out/share/arduino/lib/arduino-core.jar $out/share/arduino/lib/arduino-core.jar.bak
186
186
mv $out/share/arduino/lib/pde.jar $out/share/arduino/lib/pde.jar.bak
···
235
235
mkdir $out/lib/
236
236
ln -s ${lib.makeLibraryPath [ ncurses5 ]}/libtinfo.so.5 $out/lib/libtinfo.so.5
237
237
238
-
${stdenv.lib.optionalString withTeensyduino ''
238
+
${lib.optionalString withTeensyduino ''
239
239
# Patch the Teensy loader binary
240
240
patchelf --debug \
241
241
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+5
-6
pkgs/development/arduino/arduino-mk/default.nix
+5
-6
pkgs/development/arduino/arduino-mk/default.nix
···
1
-
{ stdenv, fetchFromGitHub, python3Packages, installShellFiles }:
1
+
{ stdenv, lib, fetchFromGitHub, python3Packages, installShellFiles }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
version = "1.6.0";
···
22
22
wrapPythonPrograms
23
23
'';
24
24
25
-
meta = {
25
+
meta = with lib; {
26
26
description = "Makefile for Arduino sketches";
27
27
homepage = "https://github.com/sudar/Arduino-Makefile";
28
-
license = stdenv.lib.licenses.lgpl21;
29
-
maintainers = [ stdenv.lib.maintainers.eyjhb ];
30
-
platforms = stdenv.lib.platforms.unix;
28
+
license = licenses.lgpl21;
29
+
maintainers = [ maintainers.eyjhb ];
30
+
platforms = platforms.unix;
31
31
};
32
32
}
33
-
+5
-5
pkgs/development/arduino/ino/default.nix
+5
-5
pkgs/development/arduino/ino/default.nix
···
1
-
{ stdenv, fetchurl, python2Packages, picocom
1
+
{ stdenv, lib, fetchurl, python2Packages, picocom
2
2
, avrdude, arduino-core }:
3
3
4
4
python2Packages.buildPythonApplication rec {
···
36
36
--replace "'-C', self.e['avrdude.conf']," ""
37
37
'';
38
38
39
-
meta = {
39
+
meta = with lib; {
40
40
description = "Command line toolkit for working with Arduino hardware";
41
41
homepage = "http://inotool.org/";
42
-
license = stdenv.lib.licenses.mit;
43
-
maintainers = with stdenv.lib.maintainers; [ antono ];
44
-
platforms = stdenv.lib.platforms.linux;
42
+
license = licenses.mit;
43
+
maintainers = with maintainers; [ antono ];
44
+
platforms = platforms.linux;
45
45
};
46
46
}
+4
-4
pkgs/development/chez-modules/chez-matchable/default.nix
+4
-4
pkgs/development/chez-modules/chez-matchable/default.nix
···
1
-
{ stdenv, fetchFromGitHub, chez }:
1
+
{ stdenv, lib, fetchFromGitHub, chez }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "chez-matchable";
···
23
23
24
24
doCheck = false;
25
25
26
-
meta = {
26
+
meta = with lib; {
27
27
description = "This is a Library for ChezScheme providing the protable hygenic pattern matcher by Alex Shinn";
28
28
homepage = "https://github.com/fedeinthemix/chez-matchable/";
29
-
maintainers = [ stdenv.lib.maintainers.jitwit ];
30
-
license = stdenv.lib.licenses.publicDomain;
29
+
maintainers = [ maintainers.jitwit ];
30
+
license = licenses.publicDomain;
31
31
};
32
32
33
33
}
+4
-4
pkgs/development/chez-modules/chez-mit/default.nix
+4
-4
pkgs/development/chez-modules/chez-mit/default.nix
···
1
-
{ stdenv, fetchgit, chez, chez-srfi }:
1
+
{ stdenv, lib, fetchgit, chez, chez-srfi }:
2
2
3
3
stdenv.mkDerivation {
4
4
pname = "chez-mit";
···
22
22
23
23
doCheck = false;
24
24
25
-
meta = {
25
+
meta = with lib; {
26
26
description = "This is a MIT/GNU Scheme compatibility library for Chez Scheme";
27
27
homepage = "https://github.com/fedeinthemix/chez-mit/";
28
-
maintainers = [ stdenv.lib.maintainers.jitwit ];
29
-
license = stdenv.lib.licenses.free;
28
+
maintainers = [ maintainers.jitwit ];
29
+
license = licenses.free;
30
30
};
31
31
32
32
}
+4
-4
pkgs/development/chez-modules/chez-scmutils/default.nix
+4
-4
pkgs/development/chez-modules/chez-scmutils/default.nix
···
1
-
{ stdenv, fetchgit, chez, chez-srfi, chez-mit }:
1
+
{ stdenv, lib, fetchgit, chez, chez-srfi, chez-mit }:
2
2
3
3
stdenv.mkDerivation {
4
4
pname = "chez-scmutils";
···
22
22
23
23
doCheck = false;
24
24
25
-
meta = {
25
+
meta = with lib; {
26
26
description = "This is a port of the ‘MIT Scmutils’ library to Chez Scheme";
27
27
homepage = "https://github.com/fedeinthemix/chez-scmutils/";
28
-
maintainers = [ stdenv.lib.maintainers.jitwit ];
29
-
license = stdenv.lib.licenses.gpl3;
28
+
maintainers = [ maintainers.jitwit ];
29
+
license = licenses.gpl3;
30
30
};
31
31
32
32
}
+4
-4
pkgs/development/chez-modules/chez-srfi/default.nix
+4
-4
pkgs/development/chez-modules/chez-srfi/default.nix
···
1
-
{ stdenv, fetchgit, chez }:
1
+
{ stdenv, lib, fetchgit, chez }:
2
2
3
3
stdenv.mkDerivation {
4
4
pname = "chez-srfi";
···
22
22
23
23
doCheck = false;
24
24
25
-
meta = {
25
+
meta = with lib; {
26
26
description = "This package provides a collection of SRFI libraries for Chez Scheme";
27
27
homepage = "https://github.com/fedeinthemix/chez-srfi/";
28
-
maintainers = [ stdenv.lib.maintainers.jitwit ];
29
-
license = stdenv.lib.licenses.free;
28
+
maintainers = [ maintainers.jitwit ];
29
+
license = licenses.free;
30
30
};
31
31
32
32
}
+1
-1
pkgs/development/go-packages/generic/default.nix
+1
-1
pkgs/development/go-packages/generic/default.nix
···
83
83
GO111MODULE = "off";
84
84
GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ];
85
85
86
-
GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
86
+
GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
87
87
88
88
configurePhase = args.configurePhase or ''
89
89
runHook preConfigure
+1
-1
pkgs/development/guile-modules/guile-gnome/default.nix
+1
-1
pkgs/development/guile-modules/guile-gnome/default.nix
···
16
16
buildInputs = [
17
17
texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2
18
18
libglade libgnome libgnomecanvas libgnomeui pango guile-cairo
19
-
] ++ stdenv.lib.optional doCheck guile-lib;
19
+
] ++ lib.optional doCheck guile-lib;
20
20
21
21
# The test suite tries to open an X display, which fails.
22
22
doCheck = false;
-1
pkgs/development/guile-modules/guile-reader/default.nix
-1
pkgs/development/guile-modules/guile-reader/default.nix
+3
-3
pkgs/development/idris-modules/with-packages.nix
+3
-3
pkgs/development/idris-modules/with-packages.nix
···
1
1
# Build a version of idris with a set of packages visible
2
2
# packages: The packages visible to idris
3
-
{ stdenv, idris, symlinkJoin, makeWrapper }: packages:
3
+
{ stdenv, lib, idris, symlinkJoin, makeWrapper }: packages:
4
4
5
-
let paths = stdenv.lib.closePropagation packages;
5
+
let paths = lib.closePropagation packages;
6
6
in
7
-
stdenv.lib.appendToName "with-packages" (symlinkJoin {
7
+
lib.appendToName "with-packages" (symlinkJoin {
8
8
9
9
inherit (idris) name;
10
10
+6
-6
pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
+6
-6
pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
···
1
-
{ stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, JSON }:
1
+
{ stdenv, lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, JSON }:
2
2
3
3
buildPerlPackage rec {
4
4
pname = "WWW-YoutubeViewer";
···
11
11
sha256 = "16p0sa91h0zpqdpqmy348g6b9qj5f6qrbzrljn157vk00cg6mx18";
12
12
};
13
13
14
-
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
14
+
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
15
15
propagatedBuildInputs = [
16
16
LWP
17
17
LWPProtocolHttps
18
18
DataDump
19
19
JSON
20
20
];
21
-
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
21
+
postInstall = lib.optionalString stdenv.isDarwin ''
22
22
shortenPerlShebang $out/bin/youtube-viewer
23
23
'';
24
24
25
-
meta = {
25
+
meta = with lib; {
26
26
description = "A lightweight application for searching and streaming videos from YouTube";
27
27
homepage = "https://github.com/trizen/youtube-viewer";
28
-
maintainers = with stdenv.lib.maintainers; [ woffs ];
29
-
license = with stdenv.lib.licenses; [ artistic2 ];
28
+
maintainers = with maintainers; [ woffs ];
29
+
license = with licenses; [ artistic2 ];
30
30
};
31
31
}
+3
-3
pkgs/development/perl-modules/maatkit/default.nix
+3
-3
pkgs/development/perl-modules/maatkit/default.nix
···
1
-
{buildPerlPackage, stdenv, fetchurl, DBDmysql}:
1
+
{buildPerlPackage, lib, stdenv, fetchurl, DBDmysql}:
2
2
3
3
buildPerlPackage {
4
4
pname = "maatkit";
···
27
27
done
28
28
'' ;
29
29
30
-
meta = {
30
+
meta = with lib; {
31
31
description = "Database toolkit";
32
32
longDescription = ''
33
33
You can use Maatkit to prove replication is working correctly, fix
···
37
37
In addition to MySQL, there is support for PostgreSQL, Memcached, and a
38
38
growing variety of other databases and technologies.
39
39
'';
40
-
license = stdenv.lib.licenses.gpl2Plus;
40
+
license = licenses.gpl2Plus;
41
41
homepage = "http://www.maatkit.org/";
42
42
};
43
43
}
+2
-2
pkgs/development/perl-modules/strip-nondeterminism/default.nix
+2
-2
pkgs/development/perl-modules/strip-nondeterminism/default.nix
···
17
17
# stray test failure
18
18
doCheck = false;
19
19
20
-
nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ shortenPerlShebang ];
20
+
nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ];
21
21
buildInputs = [ ArchiveZip ArchiveCpio file ];
22
22
23
23
perlPostHook = ''
···
26
26
rm $out/share/man/man1/dh_strip_nondeterminism.1.gz
27
27
'';
28
28
29
-
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
29
+
postInstall = lib.optionalString stdenv.isDarwin ''
30
30
shortenPerlShebang $out/bin/strip-nondeterminism
31
31
'';
32
32
+4
-4
pkgs/development/r-modules/generic-builder.nix
+4
-4
pkgs/development/r-modules/generic-builder.nix
···
1
-
{ stdenv, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }:
1
+
{ stdenv, lib, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }:
2
2
3
3
{ name, buildInputs ? [], requireX ? false, ... } @ attrs:
4
4
5
5
stdenv.mkDerivation ({
6
6
buildInputs = buildInputs ++ [R gettext] ++
7
-
stdenv.lib.optionals requireX [util-linux xvfb_run] ++
8
-
stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];
7
+
lib.optionals requireX [util-linux xvfb_run] ++
8
+
lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];
9
9
10
10
NIX_CFLAGS_COMPILE =
11
-
stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
11
+
lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
12
12
13
13
configurePhase = ''
14
14
runHook preConfigure
+3
-3
pkgs/development/ruby-modules/gem-config/default.nix
+3
-3
pkgs/development/ruby-modules/gem-config/default.nix
···
265
265
266
266
hitimes = attrs: {
267
267
buildInputs =
268
-
stdenv.lib.optionals stdenv.isDarwin
268
+
lib.optionals stdenv.isDarwin
269
269
[ darwin.apple_sdk.frameworks.CoreServices ];
270
270
};
271
271
···
514
514
--replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"
515
515
516
516
substituteInPlace lib/vips.rb \
517
-
--replace "vips_libname = 'vips'" "vips_libname = '${stdenv.lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'"
517
+
--replace "vips_libname = 'vips'" "vips_libname = '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'"
518
518
'';
519
519
};
520
520
···
631
631
};
632
632
633
633
zookeeper = attrs: {
634
-
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
634
+
buildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ];
635
635
dontBuild = false;
636
636
postPatch = ''
637
637
sed -i ext/extconf.rb -e "4a \