mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-22 04:45:39 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
6f99633360
@ -113,6 +113,10 @@ rec {
|
||||
args ? {}
|
||||
, # This would be remove in the future, Prefer _module.check option instead.
|
||||
check ? true
|
||||
# Internal variable to avoid `_key` collisions regardless
|
||||
# of `extendModules`. Used in `submoduleWith`.
|
||||
# Test case: lib/tests/modules, "168767"
|
||||
, extensionOffset ? 0
|
||||
}:
|
||||
let
|
||||
withWarnings = x:
|
||||
@ -338,15 +342,17 @@ rec {
|
||||
modules ? [],
|
||||
specialArgs ? {},
|
||||
prefix ? [],
|
||||
extensionOffset ? length modules,
|
||||
}:
|
||||
evalModules (evalModulesArgs // {
|
||||
modules = regularModules ++ modules;
|
||||
specialArgs = evalModulesArgs.specialArgs or {} // specialArgs;
|
||||
prefix = extendArgs.prefix or evalModulesArgs.prefix;
|
||||
inherit extensionOffset;
|
||||
});
|
||||
|
||||
type = lib.types.submoduleWith {
|
||||
inherit modules specialArgs;
|
||||
inherit modules specialArgs extensionOffset;
|
||||
};
|
||||
|
||||
result = withWarnings {
|
||||
|
||||
@ -293,7 +293,7 @@ checkConfigOutput '^"a c"$' config.result ./functionTo/merging-attrs.nix
|
||||
|
||||
# moduleType
|
||||
checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-variant.nix
|
||||
checkConfigOutput '^"a y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix
|
||||
checkConfigOutput '^"a b y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix
|
||||
checkConfigOutput '^"a b c"$' config.resultFooFoo ./declare-variants.nix ./define-variant.nix
|
||||
|
||||
## emptyValue's
|
||||
@ -327,6 +327,10 @@ checkConfigError 'The option .theOption.nested. in .other.nix. is already declar
|
||||
# Test that types.optionType leaves types untouched as long as they don't need to be merged
|
||||
checkConfigOutput 'ok' config.freeformItems.foo.bar ./adhoc-freeformType-survives-type-merge.nix
|
||||
|
||||
# Anonymous submodules don't get nixed by import resolution/deduplication
|
||||
# because of an `extendModules` bug, issue 168767.
|
||||
checkConfigOutput '^1$' config.sub.specialisation.value ./extendModules-168767-imports.nix
|
||||
|
||||
cat <<EOF
|
||||
====== module tests ======
|
||||
$pass Pass
|
||||
|
||||
41
lib/tests/modules/extendModules-168767-imports.nix
Normal file
41
lib/tests/modules/extendModules-168767-imports.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, extendModules
|
||||
, ...
|
||||
}:
|
||||
with lib;
|
||||
{
|
||||
imports = [
|
||||
|
||||
{
|
||||
options.sub = mkOption {
|
||||
default = { };
|
||||
type = types.submodule (
|
||||
{ config
|
||||
, extendModules
|
||||
, ...
|
||||
}:
|
||||
{
|
||||
options.value = mkOption {
|
||||
type = types.int;
|
||||
};
|
||||
|
||||
options.specialisation = mkOption {
|
||||
default = { };
|
||||
inherit
|
||||
(extendModules {
|
||||
modules = [{
|
||||
specialisation = mkOverride 0 { };
|
||||
}];
|
||||
})
|
||||
type;
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
{ config.sub.value = 1; }
|
||||
|
||||
|
||||
];
|
||||
}
|
||||
@ -568,6 +568,11 @@ rec {
|
||||
{ modules
|
||||
, specialArgs ? {}
|
||||
, shorthandOnlyDefinesConfig ? false
|
||||
|
||||
# Internal variable to avoid `_key` collisions regardless
|
||||
# of `extendModules`. Wired through by `evalModules`.
|
||||
# Test case: lib/tests/modules, "168767"
|
||||
, extensionOffset ? 0
|
||||
}@attrs:
|
||||
let
|
||||
inherit (lib.modules) evalModules;
|
||||
@ -579,11 +584,11 @@ rec {
|
||||
allModules = defs: imap1 (n: { value, file }:
|
||||
if isFunction value
|
||||
then setFunctionArgs
|
||||
(args: lib.modules.unifyModuleSyntax file "${toString file}-${toString n}" (value args))
|
||||
(args: lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (value args))
|
||||
(functionArgs value)
|
||||
else if isAttrs value
|
||||
then
|
||||
lib.modules.unifyModuleSyntax file "${toString file}-${toString n}" (shorthandToModule value)
|
||||
lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (shorthandToModule value)
|
||||
else value
|
||||
) defs;
|
||||
|
||||
@ -620,6 +625,7 @@ rec {
|
||||
(base.extendModules {
|
||||
modules = [ { _module.args.name = last loc; } ] ++ allModules defs;
|
||||
prefix = loc;
|
||||
extensionOffset = extensionOffset + length defs;
|
||||
}).config;
|
||||
emptyValue = { value = {}; };
|
||||
getSubOptions = prefix: (base.extendModules
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchgit {
|
||||
url = "git://anongit.freedesktop.org/${pname}";
|
||||
rev = "refs/tags/${pname}-${version}";
|
||||
sha256 = "168gdhzj11f4nk94a6z696sm8v1njzwww69bn6wr97l17897913g";
|
||||
sha256 = "sha256-0UGcoGkNF/19aSTWNEFAmZP7seL/yObXsOLlZLiyG2Q=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "masterpdfeditor";
|
||||
version = "5.8.33";
|
||||
version = "5.8.46";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz";
|
||||
sha256 = "sha256-sgLF/NpaNlkL5iA1l7QzMiYKwRcMDu2DHdTIaeHOtfI=";
|
||||
sha256 = "sha256-xms4aqIxYXR6v226RMf+abrFU1xz2aDIL6iQ+Yfff1k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ];
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{ lib, fetchFromGitHub, python3Packages, file, less, highlight
|
||||
, imagePreviewSupport ? true, w3m }:
|
||||
{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m
|
||||
, imagePreviewSupport ? true
|
||||
, neoVimSupport ? true
|
||||
, improvedEncodingDetection ? true
|
||||
, rightToLeftTextSupport ? false
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ranger";
|
||||
@ -15,8 +19,13 @@ python3Packages.buildPythonApplication rec {
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
checkInputs = with python3Packages; [ pytestCheckHook ];
|
||||
propagatedBuildInputs = [ file ]
|
||||
++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ];
|
||||
propagatedBuildInputs = [
|
||||
less
|
||||
file
|
||||
] ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ]
|
||||
++ lib.optionals neoVimSupport [ python3Packages.pynvim ]
|
||||
++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ]
|
||||
++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ];
|
||||
|
||||
preConfigure = ''
|
||||
${lib.optionalString (highlight != null) ''
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "c14-cli";
|
||||
version = "0.3";
|
||||
|
||||
goPackagePath = "github.com/online-net/c14-cli";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "online-net";
|
||||
repo = "c14-cli";
|
||||
rev = version;
|
||||
sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "C14 is designed for data archiving & long-term backups";
|
||||
homepage = "https://www.online.net/en/storage/c14-cold-storage";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ apeyroux ];
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm-docs";
|
||||
version = "1.7.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "norwoodj";
|
||||
repo = "helm-docs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TXwEVyRYRiVqCDL7IR+DIu1iKqaq81W5xkvz+laxVek=";
|
||||
sha256 = "sha256-OpS/CYBb2Ll6ktvEhqkw/bWMSrFa4duidK3Glu8EnPw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XTV0gyUWe6G5gxucsXOaDOUQoKMCfhrWzlKwUOaA6y4=";
|
||||
vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw=";
|
||||
|
||||
subPackages = [ "cmd/helm-docs" ];
|
||||
ldflags = [
|
||||
|
||||
@ -1,19 +1,24 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, kompose }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "kompose";
|
||||
version = "1.21.0";
|
||||
|
||||
goPackagePath = "github.com/kubernetes/kompose";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "kubernetes";
|
||||
repo = "kompose";
|
||||
sha256 = "15a1alf6ywwfc4z5kdcnv64fp3cfy3qrcw62ny6xyn1kh1w24vkh";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NfzqGG5ZwPpmjhvcvXN1AA+kfZG/oujbAEtXkm1mzeU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-OR5U2PnebO0a+lwU09Dveh0Yxk91cmSRorTxQIO5lHc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
checkFlags = [ "-short" ];
|
||||
|
||||
postInstall = ''
|
||||
for shell in bash zsh; do
|
||||
$out/bin/kompose completion $shell > kompose.$shell
|
||||
@ -21,6 +26,11 @@ buildGoPackage rec {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.tests.version = testVersion {
|
||||
package = kompose;
|
||||
command = "kompose version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to help users who are familiar with docker-compose move to Kubernetes";
|
||||
homepage = "https://kompose.io";
|
||||
|
||||
@ -162,6 +162,15 @@
|
||||
"vendorSha256": "03761vl8xcirmas38q8xivx2r312c07fmg1y80lklmswbd8d0f71",
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"buildkite": {
|
||||
"owner": "buildkite",
|
||||
"provider-source-address": "registry.terraform.io/buildkite/buildkite",
|
||||
"repo": "terraform-provider-buildkite",
|
||||
"rev": "v0.8.0",
|
||||
"sha256": "1v4kzsvzkzf0bb6vpyjh0n2kbcfrqa193idvm4jgbcrdb0y3xzn5",
|
||||
"vendorSha256": "12kqjpyy80pfrasicmdi1f43mr846rad3c6xaa4dvzn7hq640q5j",
|
||||
"version": "0.8.0"
|
||||
},
|
||||
"checkly": {
|
||||
"owner": "checkly",
|
||||
"provider-source-address": "registry.terraform.io/checkly/checkly",
|
||||
|
||||
@ -46,11 +46,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.44.0";
|
||||
version = "3.44.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "3yHT31Ik36hC6ikO/82QKv1LFBhgik37aQejt9TZlPk=";
|
||||
sha256 = "dEx+CK0R4bYQPO60u/2Jo7Yo4SbOOGe7AI80F8wEnqk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -52,13 +52,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freerdp";
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = version;
|
||||
sha256 = "sha256-+yKdB/glNf74drv9EvBwVMWrqr5ADBkSJVVDH+UKb2U=";
|
||||
sha256 = "sha256-XBYRhbwknVa8eXxk31b7n9gMWBcTjCecDN+j2FGcpw0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -10,11 +10,12 @@ mkCoqDerivation {
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
release."1.1".sha256 = "sha256:0jb28vgkr4xpg9d6k85rq7abpx5ch612iw9ps5w8q80q1jpjlc4z";
|
||||
release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.12" "8.14") (isGe "1.12") ]; out = "1.0"; }
|
||||
{ cases = [ (range "8.12" "8.15") (isGe "1.12") ]; out = "1.1"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "joker";
|
||||
version = "0.18.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "candid82";
|
||||
repo = "joker";
|
||||
sha256 = "sha256-Iia4sl8lRTpek5aZvQW/yy+TnMq5KNJH+pBnksqL/G0=";
|
||||
sha256 = "sha256-SlkhxALJwrZ/DOuBbqjb+wHEfT5mhd3lSD6E0geFP4Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA=";
|
||||
|
||||
@ -20,11 +20,14 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0"
|
||||
"-D_CL_HAVE_NAMESPACES_EXITCODE=0"
|
||||
"-D_CL_HAVE_NAMESPACES_EXITCODE__TRYRUN_OUTPUT="
|
||||
"-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0"
|
||||
"-D_CL_HAVE_NO_SNWPRINTF_BUG_EXITCODE=0"
|
||||
"-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE__TRYRUN_OUTPUT="
|
||||
"-D_CL_HAVE_TRY_BLOCKS_EXITCODE=0"
|
||||
"-D_CL_HAVE_TRY_BLOCKS_EXITCODE__TRYRUN_OUTPUT="
|
||||
"-D_CL_HAVE_PTHREAD_MUTEX_RECURSIVE=0"
|
||||
"-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE=0"
|
||||
"-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE__TRYRUN_OUTPUT="
|
||||
];
|
||||
|
||||
patches = # From debian
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-later";
|
||||
version = "2.0.10";
|
||||
version = "2.0.11";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -29,8 +29,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EwWoRLTA1vm8Su3VpXTrRVtmtneEsO/+SuuY1k1yeMQ=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-K4GResTKKWXQ0OHpBwqTLnptQ8ipuQ9iaGZDlPqRUaI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aprslib";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rossengeorgiev";
|
||||
repo = "aprs-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QasyF0Ch4zdPoAgcqRavEENVGA/02/AgeWAgXYcSUjk=";
|
||||
hash = "sha256-wWlzOFhWJ7hJeM3RWsPTEsLjRzN4SMXsb2Cd612HB4w=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fuse-python";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b9a69c38b3909ffd35d77cb1a73ebfdc3a103a6d4cdd20c86c70ed1141771580";
|
||||
sha256 = "sha256-dOX/szaCu6mlrypaBI9Ht+e0ZOv4QpG/WiWL+60Do6o=";
|
||||
};
|
||||
|
||||
buildInputs = [ fuse ];
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-it3Hku0k+o2v+KeykCO3W5CxOpkWbGXT055Kq6cSDzo=";
|
||||
sha256 = "sha256-wuoc+A+KoqH/OdZ7/Rj/RZjgRLMU1WrRFqlS3TzJL4I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,21 +1,28 @@
|
||||
{ lib, callPackage, buildPythonApplication, fetchFromGitHub
|
||||
{ lib
|
||||
, callPackage
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, jinja2
|
||||
, markdown
|
||||
, mkdocs
|
||||
, mkdocs-material-extensions
|
||||
, pygments
|
||||
, pymdown-extensions
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "mkdocs-material";
|
||||
version = "8.2.9";
|
||||
version = "8.2.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "squidfunk";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-lrklTQWWsP1rjixqu5/S7XMN+K095NRGv3JkjRQ4brM=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-YAXdIA36QWwdQxTux6Sy/F0j8lprSO+5/VezFcsGQYg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -30,7 +37,9 @@ buildPythonApplication rec {
|
||||
# No tests for python
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "mkdocs" ];
|
||||
pythonImportsCheck = [
|
||||
"mkdocs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Material for mkdocs";
|
||||
|
||||
@ -19,12 +19,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mocket";
|
||||
version = "3.10.4";
|
||||
version = "3.10.5";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "831c23bf891c525828b7da49a358c6e0698481e4c8b3a61a69e87f36d06ef969";
|
||||
sha256 = "sha256-rF6ol5T6wH0nNmaP+lHQL8H+XZz1kl7OEe7NNO4MCtw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.21.34";
|
||||
version = "1.22.0.post1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gXvMC+GZknL+jYG9ZQD1/dqRhMwXrZvXG8CvCFYxdco=";
|
||||
hash = "sha256-lOpsygYi1iCZ9DgqOjfJ4HL9PvRmLqMpEWqgeOyFCI4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pg8000";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-niXqE6W3/Mg7AmBR18bk3NUiHpUOvlOT3nFaP+oVJ9M=";
|
||||
sha256 = "sha256-zNK2/hkK3ddMCTpivgcwuemfPqA6oO96uV7Rt/9p0lc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycoolmasternet-async";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
owner = "OnFreund";
|
||||
repo = "pycoolmasternet-async";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qzdk18iqrvin8p8zrydf69d6pii3j47j11h7ymmsx08gh7c176g";
|
||||
hash = "sha256-1Xd8OdN8d3g23kQZqihZrNLKoqLCbu5BvAMNitg8aDA=";
|
||||
};
|
||||
|
||||
# no tests implemented
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoppleio";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-q//uJ+2m9S0r+Jsa5Eye90YSw4cKzd04vPHMm89j8kg=";
|
||||
hash = "sha256-S1w3pPqhX903kkXUq9ALz0+zRvNGOimLughRRVKjV8E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypykatz";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iuLQfdRNxy6Z+7sYGG+dSHlxicOPtNOdB/VNLyZjRsY=";
|
||||
hash = "sha256-G+dbP+xtRH8dIU70HbimRJV+e/yYlo2ds5OAIzUcydY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,17 +1,56 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, executor, naturalsort }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, coloredlogs
|
||||
, executor
|
||||
, fetchFromGitHub
|
||||
, humanfriendly
|
||||
, naturalsort
|
||||
, property-manager
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "update-dotdee";
|
||||
version = "6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xolox";
|
||||
repo = "python-update-dotdee";
|
||||
rev = version;
|
||||
sha256 = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A=";
|
||||
hash = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ executor naturalsort ];
|
||||
propagatedBuildInputs = [
|
||||
coloredlogs
|
||||
executor
|
||||
humanfriendly
|
||||
naturalsort
|
||||
property-manager
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tox.ini \
|
||||
--replace " --cov --showlocals --verbose" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"update_dotdee"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# TypeError: %o format: an integer is required, not str
|
||||
"test_executable"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generic modularized configuration file manager";
|
||||
|
||||
@ -2,21 +2,31 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, minikerberos
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "winsspi";
|
||||
version = "0.0.9";
|
||||
version = "0.0.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1q8hr8l8d9jxyp55qsrlkyhdhqjc0n18ajzms7hf1xkhdl7rrbd2";
|
||||
hash = "sha256-L1qNLEufRZFEQmkJ4mp05VBRLiO2z5r1LCoAADx8P9s=";
|
||||
};
|
||||
propagatedBuildInputs = [ minikerberos ];
|
||||
|
||||
# Project doesn't have tests
|
||||
propagatedBuildInputs = [
|
||||
minikerberos
|
||||
];
|
||||
|
||||
# Module doesn't have tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "winsspi" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"winsspi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for ACL/ACE/Security descriptor manipulation";
|
||||
|
||||
@ -32,13 +32,13 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.1077";
|
||||
version = "2.0.1084";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Jrwgm5diBSJGY0DFG6r6iv1VQwwawKy04K8/y8yokYI=";
|
||||
hash = "sha256-bzmXLqjtl742UcjBpYQdtiTKO6Oe/x7lGoJZh+uJzUo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.71.1";
|
||||
version = "1.72.0";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -31,7 +31,7 @@ buildGoModule rec {
|
||||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Y6YabrpM1WcNGp5ksvq3SBuAS6KEUVzEfxsPmBDS+Io=";
|
||||
sha256 = "sha256-+8uGh7cvNndBBLdTfbYDxfn7Z+4LPPgqeseLcR1P468=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,23 +2,24 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.29.0";
|
||||
version = "1.29.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-B5L4vK5JkcYHqdyxAsP+tBcA6PtM2Gd4JwtW5nMuIXQ=";
|
||||
sha256 = "sha256-a+AXWr/60VFdNk+UkDYRXo5ib8LvaCVpjNi1GFrRVho=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-iJnjmfP9BcT+OXotbS2+OSWGxQaMXwdlR1WTi04FesM=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/hetznercloud/cli/cli.Version=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorSha256 = "sha256-3YU6vAIzTzkEwyMPH4QSUuQ1PQlrWnfRRCA1fHMny48=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/hetznercloud/cli/cli.Version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
for shell in bash zsh; do
|
||||
$out/bin/hcloud completion $shell > hcloud.$shell
|
||||
|
||||
@ -18,13 +18,15 @@
|
||||
, systemd
|
||||
, useIMobileDevice ? true
|
||||
, libimobiledevice
|
||||
, withDocs ? (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "upower";
|
||||
version = "0.99.17";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputs = [ "out" "dev" ]
|
||||
++ lib.optionals withDocs [ "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
@ -34,6 +36,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "xvvqzGxgkuGcvnO12jnLURNJUoSlnMw2g/mnII+i6Bs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
@ -66,6 +74,8 @@ stdenv.mkDerivation rec {
|
||||
"-Dos_backend=linux"
|
||||
"-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
"-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d"
|
||||
"-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "auto" else "disabled"}"
|
||||
"-Dgtk-doc=${lib.boolToString withDocs}"
|
||||
];
|
||||
|
||||
doCheck = false; # fails with "env: './linux/integration-test': No such file or directory"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||
let
|
||||
version = "2.4.6";
|
||||
version = "2.5.0";
|
||||
dist = fetchFromGitHub {
|
||||
owner = "caddyserver";
|
||||
repo = "dist";
|
||||
@ -18,10 +18,10 @@ buildGoModule {
|
||||
owner = "caddyserver";
|
||||
repo = "caddy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xNCxzoNpXkj8WF9+kYJfO18ux8/OhxygkGjA49+Q4vY=";
|
||||
sha256 = "sha256-V9iIz/93n6EBJZ9v3MDKD6FivtplRFN9a/e0o7YX0/w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-NomgHqIiugSISbEtvIbJDn5GRn6Dn72adLPkAvLbUQU=";
|
||||
vendorSha256 = "sha256-xu3klc9yb4Ws8fvXRV286IDhi/zQVN1PKCiFKb8VJBo=";
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
|
||||
@ -36,6 +36,6 @@ buildGoModule {
|
||||
homepage = "https://caddyserver.com";
|
||||
description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ Br1ght0ne ];
|
||||
maintainers = with maintainers; [ Br1ght0ne techknowlogick ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klipper";
|
||||
version = "unstable-2022-03-11";
|
||||
version = "unstable-2022-03-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KevinOConnor";
|
||||
repo = "klipper";
|
||||
rev = "e3beafbdb4f2ac3f889f81aec0cad5ec473c8612";
|
||||
sha256 = "sha256-xZSZUJ2TNaUzfwEFpnzr5EPlOvILLyiQ/3K1iiup7kU=";
|
||||
rev = "30098db22a43274ceb87e078e603889f403a35c4";
|
||||
sha256 = "sha256-ORpXBFGPY6A/HEYX9Hhwb3wP2KcAE+z3pTxf6j7CwGg=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/klippy";
|
||||
|
||||
@ -1,24 +1,29 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testVersion, gosu }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "gosu";
|
||||
version = "unstable-2017-05-09";
|
||||
|
||||
goPackagePath = "github.com/tianon/gosu";
|
||||
version = "1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tianon";
|
||||
repo = "gosu";
|
||||
rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
|
||||
sha256 = "sha256-Ff0FXJg3z8akof+/St1JJu1OO1kS5gMtxSRnCLpj4eI=";
|
||||
rev = version;
|
||||
sha256 = "sha256-qwoHQB37tY8Pz8CHleYZI+SGkbHG7P/vgfXVMSyqi10=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "sha256-yxrOLCtSrY/a84N5yRWGUx1L425TckjvRyn/rtkzsRY=";
|
||||
|
||||
meta = {
|
||||
description= "Tool that avoids TTY and signal-forwarding behavior of sudo and su";
|
||||
ldflags = [ "-d" "-s" "-w" ];
|
||||
|
||||
passthru.tests.version = testVersion {
|
||||
package = gosu;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool that avoids TTY and signal-forwarding behavior of sudo and su";
|
||||
homepage = "https://github.com/tianon/gosu";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
11
pkgs/tools/misc/gosu/deps.nix
generated
11
pkgs/tools/misc/gosu/deps.nix
generated
@ -1,11 +0,0 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/opencontainers/runc";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/opencontainers/runc";
|
||||
rev = "5274430fee9bc930598cfd9c9dbd33213f79f96e";
|
||||
sha256 = "149057gm2y1mc45s7bh43c1ngjg1m54jkpaxw534ir9v5mb1zsxx";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nuclei";
|
||||
version = "2.6.8";
|
||||
version = "2.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XVABgsmPRNseWN+iNfbjicoNuHyZSrrlVOV3YEX7DPU=";
|
||||
sha256 = "sha256-BGWlkNj0LQ02BSUWQYjoT4bR0t/DmNB0jBpvwB/gWwo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Mibn93EviweuEsMF2d1kQAJtss/ELlJQIZTM7To2dkg=";
|
||||
vendorSha256 = "sha256-ar62CZ/2zXO3lwvWNiIAt9XITj2Y/0iIYGX8tmSCwcU=";
|
||||
|
||||
modRoot = "./v2";
|
||||
subPackages = [
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "natscli";
|
||||
version = "0.0.30";
|
||||
version = "0.0.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+WvJWHRQr5wYV9TG5e379trBO2Gwy0/4bAEJNwDun7s=";
|
||||
sha256 = "sha256-/bK7eQaH5VpYm0lfL43DtVxEeoo4z0Ns1ykuA0osPAs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-IHDJp+cjukX916dvffpv4Wit9kmuY101fasN+ChMxWQ=";
|
||||
vendorSha256 = "sha256-qg3fmFBHeKujNQr7WFhkdvMQeR/PCBzqTHHeNsCrrMc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "NATS Command Line Interface";
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nq";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chneukirchen";
|
||||
repo = "nq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UfCeHwOD+tG6X2obW64DYZr6j90yh1Yl7My4ur+sqmk=";
|
||||
sha256 = "sha256-g14t2Wy2GwiqnfEDiLAPGehzUgK6mLC+5PAZynez62s=";
|
||||
};
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
postPatch = ''
|
||||
|
||||
@ -1,24 +1,27 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, mmark }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "mmark";
|
||||
version = "1.3.6";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/miekg/mmark";
|
||||
version = "2.2.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "miekg";
|
||||
owner = "mmarkdown";
|
||||
repo = "mmark";
|
||||
sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9XjNTbsB4kh7YpjUnTzSXypw9r4ZyR7GALTrYebRKAg=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "sha256-uHphMy9OVnLD6IBqfMTyRlDyyTabzZC4Vn0628P+0F4=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = mmark;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A powerful markdown processor in Go geared towards the IETF";
|
||||
homepage = "https://github.com/miekg/mmark";
|
||||
homepage = "https://github.com/mmarkdown/mmark";
|
||||
license = with lib.licenses; bsd2;
|
||||
maintainers = with lib.maintainers; [ yrashk ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
12
pkgs/tools/typesetting/mmark/deps.nix
generated
12
pkgs/tools/typesetting/mmark/deps.nix
generated
@ -1,12 +0,0 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/BurntSushi/toml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/BurntSushi/toml";
|
||||
rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
|
||||
sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -1,20 +1,20 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage {
|
||||
pname = "marathonctl-unstable";
|
||||
version = "2017-03-06";
|
||||
|
||||
goPackagePath = "github.com/shoenig/marathonctl";
|
||||
subPackages = [ "." ];
|
||||
goDeps = ./deps.nix;
|
||||
buildGoModule rec {
|
||||
pname = "marathonctl";
|
||||
version = "0.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shoenig";
|
||||
repo = "marathonctl";
|
||||
rev = "0867e66551fff5d81f25959baf914a8ee11a3a8b";
|
||||
sha256 = "1fcc54hwpa8s3kz4gn26mc6nrv6zjrw869331nvm47khi23gpmxw";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MigmvOwYa0uYPexchS4MP74I1Tp6QHYuQVSOh1+FrMg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Oiol4KuPOyJq2Bfc5div+enX4kQqYn20itmwWBecuIg=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/shoenig/marathonctl";
|
||||
description = "CLI tool for Marathon";
|
||||
|
||||
12
pkgs/tools/virtualization/marathonctl/deps.nix
generated
12
pkgs/tools/virtualization/marathonctl/deps.nix
generated
@ -1,12 +0,0 @@
|
||||
# This file was generated by go2nix.
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/shoenig/config";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/shoenig/config";
|
||||
rev = "7d793e7ad7f175ef22743b1ea38acee8267788db";
|
||||
sha256 = "1dhcv1j5xk30kj73dfnx3xqx8mcvk9r8ywp9khgf2kq6wh9sm1qr";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -141,6 +141,7 @@ mapAliases ({
|
||||
|
||||
### C ###
|
||||
|
||||
c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10
|
||||
caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02
|
||||
calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13
|
||||
calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13
|
||||
|
||||
@ -4790,8 +4790,6 @@ with pkgs;
|
||||
code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; };
|
||||
code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; };
|
||||
|
||||
c14 = callPackage ../applications/networking/c14 { };
|
||||
|
||||
certstrap = callPackage ../tools/security/certstrap { };
|
||||
|
||||
cfssl = callPackage ../tools/security/cfssl { };
|
||||
@ -7740,7 +7738,7 @@ with pkgs;
|
||||
|
||||
ninka = callPackage ../development/tools/misc/ninka { };
|
||||
|
||||
nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { };
|
||||
nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
|
||||
|
||||
nodenv = callPackage ../development/tools/nodenv { };
|
||||
|
||||
@ -8683,7 +8681,7 @@ with pkgs;
|
||||
|
||||
nmap-formatter = callPackage ../tools/security/nmap-formatter { };
|
||||
|
||||
nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { };
|
||||
nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };
|
||||
|
||||
nnn = callPackage ../applications/misc/nnn { };
|
||||
|
||||
@ -12206,7 +12204,7 @@ with pkgs;
|
||||
|
||||
colm = callPackage ../development/compilers/colm { };
|
||||
|
||||
colmap = libsForQt514.callPackage ../applications/science/misc/colmap { };
|
||||
colmap = libsForQt5.callPackage ../applications/science/misc/colmap { };
|
||||
colmapWithCuda = colmap.override { cudaSupport = true; cudatoolkit = cudatoolkit_11; };
|
||||
|
||||
chickenPackages_4 = callPackage ../development/compilers/chicken/4 { };
|
||||
@ -27600,7 +27598,7 @@ with pkgs;
|
||||
|
||||
libowlevelzs = callPackage ../development/libraries/libowlevelzs { };
|
||||
|
||||
librecad = libsForQt514.callPackage ../applications/misc/librecad {
|
||||
librecad = libsForQt5.callPackage ../applications/misc/librecad {
|
||||
boost = boost175;
|
||||
};
|
||||
|
||||
@ -27881,8 +27879,7 @@ with pkgs;
|
||||
|
||||
meme-suite = callPackage ../applications/science/biology/meme-suite { };
|
||||
|
||||
# Needs qtwebkit which is broken on qt5.15
|
||||
mendeley = libsForQt514.callPackage ../applications/office/mendeley {
|
||||
mendeley = libsForQt5.callPackage ../applications/office/mendeley {
|
||||
gconf = gnome2.GConf;
|
||||
};
|
||||
|
||||
@ -28990,7 +28987,7 @@ with pkgs;
|
||||
|
||||
qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };
|
||||
|
||||
qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {
|
||||
qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {
|
||||
gdal = gdal.override {
|
||||
libgeotiff = libgeotiff.override { proj = proj_7; };
|
||||
libspatialite = libspatialite.override { proj = proj_7; };
|
||||
@ -30164,7 +30161,7 @@ with pkgs;
|
||||
|
||||
virtual-ans = callPackage ../applications/audio/virtual-ans {};
|
||||
|
||||
virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox {
|
||||
virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
|
||||
stdenv = stdenv_32bit;
|
||||
inherit (gnome2) libIDL;
|
||||
jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
@ -30447,7 +30444,7 @@ with pkgs;
|
||||
|
||||
worldengine-cli = python3Packages.worldengine;
|
||||
|
||||
wpsoffice = libsForQt514.callPackage ../applications/office/wpsoffice {};
|
||||
wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice {};
|
||||
|
||||
wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { };
|
||||
|
||||
@ -34914,7 +34911,7 @@ with pkgs;
|
||||
inherit pkgs lib stdenv;
|
||||
};
|
||||
|
||||
golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {};
|
||||
golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {};
|
||||
|
||||
linkchecker = callPackage ../tools/networking/linkchecker { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user