Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d5e672b839
23
flake.nix
23
flake.nix
@ -22,24 +22,6 @@
|
||||
import ./nixos/lib/eval-config.nix (args // {
|
||||
modules =
|
||||
let
|
||||
vmConfig = (import ./nixos/lib/eval-config.nix
|
||||
(args // {
|
||||
modules = modules ++ [ ./nixos/modules/virtualisation/qemu-vm.nix ];
|
||||
})).config;
|
||||
|
||||
vmWithBootLoaderConfig = (import ./nixos/lib/eval-config.nix
|
||||
(args // {
|
||||
modules = modules ++ [
|
||||
./nixos/modules/virtualisation/qemu-vm.nix
|
||||
{ virtualisation.useBootLoader = true; }
|
||||
({ config, ... }: {
|
||||
virtualisation.useEFIBoot =
|
||||
config.boot.loader.systemd-boot.enable ||
|
||||
config.boot.loader.efi.canTouchEfiVariables;
|
||||
})
|
||||
];
|
||||
})).config;
|
||||
|
||||
moduleDeclarationFile =
|
||||
let
|
||||
# Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't
|
||||
@ -63,11 +45,6 @@
|
||||
system.nixos.versionSuffix =
|
||||
".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
|
||||
system.nixos.revision = final.mkIf (self ? rev) self.rev;
|
||||
|
||||
system.build = {
|
||||
vm = vmConfig.system.build.vm;
|
||||
vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
|
||||
};
|
||||
}
|
||||
];
|
||||
});
|
||||
|
||||
@ -9,27 +9,6 @@ let
|
||||
modules = [ configuration ];
|
||||
};
|
||||
|
||||
# This is for `nixos-rebuild build-vm'.
|
||||
vmConfig = (import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
|
||||
}).config;
|
||||
|
||||
# This is for `nixos-rebuild build-vm-with-bootloader'.
|
||||
vmWithBootLoaderConfig = (import ./lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules =
|
||||
[ configuration
|
||||
./modules/virtualisation/qemu-vm.nix
|
||||
{ virtualisation.useBootLoader = true; }
|
||||
({ config, ... }: {
|
||||
virtualisation.useEFIBoot =
|
||||
config.boot.loader.systemd-boot.enable ||
|
||||
config.boot.loader.efi.canTouchEfiVariables;
|
||||
})
|
||||
];
|
||||
}).config;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
@ -37,7 +16,5 @@ in
|
||||
|
||||
system = eval.config.system.build.toplevel;
|
||||
|
||||
vm = vmConfig.system.build.vm;
|
||||
|
||||
vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
|
||||
inherit (eval.config.system.build) vm vmWithBootLoader;
|
||||
}
|
||||
|
||||
@ -354,6 +354,28 @@
|
||||
socket <literal>/run/redis-${serverName}/redis.sock</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The option
|
||||
<link linkend="opt-virtualisation.vmVariant">virtualisation.vmVariant</link>
|
||||
was added to allow users to make changes to the
|
||||
<literal>nixos-rebuild build-vm</literal> configuration that
|
||||
do not apply to their normal system.
|
||||
</para>
|
||||
<para>
|
||||
The <literal>config.system.build.vm</literal> attribute now
|
||||
always exists and defaults to the value from
|
||||
<literal>vmVariant</literal>. Configurations that import the
|
||||
<literal>virtualisation/qemu-vm.nix</literal> module
|
||||
themselves will override this value, such that
|
||||
<literal>vmVariant</literal> is not used.
|
||||
</para>
|
||||
<para>
|
||||
Similarly
|
||||
<link linkend="opt-virtualisation.vmVariantWithBootLoader">virtualisation.vmVariantWithBootloader</link>
|
||||
was added.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The
|
||||
|
||||
@ -124,6 +124,16 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
to the members of the Unix group `redis-${serverName}`
|
||||
through the Unix socket `/run/redis-${serverName}/redis.sock`.
|
||||
|
||||
- The option [virtualisation.vmVariant](#opt-virtualisation.vmVariant) was added
|
||||
to allow users to make changes to the `nixos-rebuild build-vm` configuration
|
||||
that do not apply to their normal system.
|
||||
|
||||
The `config.system.build.vm` attribute now always exists and defaults to the
|
||||
value from `vmVariant`. Configurations that import the `virtualisation/qemu-vm.nix`
|
||||
module themselves will override this value, such that `vmVariant` is not used.
|
||||
|
||||
Similarly [virtualisation.vmVariantWithBootloader](#opt-virtualisation.vmVariantWithBootLoader) was added.
|
||||
|
||||
- The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added.
|
||||
|
||||
- The `influxdb2` package was split into `influxdb2-server` and
|
||||
|
||||
@ -88,13 +88,8 @@ let
|
||||
|
||||
nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; };
|
||||
|
||||
in withWarnings {
|
||||
|
||||
# Merge the option definitions in all modules, forming the full
|
||||
# system configuration.
|
||||
inherit (nixosWithUserModules) config options _module type;
|
||||
|
||||
in
|
||||
withWarnings nixosWithUserModules // {
|
||||
inherit extraArgs;
|
||||
|
||||
inherit (nixosWithUserModules._module.args) pkgs;
|
||||
}
|
||||
|
||||
@ -1187,6 +1187,7 @@
|
||||
./tasks/powertop.nix
|
||||
./testing/service-runner.nix
|
||||
./virtualisation/anbox.nix
|
||||
./virtualisation/build-vm.nix
|
||||
./virtualisation/container-config.nix
|
||||
./virtualisation/containerd.nix
|
||||
./virtualisation/containers.nix
|
||||
|
||||
@ -148,7 +148,7 @@ in
|
||||
system.build = mkOption {
|
||||
internal = true;
|
||||
default = {};
|
||||
type = types.attrs;
|
||||
type = types.lazyAttrsOf types.unspecified;
|
||||
description = ''
|
||||
Attribute set of derivations used to setup the system.
|
||||
'';
|
||||
|
||||
55
nixos/modules/virtualisation/build-vm.nix
Normal file
55
nixos/modules/virtualisation/build-vm.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ config, extendModules, lib, ... }:
|
||||
let
|
||||
|
||||
inherit (lib)
|
||||
mkOption
|
||||
;
|
||||
|
||||
vmVariant = extendModules {
|
||||
modules = [ ./qemu-vm.nix ];
|
||||
};
|
||||
|
||||
vmVariantWithBootLoader = vmVariant.extendModules {
|
||||
modules = [
|
||||
({ config, ... }: {
|
||||
_file = "nixos/default.nix##vmWithBootLoader";
|
||||
virtualisation.useBootLoader = true;
|
||||
virtualisation.useEFIBoot =
|
||||
config.boot.loader.systemd-boot.enable ||
|
||||
config.boot.loader.efi.canTouchEfiVariables;
|
||||
})
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
|
||||
virtualisation.vmVariant = mkOption {
|
||||
description = ''
|
||||
Machine configuration to be added for the vm script produced by <literal>nixos-rebuild build-vm</literal>.
|
||||
'';
|
||||
inherit (vmVariant) type;
|
||||
default = {};
|
||||
visible = "shallow";
|
||||
};
|
||||
|
||||
virtualisation.vmVariantWithBootLoader = mkOption {
|
||||
description = ''
|
||||
Machine configuration to be added for the vm script produced by <literal>nixos-rebuild build-vm-with-bootloader</literal>.
|
||||
'';
|
||||
inherit (vmVariantWithBootLoader) type;
|
||||
default = {};
|
||||
visible = "shallow";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = {
|
||||
|
||||
system.build = {
|
||||
vm = lib.mkDefault config.virtualisation.vmVariant.system.build.vm;
|
||||
vmWithBootLoader = lib.mkDefault config.virtualisation.vmVariantWithBootLoader.system.build.vm;
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
62
pkgs/applications/misc/mepo/default.nix
Normal file
62
pkgs/applications/misc/mepo/default.nix
Normal file
@ -0,0 +1,62 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, pkg-config
|
||||
, zig
|
||||
, curl
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, SDL2_ttf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mepo";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~mil";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ECq748GpjOjvchzAWlGA7H7HBvKNxY9d43+PTOWopiM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config zig ];
|
||||
|
||||
buildInputs = [ curl SDL2 SDL2_image SDL2_ttf ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$TMPDIR
|
||||
zig build -Drelease-safe=true -Dcpu=baseline
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
zig build test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 zig-out/bin/mepo -t $out/bin
|
||||
install -Dm755 scripts/mepo_* $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast, simple, and hackable OSM map viewer";
|
||||
homepage = "https://sr.ht/~mil/mepo/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # See https://github.com/NixOS/nixpkgs/issues/86299
|
||||
};
|
||||
}
|
||||
@ -16,10 +16,10 @@ in {
|
||||
pname = "discord-ptb";
|
||||
binaryName = "DiscordPTB";
|
||||
desktopName = "Discord PTB";
|
||||
version = "0.0.26";
|
||||
version = "0.0.27";
|
||||
src = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
sha256 = "1rlj76yhxjwwfmdln3azjr69hvfx1bjqdg9jhdn4fp6mlirkrcq4";
|
||||
sha256 = "0yphs65wpyr0ap6y24b0nbhq7sm02dg5c1yiym1fxjbynm1mdvqb";
|
||||
};
|
||||
};
|
||||
canary = callPackage ./base.nix rec {
|
||||
|
||||
@ -17,10 +17,10 @@ in
|
||||
mkFranzDerivation' rec {
|
||||
pname = "ferdi";
|
||||
name = "Ferdi";
|
||||
version = "5.6.10";
|
||||
version = "5.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
|
||||
sha256 = "sha256-tm9tuIP4pVociJAiXVsZkDU+zCM5tVAlt+FNpOaiths=";
|
||||
sha256 = "sha256-WwtnYNjXHk80o1wMsEBoaT9j0+4TWTfWhuVpGHaZB7c=";
|
||||
};
|
||||
extraBuildInputs = [ xorg.libxshmfence ];
|
||||
meta = with lib; {
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, gl2ps
|
||||
, glew
|
||||
, gsl
|
||||
, lapack
|
||||
, libX11
|
||||
, libXpm
|
||||
, libXft
|
||||
@ -19,6 +20,7 @@
|
||||
, llvm_9
|
||||
, lz4
|
||||
, xz
|
||||
, openblas
|
||||
, pcre
|
||||
, nlohmann_json
|
||||
, pkg-config
|
||||
@ -55,11 +57,13 @@ stdenv.mkDerivation rec {
|
||||
pcre
|
||||
zlib
|
||||
zstd
|
||||
lapack
|
||||
libxml2
|
||||
llvm_9
|
||||
lz4
|
||||
xz
|
||||
gsl
|
||||
openblas
|
||||
xxHash
|
||||
libAfterImage
|
||||
giflib
|
||||
@ -153,6 +157,7 @@ stdenv.mkDerivation rec {
|
||||
"-Droot7=OFF"
|
||||
"-Dsqlite=OFF"
|
||||
"-Dssl=OFF"
|
||||
"-Dtmva=ON"
|
||||
"-Dvdt=OFF"
|
||||
"-Dwebgui=OFF"
|
||||
"-Dxml=ON"
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hyper";
|
||||
version = "3.1.4";
|
||||
version = "3.1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb";
|
||||
sha256 = "sha256-4C0vx4m/ojOJl5ownsbasSFiIrJ9kfJJWh0y4j/DGIQ=";
|
||||
sha256 = "sha256-Pgu09QvP1PnZ13omQlQLVHr3NayhFaQndmsQdLM+W90=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, writeText, asttokens
|
||||
, pycryptodome, pytest-xdist, pytest-cov, recommonmark, semantic-version, sphinx
|
||||
, sphinx_rtd_theme, pytest-runner }:
|
||||
, sphinx_rtd_theme, pytest-runner, setuptools-scm }:
|
||||
|
||||
let
|
||||
sample-contract = writeText "example.vy" ''
|
||||
@ -21,15 +21,7 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-fXug5v3zstz19uexMWokHBVsfcl2ZCdIOIXKeLVyh/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
|
||||
# Replace the dynamic commit hash lookup with the hash from the tag
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'asttokens==' 'asttokens>=' \
|
||||
--replace 'subprocess.check_output("git rev-parse HEAD".split())' "' '" \
|
||||
--replace 'commithash.decode("utf-8").strip()' "'6e7dba7a8b5f29762d3470da4f44634b819c808d'"
|
||||
'';
|
||||
nativeBuildInputs = [ pytest-runner setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asttokens
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "khronos-ocl-icd-loader-${version}";
|
||||
version = "2021.06.30";
|
||||
version = "2022.01.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenCL-ICD-Loader";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1bSeGI8IufKtdcyxVHX4DVxkPKfJrUBVzzIGe8rQ/AA=";
|
||||
sha256 = "sha256-T2tBoN0yv41W+UksFABVjsetdkXlnEFUINfxumGgC04=";
|
||||
};
|
||||
|
||||
patches = lib.optional withTracing ./tracing.patch;
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, # base build deps
|
||||
meson
|
||||
@ -26,7 +27,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wireplumber";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
|
||||
outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc";
|
||||
|
||||
@ -35,9 +36,18 @@ stdenv.mkDerivation rec {
|
||||
owner = "pipewire";
|
||||
repo = "wireplumber";
|
||||
rev = version;
|
||||
sha256 = "sha256-y+Gj9EZn67W3U81zXgp+6JAFxZSZTwwT0TB3Kueb/Tw=";
|
||||
sha256 = "sha256-yp4xtp+s+h+43LGVtYonoJ2tQaLRfwyMY4fp8z1l0CM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# backport a fix for default device selection
|
||||
# FIXME remove this after 0.4.8
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/211f1e6b6cd4898121e4c2b821fae4dea6cc3317.patch";
|
||||
sha256 = "sha256-EGcbJ8Rq/5ft6SV0VC+mTkhVE7Ycze4TL6AVc9KH7+M=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
pkg-config
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline, ncurses, zlib }:
|
||||
{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline, ncurses, zlib, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqlcipher";
|
||||
@ -21,9 +21,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
CFLAGS = [
|
||||
"-DSQLITE_ENABLE_COLUMN_METADATA=1"
|
||||
"-DSQLITE_SECURE_DELETE=1"
|
||||
"-DSQLITE_ENABLE_UNLOCK_NOTIFY=1"
|
||||
# We want feature parity with sqlite
|
||||
sqlite.NIX_CFLAGS_COMPILE
|
||||
"-DSQLITE_HAS_CODEC"
|
||||
];
|
||||
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "fix";
|
||||
version = "20201120";
|
||||
version = "20211231";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
owner = "fpottier";
|
||||
repo = "fix";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-RO+JCG6R2i5uZfwTYEnQBCVq963fjv5lA2wA/8KrgMg=";
|
||||
sha256 = "sha256-T/tbiC95yzPb60AiEcvMRU47D8xUZNN5C4X33Y1VB9E=";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
@ -18,7 +18,7 @@ buildDunePackage rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.inria.fr/fpottier/fix/";
|
||||
description = "A simple OCaml module for computing the least solution of a system of monotone equations";
|
||||
license = licenses.cecill-c;
|
||||
license = licenses.lgpl2Only;
|
||||
maintainers = with maintainers; [ vbgl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,19 +1,56 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, coverage, nose, six }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, coverage
|
||||
, pythonOlder
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "attrdict";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "35c90698b55c683946091177177a9e9c0713a0860f0e049febd72649ccd77b70";
|
||||
hash = "sha256-NckGmLVcaDlGCRF3F3qenAcToIYPDgSf69cmSczXe3A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ coverage nose six ];
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
coverage
|
||||
nose
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace attrdict/merge.py \
|
||||
--replace "from collections" "from collections.abc"
|
||||
substituteInPlace attrdict/mapping.py \
|
||||
--replace "from collections" "from collections.abc"
|
||||
substituteInPlace attrdict/default.py \
|
||||
--replace "from collections" "from collections.abc"
|
||||
substituteInPlace attrdict/mixins.py \
|
||||
--replace "from collections" "from collections.abc"
|
||||
'';
|
||||
|
||||
# Tests are not shipped and source is not tagged
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"attrdict"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A dict with attribute-style access";
|
||||
homepage = "https://github.com/bcj/AttrDict";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, unittest2
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -27,7 +26,6 @@ buildPythonPackage rec {
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
unittest2
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
, attrs
|
||||
, od
|
||||
, docutils
|
||||
, repeated_test
|
||||
, pygments
|
||||
, unittest2
|
||||
, pytestCheckHook
|
||||
@ -22,11 +21,13 @@ buildPythonPackage rec {
|
||||
sha256 = "3177a028e4169d8865c79af82bdd441b24311d4bd9c0ae8803641882d340a51d";
|
||||
};
|
||||
|
||||
# repeated_test no longer exists in nixpkgs
|
||||
# also see: https://github.com/epsy/clize/issues/74
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
python-dateutil
|
||||
pygments
|
||||
repeated_test
|
||||
unittest2
|
||||
];
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flux-led";
|
||||
version = "0.28.1";
|
||||
version = "0.28.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "flux_led";
|
||||
rev = version;
|
||||
sha256 = "sha256-4Er9n3dx2j4/dAmNiQVGh7vwbjtKk8+KOFClyDrLOsk=";
|
||||
sha256 = "sha256-IkH5cCJbBUekABUcRyJl00tZgx+WqipEVsK8/ks2KDk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, unittest2, repeated_test }:
|
||||
{ lib, buildPythonPackage, fetchPypi, unittest2 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "od";
|
||||
@ -9,8 +9,10 @@ buildPythonPackage rec {
|
||||
sha256 = "1az30snc3w6s4k1pi7mspcv8y0kp3ihf3ly44z517nszmz9lrjfi";
|
||||
};
|
||||
|
||||
# repeated_test no longer exists in nixpkgs
|
||||
# also see: https://github.com/epsy/od/issues/1
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
repeated_test
|
||||
unittest2
|
||||
];
|
||||
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, unittest2
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "repeated_test";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "65107444a4945668ab7be6d1a3e1814cee9b2cfc577e7c70381700b11b809d27";
|
||||
};
|
||||
|
||||
buildInputs = [ unittest2 ];
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A quick unittest-compatible framework for repeating a test function over many fixtures";
|
||||
homepage = "https://github.com/epsy/repeated_test";
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,79 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, python
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, qtbase
|
||||
, boost
|
||||
, assimp
|
||||
, gym
|
||||
, bullet-roboschool
|
||||
, pkg-config
|
||||
, which
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "roboschool";
|
||||
version = "1.0.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "roboschool";
|
||||
rev = version;
|
||||
sha256 = "1s7rp5bbiglnrfm33wf7x7kqj0ks3b21bqyz18c5g6vx39rxbrmh";
|
||||
};
|
||||
|
||||
# fails to find boost_python for some reason
|
||||
disabled = !isPy3k;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gym
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qtbase # needs the `moc` tool
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bullet-roboschool
|
||||
assimp
|
||||
qtbase
|
||||
boost
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}";
|
||||
|
||||
patches = [
|
||||
# Remove kwarg that was removed in upstream gym
|
||||
# https://github.com/openai/roboschool/pull/180
|
||||
(fetchpatch {
|
||||
name = "remove-close-kwarg.patch";
|
||||
url = "https://github.com/openai/roboschool/pull/180/commits/334f489c8ce7af4887e376139ec676f89da5b16f.patch";
|
||||
sha256 = "0bbz8b63m40a9lrwmh7c8d8gj9kpa8a7svdh08qhrddjkykvip6r";
|
||||
})
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# First build the cpp dependencies
|
||||
cd roboschool/cpp-household
|
||||
make \
|
||||
MOC=moc \
|
||||
-j$NIX_BUILD_CORES
|
||||
cd ../..
|
||||
'';
|
||||
|
||||
# Does a QT sanity check, but QT is not expected to work in isolation
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source software for robot simulation, integrated with OpenAI Gym";
|
||||
homepage = "https://github.com/openai/roboschool";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ timokau ];
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, repeated_test
|
||||
, sphinx
|
||||
, mock
|
||||
, coverage
|
||||
@ -19,11 +18,15 @@ buildPythonPackage rec {
|
||||
sha256 = "e7789628ec0d02e421bca76532b0d5da149f96f09e7ed4a5cbf318624b75e949";
|
||||
};
|
||||
|
||||
buildInputs = [ repeated_test sphinx mock coverage unittest2 ];
|
||||
propagatedBuildInputs = [ funcsigs six ];
|
||||
|
||||
patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py'';
|
||||
|
||||
# repeated_test no longer exists in nixpkgs
|
||||
# Also see: https://github.com/epsy/sigtools/issues/26
|
||||
doCheck = false;
|
||||
checkInputs = [ sphinx mock coverage unittest2 ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utilities for working with 3.3's inspect.Signature objects.";
|
||||
homepage = "https://pypi.python.org/pypi/sigtools";
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, python
|
||||
, unittest2, scripttest, pytz, mock
|
||||
, testtools, pbr, tempita, decorator, sqlalchemy
|
||||
, scripttest, pytz, pbr, tempita, decorator, sqlalchemy
|
||||
, six, sqlparse, testrepository
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlalchemy-migrate";
|
||||
version = "0.13.0";
|
||||
@ -13,21 +13,27 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
# See: https://review.openstack.org/#/c/608382/
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch";
|
||||
sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07";
|
||||
}) ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch";
|
||||
sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [ unittest2 scripttest pytz mock testtools testrepository ];
|
||||
postPatch = ''
|
||||
substituteInPlace test-requirements.txt \
|
||||
--replace "ibm_db_sa>=0.3.0;python_version<'3.0'" "" \
|
||||
--replace "ibm-db-sa-py3;python_version>='3.0'" "" \
|
||||
--replace "tempest-lib>=0.1.0" "" \
|
||||
--replace "testtools>=0.9.34,<0.9.36" "" \
|
||||
--replace "pylint" ""
|
||||
'';
|
||||
|
||||
checkInputs = [ scripttest pytz testrepository ];
|
||||
propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
prePatch = ''
|
||||
sed -i -e /tempest-lib/d \
|
||||
-e /testtools/d \
|
||||
test-requirements.txt
|
||||
'';
|
||||
checkPhase = ''
|
||||
export PATH=$PATH:$out/bin
|
||||
echo sqlite:///__tmp__ > test_db.cfg
|
||||
@ -41,9 +47,9 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/openstack/sqlalchemy-migrate";
|
||||
homepage = "https://opendev.org/x/sqlalchemy-migrate";
|
||||
description = "Schema migration tools for SQLAlchemy";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ makefu ];
|
||||
maintainers = teams.openstack.members ++ (with maintainers; [ makefu ]);
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, attrdict
|
||||
, buildPythonPackage
|
||||
, cairosvg
|
||||
, fetchPypi
|
||||
, pillow
|
||||
, pytestCheckHook
|
||||
, setuptools-scm
|
||||
@ -14,9 +14,11 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "wavedrom";
|
||||
version = "2.0.3.post2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "239b3435ff116b09007d5517eed755fc8591891b7271a1cd40db9e400c02448d";
|
||||
hash = "sha256-I5s0Nf8RawkAfVUX7tdV/IWRiRtycaHNQNueQAwCRI0=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
@ -32,22 +34,25 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
cairosvg
|
||||
pillow
|
||||
pytestCheckHook
|
||||
xmldiff
|
||||
pillow
|
||||
cairosvg
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_upstream" # requires to clone a full git repository
|
||||
# Requires to clone a full git repository
|
||||
"test_upstream"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "wavedrom" ];
|
||||
pythonImportsCheck = [
|
||||
"wavedrom"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "WaveDrom compatible Python command line";
|
||||
homepage = "https://github.com/wallento/wavedrompy";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ airwoodix ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ airwoodix ];
|
||||
};
|
||||
}
|
||||
|
||||
40
pkgs/development/tools/misc/dura/default.nix
Normal file
40
pkgs/development/tools/misc/dura/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dura";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tkellogg";
|
||||
repo = "dura";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "sha256-XnsR1oL9iImtj0X7wJ8Pp/An0/AVF5y+sD551yX4IGo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-+Tq0a5cs2XZoT7yzTf1oIPd3kgD6SyrQqxQ1neTcMwk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A background process that saves uncommited changes on git";
|
||||
longDescription = ''
|
||||
Dura is a background process that watches your Git repositories and
|
||||
commits your uncommitted changes without impacting HEAD, the current
|
||||
branch, or the Git index (staged files). If you ever get into an
|
||||
"oh snap!" situation where you think you just lost days of work,
|
||||
checkout a "dura" branch and recover.
|
||||
'';
|
||||
homepage = "https://github.com/tkellogg/dura";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ drupol ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pciutils, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ryzenadj";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FlyGoat";
|
||||
repo = "RyzenAdj";
|
||||
rev = "v${version}";
|
||||
sha256 = "182l9nchlpl4yr568n86086glkr607rif92wnwc7v3aym62ch6ld";
|
||||
sha256 = "sha256-eb8DskF0SJtc0tDKJ1vU7dtuQmHO7RX8vm4DQki2ZEg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pciutils cmake ];
|
||||
|
||||
@ -232,6 +232,33 @@ let
|
||||
});
|
||||
})
|
||||
|
||||
# Remove as soon the dependency is updated and pytest-httpx > 0.15
|
||||
(self: super: {
|
||||
luftdaten = super.luftdaten.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.7.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-ecosystem";
|
||||
repo = "python-luftdaten";
|
||||
rev = version;
|
||||
sha256 = "sha256-76Y5TJet0WtzYXuK8Og0rmpsUIlXK7b37oesh+MliU8=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
# Remove as soon the dependency is updated and pytest-httpx > 0.15
|
||||
(self: super: {
|
||||
pyrmvtransport = super.pyrmvtransport.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.3.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cgtobi";
|
||||
repo = "pyrmvtransport";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
})
|
||||
|
||||
# home-assistant-frontend does not exist in python3.pkgs
|
||||
(self: super: {
|
||||
home-assistant-frontend = self.callPackage ./frontend.nix { };
|
||||
@ -986,6 +1013,9 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
# august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' / assert 'off' == 'on'
|
||||
"test_lock_update_via_pubnub"
|
||||
"test_door_sense_update_via_pubnub"
|
||||
# Tests are flaky
|
||||
"test_config_platform_valid"
|
||||
"test_hls_stream"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "yaml-merge";
|
||||
version = "unstable-2016-02-16";
|
||||
version = "unstable-2022-01-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abbradar";
|
||||
repo = "yaml-merge";
|
||||
rev = "4eef7b68632d79dec369b4eff5a8c63f995f81dc";
|
||||
sha256 = "0mwda2shk43i6f22l379fcdchmb07fm7nf4i2ii7fk3ihkhb8dgp";
|
||||
rev = "2f0174fe92fc283dd38063a3a14f7fe71db4d9ec";
|
||||
sha256 = "sha256-S2eZw+FOZvOn0XupZDRNcolUPd4PhvU1ziu+kx2AwnY=";
|
||||
};
|
||||
|
||||
pythonPath = with python3Packages; [ pyyaml ];
|
||||
|
||||
@ -104,7 +104,7 @@ core = stdenv.mkDerivation rec {
|
||||
|
||||
# TODO: perhaps improve texmf.cnf search locations
|
||||
postInstall = /* links format -> engine will be regenerated in texlive.combine */ ''
|
||||
PATH="$out/bin:$PATH" ${texlinks} --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin"
|
||||
PATH="$out/bin:$PATH" ${texlinks}/bin/texlinks --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin"
|
||||
'' + /* a few texmf-dist files are useful; take the rest from pkgs */ ''
|
||||
mv "$out/share/texmf-dist/web2c/texmf.cnf" .
|
||||
rm -r "$out/share/texmf-dist"
|
||||
@ -136,6 +136,8 @@ core = stdenv.mkDerivation rec {
|
||||
+ /* doc location identical with individual TeX pkgs */ ''
|
||||
mkdir -p "$doc/doc"
|
||||
mv "$out"/share/{man,info} "$doc"/doc
|
||||
'' + /* remove manpages for utils that live in texlive.texlive-scripts to avoid a conflict in buildEnv */ ''
|
||||
(cd "$doc"/doc/man/man1; rm {fmtutil-sys.1,fmtutil.1,mktexfmt.1,mktexmf.1,mktexpk.1,mktextfm.1,texhash.1,updmap-sys.1,updmap.1})
|
||||
'' + cleanBrokenLinks;
|
||||
|
||||
setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references)
|
||||
@ -360,7 +362,7 @@ pygmentex = python3Packages.buildPythonApplication rec {
|
||||
|
||||
|
||||
texlinks = stdenv.mkDerivation rec {
|
||||
name = "texlinks.sh";
|
||||
name = "texlinks";
|
||||
|
||||
src = lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs);
|
||||
|
||||
@ -373,7 +375,7 @@ texlinks = stdenv.mkDerivation rec {
|
||||
# Patch texlinks.sh back to 2015 version;
|
||||
# otherwise some bin/ links break, e.g. xe(la)tex.
|
||||
patch --verbose -R scripts/texlive-extra/texlinks.sh < '${./texlinks.diff}'
|
||||
install -Dm555 scripts/texlive-extra/texlinks.sh "$out"
|
||||
install -Dm555 scripts/texlive-extra/texlinks.sh "$out"/bin/texlinks
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -223,17 +223,17 @@ in (buildEnv {
|
||||
sed "1s|$| -I $out/share/texmf/scripts/texlive|" -i "$out/bin/fmtutil"
|
||||
ln -sf fmtutil "$out/bin/mktexfmt"
|
||||
|
||||
perl `type -P mktexlsr.pl` ./share/texmf
|
||||
${bin.texlinks} "$out/bin" && wrapBin
|
||||
perl `type -P mktexlsr.pl` --sort ./share/texmf
|
||||
${bin.texlinks}/bin/texlinks "$out/bin" && wrapBin
|
||||
perl `type -P fmtutil.pl` --sys --all | grep '^fmtutil' # too verbose
|
||||
#${bin.texlinks} "$out/bin" && wrapBin # do we need to regenerate format links?
|
||||
#${bin.texlinks}/bin/texlinks "$out/bin" && wrapBin # do we need to regenerate format links?
|
||||
|
||||
# Disable unavailable map files
|
||||
echo y | perl `type -P updmap.pl` --sys --syncwithtrees --force
|
||||
# Regenerate the map files (this is optional)
|
||||
perl `type -P updmap.pl` --sys --force
|
||||
|
||||
perl `type -P mktexlsr.pl` ./share/texmf-* # to make sure
|
||||
perl `type -P mktexlsr.pl` --sort ./share/texmf-* # to make sure
|
||||
'' +
|
||||
# install (wrappers for) scripts, based on a list from upstream texlive
|
||||
''
|
||||
|
||||
@ -125,8 +125,8 @@ let
|
||||
|
||||
snapshot = {
|
||||
year = "2021";
|
||||
month = "04";
|
||||
day = "08";
|
||||
month = "12";
|
||||
day = "27";
|
||||
};
|
||||
|
||||
tlpdb = fetchurl {
|
||||
@ -136,7 +136,7 @@ let
|
||||
#"ftp://tug.org/texlive/historic/2019/tlnet-final/tlpkg/texlive.tlpdb.xz"
|
||||
"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/tlpkg/texlive.tlpdb.xz"
|
||||
];
|
||||
sha512 = "1dsj4bza84g2f2z0w31yil3iwcnggcyg9f1xxwmp6ljk5xlzyr39cb556prx9691zbwpbrwbb5hnbqxqlnwsivgk0pmbl9mbjbk9cz0";
|
||||
hash = "sha512-PcXTctrO0aL5C7Ci1J2Z5fa5WqKONhOK2q0FnSbT5+iP9WWSCljyQiHE8C4LYMMHii48y6AJVRkjVIukI3+rUQ==";
|
||||
};
|
||||
|
||||
# create a derivation that contains an unpacked upstream TL package
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -14655,6 +14655,8 @@ with pkgs;
|
||||
|
||||
drush = callPackage ../development/tools/misc/drush { };
|
||||
|
||||
dura = callPackage ../development/tools/misc/dura { };
|
||||
|
||||
dwfv = callPackage ../applications/science/electronics/dwfv { };
|
||||
|
||||
dwz = callPackage ../development/tools/misc/dwz { };
|
||||
@ -27099,6 +27101,10 @@ with pkgs;
|
||||
|
||||
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
|
||||
|
||||
mepo = callPackage ../applications/misc/mepo {
|
||||
zig = zig_0_8_1;
|
||||
};
|
||||
|
||||
meshcentral = callPackage ../tools/admin/meshcentral { };
|
||||
|
||||
meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };
|
||||
|
||||
@ -87,6 +87,7 @@ mapAliases ({
|
||||
python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
|
||||
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
|
||||
rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05
|
||||
repeated_test = throw "repeated_test is no longer maintained"; # added 2022-01-11
|
||||
requests_toolbelt = requests-toolbelt; # added 2017-09-26
|
||||
rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
|
||||
ruamel_base = ruamel-base; # added 2021-11-01
|
||||
|
||||
@ -8461,8 +8461,6 @@ in {
|
||||
|
||||
reparser = callPackage ../development/python-modules/reparser { };
|
||||
|
||||
repeated_test = callPackage ../development/python-modules/repeated_test { };
|
||||
|
||||
repocheck = callPackage ../development/python-modules/repocheck { };
|
||||
|
||||
reportlab = callPackage ../development/python-modules/reportlab { };
|
||||
@ -8585,10 +8583,6 @@ in {
|
||||
|
||||
robomachine = callPackage ../development/python-modules/robomachine { };
|
||||
|
||||
roboschool = callPackage ../development/python-modules/roboschool {
|
||||
inherit (pkgs.qt5) qtbase;
|
||||
};
|
||||
|
||||
robot-detection = callPackage ../development/python-modules/robot-detection { };
|
||||
|
||||
robotframework = callPackage ../development/python-modules/robotframework { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user