Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-04-03 18:18:51 +00:00 committed by GitHub
commit 3bf92ca4db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
90 changed files with 1869 additions and 3429 deletions

View file

@ -43,6 +43,7 @@ let
"nginx"
"nginxlog"
"node"
"openldap"
"openvpn"
"postfix"
"postgres"

View file

@ -0,0 +1,67 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.openldap;
in {
port = 9330;
extraOpts = {
ldapCredentialFile = mkOption {
type = types.path;
example = "/run/keys/ldap_pass";
description = ''
Environment file to contain the credentials to authenticate against
<package>openldap</package>.
The file should look like this:
<programlisting>
---
ldapUser: "cn=monitoring,cn=Monitor"
ldapPass: "secret"
</programlisting>
'';
};
protocol = mkOption {
default = "tcp";
example = "udp";
type = types.str;
description = ''
Which protocol to use to connect against <package>openldap</package>.
'';
};
ldapAddr = mkOption {
default = "localhost:389";
type = types.str;
description = ''
Address of the <package>openldap</package>-instance.
'';
};
metricsPath = mkOption {
default = "/metrics";
type = types.str;
description = ''
URL path where metrics should be exposed.
'';
};
interval = mkOption {
default = "30s";
type = types.str;
example = "1m";
description = ''
Scrape interval of the exporter.
'';
};
};
serviceOpts.serviceConfig = {
ExecStart = ''
${pkgs.prometheus-openldap-exporter}/bin/openldap_exporter \
--promAddr ${cfg.listenAddress}:${toString cfg.port} \
--metrPath ${cfg.metricsPath} \
--ldapNet ${cfg.protocol} \
--interval ${cfg.interval} \
--config ${cfg.ldapCredentialFile} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
};
}

View file

@ -603,6 +603,66 @@ let
'';
};
openldap = {
exporterConfig = {
enable = true;
ldapCredentialFile = "${pkgs.writeText "exporter.yml" ''
ldapUser: "cn=root,dc=example"
ldapPass: "notapassword"
''}";
};
metricProvider = {
services.openldap = {
enable = true;
settings.children = {
"cn=schema".includes = [
"${pkgs.openldap}/etc/schema/core.ldif"
"${pkgs.openldap}/etc/schema/cosine.ldif"
"${pkgs.openldap}/etc/schema/inetorgperson.ldif"
"${pkgs.openldap}/etc/schema/nis.ldif"
];
"olcDatabase={1}mdb" = {
attrs = {
objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ];
olcDatabase = "{1}mdb";
olcDbDirectory = "/var/db/openldap";
olcSuffix = "dc=example";
olcRootDN = {
# cn=root,dc=example
base64 = "Y249cm9vdCxkYz1leGFtcGxl";
};
olcRootPW = {
path = "${pkgs.writeText "rootpw" "notapassword"}";
};
};
};
"olcDatabase={2}monitor".attrs = {
objectClass = [ "olcDatabaseConfig" ];
olcDatabase = "{2}monitor";
olcAccess = [ "to dn.subtree=cn=monitor by users read" ];
};
};
declarativeContents."dc=example" = ''
dn: dc=example
objectClass: domain
dc: example
dn: ou=users,dc=example
objectClass: organizationalUnit
ou: users
'';
};
};
exporterTest = ''
wait_for_unit("prometheus-openldap-exporter.service")
wait_for_open_port(389)
wait_for_open_port(9330)
wait_until_succeeds(
"curl -sSf http://localhost:9330/metrics | grep -q 'openldap_scrape{result=\"ok\"} 1'"
)
'';
};
openvpn = {
exporterConfig = {
enable = true;

View file

@ -1,6 +1,6 @@
{ lib, fetchurl, pythonPackages, gettext, klick}:
{ lib, fetchurl, python2Packages, gettext, klick}:
pythonPackages.buildPythonApplication rec {
python2Packages.buildPythonApplication rec {
pname = "gtklick";
version = "0.6.4";
@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137";
};
pythonPath = with pythonPackages; [
pythonPath = with python2Packages; [
pyliblo
pyGtkGlade
];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
, lv2, makeWrapper, pkg-config, python, raul, rdflib, serd, sord, sratom
, lv2, makeWrapper, pkg-config, python3, raul, serd, sord, sratom
, wafHook
, suil
}:
@ -16,24 +16,21 @@ stdenv.mkDerivation rec {
deepClone = true;
};
nativeBuildInputs = [ pkg-config wafHook ];
nativeBuildInputs = [ pkg-config wafHook python3 python3.pkgs.wrapPython ];
buildInputs = [
boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper
python raul serd sord sratom suil
boost ganv glibmm gtkmm2 libjack2 lilv lv2
python3 raul serd sord sratom suil
];
preConfigure = ''
sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript
'';
strictDeps = true;
propagatedBuildInputs = [ rdflib ];
pythonPath = [
python3
python3.pkgs.rdflib
];
postInstall = ''
for program in ingenams ingenish
do
wrapProgram $out/bin/$program \
--prefix PYTHONPATH : $out/${python.sitePackages}:$PYTHONPATH
done
wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
'';
meta = with lib; {

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python
{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3
, serd, sord , sratom, suil, wafHook }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config wafHook ];
buildInputs = [
gtk2 libjack2 lilv lv2 python serd sord sratom suil
gtk2 libjack2 lilv lv2 python3 serd sord sratom suil
];
meta = with lib; {

View file

@ -1,6 +1,6 @@
{ lib, fetchurl, pythonPackages }:
{ lib, fetchurl, python2Packages }:
pythonPackages.buildPythonApplication rec {
python2Packages.buildPythonApplication rec {
pname = "lastfmsubmitd";
version = "1.0.6";

View file

@ -1,5 +1,4 @@
{ lib, stdenv, callPackage, fetchurl
, python
, jdk, cmake, libxml2, zlib, python3, ncurses5
, dotnet-sdk_3
, vmopts ? null
@ -199,7 +198,7 @@ let
platforms = platforms.linux;
};
}).override {
propagatedUserEnvPkgs = [ python ];
propagatedUserEnvPkgs = [ python3 ];
};
buildRider = { name, version, src, license, description, wmClass, ... }:

View file

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
karchive, ki18n, kio, perl, python, php, qttools
karchive, ki18n, kio, perl, python3, php, qttools
, kdbusaddons
}:
@ -12,5 +12,5 @@ mkDerivation {
maintainers = with lib.maintainers; [ orivej ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ karchive ki18n kio perl python php qttools kdbusaddons ];
buildInputs = [ karchive ki18n kio perl python3 php qttools kdbusaddons ];
}

View file

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
gettext,
kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion,
qtbase, python
qtbase, python3
}:
mkDerivation {
@ -15,7 +15,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python
gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python3
];
propagatedUserEnvPkgs = [ ];
}

View file

@ -1,5 +1,5 @@
{ mkDerivation, qtbase
, lib, extra-cmake-modules, gettext, python
, lib, extra-cmake-modules, gettext, python3
, drumstick, fluidsynth
, kcoreaddons, kcrash, kdoctools
, qtquickcontrols2, qtsvg, qttools, qtdeclarative
@ -13,7 +13,7 @@ mkDerivation {
broken = lib.versionOlder qtbase.version "5.14";
};
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ];
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 qtdeclarative ];
propagatedBuildInputs = [
drumstick fluidsynth

View file

@ -1,15 +1,16 @@
diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 31da529..90308aa 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -80,7 +80,6 @@ else()
@@ -77,7 +77,6 @@ else()
message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
endif()
if(NOT EXISTS "${LIBDIR}/")
- message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
endif()
# -------------------------------------------------------------------------
@@ -112,10 +111,6 @@ if(WITH_CODEC_SNDFILE)
# Prefer lib directory paths
@@ -113,10 +112,6 @@ if(WITH_CODEC_SNDFILE)
find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
list(APPEND LIBSNDFILE_LIBRARIES
@ -20,7 +21,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
)
print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
@@ -132,7 +127,7 @@ if(WITH_PYTHON)
@@ -133,7 +128,7 @@ if(WITH_PYTHON)
# normally cached but not since we include them with blender
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
@ -29,7 +30,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
else()
@@ -173,9 +168,7 @@ endif()
@@ -174,9 +169,7 @@ endif()
if(WITH_CODEC_FFMPEG)
set(FFMPEG_FIND_COMPONENTS
avcodec avdevice avformat avutil
@ -40,20 +41,20 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
find_package(FFmpeg)
endif()
@@ -266,7 +259,6 @@ if(WITH_BOOST)
@@ -267,7 +260,6 @@ if(WITH_BOOST)
endif()
if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv") # boost_locale and ffmpeg needs it !
- string(APPEND PLATFORM_LINKFLAGS " -liconv") # boost_locale and ffmpeg needs it !
endif()
if(WITH_OPENIMAGEIO)
@@ -439,7 +431,7 @@ else()
if(WITH_PUGIXML)
@@ -451,7 +443,7 @@ else()
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
endif()
-if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
+if(FALSE)
# Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
endif()

View file

@ -1,5 +1,5 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch
, python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns
, python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns
, which, perl, makeWrapper
}:
@ -21,11 +21,11 @@ mkDerivation rec {
nativeBuildInputs = [
which
python3
ruby
];
buildInputs = [
python
ruby
qtbase
qtmultimedia
qttools

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxctl";
version = "1.22.0";
version = "1.22.1";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
sha256 = "sha256-7uS8704YZ7lQTSSnbVvc6T5iadl02TeVpwVPf2uS9L4=";
sha256 = "sha256-SaDO3a50CLhgLafCdgKEfHpuHdIweSy5L/TUgEUv5CM=";
};
vendorSha256 = "sha256-oqfJaQA8ybh0UNWYJ2ukoWkwdgORwvXzRCquGstwA4M=";
vendorSha256 = "sha256-4uSw/9lI/rdDqy78jNC9eHYW/v/sMFb+sQvwYG6GZks=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubeval";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "instrumenta";
repo = "kubeval";
rev = version;
sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0";
sha256 = "sha256-c5UESyWK1rfnD0etOuIroBUSqZQuu57jio7/ArItMP0=";
};
vendorSha256 = "1kpwvi84i3h1yjprd6m6hn8l9j235931871y3qk9cl0g8q0hv9ja";
vendorSha256 = "sha256-SqYNAUYPUJYmHj4cFEYqQ8hEkYWmmpav9AGOSFDc/M4=";
doCheck = false;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, gmp, mpfr, python
{ lib, stdenv, fetchFromGitHub, cmake, gmp, mpfr, python2
, gperftools, ninja, makeWrapper }:
stdenv.mkDerivation {
@ -13,7 +13,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake makeWrapper ninja ];
buildInputs = [ gmp mpfr python gperftools ];
buildInputs = [ gmp mpfr python2 gperftools ];
preConfigure = ''
patchShebangs bin/leantags

View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchFromGitHub, gmp, cmake, python}:
{lib, stdenv, fetchFromGitHub, gmp, cmake, python3}:
stdenv.mkDerivation rec {
pname = "libpoly";
@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ gmp python ];
buildInputs = [ gmp python3 ];
strictDeps = true;
meta = with lib; {
homepage = "https://github.com/SRI-CSL/libpoly";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python }:
{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python3 }:
stdenv.mkDerivation rec {
name = "ginac-1.8.0";
@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [ readline ] ++ lib.optional stdenv.isDarwin gmp;
nativeBuildInputs = [ pkg-config python ];
nativeBuildInputs = [ pkg-config python3 ];
strictDeps = true;
preConfigure = "patchShebangs ginsh";

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, autoPatchelfHook, python }:
{ stdenv, lib, fetchurl, autoPatchelfHook, python2 }:
let
majorVersion = "8.1";
@ -14,7 +14,9 @@ in stdenv.mkDerivation rec {
sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64";
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ (python.withPackages (ps: [ ps.gurobipy ])) ];
buildInputs = [ (python2.withPackages (ps: [ ps.gurobipy ])) ];
strictDeps = true;
buildPhase = ''
cd src/build

View file

@ -18,10 +18,14 @@
, pkg-config
, allowPgo ? true
, python3 # for PGO
# for clang stdenv check
, foot
, llvmPackages
, llvmPackages_latest
}:
let
version = "1.7.0";
version = "1.7.1";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
@ -67,8 +71,8 @@ let
# https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#performance-optimized-pgo
pgoCflags = {
"clang" = "-O3 -Wno-ignored-optimization-argument -Wno-profile-instr-out-of-date -Wno-profile-instr-unprofiled";
"gcc" = "-O3 -Wno-missing-profile";
"clang" = "-O3 -Wno-ignored-optimization-argument";
"gcc" = "-O3";
}."${compilerName}";
# ar with lto support
@ -89,7 +93,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
sha256 = "0w07fw7y31g891335ji3fm783r4dsk5py82qp0zx6z3rfr07paby";
sha256 = "1x6nyhlp0zynnbdjx87c4ybfx6fyr0r53vypkfima56dwbfh98ka";
};
nativeBuildInputs = [
@ -130,12 +134,26 @@ stdenv.mkDerivation rec {
preBuild = lib.optionalString doPgo ''
meson configure -Db_pgo=generate
ninja
# make sure there is _some_ profiling data on all binaries
./footclient --version
./foot --version
# generate pgo data of wayland independent code
./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile}
meson configure -Db_pgo=use
'' + lib.optionalString (doPgo && stdenv.cc.cc.pname == "clang") ''
'' + lib.optionalString (doPgo && compilerName == "clang") ''
llvm-profdata merge default_*profraw --output=default.profdata
'';
passthru.tests = {
clang-default-compilation = foot.override {
inherit (llvmPackages) stdenv;
};
clang-latest-compilation = foot.override {
inherit (llvmPackages_latest) stdenv;
};
};
meta = with lib; {
homepage = "https://codeberg.org/dnkl/foot/";
changelog = "https://codeberg.org/dnkl/foot/releases/tag/${version}";

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchgit
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto
, pythonPackages }:
, python2Packages }:
stdenv.mkDerivation {
pname = "git-bz";
@ -16,7 +16,7 @@ stdenv.mkDerivation {
asciidoc docbook_xml_dtd_45 docbook_xsl libxslt makeWrapper xmlto
];
buildInputs = []
++ (with pythonPackages; [ python pysqlite ]);
++ (with python2Packages; [ python pysqlite ]);
postPatch = ''
patchShebangs configure
@ -27,8 +27,8 @@ stdenv.mkDerivation {
postInstall = ''
wrapProgram $out/bin/git-bz \
--prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pycrypto}")" \
--prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")"
--prefix PYTHONPATH : "$(toPythonPath "${python2Packages.pycrypto}")" \
--prefix PYTHONPATH : "$(toPythonPath "${python2Packages.pysqlite}")"
'';
meta = with lib; {

View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pythonPackages }:
{ lib, fetchFromGitHub, python2Packages }:
pythonPackages.buildPythonApplication rec {
python2Packages.buildPythonApplication rec {
pname = "git-crecord";
version = "20161216.0";
@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0v3y90zi43myyi4k7q3892dcrbyi9dn2q6xgk12nw9db9zil269i";
};
propagatedBuildInputs = with pythonPackages; [ docutils ];
propagatedBuildInputs = with python2Packages; [ docutils ];
meta = {
homepage = "https://github.com/andrewshadura/git-crecord";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }:
{ lib, stdenv, fetchzip, perl, python2, gnuplot, coreutils, gnugrep }:
stdenv.mkDerivation rec {
pname = "gitstats";
@ -11,7 +11,11 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}" + "-src";
};
buildInputs = [ perl python ];
nativeBuildInputs = [ perl ];
buildInputs = [ python2 ];
strictDeps = true;
postPatch = ''
sed -e "s|gnuplot_cmd = .*|gnuplot_cmd = '${gnuplot}/bin/gnuplot'|" \

View file

@ -3,7 +3,7 @@
, extra-cmake-modules
, gettext
, kdoctools
, python
, python3
, appstream-qt
, discount
, flatpak
@ -34,7 +34,7 @@
mkDerivation {
name = "discover";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 ];
buildInputs = [
# discount is needed for libmarkdown
appstream-qt

View file

@ -27,13 +27,13 @@ let
ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb split ]));
in stdenv.mkDerivation rec {
pname = "bluespec";
version = "unstable-2021.02.14";
version = "unstable-2021.03.29";
src = fetchFromGitHub {
owner = "B-Lang-org";
repo = "bsc";
rev = "c085ecd807d85f31d102d8bec71f5c28dc96b31d";
sha256 = "0c86gwhrarw78cr9c9slb9vij6kcwx3x281kbqji96qqzs0dfb32";
rev = "00185f7960bd1bd5554a1167be9f37e1f18ac454";
sha256 = "1bcdhql4cla137d8xr8m2h21dyxv0jpjpalpr5mgj2jxqfsmkbrn";
};
enableParallelBuilding = true;

View file

@ -7,7 +7,7 @@
, flex
, llvmPackages_8
, opencl-clang
, python
, python3
, spirv-llvm-translator
, buildWithPatches ? true
@ -33,9 +33,11 @@ stdenv.mkDerivation rec {
sha256 = "1jp3c67ppl1x4pazr5nzy52615cpx0kyckaridhc0fsmrkgilyxq";
};
nativeBuildInputs = [ clang cmake bison flex llvm python ];
nativeBuildInputs = [ clang cmake bison flex python3 ];
buildInputs = [ clang opencl-clang spirv-llvm-translator ];
buildInputs = [ clang opencl-clang spirv-llvm-translator llvm ];
strictDeps = true;
# checkInputs = [ lit pythonPackages.nose ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }:
{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, wafHook }:
stdenv.mkDerivation rec {
pname = "raul";
@ -12,8 +12,10 @@ stdenv.mkDerivation rec {
sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l";
};
nativeBuildInputs = [ pkg-config wafHook ];
buildInputs = [ boost gtk2 python ];
nativeBuildInputs = [ pkg-config wafHook python3 ];
buildInputs = [ boost gtk2 ];
strictDeps = true;
meta = with lib; {
description = "A C++ utility library primarily aimed at audio/musical applications";

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python, serd, sord, sratom
{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom
, wafHook
, withQt4 ? true, qt4 ? null
, withQt5 ? false, qt5 ? null }:
@ -17,13 +17,15 @@ stdenv.mkDerivation rec {
sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06";
};
nativeBuildInputs = [ pkg-config wafHook ];
buildInputs = [ gtk2 lv2 python serd sord sratom ]
nativeBuildInputs = [ pkg-config wafHook python3 ];
buildInputs = [ gtk2 lv2 serd sord sratom ]
++ (lib.optionals withQt4 [ qt4 ])
++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
dontWrapQtApps = true;
strictDeps = true;
meta = with lib; {
homepage = "http://drobilla.net/software/suil";
description = "A lightweight C library for loading and wrapping LV2 plugin UIs";

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
, postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
, libiconv, libxml2
, netcdfSupport ? true, netcdf, hdf5, curl
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ unzip ];
buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
++ (with pythonPackages; [ python numpy wrapPython ])
++ (with python2Packages; [ python numpy wrapPython ])
++ lib.optional stdenv.isDarwin libiconv
++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];

View file

@ -1,67 +0,0 @@
{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
, postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl
, libpng }:
stdenv.mkDerivation rec {
pname = "gdal";
version = "1.11.5";
src = fetchurl {
url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz";
sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl";
};
nativeBuildInputs = [ unzip ];
buildInputs = [ libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ];
patches = [
# This ensures that the python package is installed into gdal's prefix,
# rather than trying to install into python's prefix.
./python.patch
];
hardeningDisable = [ "format" "fortify" ];
# Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
# Unset CC and CXX as they confuse libtool.
preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
configureFlags = [
"--with-jpeg=${libjpeg.dev}"
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
"--with-libpng=${libpng.dev}" # optional
"--with-libz=${zlib.dev}" # optional
"--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${mysql57.connector-c}/bin/mysql_config"
"--with-geotiff=${libgeotiff.dev}"
"--with-python" # optional
"--with-static-proj4=${proj}" # optional
"--with-geos=${geos}/bin/geos-config"# optional
];
# Allow use of old proj_api.h
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
# Prevent this:
#
# Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/
# /nix/store/pbi1lgank10fy0xpjckbdpgacqw34dsz-python-2.7.9/bin/python -E -c pass
# TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files
# error: bad install directory or PYTHONPATH
preBuild = ''
pythonInstallDir=$out/lib/${python.libPrefix}/site-packages
mkdir -p $pythonInstallDir
export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir
'';
enableParallelBuilding = true;
meta = {
description = "Translator library for raster geospatial data formats";
homepage = "https://www.gdal.org/";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.marcweber ];
platforms = with lib.platforms; linux ++ darwin;
};
}

View file

@ -1,17 +0,0 @@
diff --git a/swig/python/GNUmakefile.old b/swig/python/GNUmakefile
index b4d5e90..2160b83 100644
--- a/swig/python/GNUmakefile
+++ b/swig/python/GNUmakefile
@@ -67,11 +67,7 @@ egg:
install:
-ifeq ($(PY_HAVE_SETUPTOOLS),1)
- $(PYTHON) setup.py install
-else
$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-endif
for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done

View file

@ -1,6 +1,6 @@
{ fetchurl, fetchpatch, lib, stdenv,
cmake, netcdf, gfortran, libpng, openjpeg,
enablePython ? false, pythonPackages }:
enablePython ? false, pythonPackages ? null }:
stdenv.mkDerivation rec {
pname = "grib-api";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }:
{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python3 }:
stdenv.mkDerivation rec {
pname = "hpx";
@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
};
buildInputs = [ boost hwloc gperftools ];
nativeBuildInputs = [ cmake pkg-config python ];
nativeBuildInputs = [ cmake pkg-config python3 ];
strictDeps = true;
meta = {
description = "C++ standard library for concurrency and parallelism";

View file

@ -1,9 +1,9 @@
{ mkDerivation, lib, extra-cmake-modules, python }:
{ mkDerivation, lib, extra-cmake-modules, python3 }:
mkDerivation {
name = "kapidox";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules python ];
nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ];
postFixup = ''
moveToOutput bin $bin
'';

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libdrm
, withPython ? false, python }:
, withPython ? false, python ? null }:
stdenv.mkDerivation {
pname = "kmsxx";
@ -16,7 +16,7 @@ stdenv.mkDerivation {
cmakeFlags = lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libdrm python ];
buildInputs = [ libdrm ] ++ lib.optionals withPython [ python ];
meta = with lib; {
description = "C++11 library, utilities and python bindings for Linux kernel mode setting";
@ -24,5 +24,6 @@ stdenv.mkDerivation {
license = licenses.mpl20;
maintainers = with maintainers; [ gnidorah ];
platforms = platforms.linux;
broken = true; # marked broken 2021-03-26
};
}

View file

@ -4,7 +4,7 @@
, cmake
, blas
# Check Inputs
, python
, python3
}:
stdenv.mkDerivation rec {
@ -26,8 +26,10 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_PREFIX=" # ends up double-adding /nix/store/... prefix, this avoids issue
];
strictDeps = true;
doCheck = true;
checkInputs = [ python.pkgs.numpy ];
checkInputs = [ python3.pkgs.numpy ];
meta = with lib; {
description = "General GTO integrals for quantum chemistry";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python, llvmPackages }:
{ lib, stdenv, fetchFromGitHub, python3, llvmPackages }:
let
llvm = llvmPackages.llvm;
@ -16,8 +16,9 @@ stdenv.mkDerivation {
sha256 = "03l9frx3iw3qdsb9rrscgzdwm6872gv6mkssvn027ndf9y321xk7";
};
nativeBuildInputs = [ python ];
buildInputs = [ llvm clang clang-unwrapped ];
nativeBuildInputs = [ python3 llvm ];
strictDeps = true;
postPatch = ''
sed -i 's,llvm_clang =.*,llvm_clang = "${clang-unwrapped}/bin/clang",' configure.py
@ -25,7 +26,7 @@ stdenv.mkDerivation {
'';
configurePhase = ''
${python.interpreter} ./configure.py --prefix=$out
${python3.interpreter} ./configure.py --prefix=$out
'';
enableParallelBuilding = true;

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
, python
, python2
}:
stdenv.mkDerivation rec {
@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g";
};
nativeBuildInputs = [ python ];
nativeBuildInputs = [ python2 ];
strictDeps = true;
patchPhase = ''
patchShebangs src

View file

@ -111,6 +111,8 @@ stdenv.mkDerivation rec {
pkg-config
];
strictDeps = true;
# Some grammar files needed to be copied too from some dependencies. I suppose
# if one define a dependency in such a way that its share directory is found,
# then this copying would be unnecessary. Instead of actually copying these

View file

@ -1,4 +1,4 @@
{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }:
{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python ? null, glib }:
stdenv.mkDerivation rec {
pname = "libplist";

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, texinfo, pcre2
, enablePython ? false, python, swig, libxml2, ncurses
, enablePython ? false, python ? null, swig, libxml2, ncurses
}:
let
isPython3 = enablePython && python.pythonAtLeast "3";

View file

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
version = "0.4.38";
version = "0.4.39";
pname = "libzen";
src = fetchurl {
url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
sha256 = "1nkygc17sndznpcf71fdrhwpm8z9a3hc9csqlafwswh49axhfkjr";
sha256 = "1rwaxmid9iv65n0y6xlcyxxydsvihjni9ldxpg6pbqz43amp49xx";
};
nativeBuildInputs = [ autoreconfHook ];

View file

@ -4,7 +4,7 @@
, cmake
, ninja
, perl # Project uses Perl for scripting and testing
, python
, python3
, enableThreading ? true # Threading can be disabled to increase security https://tls.mbed.org/kb/development/thread-safety-and-multi-threading
}:
@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
sha256 = "0mz7n373b8d287crwi6kq2hb8ryyi228j38h25744lqai23qj5cf";
};
nativeBuildInputs = [ cmake ninja perl python ];
nativeBuildInputs = [ cmake ninja perl python3 ];
strictDeps = true;
postConfigure = lib.optionals enableThreading ''
perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer

View file

@ -87,6 +87,8 @@ stdenv.mkDerivation rec {
srtp
];
strictDeps = true;
# Do not build static libraries
cmakeFlags = [ "-DENABLE_STATIC=NO" ];

View file

@ -35,5 +35,12 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
knownVulnerabilities = [
"CVE-2018-1320"
"CVE-2018-11798"
"CVE-2019-0205"
"CVE-2019-0210"
"CVE-2020-13949"
];
};
}

View file

@ -56,5 +56,8 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
knownVulnerabilities = [
"CVE-2020-13949"
];
};
}

View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = version;
sha256 = "sha256-2igN5mmkXyYpQeAoPAYzhirictuionVMbqifNigEYdw=";
sha256 = "sha256-vlIon+VAHeJiaSIVMEKEpwQC4gXA52vxfEkiQMC9yiw=";
};
propagatedBuildInputs = [

View file

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "axis";
version = "43";
version = "44";
src = fetchFromGitHub {
owner = "Kane610";
repo = pname;
rev = "v${version}";
sha256 = "1p9yfixsrkw7rxbvgybcb653rbqv0x18wzqkh620g193snm9sgm2";
sha256 = "sha256-GC8GiDP/QHU+8swe60VFPRx8kSMMHuXjIPEKCja8HPE=";
};
propagatedBuildInputs = [

View file

@ -1,9 +1,10 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools_scm
, setuptools-scm
, pycryptodome
, requests
, six
}:
buildPythonPackage rec {
@ -15,13 +16,17 @@ buildPythonPackage rec {
sha256 = "1rkc3zwsq53rjsmc47335m4viljiwdbmw3y2zry4z70j8q1dbmki";
};
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ pycryptodome requests ];
buildInputs = [
setuptools-scm
];
# Jailbreak pycryptodome
preBuild = ''
substituteInPlace setup.py --replace "==3.4.7" ""
'';
propagatedBuildInputs = [
pycryptodome
requests
six
];
pythonImportsCheck = [ "httpsig" ];
meta = with lib; {
description = "Sign HTTP requests with secure signatures";

View file

@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "pynetdicom";
version = "1.5.5";
version = "1.5.6";
src = fetchFromGitHub {
owner = "pydicom";
repo = pname;
rev = "v${version}";
sha256 = "0zjpscxdhlcv99py7jx5r6dw32nzbcr49isrzkdr6g3zwyxwzbfm";
sha256 = "sha256-xYwnv30I0+CAx4QODSeMNhdlM2NuM8v4J3rx99NdYCc=";
};
propagatedBuildInputs = [
@ -32,14 +32,22 @@ buildPythonPackage rec {
disabledTests = [
# Some tests needs network capabilities
"test_str_types_empty"
"test_associate_reject"
"TestEchoSCP"
"TestEchoSCPCLI"
"TestFindSCP"
"TestFindSCPCLI"
"TestGetSCP"
"TestGetSCPCLI"
"TestMoveSCP"
"TestMoveSCPCLI"
"TestQRGetServiceClass"
"TestQRMoveServiceClass"
"TestStoreSCP"
"TestStoreSCPCLI"
"TestStoreSCU"
"TestStoreSCUCLI"
"TestQRGetServiceClass"
"TestQRMoveServiceClass"
"TestState"
];
pythonImportsCheck = [ "pynetdicom" ];
@ -49,7 +57,7 @@ buildPythonPackage rec {
homepage = "https://github.com/pydicom/pynetdicom";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
# Tests are not passing on Darwin, thus it's assumed that it doesn't work
broken = stdenv.isDarwin;
# Tests are not passing on Darwin/Aarch64, thus it's assumed that it doesn't work
broken = stdenv.isDarwin || stdenv.isAarch64;
};
}

View file

@ -36,7 +36,8 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'croniter = "^0"' 'croniter = "*"' \
--replace 'defusedxml = "^0.6"' 'defusedxml = "*"'
--replace 'defusedxml = "^0.6"' 'defusedxml = "*"' \
--replace 'zeroconf = "^0.28"' 'zeroconf = "*"'
'';
nativeBuildInputs = [

View file

@ -3,27 +3,26 @@
, buildPythonPackage
, fetchPypi
, ifaddr
, typing
, isPy27
, pythonOlder
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "zeroconf";
version = "0.28.8";
disabled = isPy27;
version = "0.29.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0narq8haa3b375vfblbyil77n8bw0wxqnanl91pl0wwwm884mqjb";
sha256 = "sha256-eu+7ZYtFKx/X5REkNk+TjG9eQtbqiT+iVXvqjAbFQK8=";
};
propagatedBuildInputs = [ ifaddr ]
++ lib.optionals (pythonOlder "3.5") [ typing ];
propagatedBuildInputs = [ ifaddr ];
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "zeroconf/test.py" ];
disabledTests = [
# disable tests that expect some sort of networking in the build container
"test_launch_and_close"
@ -33,6 +32,7 @@ buildPythonPackage rec {
] ++ lib.optionals stdenv.isDarwin [
"test_lots_of_names"
];
__darwinAllowLocalNetworking = true;
pythonImportsCheck = [ "zeroconf" ];
@ -40,7 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python implementation of multicast DNS service discovery";
homepage = "https://github.com/jstasiak/python-zeroconf";
license = licenses.lgpl21;
license = licenses.lgpl21Only;
maintainers = with maintainers; [ abbradar ];
};
}

View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}:
{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python3, libiberty, libopcodes}:
stdenv.mkDerivation rec {
pname = "kcov";
@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
};
preConfigure = "patchShebangs src/bin-to-c-source.py";
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake pkg-config python3 ];
buildInputs = [ zlib curl elfutils python libiberty libopcodes ];
buildInputs = [ curl zlib elfutils libiberty libopcodes ];
strictDeps = true;
meta = with lib; {
description = "Code coverage tester for compiled programs, Python scripts and shell scripts";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, nix-update-source, lib, python
{ stdenv, fetchFromGitHub, nix-update-source, lib, python3
, which, runtimeShell, pychecker ? null }:
stdenv.mkDerivation rec {
version = "0.7.0";
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv";
};
pname = "gup";
buildInputs = lib.remove null [ python which pychecker ];
nativeBuildInputs = [ python3 which pychecker ];
buildInputs = [ python3 ];
strictDeps = true;
SKIP_PYCHECKER = pychecker == null;
buildPhase = "make python";
installPhase = ''

View file

@ -6,6 +6,7 @@
, jinja2
, pylint
, pyyaml
, six
}:
buildPythonApplication rec {
@ -21,7 +22,7 @@ buildPythonApplication rec {
sha256 = "0kmggnfbv6bba75l3zfzqwk0swi90brjka307m2kcz2w35kr8jvn";
};
propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ];
propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml six ];
doCheck = false;

View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pythonPackages }:
{ lib, fetchFromGitHub, python3Packages }:
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "grabserial";
version = "2.0.2";
@ -11,7 +11,10 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0ryk4w8q6zfmia71nwnk5b7xaxw0sf45dw9q50xp7k76i3k5f9f3";
};
propagatedBuildInputs = [ pythonPackages.pyserial ];
propagatedBuildInputs = [ python3Packages.pyserial ];
# no usable tests
doCheck = false;
meta = with lib; {
description = "Python based serial dump and timing program";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python, pcsclite, pth }:
{ lib, stdenv, fetchFromGitHub, pcsclite, pth, python2 }:
stdenv.mkDerivation rec {
pname = "hexio";
@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
repo = "hexio";
};
propagatedBuildInputs = [ python ];
buildInputs = [ pcsclite pth ];
strictDeps = true;
buildInputs = [ pcsclite pth python2 ];
patchPhase = ''
substituteInPlace Makefile \

View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, makeWrapper, python, qmake, ctags, gdb }:
{ mkDerivation, lib, fetchurl, makeWrapper, python3, qmake, ctags, gdb }:
mkDerivation rec {
pname = "gede";
@ -9,10 +9,12 @@ mkDerivation rec {
sha256 = "0hbsy2ymzgl8xd9mnh43gxdfncy7g6czxfvfyh7zp3ij8yiwf8x3";
};
nativeBuildInputs = [ qmake makeWrapper python ];
nativeBuildInputs = [ qmake makeWrapper python3 ];
buildInputs = [ ctags ];
strictDeps = true;
dontUseQmakeConfigure = true;
buildPhase = ":";

View file

@ -1,8 +1,10 @@
{ fetchurl, lib, stdenv, libtool, makeWrapper
, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags
, coreutils, ctags, ncurses, python3Packages, sqlite, universal-ctags
}:
stdenv.mkDerivation rec {
let
pygments = python3Packages.pygments;
in stdenv.mkDerivation rec {
pname = "global";
version = "6.6.5";
@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ];
propagatedBuildInputs = [ pythonPackages.pygments ];
propagatedBuildInputs = [ pygments ];
configureFlags = [
"--with-ltdl-include=${libtool}/include"
@ -34,9 +36,9 @@ stdenv.mkDerivation rec {
cp -v *.el "$out/share/emacs/site-lisp"
wrapProgram $out/bin/gtags \
--prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
--prefix PYTHONPATH : "$(toPythonPath ${pygments})"
wrapProgram $out/bin/global \
--prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
--prefix PYTHONPATH : "$(toPythonPath ${pygments})"
'';
meta = with lib; {

View file

@ -1,4 +1,4 @@
{ autoconf, fetchurl, makedepend, perl, python, lib, stdenv, unzip, zip }:
{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, unzip, zip }:
stdenv.mkDerivation rec {
name = "jscoverage-0.5.1";
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
./jsfalse_to_null.patch
];
nativeBuildInputs = [ unzip ];
buildInputs = [ autoconf makedepend perl python zip ];
nativeBuildInputs = [ unzip perl python3 zip ];
strictDeps = true;
# It works without MOZ_FIX_LINK_PATHS, circumventing an impurity
# issue. Maybe we could kick js/ (spidermonkey) completely and

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }:
{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }:
stdenv.mkDerivation rec {
basename = "kconfig-frontends";
@ -10,17 +10,15 @@ stdenv.mkDerivation rec {
url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ];
nativeBuildInputs = [ bison flex gperf pkg-config ];
buildInputs = [ bash ncurses python3 ];
strictDeps = true;
configureFlags = [
"--enable-frontends=conf,mconf,nconf"
];
postInstall = ''
wrapPythonPrograms
'';
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
meta = with lib; {

View file

@ -135,7 +135,5 @@ rustPlatform.buildRustPackage {
'';
license = licenses.mit;
maintainers = with maintainers; [ Profpatsch ];
# Aarch has test failures with how tree-sitter compiles the generated C files
broken = stdenv.isAarch64;
};
}

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake
, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis
, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python2, libvorbis
, libiconv }:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl
# reqs) optional
buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ];
buildInputs = [ freetype python2 openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ];
nativeBuildInputs = [ cmake ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, glib, python, gtk2, readline }:
{ lib, stdenv, fetchurl, pkg-config, glib, python3, gtk2, readline }:
let version = "1.06.002"; in
stdenv.mkDerivation {
@ -9,8 +9,10 @@ stdenv.mkDerivation {
sha256 = "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ python glib gtk2 readline ];
nativeBuildInputs = [ pkg-config python3 glib ];
buildInputs = [ gtk2 readline ];
strictDeps = true;
configureFlags = [ "--with-gtk" "--with--board3d" ];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, gcc-arm-embedded, binutils-arm-embedded, makeWrapper
, python, pythonPackages
, python2Packages
# Extra options
, device ? "fsij", vid ? "234b", pid ? "0000"
@ -15,7 +15,7 @@ stdenv.mkDerivation {
inherit src;
nativeBuildInputs = [ gcc-arm-embedded binutils-arm-embedded makeWrapper ];
buildInputs = [ python ] ++ (with pythonPackages; [ pyusb colorama ]);
buildInputs = with python2Packages; [ python pyusb colorama ];
configurePhase = ''
cd src

View file

@ -1,5 +1,5 @@
{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkg-config
, pythonSupport ? false, swig ? null, python}:
, pythonSupport ? false, swig ? null, python ? null}:
stdenv.mkDerivation rec {
pname = "libnl";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
postBuild = lib.optionalString (pythonSupport) ''
cd python
${python}/bin/python setup.py install --prefix=../pythonlib
${python.interpreter} setup.py install --prefix=../pythonlib
cd -
'';

View file

@ -182,6 +182,7 @@ in with py.pkgs; buildPythonApplication rec {
"api"
"auth"
"automation"
"axis"
"bayesian"
"binary_sensor"
"caldav"

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, python, pkg-config
{ lib, stdenv, fetchFromGitLab, python3, pkg-config
, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }:
stdenv.mkDerivation {
@ -15,12 +15,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ];
buildInputs = [
python
python3
# Needed for proxy support I believe, which I haven't tested.
# Probably needs to be propagated and some wrapPython magic
# python.pkgs.pysocks
];
strictDeps = true;
postPatch = ''
substituteInPlace Makefile \
--replace '-o 0 -g 0' ""

View file

@ -1,100 +0,0 @@
# This is the installation portion of kippo.
# This is somewhat jumbled together. There is no "easy_install" for kippo,
# and there isn't a way to regenerate the twistd plugin cache.
#
# Use the services.kippo options to properly configure if on NixOS.
# On other platforms there is a problem with hardcoded paths.
# Your best bet is to change kippo source to customise
# or manually copy the proper filesystems.
# At a minimum the following are required in /var/lib/kippo:
# honeyfs/
# fs.pickle
# data/
# txtcmds/
#
# There is also benefit in preparing /var/log/kippo
# tty/
# dl/
#
# Most of these files need read/write permissions.
#
# Read only files: kippo.tac and kippo.cfg
#
# Execution may look like this:
# twistd -y kippo.tac --syslog --pidfile=kippo.pid
#
# Use this package at your own risk.
{lib, stdenv, fetchurl, pythonPackages }:
let
twisted_13 = pythonPackages.buildPythonPackage rec {
# NOTE: When updating please check if new versions still cause issues
# to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem)
disabled = pythonPackages.isPy3k;
name = "Twisted-13.2.0";
src = fetchurl {
url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89";
};
propagatedBuildInputs = with pythonPackages; [ zope_interface ];
# Generate Twisted's plug-in cache. Twited users must do it as well. See
# http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3
# and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for
# details.
postInstall = "$out/bin/twistd --help > /dev/null";
meta = with lib; {
homepage = "https://twistedmatrix.com/";
description = "Twisted, an event-driven networking engine written in Python";
longDescription = ''
Twisted is an event-driven networking engine written in Python
and licensed under the MIT license.
'';
license = licenses.mit;
};
};
in stdenv.mkDerivation rec {
pname = "kippo";
version = "0.8";
src = fetchurl {
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${pname}-${version}.tar.gz";
sha256 = "0rd2mk36d02qd24z8s4xyy64fy54rzpar4379iq4dcjwg7l7f63d";
};
buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ];
installPhase = ''
substituteInPlace ./kippo.tac --replace "kippo.cfg" "$out/src/kippo.cfg"
substituteInPlace ./kippo.cfg --replace "log_path = log" "log_path = /var/log/kippo" \
--replace "download_path = dl" "download_path = /var/log/kippo/dl" \
--replace "contents_path = honeyfs" "filesystem_file = /var/lib/kippo/honeyfs" \
--replace "filesystem_file = fs.pickle" "filesystem_file = /var/lib/kippo/fs.pickle" \
--replace "data_path = data" "data_path = /var/lib/kippo/data" \
--replace "txtcmds_path = txtcmds" "txtcmds_path = /var/lib/kippo/txtcmds" \
--replace "public_key = public.key" "public_key = /var/lib/kippo/keys/public.key" \
--replace "private_key = private.key" "private_key = /var/lib/kippo/keys/private.key"
mkdir -p $out/bin
mkdir -p $out/src
mv ./* $out/src
mv $out/src/utils/* $out/bin
'';
passthru.twisted = twisted_13;
meta = with lib; {
homepage = "https://github.com/desaster/kippo";
description = "SSH Honeypot";
longDescription = ''
Default port is 2222. Recommend using something like this for port redirection to default SSH port:
networking.firewall.extraCommands = '''
iptables -t nat -A PREROUTING -i IN_IFACE -p tcp --dport 22 -j REDIRECT --to-port 2222''' '';
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ tomberek ];
broken = true; # 2018-09-12, failed on hydra since 2017-12-11
};
}

View file

@ -0,0 +1,29 @@
{ buildGoPackage, lib, fetchFromGitHub }:
buildGoPackage rec {
pname = "openldap_exporter";
version = "2.1";
src = fetchFromGitHub {
owner = "tomcz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Di1GiyVp/hGCFhqxhlqJSucGZK7f/FDDUFtJRaiAZu4=";
};
buildFlagsArray = ''
-ldflags=
-s -w
-X github.com/tomcz/openldap_exporter.tag=v${version}
-X github.com/tomcz/openldap_exporter.commit=unknown
'';
goPackagePath = "github.com/tomcz/openldap_exporter";
meta = with lib; {
homepage = "https://github.com/tomcz/openldap_exporter";
description = " Simple service that scrapes metrics from OpenLDAP and exports them via HTTP for Prometheus consumption";
license = licenses.mit;
maintainers = with maintainers; [ ma27 ];
};
}

View file

@ -3,14 +3,14 @@ let
package = (import ./node.nix { inherit pkgs system; }).package;
in
package.override rec {
version = "1.18.2";
version = "1.16.2";
reconstructLock = true;
src = pkgs.fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
sha256 = "sha256-95RhoJ0aqprzMNOUw9UbLosBwBtQvudKOQaBvBJohn8=";
sha256 = "0rpmm4pwm8s4i9fl26ql0czg5kijv42k9wwik7jb3ppi5jzxrakd";
};
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

File diff suppressed because it is too large Load diff

View file

@ -1,17 +1,17 @@
# This file has been generated by node2nix 1.9.0. Do not edit!
# This file has been generated by node2nix 1.8.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
let
nodeEnv = import ../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
nodeEnv = import ./node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, meson, ninja, fetchFromGitHub, which, python, fetchpatch
{ lib, stdenv, meson, ninja, fetchFromGitHub, which, python3, fetchpatch
, libiconv }:
stdenv.mkDerivation rec {
@ -19,10 +19,12 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ meson ninja which python ];
nativeBuildInputs = [ meson ninja which python3 ];
buildInputs = [ libiconv ];
strictDeps = true;
meta = with lib; {
description = "KornShell Command And Programming Language";
longDescription = ''

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, makeWrapper, python
{ lib, stdenv, fetchurl, cmake, makeWrapper
, boost, lzma
, withGog ? false, unar ? null }:
@ -10,10 +10,15 @@ stdenv.mkDerivation rec {
sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33";
};
buildInputs = [ python lzma boost ];
buildInputs = [ lzma boost ];
# Python is reported as missing during the build, however
# including Python does not change the output.
nativeBuildInputs = [ cmake makeWrapper ];
strictDeps = true;
# we need unar to for multi-archive extraction
postFixup = lib.optionalString withGog ''
wrapProgram $out/bin/innoextract \

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, which, ninja, python, pkg-config, protobuf
{ lib, stdenv, fetchFromGitHub, which, ninja, pkg-config, protobuf
, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }:
let

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.0.5";
version = "2.0.7";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-mq9kwkEeh+kVhiVy/h44oP3Rj819gGQDiMifSb7ryeY=";
sha256 = "sha256-mJJtkJ57rYEe1BWK3TWAMOar/IUUC9ybiccx81puHsE=";
};
vendorSha256 = "sha256-YU+t8GVsLYWONezUIB4NUrVxtYOmf/2b5v4v3VSYtBU=";

View file

@ -0,0 +1,33 @@
{ lib
, stdenv
, fetchFromSourcehut
, SDL2
}:
stdenv.mkDerivation rec {
pname = "clickclack";
version = "0.1.1";
src = fetchFromSourcehut {
owner = "~proycon";
repo = "clickclack";
rev = version;
sha256 = "1q8r0ng1bld5n82gh7my7ck90f4plf8vf019hm2wz475dl38izd5";
};
buildInputs = [
SDL2
];
makeFlags = [
"PREFIX=${placeholder "out"}"
];
meta = with lib; {
description = "A vibration/audio feedback tool to be used with virtual keyboards";
homepage = "https://git.sr.ht/~proycon/clickclack";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pythonPackages, glibcLocales }:
{ lib, fetchFromGitHub, python3Packages, glibcLocales }:
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "i3minator";
version = "0.0.4";
@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
LC_ALL = "en_US.UTF-8";
buildInputs = [ glibcLocales ];
propagatedBuildInputs = [ pythonPackages.pyyaml pythonPackages.i3-py ];
propagatedBuildInputs = [ python3Packages.pyyaml python3Packages.i3-py ];
# No tests
doCheck = false;

View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, curl, pythonPackages, glibcLocales }:
{ lib, fetchFromGitHub, curl, python3Packages, glibcLocales }:
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "httpstat";
version = "1.3.1";
src = fetchFromGitHub {

View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper,
pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr,
bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python,
bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python3,
docs ? false, xmlto, libselinux, ldns
}:
let
binPath = lib.makeBinPath [
bash iproute iptables procps coreutils gnused gawk nss.tools which python
bash iproute iptables procps coreutils gnused gawk nss.tools which python3
];
in
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
sha256 = "0bj3g6qwd3ir3gk6hdl9npy3k44shf56vcgjahn30qpmx3z5fsr3";
};
strictDeps = true;
# These flags were added to compile v3.18. Try to lift them when updating.
NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral"
# these flags were added to build with gcc7
@ -35,9 +37,15 @@ stdenv.mkDerivation rec {
"-DNSS_PKCS11_2_0_COMPAT=1"
];
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
libcap_ng curl nspr nss python ldns ]
nativeBuildInputs = [
bison
flex
makeWrapper
pkg-config
];
buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound pam libevent
libcap_ng curl nspr nss python3 ldns ]
++ lib.optional docs xmlto
++ lib.optional stdenv.isLinux libselinux;

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "doppler";
version = "3.23.1";
version = "3.23.2";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
sha256 = "sha256-6sTsASfHIFH1V3Q20R2y8AiOVZ4NR4GGRCKRVr25kkc=";
sha256 = "sha256-qdBq1vjvvb55gyL4XuPDrPK58YLSSH5kLp1oP84vJsU=";
};
vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY=";

View file

@ -22,14 +22,14 @@
buildPythonApplication rec {
pname = "expliot";
version = "0.9.6";
version = "0.9.7";
disabled = pythonOlder "3.7";
src = fetchFromGitLab {
owner = "expliot_framework";
repo = pname;
rev = version;
sha256 = "1wn8fyrvis0gw80zzmpivinw6mz5n33inhv39iallsl3is8xpgpa";
sha256 = "sha256-k43PvH9BXcvxe7O5iCGzLuxv/WkB9YelH/d/1S7BpU0=";
};
propagatedBuildInputs = [

View file

@ -1,4 +1,4 @@
{ coreutils, fetchFromGitHub, file, libcaca, makeWrapper, python, openssl, qrencode, lib, stdenv, yubikey-manager }:
{ coreutils, fetchFromGitHub, file, libcaca, makeWrapper, python3, openssl, qrencode, lib, stdenv, yubikey-manager }:
stdenv.mkDerivation rec {
pname = "gen-oath-safe";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
file
libcaca.bin
openssl.bin
python
python3
qrencode
yubikey-manager
];

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }:
{ lib, stdenv, fetchFromGitHub, python2Packages, unbound, libreswan }:
let
inherit (pythonPackages) python;
pythonPackages = python2Packages;
in stdenv.mkDerivation rec {
pname = "hash-slinger";
version = "2.7";
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
'';
installPhase = ''
mkdir -p $out/bin $out/man $out/${python.sitePackages}/
mkdir -p $out/bin $out/man $out/${pythonPackages.python.sitePackages}/
make install
wrapPythonPrograms
'';

View file

@ -1,15 +1,14 @@
{ lib, fetchFromGitHub, pythonPackages }:
{ lib, fetchFromGitHub, python3Packages }:
let
inherit (pythonPackages) python;
inherit (python3Packages) python;
pname = "honcho";
in
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
name = "${pname}-${version}";
version = "1.0.1";
namePrefix = "";
src = fetchFromGitHub {
owner = "nickstenning";
@ -18,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "11bd87474qpif20xdcn0ra1idj5k16ka51i658wfpxwc6nzsn92b";
};
checkInputs = with pythonPackages; [ jinja2 pytest mock coverage ];
checkInputs = with python3Packages; [ jinja2 pytest mock coverage ];
buildPhase = ''
${python.interpreter} setup.py build

View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pythonPackages }:
{ lib, fetchFromGitHub, python3Packages, bash, git, less }:
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "icdiff";
version = "1.9.5";
@ -11,6 +11,20 @@ pythonPackages.buildPythonApplication rec {
sha256 = "080v8h09pv8qwplin4kwfm0kmqjwdqjfxbpcdrv16sv4hwfwl5qd";
};
checkInputs = [
bash
git
less
];
# error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory
doCheck = false;
checkPhase = ''
patchShebangs test.sh
./test.sh ${python3Packages.python.interpreter}
'';
meta = with lib; {
homepage = "https://www.jefftk.com/icdiff";
description = "Side-by-side highlighted command line diffs";

View file

@ -225,6 +225,7 @@ mapAliases ({
fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19
g4py = python3Packages.geant4; # added 2020-06-06
gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # added 2021-04-03
gdb-multitarget = gdb; # added 2017-11-13
gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
gettextWithExpat = gettext; # 2016-02-19

View file

@ -2006,6 +2006,8 @@ in
cli-visualizer = callPackage ../applications/misc/cli-visualizer { };
clickclack = callPackage ../tools/misc/clickclack { };
clog-cli = callPackage ../development/tools/clog-cli { };
cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { };
@ -5945,8 +5947,6 @@ in
kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { };
kippo = callPackage ../servers/kippo { };
kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { };
lagrange = callPackage ../applications/networking/browsers/lagrange {
@ -14270,8 +14270,6 @@ in
autoreconfHook = buildPackages.autoreconfHook269;
};
gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { };
gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { };
gdcm = callPackage ../development/libraries/gdcm { };
@ -15366,7 +15364,9 @@ in
libgxps = callPackage ../development/libraries/libgxps { };
libiio = callPackage ../development/libraries/libiio { };
libiio = callPackage ../development/libraries/libiio {
python = python3;
};
libinjection = callPackage ../development/libraries/libinjection { };
@ -18887,6 +18887,7 @@ in
prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };
prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { };
prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { };
prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { };
prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { };
prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { };
prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { };
@ -22786,7 +22787,7 @@ in
gthumb = callPackage ../applications/graphics/gthumb { };
gtimelog = pythonPackages.gtimelog;
gtimelog = with python3Packages; toPythonApplication gtimelog;
inherit (gnome3) gucharmap;
@ -27457,9 +27458,7 @@ in
icbm3d = callPackage ../games/icbm3d { };
ingen = callPackage ../applications/audio/ingen {
inherit (pythonPackages) rdflib;
};
ingen = callPackage ../applications/audio/ingen { };
ideogram = callPackage ../applications/graphics/ideogram { };

View file

@ -31,6 +31,7 @@ in {
### Packages
inherit gnuradio;
inherit (gnuradio) python;
osmosdr = callPackage ../development/gnuradio-modules/osmosdr/default.nix { };