Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
fcbf2d2896
@ -303,14 +303,12 @@ rec {
|
||||
preferBuiltin = true;
|
||||
target = "zImage";
|
||||
extraConfig = ''
|
||||
# Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
|
||||
# Serial port for Raspberry Pi 3. Wasn't included in ARMv7 defconfig
|
||||
# until 4.17.
|
||||
SERIAL_8250_BCM2835AUX y
|
||||
SERIAL_8250_EXTENDED y
|
||||
SERIAL_8250_SHARE_IRQ y
|
||||
|
||||
# Fix broken sunxi-sid nvmem driver.
|
||||
TI_CPTS y
|
||||
|
||||
# Hangs ODROID-XU4
|
||||
ARM_BIG_LITTLE_CPUIDLE n
|
||||
|
||||
|
||||
@ -82,6 +82,7 @@ with lib.maintainers; {
|
||||
jtojnar
|
||||
worldofpeace
|
||||
dasj19
|
||||
maxeaubrey
|
||||
];
|
||||
scope = "Maintain GNOME desktop environment and platform.";
|
||||
};
|
||||
|
||||
26
pkgs/applications/misc/go-org/default.nix
Normal file
26
pkgs/applications/misc/go-org/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-org";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "niklasfasching";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nMZzRbu3lxunIlnnmb49Ljt8oSiYpj+8gZ0u/OFRRDM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-njx89Ims7GZql8sbVmH/E9gM/ONRWiPRLVs+FzsCSzI=";
|
||||
|
||||
postInstallCheck = ''
|
||||
$out/bin/go-org > /dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Org-mode parser and static site generator in go";
|
||||
homepage = "https://niklasfasching.github.io/go-org";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ payas ];
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, buildPythonApplication, fetchpatch
|
||||
, bottle, click, colorama, semantic-version
|
||||
{ stdenv, lib, buildPythonApplication, bottle
|
||||
, click, click-completion, colorama, semantic-version
|
||||
, lockfile, pyserial, requests
|
||||
, tabulate, pyelftools, marshmallow
|
||||
, pytest, tox, jsondiff
|
||||
@ -79,8 +79,8 @@ in buildPythonApplication rec {
|
||||
inherit version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bottle click colorama git lockfile
|
||||
pyserial requests semantic-version
|
||||
bottle click click-completion colorama git
|
||||
lockfile pyserial requests semantic-version
|
||||
tabulate pyelftools marshmallow
|
||||
];
|
||||
|
||||
|
||||
@ -86,7 +86,6 @@ let
|
||||
else if targetPlatform.isWindows then "mcf"
|
||||
else "single"}"
|
||||
"--enable-nls"
|
||||
"--disable-decimal-float" # No final libdecnumber (it may work only in 386)
|
||||
] ++ lib.optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
|
||||
# libsanitizer requires netrom/netrom.h which is not
|
||||
# available in uclibc.
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages
|
||||
, which, readline, zlib, icu }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
version = "60.9.0";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "spidermonkey";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha256 = "0gy5x2rnnbkqmjd9sq93s3q5na9nkba68xwpizild7k6qn63qicz";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
setOutputFlags = false; # Configure script only understands --includedir
|
||||
|
||||
buildInputs = [ readline zlib icu ];
|
||||
nativeBuildInputs = [ autoconf213 pkg-config perl which python2 zip ];
|
||||
|
||||
patches = [
|
||||
# Fixed in 62.0
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1415202
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/mozjs60/raw/a1b605c73f382db25977cb2d4d70a3ba2ff85b92/f/Always-use-the-equivalent-year-to-determine-the-time-zone.patch";
|
||||
sha256 = "12i225qbzlyfj2disms50zrr5jy8zgn2cc4rgsg58sfgf1bn7150";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export CXXFLAGS="-fpermissive"
|
||||
export LIBXUL_DIST=$out
|
||||
export PYTHON="${buildPackages.python2.interpreter}"
|
||||
|
||||
# We can't build in js/src/, so create a build dir
|
||||
mkdir obj
|
||||
cd obj/
|
||||
configureScript=../js/src/configure
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-system-zlib"
|
||||
"--with-system-icu"
|
||||
"--with-intl-api"
|
||||
"--enable-readline"
|
||||
"--enable-shared-js"
|
||||
"--enable-posix-nspr-emulation"
|
||||
"--disable-jemalloc"
|
||||
# Fedora and Arch disable optimize, but it doesn't seme to be necessary
|
||||
# It turns on -O3 which some gcc version had a problem with:
|
||||
# https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
|
||||
"--enable-optimize"
|
||||
"--enable-release"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# Spidermonkey seems to use different host/build terminology for cross
|
||||
# compilation here.
|
||||
"--host=${stdenv.buildPlatform.config}"
|
||||
"--target=${stdenv.hostPlatform.config}"
|
||||
];
|
||||
|
||||
configurePlatforms = [];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
# Remove unnecessary static lib
|
||||
preFixup = ''
|
||||
moveToOutput bin/js60-config "$dev"
|
||||
rm $out/lib/libjs_static.ajs
|
||||
ln -s $out/bin/js60 $out/bin/js
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mozilla's JavaScript engine written in C/C++";
|
||||
homepage = "https://developer.mozilla.org/en/SpiderMonkey";
|
||||
license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
|
||||
maintainers = [ maintainers.abbradar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -12,6 +12,7 @@
|
||||
, "@webassemblyjs/wast-refmt"
|
||||
, "alloy"
|
||||
, "asar"
|
||||
, "balanceofsatoshis"
|
||||
, "bash-language-server"
|
||||
, "bower"
|
||||
, "bower2nix"
|
||||
|
||||
5822
pkgs/development/node-packages/node-packages.nix
generated
5822
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,22 +1,22 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, pbr
|
||||
, aiohttp
|
||||
, ddt
|
||||
, asynctest
|
||||
, pytest
|
||||
, buildPythonPackage
|
||||
, ddt
|
||||
, fetchPypi
|
||||
, pbr
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioresponses";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f65bba2be1e9a4997ee166bc0161a50be0fef7350ad09e6afdb2adccf74dfefe";
|
||||
sha256 = "sha256-guSV0Ri3SJaqW01H4X7/teLMeD5RCuOVzq3l6Hyr6Jo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -30,13 +30,16 @@ buildPythonPackage rec {
|
||||
checkInputs = [
|
||||
asynctest
|
||||
ddt
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Skip a test which makes requests to httpbin.org
|
||||
checkPhase = ''
|
||||
pytest -k "not (test_address_as_instance_of_url_combined_with_pass_through or test_pass_through_with_origin_params)"
|
||||
'';
|
||||
disabledTests = [
|
||||
# Skip a test which makes requests to httpbin.org
|
||||
"test_address_as_instance_of_url_combined_with_pass_through"
|
||||
"test_pass_through_with_origin_params"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aioresponses" ];
|
||||
|
||||
meta = {
|
||||
description = "A helper to mock/fake web requests in python aiohttp package";
|
||||
|
||||
@ -1,54 +1,55 @@
|
||||
{ lib
|
||||
, astropy
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest-astropy
|
||||
, semantic-version
|
||||
, pyyaml
|
||||
, jsonschema
|
||||
, six
|
||||
, numpy
|
||||
, isPy27
|
||||
, astropy
|
||||
, setuptools_scm
|
||||
, setuptools
|
||||
, packaging
|
||||
, pytest-astropy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, semantic-version
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asdf";
|
||||
version = "2.7.1";
|
||||
disabled = isPy27;
|
||||
version = "2.7.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4ba2e31cb24b974a10dfae3edee23db2e6bea2d00608604d062366aa3af6e81a";
|
||||
sha256 = "11dyr295wn5m2pcynlwj7kgw9xr66msfvwn1m6a5vv13vzj19spp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jsonschema
|
||||
numpy
|
||||
packaging
|
||||
pyyaml
|
||||
semantic-version
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-astropy
|
||||
astropy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
semantic-version
|
||||
pyyaml
|
||||
jsonschema
|
||||
six
|
||||
numpy
|
||||
setuptools_scm
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
PY_IGNORE_IMPORTMISMATCH=1 pytest
|
||||
preCheck = ''
|
||||
export PY_IGNORE_IMPORTMISMATCH=1
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "asdf" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python tools to handle ASDF files";
|
||||
homepage = "https://github.com/spacetelescope/asdf";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
# many ValueError in tests
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
36
pkgs/development/python-modules/iaqualink/default.nix
Normal file
36
pkgs/development/python-modules/iaqualink/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-runner
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "iaqualink";
|
||||
version = "0.4.0";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flz";
|
||||
repo = "iaqualink-py";
|
||||
rev = "v${version}";
|
||||
sha256 = "13iwngjjqzr1pkmskbc2wakccvcjkf4bk65f4jp4ywpciilr4zjw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "iaqualink" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for Jandy iAqualink";
|
||||
homepage = "https://github.com/flz/iaqualink-py";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -43,13 +43,19 @@ buildPythonPackage rec {
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Relaxes msgpack pinning
|
||||
url = "https://github.com/influxdata/influxdb-python/commit/cc41e290f690c4eb67f75c98fa9f027bdb6eb16b.patch";
|
||||
sha256 = "1fb9qrq1kp24pixjwvzhdy67z3h0wnj92aj0jw0a25fd0rdxdvg4";
|
||||
})
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Disable failing test
|
||||
# Tests cause FutureWarning due to use of 'record' instead of 'records' in pandas.
|
||||
# https://github.com/influxdata/influxdb-python/pull/845
|
||||
# Also type mismatches in assertEqual on DataFrame:
|
||||
# b'foo[30 chars]_one=1.0,column_two=1.0 0\nfoo,tag_one=red,tag[47 chars]00\n' !=
|
||||
# b'foo[30 chars]_one="1",column_two=1i 0\nfoo,tag_one=red,tag_[46 chars]00\n'
|
||||
"test_write_points_from_dataframe_with_nan_json"
|
||||
"test_write_points_from_dataframe_with_tags_and_nan_json"
|
||||
];
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyChromecast";
|
||||
version = "8.1.0";
|
||||
version = "9.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-3wKV9lPO51LeOM+O8J8TrZeCxTkk37qhkcpivV4dzhQ=";
|
||||
sha256 = "sha256-q52h0u9CSx/HVfZDb1RaVgVuxt4kB16T82nqyOuCGDc=";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang }:
|
||||
{ lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }:
|
||||
|
||||
lib.fix (noweb: stdenv.mkDerivation rec {
|
||||
pname = "noweb";
|
||||
@ -22,14 +22,14 @@ lib.fix (noweb: stdenv.mkDerivation rec {
|
||||
substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ groff ] ++ lib.optionals (!isNull icon-lang) [ icon-lang ];
|
||||
nativeBuildInputs = [ groff ] ++ lib.optionals useIcon [ icon-lang ];
|
||||
buildInputs = [ nawk ];
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p "$out/lib/noweb"
|
||||
'';
|
||||
|
||||
makeFlags = lib.optionals (!isNull icon-lang) [
|
||||
makeFlags = lib.optionals useIcon [
|
||||
"LIBSRC=icon"
|
||||
"ICONC=icont"
|
||||
] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
@ -1,17 +1,27 @@
|
||||
{ lib, buildPythonApplication, fetchPypi, xcffib, pyyaml, click, i3ipc, marshmallow, cffi, xpybutil, pytestrunner }:
|
||||
{ lib, python3 }:
|
||||
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "flashfocus";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1z20d596rnc7cs0rrd221gjn14dmbr11djv94y9p4v7rr788sswv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
propagatedBuildInputs = [ i3ipc xcffib click cffi xpybutil marshmallow pyyaml ];
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pytestrunner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
i3ipc
|
||||
xcffib
|
||||
click
|
||||
cffi
|
||||
xpybutil
|
||||
marshmallow
|
||||
pyyaml
|
||||
];
|
||||
|
||||
# Tests require access to a X session
|
||||
doCheck = false;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -45,6 +45,7 @@ cespare/vim-toml
|
||||
Chiel92/vim-autoformat
|
||||
chikatoike/concealedyank.vim
|
||||
chikatoike/sourcemap.vim
|
||||
chr4/nginx.vim
|
||||
chrisbra/CheckAttach
|
||||
chrisbra/csv.vim
|
||||
chrisbra/NrrwRgn
|
||||
|
||||
@ -374,7 +374,7 @@
|
||||
"hydrawise" = ps: with ps; [ hydrawiser ];
|
||||
"hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py
|
||||
"iammeter" = ps: with ps; [ ]; # missing inputs: iammeter
|
||||
"iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink
|
||||
"iaqualink" = ps: with ps; [ iaqualink ];
|
||||
"icloud" = ps: with ps; [ pyicloud ];
|
||||
"idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py
|
||||
"ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
|
||||
|
||||
@ -28,6 +28,21 @@ let
|
||||
(mkOverride "astral" "1.10.1"
|
||||
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
|
||||
|
||||
# Pinned due to API changes in iaqualink>=2.0, remove after
|
||||
# https://github.com/home-assistant/core/pull/48137 was merged
|
||||
(self: super: {
|
||||
iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.3.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "flz";
|
||||
repo = "iaqualink-py";
|
||||
rev = version;
|
||||
sha256 = "16mn6nd9x3hm6j6da99qhwbqs95hh8wx21r1h1m9csl76z77n9lh";
|
||||
};
|
||||
checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.asynctest ];
|
||||
});
|
||||
})
|
||||
|
||||
# Pinned due to bug in ring-doorbell 0.7.0
|
||||
# https://github.com/tchellomello/python-ring-doorbell/issues/240
|
||||
(mkOverride "ring-doorbell" "0.6.2"
|
||||
@ -213,6 +228,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"html5"
|
||||
"http"
|
||||
"hue"
|
||||
"iaqualink"
|
||||
"ifttt"
|
||||
"image"
|
||||
"image_processing"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nixos-shell";
|
||||
version = "0.2";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "nixos-shell";
|
||||
rev = version;
|
||||
sha256 = "sha256-C0K20X0P4SYQV+xtQAUcEiX32kr3IF1RoYdkJ4R3aRM=";
|
||||
sha256 = "sha256-HoY2diusDHXwR0BjYwKR3svLz5LrviE03yxyjWG9oPQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -695,7 +695,8 @@ mapAliases ({
|
||||
speedtest_cli = speedtest-cli; # added 2015-02-17
|
||||
spice_gtk = spice-gtk; # added 2018-02-25
|
||||
spice_protocol = spice-protocol; # added 2018-02-25
|
||||
spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_60 instead."; # added 2019-10-16
|
||||
spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16
|
||||
spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21
|
||||
spring-boot = spring-boot-cli; # added 2020-04-24
|
||||
sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22
|
||||
sqliteInteractive = sqlite-interactive; # added 2014-12-06
|
||||
|
||||
@ -2408,7 +2408,7 @@ in
|
||||
|
||||
fuzzel = callPackage ../applications/misc/fuzzel { };
|
||||
|
||||
flashfocus = python3Packages.callPackage ../misc/flashfocus { };
|
||||
flashfocus = callPackage ../misc/flashfocus { };
|
||||
|
||||
qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { };
|
||||
|
||||
@ -11792,7 +11792,6 @@ in
|
||||
} // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
|
||||
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
|
||||
}));
|
||||
spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { };
|
||||
spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { };
|
||||
spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { };
|
||||
|
||||
@ -12863,7 +12862,7 @@ in
|
||||
gconf = pkgs.gnome2.GConf;
|
||||
};
|
||||
|
||||
# NOTE: Override and set icon-lang = null to use Awk instead of Icon.
|
||||
# NOTE: Override and set useIcon = false to use Awk instead of Icon.
|
||||
noweb = callPackage ../development/tools/literate-programming/noweb { };
|
||||
|
||||
nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; };
|
||||
@ -23150,6 +23149,8 @@ in
|
||||
|
||||
hugo = callPackage ../applications/misc/hugo { };
|
||||
|
||||
go-org = callPackage ../applications/misc/go-org { };
|
||||
|
||||
hydrogen = qt5.callPackage ../applications/audio/hydrogen { };
|
||||
hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit.
|
||||
|
||||
@ -26707,6 +26708,8 @@ in
|
||||
|
||||
aeon = callPackage ../applications/blockchains/aeon { };
|
||||
|
||||
balanceofsatoshis = nodePackages.balanceofsatoshis;
|
||||
|
||||
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
|
||||
bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; };
|
||||
|
||||
|
||||
@ -3210,6 +3210,8 @@ in {
|
||||
|
||||
iapws = callPackage ../development/python-modules/iapws { };
|
||||
|
||||
iaqualink = callPackage ../development/python-modules/iaqualink { };
|
||||
|
||||
ibis = callPackage ../development/python-modules/ibis { };
|
||||
|
||||
ibis-framework = callPackage ../development/python-modules/ibis-framework { };
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user