mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2025-01-08 14:40:07 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
5e498b046d
@ -567,15 +567,19 @@ rec {
|
||||
zipAttrsWith (n: concatLists)
|
||||
(map (module: let subtree = module.${attr}; in
|
||||
if !(builtins.isAttrs subtree) then
|
||||
throw ''
|
||||
You're trying to declare a value of type `${builtins.typeOf subtree}'
|
||||
rather than an attribute-set for the option
|
||||
throw (if attr == "config" then ''
|
||||
You're trying to define a value of type `${builtins.typeOf subtree}'
|
||||
rather than an attribute set for the option
|
||||
`${builtins.concatStringsSep "." prefix}'!
|
||||
|
||||
This usually happens if `${builtins.concatStringsSep "." prefix}' has option
|
||||
definitions inside that are not matched. Please check how to properly define
|
||||
this option by e.g. referring to `man 5 configuration.nix'!
|
||||
''
|
||||
'' else ''
|
||||
An option declaration for `${builtins.concatStringsSep "." prefix}' has type
|
||||
`${builtins.typeOf subtree}' rather than an attribute set.
|
||||
Did you mean to define this outside of `options'?
|
||||
'')
|
||||
else
|
||||
mapAttrs (n: f module) subtree
|
||||
) modules);
|
||||
|
||||
@ -189,7 +189,7 @@ checkConfigOutput '^"foo"$' config.submodule.foo ./declare-submoduleWith-special
|
||||
## shorthandOnlyDefines config behaves as expected
|
||||
checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix
|
||||
checkConfigError 'is not of type `boolean' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-noshorthand.nix
|
||||
checkConfigError "You're trying to declare a value of type \`bool'\n\s*rather than an attribute-set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
|
||||
checkConfigError "You're trying to define a value of type \`bool'\n\s*rather than an attribute set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
|
||||
checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix
|
||||
|
||||
## submoduleWith should merge all modules in one swoop
|
||||
|
||||
@ -13792,12 +13792,6 @@
|
||||
github = "ShamrockLee";
|
||||
githubId = 44064051;
|
||||
};
|
||||
shanemikel = {
|
||||
email = "shanepearlman@pm.me";
|
||||
github = "shanemikel";
|
||||
githubId = 6720672;
|
||||
name = "Shane Pearlman";
|
||||
};
|
||||
shanesveller = {
|
||||
email = "shane@sveller.dev";
|
||||
github = "shanesveller";
|
||||
|
||||
@ -156,6 +156,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name.
|
||||
|
||||
- The old unsupported version 6.x of the ELK-stack and Elastic beats have been removed. Use OpenSearch instead.
|
||||
|
||||
- The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead.
|
||||
|
||||
- Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually.
|
||||
|
||||
@ -46,6 +46,15 @@ let
|
||||
done
|
||||
'';
|
||||
|
||||
dbAddr = if cfg.database.socket == null then
|
||||
"${cfg.database.host}:${toString cfg.database.port}"
|
||||
else if cfg.database.type == "mysql" then
|
||||
"${cfg.database.host}:${cfg.database.socket}"
|
||||
else if cfg.database.type == "postgres" then
|
||||
"${cfg.database.socket}"
|
||||
else
|
||||
throw "Unsupported database type: ${cfg.database.type} for socket: ${cfg.database.socket}";
|
||||
|
||||
mediawikiConfig = pkgs.writeText "LocalSettings.php" ''
|
||||
<?php
|
||||
# Protect against web entry
|
||||
@ -87,7 +96,8 @@ let
|
||||
|
||||
## Database settings
|
||||
$wgDBtype = "${cfg.database.type}";
|
||||
$wgDBserver = "${cfg.database.host}:${if cfg.database.socket != null then cfg.database.socket else toString cfg.database.port}";
|
||||
$wgDBserver = "${dbAddr}";
|
||||
$wgDBport = "${toString cfg.database.port}";
|
||||
$wgDBname = "${cfg.database.name}";
|
||||
$wgDBuser = "${cfg.database.user}";
|
||||
${optionalString (cfg.database.passwordFile != null) "$wgDBpassword = file_get_contents(\"${cfg.database.passwordFile}\");"}
|
||||
@ -246,7 +256,8 @@ in
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 3306;
|
||||
default = if cfg.database.type == "mysql" then 3306 else 5432;
|
||||
defaultText = literalExpression "3306";
|
||||
description = lib.mdDoc "Database host port.";
|
||||
};
|
||||
|
||||
@ -286,14 +297,19 @@ in
|
||||
|
||||
socket = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = if cfg.database.createLocally then "/run/mysqld/mysqld.sock" else null;
|
||||
default = if (cfg.database.type == "mysql" && cfg.database.createLocally) then
|
||||
"/run/mysqld/mysqld.sock"
|
||||
else if (cfg.database.type == "postgres" && cfg.database.createLocally) then
|
||||
"/run/postgresql"
|
||||
else
|
||||
null;
|
||||
defaultText = literalExpression "/run/mysqld/mysqld.sock";
|
||||
description = lib.mdDoc "Path to the unix socket file to use for authentication.";
|
||||
};
|
||||
|
||||
createLocally = mkOption {
|
||||
type = types.bool;
|
||||
default = cfg.database.type == "mysql";
|
||||
default = cfg.database.type == "mysql" || cfg.database.type == "postgres";
|
||||
defaultText = literalExpression "true";
|
||||
description = lib.mdDoc ''
|
||||
Create the database and database user locally.
|
||||
@ -354,8 +370,8 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
assertions = [
|
||||
{ assertion = cfg.database.createLocally -> cfg.database.type == "mysql";
|
||||
message = "services.mediawiki.createLocally is currently only supported for database type 'mysql'";
|
||||
{ assertion = cfg.database.createLocally -> (cfg.database.type == "mysql" || cfg.database.type == "postgres");
|
||||
message = "services.mediawiki.createLocally is currently only supported for database type 'mysql' and 'postgres'";
|
||||
}
|
||||
{ assertion = cfg.database.createLocally -> cfg.database.user == user;
|
||||
message = "services.mediawiki.database.user must be set to ${user} if services.mediawiki.database.createLocally is set true";
|
||||
@ -374,15 +390,23 @@ in
|
||||
Vector = "${cfg.package}/share/mediawiki/skins/Vector";
|
||||
};
|
||||
|
||||
services.mysql = mkIf cfg.database.createLocally {
|
||||
services.mysql = mkIf (cfg.database.type == "mysql" && cfg.database.createLocally) {
|
||||
enable = true;
|
||||
package = mkDefault pkgs.mariadb;
|
||||
ensureDatabases = [ cfg.database.name ];
|
||||
ensureUsers = [
|
||||
{ name = cfg.database.user;
|
||||
ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
|
||||
}
|
||||
];
|
||||
ensureUsers = [{
|
||||
name = cfg.database.user;
|
||||
ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
|
||||
}];
|
||||
};
|
||||
|
||||
services.postgresql = mkIf (cfg.database.type == "postgres" && cfg.database.createLocally) {
|
||||
enable = true;
|
||||
ensureDatabases = [ cfg.database.name ];
|
||||
ensureUsers = [{
|
||||
name = cfg.database.user;
|
||||
ensurePermissions = { "DATABASE \"${cfg.database.name}\"" = "ALL PRIVILEGES"; };
|
||||
}];
|
||||
};
|
||||
|
||||
services.phpfpm.pools.mediawiki = {
|
||||
@ -431,7 +455,8 @@ in
|
||||
systemd.services.mediawiki-init = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
before = [ "phpfpm-mediawiki.service" ];
|
||||
after = optional cfg.database.createLocally "mysql.service";
|
||||
after = optional (cfg.database.type == "mysql" && cfg.database.createLocally) "mysql.service"
|
||||
++ optional (cfg.database.type == "postgres" && cfg.database.createLocally) "postgresql.service";
|
||||
script = ''
|
||||
if ! test -e "${stateDir}/secret.key"; then
|
||||
tr -dc A-Za-z0-9 </dev/urandom 2>/dev/null | head -c 64 > ${stateDir}/secret.key
|
||||
@ -442,7 +467,7 @@ in
|
||||
${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/install.php \
|
||||
--confpath /tmp \
|
||||
--scriptpath / \
|
||||
--dbserver ${cfg.database.host}${optionalString (cfg.database.socket != null) ":${cfg.database.socket}"} \
|
||||
--dbserver "${dbAddr}" \
|
||||
--dbport ${toString cfg.database.port} \
|
||||
--dbname ${cfg.database.name} \
|
||||
${optionalString (cfg.database.tablePrefix != null) "--dbprefix ${cfg.database.tablePrefix}"} \
|
||||
@ -464,7 +489,8 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.httpd.after = optional (cfg.database.createLocally && cfg.database.type == "mysql") "mysql.service";
|
||||
systemd.services.httpd.after = optional (cfg.database.createLocally && cfg.database.type == "mysql") "mysql.service"
|
||||
++ optional (cfg.database.createLocally && cfg.database.type == "postgres") "postgresql.service";
|
||||
|
||||
users.users.${user} = {
|
||||
group = group;
|
||||
|
||||
@ -268,14 +268,6 @@ let
|
||||
'';
|
||||
}) { inherit pkgs system; };
|
||||
in {
|
||||
ELK-6 = mkElkTest "elk-6-oss" {
|
||||
name = "elk-6-oss";
|
||||
elasticsearch = pkgs.elasticsearch6-oss;
|
||||
logstash = pkgs.logstash6-oss;
|
||||
kibana = pkgs.kibana6-oss;
|
||||
journalbeat = pkgs.journalbeat6;
|
||||
metricbeat = pkgs.metricbeat6;
|
||||
};
|
||||
# We currently only package upstream binaries.
|
||||
# Feel free to package an SSPL licensed source-based package!
|
||||
# ELK-7 = mkElkTest "elk-7-oss" {
|
||||
@ -287,13 +279,6 @@ in {
|
||||
# metricbeat = pkgs.metricbeat7;
|
||||
# };
|
||||
unfree = lib.dontRecurseIntoAttrs {
|
||||
ELK-6 = mkElkTest "elk-6" {
|
||||
elasticsearch = pkgs.elasticsearch6;
|
||||
logstash = pkgs.logstash6;
|
||||
kibana = pkgs.kibana6;
|
||||
journalbeat = pkgs.journalbeat6;
|
||||
metricbeat = pkgs.metricbeat6;
|
||||
};
|
||||
ELK-7 = mkElkTest "elk-7" {
|
||||
elasticsearch = pkgs.elasticsearch7;
|
||||
logstash = pkgs.logstash7;
|
||||
|
||||
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
|
||||
services.mongodb.enable = true;
|
||||
services.elasticsearch.enable = true;
|
||||
services.elasticsearch.package = pkgs.elasticsearch-oss;
|
||||
services.elasticsearch.extraConf = ''
|
||||
network.publish_host: 127.0.0.1
|
||||
network.bind_host: 127.0.0.1
|
||||
|
||||
@ -1,28 +1,57 @@
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
name = "mediawiki";
|
||||
meta.maintainers = [ lib.maintainers.aanderse ];
|
||||
{
|
||||
system ? builtins.currentSystem,
|
||||
config ? {},
|
||||
pkgs ? import ../.. { inherit system config; },
|
||||
}:
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
{ services.mediawiki.enable = true;
|
||||
services.mediawiki.virtualHost.hostName = "localhost";
|
||||
services.mediawiki.virtualHost.adminAddr = "root@example.com";
|
||||
services.mediawiki.passwordFile = pkgs.writeText "password" "correcthorsebatterystaple";
|
||||
services.mediawiki.extensions = {
|
||||
Matomo = pkgs.fetchzip {
|
||||
url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz";
|
||||
sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b";
|
||||
};
|
||||
ParserFunctions = null;
|
||||
let
|
||||
shared = {
|
||||
services.mediawiki.enable = true;
|
||||
services.mediawiki.virtualHost.hostName = "localhost";
|
||||
services.mediawiki.virtualHost.adminAddr = "root@example.com";
|
||||
services.mediawiki.passwordFile = pkgs.writeText "password" "correcthorsebatterystaple";
|
||||
services.mediawiki.extensions = {
|
||||
Matomo = pkgs.fetchzip {
|
||||
url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz";
|
||||
sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b";
|
||||
};
|
||||
ParserFunctions = null;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
testLib = import ../lib/testing-python.nix {
|
||||
inherit system pkgs;
|
||||
extraConfigurations = [ shared ];
|
||||
};
|
||||
in
|
||||
{
|
||||
mysql = testLib.makeTest {
|
||||
name = "mediawiki-mysql";
|
||||
nodes.machine = {
|
||||
services.mediawiki.database.type = "mysql";
|
||||
};
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
machine.wait_for_unit("phpfpm-mediawiki.service")
|
||||
machine.wait_for_unit("phpfpm-mediawiki.service")
|
||||
|
||||
page = machine.succeed("curl -fL http://localhost/")
|
||||
assert "MediaWiki has been installed" in page
|
||||
'';
|
||||
})
|
||||
page = machine.succeed("curl -fL http://localhost/")
|
||||
assert "MediaWiki has been installed" in page
|
||||
'';
|
||||
};
|
||||
|
||||
postgresql = testLib.makeTest {
|
||||
name = "mediawiki-postgres";
|
||||
nodes.machine = {
|
||||
services.mediawiki.database.type = "postgres";
|
||||
};
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
machine.wait_for_unit("phpfpm-mediawiki.service")
|
||||
|
||||
page = machine.succeed("curl -fL http://localhost/")
|
||||
assert "MediaWiki has been installed" in page
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@ -84,8 +84,6 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
services.elasticsearch.package = pkgs.elasticsearch-oss;
|
||||
|
||||
environment.systemPackages = [
|
||||
(sendEmail "dmarc@localhost")
|
||||
pkgs.jq
|
||||
@ -158,8 +156,6 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
services.elasticsearch.package = pkgs.elasticsearch-oss;
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.jq
|
||||
];
|
||||
|
||||
@ -106,6 +106,31 @@ self: let
|
||||
};
|
||||
});
|
||||
|
||||
jinx = super.jinx.overrideAttrs (old: {
|
||||
dontUnpack = false;
|
||||
|
||||
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
|
||||
pkgs.pkg-config
|
||||
];
|
||||
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ];
|
||||
|
||||
postBuild = ''
|
||||
NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE"
|
||||
$CC -shared -o jinx-mod.so jinx-mod.c -lenchant-2
|
||||
'';
|
||||
|
||||
postInstall = (old.postInstall or "") + "\n" + ''
|
||||
outd=$out/share/emacs/site-lisp/elpa/jinx-*
|
||||
install -m444 -t $outd jinx-mod.so
|
||||
rm $outd/jinx-mod.c $outd/emacs-module.h
|
||||
'';
|
||||
|
||||
meta = old.meta // {
|
||||
maintainers = [ lib.maintainers.DamienCassou ];
|
||||
};
|
||||
});
|
||||
|
||||
plz = super.plz.overrideAttrs (
|
||||
old: {
|
||||
dontUnpack = false;
|
||||
|
||||
@ -314,6 +314,33 @@ let
|
||||
|
||||
ivy-rtags = fix-rtags super.ivy-rtags;
|
||||
|
||||
jinx = super.jinx.overrideAttrs (old: {
|
||||
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
|
||||
pkgs.pkg-config
|
||||
];
|
||||
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ];
|
||||
|
||||
postBuild = ''
|
||||
pushd working/jinx
|
||||
NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE"
|
||||
$CC -shared -o jinx-mod.so jinx-mod.c -lenchant-2
|
||||
popd
|
||||
'';
|
||||
|
||||
postInstall = (old.postInstall or "") + "\n" + ''
|
||||
pushd source
|
||||
outd=$(echo $out/share/emacs/site-lisp/elpa/jinx-*)
|
||||
install -m444 --target-directory=$outd jinx-mod.so
|
||||
rm $outd/jinx-mod.c $outd/emacs-module.h
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = old.meta // {
|
||||
maintainers = [ lib.maintainers.DamienCassou ];
|
||||
};
|
||||
});
|
||||
|
||||
libgit = super.libgit.overrideAttrs(attrs: {
|
||||
nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ];
|
||||
buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ];
|
||||
@ -410,6 +437,8 @@ let
|
||||
|
||||
orgit-forge = buildWithGit super.orgit-forge;
|
||||
|
||||
ox-rss = buildWithGit super.ox-rss;
|
||||
|
||||
# upstream issue: missing file header
|
||||
mhc = super.mhc.override {
|
||||
inherit (self.melpaPackages) calfw;
|
||||
|
||||
@ -210,13 +210,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"cloudamqp": {
|
||||
"hash": "sha256-/KttKu5KDmjFhJ7Z8vVlLJjtgNQOa93Wjv2r65DZjjk=",
|
||||
"hash": "sha256-sXt0q6eKWk1BRm0GDsXKl/Rr3mro7FZkQcSIDan1df4=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
|
||||
"owner": "cloudamqp",
|
||||
"repo": "terraform-provider-cloudamqp",
|
||||
"rev": "v1.24.2",
|
||||
"rev": "v1.25.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M="
|
||||
"vendorHash": "sha256-w7Rsr3UgijW/3RMKzhMyWCvn5b1R1oqRs87/ZPO7jHs="
|
||||
},
|
||||
"cloudflare": {
|
||||
"hash": "sha256-jf2NAhiavSWsKTRIJF8Ypm7tobzvTlESKEkDRre4ZVo=",
|
||||
@ -228,11 +228,11 @@
|
||||
"vendorHash": "sha256-9YmvaKPZVu+Fi0zlmJbKcU2iw2WUdzZJzgWPfkI1C24="
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"hash": "sha256-/2MUyn5+lpIp/UeT/7hfwLKF/mXTgtlJSs/B7lzXFys=",
|
||||
"hash": "sha256-MKhsUGuDpKfYFf9Vk0uVrP/Z4hnQyO+2WiqWXO9EAC0=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry",
|
||||
"owner": "cloudfoundry-community",
|
||||
"repo": "terraform-provider-cloudfoundry",
|
||||
"rev": "v0.50.6",
|
||||
"rev": "v0.50.7",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-nBp/0HhflaoDzdHY6t42/gq3x6092ERIlNKv8ggahKE="
|
||||
},
|
||||
@ -420,11 +420,11 @@
|
||||
"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
|
||||
},
|
||||
"github": {
|
||||
"hash": "sha256-5HOGOISVozkwJU1/CRpzBOqChWEG3TTNrE5tssgWtH8=",
|
||||
"hash": "sha256-QsytXQ1bf9/OI4+XyZ+lBIuwTwAbdSOdquH1oyp6rOE=",
|
||||
"homepage": "https://registry.terraform.io/providers/integrations/github",
|
||||
"owner": "integrations",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v5.18.3",
|
||||
"rev": "v5.19.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -973,13 +973,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"scaleway": {
|
||||
"hash": "sha256-Ru3jcpnZR3guA3kGxO3iS/ZADtekTOy48kPFpv84wp8=",
|
||||
"hash": "sha256-cHleY4quCLquw4XH0TmvQ+TO0XP+ikclCvd0LASgC2w=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.14.1",
|
||||
"rev": "v2.15.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-7uatC3EI9IEgGEAaYWUNzPStGqtf+0vp8Liuru9NMZI="
|
||||
"vendorHash": "sha256-BIXxAGvF4+MjfU5X9/wNLUgzcVkiuz60EGXU/mNyqd8="
|
||||
},
|
||||
"secret": {
|
||||
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
|
||||
@ -1036,11 +1036,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"snowflake": {
|
||||
"hash": "sha256-rNKb1jmpVmId2ftuQ/+cCYyRNGmdsQj5UswRrVxlMe0=",
|
||||
"hash": "sha256-IAS0IJwWBmZi0x32ZMWFRyiiPZrnL6z1SGQ3AxuFAd8=",
|
||||
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
|
||||
"owner": "Snowflake-Labs",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.60.0",
|
||||
"rev": "v0.61.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-INAtZefgxjNpf/PWGLn8SS2PxKu3SBhY+06cEnr9V3g="
|
||||
},
|
||||
@ -1245,11 +1245,11 @@
|
||||
"vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI="
|
||||
},
|
||||
"vultr": {
|
||||
"hash": "sha256-5pI/jLG8UdMxgubvp5SJDW49C6iHKXOtlnr3EuzwtsQ=",
|
||||
"hash": "sha256-fEeKvV2t38gD5SLYAgEOJJSPjTcIhCtIYmOYMFiwcYg=",
|
||||
"homepage": "https://registry.terraform.io/providers/vultr/vultr",
|
||||
"owner": "vultr",
|
||||
"repo": "terraform-provider-vultr",
|
||||
"rev": "v2.12.1",
|
||||
"rev": "v2.13.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@ -20,9 +20,7 @@
|
||||
, pcre
|
||||
, libpthreadstubs
|
||||
, libXdmcp
|
||||
, lndir
|
||||
, unixODBC
|
||||
, fetchpatch
|
||||
|
||||
, util-linux
|
||||
, libselinux
|
||||
@ -48,7 +46,6 @@
|
||||
, baseName
|
||||
, kicadSrc
|
||||
, kicadVersion
|
||||
, withOCC
|
||||
, withNgspice
|
||||
, withScripting
|
||||
, withI18n
|
||||
@ -72,19 +69,6 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
# upstream issue 12941 (attempted to upstream, but appreciably unacceptable)
|
||||
./writable.patch
|
||||
]
|
||||
++ optionals (stable) # the 2 wxGTK ones should in the next stable point release
|
||||
[
|
||||
(fetchpatch { # for wxGTK 3.2.2.1's .1 field
|
||||
name = "support wxWidgets subrelease field";
|
||||
url = "https://gitlab.com/kicad/code/kicad/-/commit/b536580119c59fde78e38d8d6388f2540ecb6cf9.diff";
|
||||
hash = "sha256-F+J5oZO0BsT1VWKpx0KGA7ecn5/PBgCw8uiScihM+54=";
|
||||
})
|
||||
(fetchpatch { # for wxGTK 3.2.2.1's .1 field, but for wxPython
|
||||
name = "relax wxPython check to just major.minor";
|
||||
url = "https://gitlab.com/kicad/code/kicad/-/commit/1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c.diff";
|
||||
hash = "sha256-CGNgxZ7QiVLkaauNl7Pmcl152lwyDZqA/HSyFdOswwU=";
|
||||
})
|
||||
];
|
||||
|
||||
# tagged releases don't have "unknown"
|
||||
@ -97,40 +81,42 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];
|
||||
|
||||
# some ngspice tests attempt to write to $HOME/.cache/
|
||||
XDG_CACHE_HOME = "$TMP";
|
||||
# failing tests still attempt to create $HOME though
|
||||
|
||||
cmakeFlags = [
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
"-DKICAD_USE_EGL=ON"
|
||||
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" # upstream issue 12491
|
||||
"-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
|
||||
]
|
||||
++ optionals (withScripting) [
|
||||
"-DKICAD_SCRIPTING_WXPYTHON=ON"
|
||||
++ optionals (stable) [
|
||||
# https://gitlab.com/kicad/code/kicad/-/issues/12491
|
||||
# should be resolved in the next release
|
||||
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'"
|
||||
]
|
||||
++ optionals (!stable) [ # workaround for https://gitlab.com/kicad/code/kicad/-/issues/14346
|
||||
"-DPYTHON_SITE_PACKAGE_PATH=${placeholder "out"}/${python.sitePackages}/"
|
||||
]
|
||||
++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF"
|
||||
++ optionals (!withScripting) [
|
||||
"-DKICAD_SCRIPTING_WXPYTHON=OFF"
|
||||
]
|
||||
++ optional (!withNgspice) "-DKICAD_SPICE=OFF"
|
||||
++ optional (!withOCC) "-DKICAD_USE_OCC=OFF"
|
||||
++ optionals (withOCC) [
|
||||
"-DKICAD_USE_OCC=ON"
|
||||
"-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
|
||||
++ optionals (withI18n) [
|
||||
"-DKICAD_BUILD_I18N=ON"
|
||||
]
|
||||
++ optionals (!doInstallCheck) [
|
||||
"-DKICAD_BUILD_QA_TESTS=OFF"
|
||||
]
|
||||
++ optionals (debug) [
|
||||
"-DCMAKE_BUILD_TYPE=Debug"
|
||||
"-DKICAD_STDLIB_DEBUG=ON"
|
||||
"-DKICAD_USE_VALGRIND=ON"
|
||||
]
|
||||
++ optionals (!doInstallCheck) [
|
||||
"-DKICAD_BUILD_QA_TESTS=OFF"
|
||||
]
|
||||
++ optionals (sanitizeAddress) [
|
||||
"-DKICAD_SANITIZE_ADDRESS=ON"
|
||||
]
|
||||
++ optionals (sanitizeThreads) [
|
||||
"-DKICAD_SANITIZE_THREADS=ON"
|
||||
]
|
||||
++ optionals (withI18n) [
|
||||
"-DKICAD_BUILD_I18N=ON"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -138,7 +124,6 @@ stdenv.mkDerivation rec {
|
||||
doxygen
|
||||
graphviz
|
||||
pkg-config
|
||||
lndir
|
||||
]
|
||||
# wanted by configuration on linux, doesn't seem to affect performance
|
||||
# no effect on closure size
|
||||
@ -177,10 +162,10 @@ stdenv.mkDerivation rec {
|
||||
python
|
||||
unixODBC
|
||||
libdeflate
|
||||
opencascade-occt
|
||||
]
|
||||
++ optional (withScripting) wxPython
|
||||
++ optional (withNgspice) libngspice
|
||||
++ optional (withOCC) opencascade-occt
|
||||
++ optional (debug) valgrind;
|
||||
|
||||
# debug builds fail all but the python test
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
|
||||
, pname ? "kicad"
|
||||
, stable ? true
|
||||
, withOCC ? true
|
||||
, withNgspice ? !stdenv.isDarwin
|
||||
, libngspice
|
||||
, withScripting ? true
|
||||
@ -117,7 +116,7 @@ stdenv.mkDerivation rec {
|
||||
inherit stable baseName;
|
||||
inherit kicadSrc kicadVersion;
|
||||
inherit wxGTK python wxPython;
|
||||
inherit withOCC withNgspice withScripting withI18n;
|
||||
inherit withNgspice withScripting withI18n;
|
||||
inherit debug sanitizeAddress sanitizeThreads;
|
||||
};
|
||||
|
||||
@ -131,7 +130,7 @@ stdenv.mkDerivation rec {
|
||||
dontFixup = true;
|
||||
|
||||
pythonPath = optionals (withScripting)
|
||||
[ wxPython python.pkgs.six ];
|
||||
[ wxPython python.pkgs.six python.pkgs.requests ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ optionals (withScripting)
|
||||
|
||||
@ -3,45 +3,45 @@
|
||||
{
|
||||
"kicad" = {
|
||||
kicadVersion = {
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
src = {
|
||||
rev = "da2b9df05c3ccd5ec104cf8cd8ded34f5dd25216";
|
||||
sha256 = "1zgpj1rvf97qv36hg4dja46pbzyixlh2g04wlh7cizcrs16b9mzw";
|
||||
rev = "3b83917a115be1ce2f33a73039f59f8784b5c2e7";
|
||||
sha256 = "021safxvyq9qzs08jy3jvpazmhvix4kyl05s9y9hwmyzdmdl2smn";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
libSources = {
|
||||
symbols.rev = "08a25991d07924b263cbf87c6e513feac2b2169f";
|
||||
symbols.sha256 = "1r87xr1453dpfglkg1m4p5d7kcv9gxls1anwk3vp2yppnwz24ydm";
|
||||
symbols.rev = "adfe3c06b5750d81580ed44e669b578f49c205eb";
|
||||
symbols.sha256 = "14c5gci13m30xv0cmic5jxsmfx9lq3fnd8hyq3mmgkrw7443zy30";
|
||||
templates.rev = "66d76556d9e81f8a5be74457686d211c666ed200";
|
||||
templates.sha256 = "02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv";
|
||||
footprints.rev = "a0388d07e4a37e8db13a716efb3ad4750c839f9c";
|
||||
footprints.sha256 = "1akhifnjm8jvqsvscn2rr1wpzrls73bpdc6sk40355r1in2djmry";
|
||||
packages3d.rev = "bbee2295519bcf469d97f5e06bcf7175cddd2037";
|
||||
packages3d.sha256 = "1qw5xm0wbhv6gqvd8mn0jp4abjbizrkx79r6y8f6911mkzi47r6n";
|
||||
footprints.rev = "1cf5a1d979cffebd62464c1bb0d7b09c5ee3b8c3";
|
||||
footprints.sha256 = "0k0z40wmaq665hjxb6kp1yl3v7clxz49r6ki0chyphsxv1cnixmy";
|
||||
packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33";
|
||||
packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v";
|
||||
};
|
||||
};
|
||||
};
|
||||
"kicad-unstable" = {
|
||||
kicadVersion = {
|
||||
version = "2023-02-14";
|
||||
version = "2023-03-29";
|
||||
src = {
|
||||
rev = "29c4482bc898f627cebcd5f64e063e8a813a5445";
|
||||
sha256 = "1hs1p79skmrn2k7qrpnkynzkk2g8ry20lqivzfqg87c56rd1522y";
|
||||
rev = "d5bc223ff2cd1fbf4e923e23b5bb442bb54faa95";
|
||||
sha256 = "0pbzmv9vh4bzhsxj46gjkgh7kk6a0v8gijvkmb56fy5i8xv2ixkn";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "2023-02-14";
|
||||
version = "2023-03-29";
|
||||
libSources = {
|
||||
symbols.rev = "3ad8b98287ddf528ce8ff07bbe70aed85cb4410a";
|
||||
symbols.sha256 = "1p0wa3bhw2qgdvb5vzwvrbhkb6sqpc93d754rbcs2xh79d75l9nn";
|
||||
symbols.rev = "36fc1c88921bf32ebf667e027dfe63cca649fd95";
|
||||
symbols.sha256 = "177mqvjf3knldnl7pf1abv4pmlgi5cg02ggfwbc655jq4x6x8fkz";
|
||||
templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a";
|
||||
templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
|
||||
footprints.rev = "a168dd18ea63c2df948c2de3026dc19730cb70cf";
|
||||
footprints.sha256 = "0y3cl9fcyi8z4yrn0kfgfy28gn9ngrdvnpgbpwykbbp8fpx401nk";
|
||||
packages3d.rev = "a0919e5e805157bccd65af313806de3833c1673e";
|
||||
packages3d.sha256 = "1yizw9g3skz7i9x9iwbnn3gk3lnh10krf6xg32plb2plxfynz3cw";
|
||||
footprints.rev = "dc4574eb65136d95a7775d09412d5159f8d7832c";
|
||||
footprints.sha256 = "1iz4wyiysdii378c3pjgkgwh1cssxbh5jkbhvj7rmi2vmgngl6nc";
|
||||
packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33";
|
||||
packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -8,10 +8,12 @@ mkCoqDerivation rec {
|
||||
useDune = true;
|
||||
|
||||
release."0.1.6.1+8.16".sha256 = "sha256-aX8/pN4fVYaF7ZEPYfvYpEZLiQM++ZG1fAhiLftQ9Aw=";
|
||||
release."0.1.6.1+8.17".sha256 = "sha256-je+OlKM7x3vYB36sl406GREAWB4ePmC0ewHS6rCmWfk=";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = isEq "8.16"; out = "0.1.6.1+8.16"; }
|
||||
{ case = isEq "8.17"; out = "0.1.6.1+8.17"; }
|
||||
] null;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@ -30,7 +32,7 @@ mkCoqDerivation rec {
|
||||
description = "Language Server Protocol and VS Code Extension for Coq";
|
||||
homepage = "https://github.com/ejgallego/coq-lsp";
|
||||
changelog = "https://github.com/ejgallego/coq-lsp/blob/${defaultVersion}/CHANGES.md";
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
maintainers = with maintainers; [ alizter marsam ];
|
||||
license = licenses.lgpl21Only;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
let
|
||||
release = {
|
||||
"8.17.0+0.17.0".sha256 = "sha256-I81qvaXpJfXcbFw8vyzYLzlnhPg1QD0lTqAFXhoZ0rI=";
|
||||
"8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc=";
|
||||
"8.15.0+0.15.0".sha256 = "1vh99ya2dq6a8xl2jrilgs0rpj4j227qx8zvzd2v5xylx0p4bbrp";
|
||||
"8.14.0+0.14.0".sha256 = "1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d";
|
||||
@ -12,12 +13,13 @@ let
|
||||
};
|
||||
in
|
||||
|
||||
(with lib; mkCoqDerivation rec {
|
||||
(with lib; mkCoqDerivation {
|
||||
pname = "serapi";
|
||||
inherit version release;
|
||||
|
||||
defaultVersion = with versions;
|
||||
lib.switch coq.version [
|
||||
{ case = isEq "8.17"; out = "8.17.0+0.17.0"; }
|
||||
{ case = isEq "8.16"; out = "8.16.0+0.16.3"; }
|
||||
{ case = isEq "8.15"; out = "8.15.0+0.15.0"; }
|
||||
{ case = isEq "8.14"; out = "8.14.0+0.14.0"; }
|
||||
@ -39,6 +41,7 @@ in
|
||||
ppx_deriving_yojson
|
||||
ppx_import
|
||||
ppx_sexp_conv
|
||||
ppx_hash
|
||||
sexplib
|
||||
yojson
|
||||
zarith # needed because of Coq
|
||||
@ -54,7 +57,7 @@ in
|
||||
homepage = "https://github.com/ejgallego/coq-serapi";
|
||||
description = "SerAPI is a library for machine-to-machine interaction with the Coq proof assistant";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = [ maintainers.Zimmi48 ];
|
||||
maintainers = with maintainers; [ alizter Zimmi48 ];
|
||||
};
|
||||
}).overrideAttrs(o:
|
||||
let inherit (o) version; in {
|
||||
|
||||
@ -170,19 +170,19 @@ let
|
||||
ln -s ${extraInit} $out/lib/php.ini
|
||||
|
||||
if test -e $out/bin/php; then
|
||||
wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib
|
||||
wrapProgram $out/bin/php --set-default PHP_INI_SCAN_DIR $out/lib
|
||||
fi
|
||||
|
||||
if test -e $out/bin/php-fpm; then
|
||||
wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib
|
||||
wrapProgram $out/bin/php-fpm --set-default PHP_INI_SCAN_DIR $out/lib
|
||||
fi
|
||||
|
||||
if test -e $out/bin/phpdbg; then
|
||||
wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib
|
||||
wrapProgram $out/bin/phpdbg --set-default PHP_INI_SCAN_DIR $out/lib
|
||||
fi
|
||||
|
||||
if test -e $out/bin/php-cgi; then
|
||||
wrapProgram $out/bin/php-cgi --set PHP_INI_SCAN_DIR $out/lib
|
||||
wrapProgram $out/bin/php-cgi --set-default PHP_INI_SCAN_DIR $out/lib
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
26
pkgs/development/ocaml-modules/algaeff/default.nix
Normal file
26
pkgs/development/ocaml-modules/algaeff/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, buildDunePackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "algaeff";
|
||||
version = "0.2.1";
|
||||
|
||||
minimalOCamlVersion = "5.0";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RedPRL";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-jpnJhF+LN2ef6QPLcCHxcMg3Fr3GSLOnJkZ9ZUIOrlY=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Reusable Effects-Based Components";
|
||||
homepage = "https://github.com/RedPRL/algaeff";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
@ -2,15 +2,16 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "bwd";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RedPRL";
|
||||
repo = "ocaml-bwd";
|
||||
rev = version;
|
||||
sha256 = "sha256:0zgi8an53z6wr6nzz0zlmhx19zhqy1w2vfy1sq3sikjwh74jjq60";
|
||||
hash = "sha256-ucXOBjD1behL2h8CZv64xtRjCPkajZic7G1oxxDmEXY=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -49,6 +49,8 @@ let
|
||||
sha256 = "sha256:1xb754fha4s0bgjfqjxzqljvalmkfdwdn5y4ycsp51wiah235bsy";
|
||||
};
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ bwd ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-jsonm";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz";
|
||||
sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w";
|
||||
hash = "sha256-6ikjn+tAUyAd8+Hm0nws4SOIKsRljhyL6plYvhGKe9Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
|
||||
@ -1,24 +1,41 @@
|
||||
{ lib, fetchFromGitHub, buildDunePackage, qcheck-alcotest }:
|
||||
{ lib, ocaml, fetchFromGitHub, buildDunePackage
|
||||
, algaeff, bwd
|
||||
, qcheck-alcotest
|
||||
}:
|
||||
|
||||
let params = if lib.versionAtLeast ocaml.version "5.0" then {
|
||||
version = "4.0.0";
|
||||
hash = "sha256-yNLN5bBe4aft9Rl5VHmlOYTlnCdR2NgDWsc3uJHaZy4=";
|
||||
propagatedBuildInputs = [ algaeff bwd ];
|
||||
} else {
|
||||
version = "2.0.0";
|
||||
hash = "sha256:1nhz44cyipy922anzml856532m73nn0g7iwkg79yzhq6yb87109w";
|
||||
}
|
||||
; in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "yuujinchou";
|
||||
version = "2.0.0";
|
||||
inherit (params) version;
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RedPRL";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256:1nhz44cyipy922anzml856532m73nn0g7iwkg79yzhq6yb87109w";
|
||||
inherit (params) hash;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = params.propagatedBuildInputs or [];
|
||||
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ qcheck-alcotest ];
|
||||
|
||||
meta = {
|
||||
description = "Name pattern combinators";
|
||||
inherit (src.meta) homepage;
|
||||
homepage = "https://github.com/RedPRL/yuujinchou";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiocoap";
|
||||
version = "0.4.5";
|
||||
version = "0.4.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "chrysn";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-t2yfWWfkJmOr14XdLsIV48HMgVRaEnUO4IG2jQHbKWA=";
|
||||
hash = "sha256-4iwoPfmIwk+PlWUp60aqA5qZgzyj34pnZHf9uH5UhnY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-doctor";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hbHQbYc/cOqbeubAMa0J+UtI00jtyG/WUBe0xcSaGSI=";
|
||||
hash = "sha256-rhXhz6aUQ9hw83cfHmOLXMyyLQc7pSCGgurFhuglKjU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-detect-secrets";
|
||||
version = "1.4.14";
|
||||
version = "1.4.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "bridgecrewio";
|
||||
repo = "detect-secrets";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-WgUbVpn5KoayiWv3sYp+hZxqfQg73k0pXkxgUK8wrPg=";
|
||||
hash = "sha256-zTRrWgbuSRK1zRurv3a2G1gZ6LCzmVQh8eFFa3g6eSE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,9 +6,10 @@
|
||||
, jsonschema
|
||||
, lxml
|
||||
, packageurl-python
|
||||
, py-serializable
|
||||
, pythonRelaxDepsHook
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pythonOlder
|
||||
, requirements-parser
|
||||
, sortedcontainers
|
||||
@ -21,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclonedx-python-lib";
|
||||
version = "3.1.5";
|
||||
version = "4.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -30,11 +31,12 @@ buildPythonPackage rec {
|
||||
owner = "CycloneDX";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4lA8OdmvQD94jTeDf+Iz7ZyEQ9fZzCxnXQG9Ir8FKhk=";
|
||||
hash = "sha256-xXtUEunPYiuVh+1o4xoFutGstZ918ju5xK5zLvgbLHc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -44,6 +46,7 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
sortedcontainers
|
||||
toml
|
||||
py-serializable
|
||||
types-setuptools
|
||||
types-toml
|
||||
];
|
||||
@ -60,6 +63,10 @@ buildPythonPackage rec {
|
||||
"cyclonedx"
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"py-serializable"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH}
|
||||
'';
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-logging";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-OsQeBJMvq/NOC6T7N4jyrsKzcazOAn838CDjfDq7dZA=";
|
||||
hash = "sha256-zTVOt3175ruIHatHTemOAt9VF4pvJn/fQIvm/DXXw9M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,14 +5,15 @@
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, pdm-pep517
|
||||
, jsonschema
|
||||
, pdm-backend
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "0.25.5";
|
||||
version = "0.26.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0+n5v93ERcQDKNtXxSZYfCUMTRzcbtQEXl023KSxfrE=";
|
||||
hash = "sha256-p5JYBVvKvqKdYIYFh8ZiEgepJips9jg/6ao5yZ/fbcs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -32,7 +33,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pdm-pep517
|
||||
pdm-backend
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -43,6 +44,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
jsonschema
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
38
pkgs/development/python-modules/jiwer/default.nix
Normal file
38
pkgs/development/python-modules/jiwer/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, rapidfuzz
|
||||
, click
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jiwer";
|
||||
version = "3.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jitsi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bH5TE6mcSG+WqvjW8Sd/o5bCBJmv9zurFEG2cVY/vYQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
rapidfuzz
|
||||
click
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "jiwer" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "JiWER is a simple and fast python package to evaluate an automatic speech recognition system";
|
||||
homepage = "https://github.com/jitsi/jiwer";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
@ -3,13 +3,14 @@
|
||||
, camel-converter
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meilisearch";
|
||||
version = "0.25.0";
|
||||
format = "setuptools";
|
||||
version = "0.26.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -17,9 +18,13 @@ buildPythonPackage rec {
|
||||
owner = "meilisearch";
|
||||
repo = "meilisearch-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tN6rjUozN+VqUAm4vHN3RDQoNmkPE49pSUl+zuei9lc=";
|
||||
hash = "sha256-DhArrKIA9S/huO3QRjZNZ2xOpHybZgj6tIBKfRX6ZYg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
camel-converter
|
||||
requests
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocstrings-python";
|
||||
version = "0.8.3";
|
||||
version = "0.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = "python";
|
||||
rev = version;
|
||||
hash = "sha256-JGk6oJQ6mcLtn7SDtltsLPT+CxPZNRbq8bnY9pMcXHc=";
|
||||
hash = "sha256-PM6J21yT5paukDB8uJkcIyy+miYwN4+gk8Ej1xI8Q1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msgspec";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "jcrist";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Sq0hV5ZftUCIR/6QOWvdfzg8UHYLZXo5ba5ydTnjqPg=";
|
||||
hash = "sha256-adjLXMHJx9sP5qbg9sw+fV2h843KuG1NKqNyX3gEkVY=";
|
||||
};
|
||||
|
||||
# Requires libasan to be accessible
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "13.4.14";
|
||||
version = "15.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BTRv/vzOo5/Ak8J0wnVMxUbeYmPHAZfsISQ6eMkhHeU=";
|
||||
hash = "sha256-UH9QlfOzMGxoLgsoVr/+OqI53YGDMXfilW9sIM3EsD8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.13.6";
|
||||
version = "8.13.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+L2Sl1unRjt4KK4vleEDe34KuPAj6ej/t8Vg/X9dZtc=";
|
||||
hash = "sha256-JTuw4BJQ0hoR8rQrPm4WG39ssqxEDi4qlcHacdIh7ho=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, pythonOlder
|
||||
, substituteAll
|
||||
@ -48,6 +49,11 @@ let
|
||||
libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
libc = "${stdenv.cc.libc}/lib/libc.so.6";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "cython-3.0.0b1-compat.patch";
|
||||
url = "https://github.com/psycopg/psycopg/commit/573446a14312f36257ed9dcfb8eb2756b69d5d9b.patch";
|
||||
hash = "sha256-NWItarNb/Yyfj1avb/SXTkinVGxvWUGH8y6tR/zhVmE=";
|
||||
})
|
||||
];
|
||||
|
||||
baseMeta = {
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gvm";
|
||||
version = "23.2.0";
|
||||
version = "23.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6EmmiJjadC6zJM4+HhL8w2Xw1p7pG5LI0TS53bH61Tc=";
|
||||
hash = "sha256-qpPoE5QSm6JwBG3842gjxGeSd87yY2/T/HFi4k8U/qY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rapidfuzz";
|
||||
version = "2.13.7";
|
||||
version = "2.14.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "maxbachmann";
|
||||
repo = "RapidFuzz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZovXYOoLriAmJHptolD135qCn7XHeVvzLJNzI08mqwY=";
|
||||
hash = "sha256-qZfVr1V7YBuMoFiMwRoEVosof6kCSiIb944gXzPn4P0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "shtab";
|
||||
version = "1.5.8";
|
||||
version = "1.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FVV8AKe3PG387jarWYbXWxwVUAX6sM89KM8MuOr5cRw=";
|
||||
hash = "sha256-CR6fUDLjwUu2pD/1crUDPjU22evybUAfBA/YF/zf1mk=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
29
pkgs/development/tools/cdecrypt/default.nix
Normal file
29
pkgs/development/tools/cdecrypt/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cdecrypt";
|
||||
version = "4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VitaSmith";
|
||||
repo = "cdecrypt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PyT60RDyp1/Co/7WHC0+KrsnrDeTJ605x1pt4OmlGYg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 cdecrypt $out/bin/cdecrypt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility that decrypts Wii U NUS content files";
|
||||
homepage = "https://github.com/VitaSmith/cdecrypt";
|
||||
changelog = "https://github.com/VitaSmith/cdecrypt/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ hughobrien ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "skopeo";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "containers";
|
||||
repo = "skopeo";
|
||||
hash = "sha256-wTOcluPSguF6ZnKHlLelM5R2dIF9nd66qu7u/48uNyU=";
|
||||
hash = "sha256-+FYq6Far8zFlIsaPtt/1mvfjMHb0gc4rat+M+aK+XW4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
@ -72,7 +72,7 @@ buildGoModule rec {
|
||||
changelog = "https://github.com/containers/skopeo/releases/tag/${src.rev}";
|
||||
description = "A command line utility for various operations on container images and image repositories";
|
||||
homepage = "https://github.com/containers/skopeo";
|
||||
maintainers = with maintainers; [ lewo ] ++ teams.podman.members;
|
||||
maintainers = with maintainers; [ lewo developer-guy ] ++ teams.podman.members;
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zsv";
|
||||
version = "0.3.5-alpha";
|
||||
version = "0.3.6-alpha";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liquidaty";
|
||||
repo = "zsv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HW/w2bJVnTELh36rUfGIzAsc6e+PTBGsAdHDz7gFAdI=";
|
||||
hash = "sha256-P4xgWmNPBmuB87jsQvoyuRFCYkD4n/mTd04ZPfaf5ZE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg, zstd }:
|
||||
{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg, zstd, commandLineArgs ? [] }:
|
||||
|
||||
let
|
||||
pname = "anki-bin";
|
||||
@ -57,7 +57,7 @@ let
|
||||
targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile krb5 ]);
|
||||
|
||||
runScript = writeShellScript "anki-wrapper.sh" ''
|
||||
exec ${unpacked}/bin/anki
|
||||
exec ${unpacked}/bin/anki ${ lib.strings.escapeShellArgs commandLineArgs }
|
||||
'';
|
||||
|
||||
extraInstallCommands = ''
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }:
|
||||
|
||||
let beat = package : extraArgs : buildGoPackage (rec {
|
||||
name = "${package}-${version}";
|
||||
version = elk6Version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vnw9clsc10cfpjf6vxvc6m507b2q17sgsl079iwqbp4v0286il7";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/elastic/beats";
|
||||
|
||||
subPackages = [ package ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Build fix for aarch64, possibly other systems, merged in beats 7.x https://github.com/elastic/beats/pull/9493
|
||||
url = "https://github.com/elastic/beats/commit/5d796571de1aa2a299393d2045dacc2efac41a04.diff";
|
||||
sha256 = "sha256:0b79fljbi5xd3h8iiv1m38ad0zhmj09f187asc0m9rxlqrz2l9r2";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.elastic.co/products/beats";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fadenb basvandijk dfithian ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
} // extraArgs);
|
||||
in rec {
|
||||
filebeat6 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";};
|
||||
heartbeat6 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";};
|
||||
metricbeat6 = beat "metricbeat" {
|
||||
meta.description = "Lightweight shipper for metrics";
|
||||
passthru.tests =
|
||||
assert metricbeat6.drvPath == nixosTests.elk.ELK-6.elkPackages.metricbeat.drvPath;
|
||||
{
|
||||
elk = nixosTests.elk.ELK-6;
|
||||
};
|
||||
};
|
||||
journalbeat6 = beat "journalbeat" {
|
||||
meta.description = ''
|
||||
Journalbeat is an open source data collector to read and forward
|
||||
journal entries from Linuxes with systemd.
|
||||
'';
|
||||
buildInputs = [ systemd.dev ];
|
||||
postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in ''
|
||||
patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -1,76 +0,0 @@
|
||||
{ elk6Version
|
||||
, enableUnfree ? true
|
||||
, lib, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, jre_headless
|
||||
, util-linux, gnugrep, coreutils
|
||||
, libxcrypt
|
||||
, autoPatchelfHook
|
||||
, zlib
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
version = elk6Version;
|
||||
pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz";
|
||||
sha256 =
|
||||
if enableUnfree
|
||||
then "1hkcgqsrnnx3zjpgar4424mxfaxrx0zbrp7n7n0dlbhphshwnkmd"
|
||||
else "1pglg60aigy31xmpfchnxcc04nd18zwc3av4m0kyp00yk5mnlyqm";
|
||||
};
|
||||
|
||||
patches = [ ./es-home-6.x.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace bin/elasticsearch-env --replace \
|
||||
"ES_CLASSPATH=\"\$ES_HOME/lib/*\"" \
|
||||
"ES_CLASSPATH=\"$out/lib/*\""
|
||||
|
||||
substituteInPlace bin/elasticsearch-cli --replace \
|
||||
"ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/*\"" \
|
||||
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ jre_headless util-linux ]
|
||||
++ optionals enableUnfree [ zlib libxcrypt ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -R bin config lib modules plugins $out
|
||||
|
||||
chmod -x $out/bin/*.*
|
||||
|
||||
wrapProgram $out/bin/elasticsearch \
|
||||
--prefix PATH : "${makeBinPath [ util-linux gnugrep coreutils ]}" \
|
||||
--set JAVA_HOME "${jre_headless}"
|
||||
|
||||
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
|
||||
'';
|
||||
|
||||
passthru = { inherit enableUnfree; };
|
||||
|
||||
meta = {
|
||||
description = "Open Source, Distributed, RESTful Search Engine";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
license = if enableUnfree then licenses.elastic else licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ apeschar basvandijk ];
|
||||
};
|
||||
} // optionalAttrs enableUnfree {
|
||||
dontPatchELF = true;
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ optional stdenv.isLinux autoPatchelfHook;
|
||||
runtimeDependencies = [ zlib ];
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
|
||||
echo "patching $exe..."
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe"
|
||||
done
|
||||
'';
|
||||
})
|
||||
@ -39,7 +39,6 @@ in
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
|
||||
sha256 =
|
||||
if version == "7.17.4" then "a4e881d86694ae70ab6b18f72ea700415971200145d33d438e57c0374d9fc16f"
|
||||
else if version == "6.8.21" then "06b1pavyggzfp4wwdql0q9nm3r7i9px9cagp4yh4nhxhnk4w5fiq"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
meta = with lib; {
|
||||
@ -56,7 +55,6 @@ in
|
||||
url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip";
|
||||
sha256 =
|
||||
if version == "7.17.3" then "1835f374230cb17193859cee22ac90e3d7a67fb41a55fd4578e840d708287a08"
|
||||
else if version == "6.8.21" then "0m80cn7vkcvk95v4pdmi6vk5ww7p01k0hj2iqb9g870vs6x2qjzv"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
meta = with lib; {
|
||||
@ -73,7 +71,6 @@ in
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
|
||||
sha256 =
|
||||
if version == "7.17.4" then "1c8175b2dac54277c1f41981fb4a784829e74e6e74268381fe0c27bc6652704b"
|
||||
else if version == "6.8.21" then "07w8s4a5gvr9lzjzf629y8rx3kvs6zd1vl07ksw1paghp42yb354"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
meta = with lib; {
|
||||
@ -90,7 +87,6 @@ in
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
|
||||
sha256 =
|
||||
if version == "7.17.4" then "702e446997bde5cb38af120a1cb4271d976fdd23444be49e53b6be3801d845a9"
|
||||
else if version == "6.8.21" then "1kdpbrasxwr3dn21zjrklp1s389rwa51fairygdwl8px9liwwfa5"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
meta = with lib; {
|
||||
@ -107,7 +103,6 @@ in
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
|
||||
sha256 =
|
||||
if version == "7.17.4" then "7d1574a585a9db0988ee248159d51f62cce5578a8c082096ef3e26efdb24aee7"
|
||||
else if version == "6.8.21" then "0v31yyhjcdlqnjw1f9kihh7z3c6d31whc57hqqd1dn579n4s9rlz"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
meta = with lib; {
|
||||
@ -124,7 +119,6 @@ in
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
|
||||
sha256 =
|
||||
if version == "7.17.4" then "cad923a662db705d40ca29698aa118e9e4cc50ae564c426a76d5acb777a4f57c"
|
||||
else if version == "6.8.21" then "0sfh1az30q4f34zxig2fz8wn9gk53fmmxyg5pbi1svn9761p5awq"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
meta = with lib; {
|
||||
@ -141,7 +135,6 @@ in
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
|
||||
sha256 =
|
||||
if version == "7.17.4" then "a50be4cea5c68ad7615f87d672ba160d027fdfde2be0578bb2dabd6384cc8108"
|
||||
else if version == "6.8.21" then "00lwj00rfdk6850gk1n86chiz2w6afpqn7jn588jdbwv41qh5mrv"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
meta = with lib; {
|
||||
@ -158,7 +151,6 @@ in
|
||||
version =
|
||||
# https://docs.search-guard.com/latest/search-guard-versions
|
||||
if esVersion == "7.17.3" then "${esVersion}-53.1.0"
|
||||
else if esVersion == "6.8.21" then "${esVersion}-25.6"
|
||||
else throw "unsupported version ${esVersion} for plugin ${pluginName}";
|
||||
src =
|
||||
if esVersion == "7.17.3" then
|
||||
@ -166,11 +158,6 @@ in
|
||||
url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip";
|
||||
sha256 = "b49b24f7b74043cb5bab93f18316ea71656a7668e61bf063ccaa7b0ee2302a31";
|
||||
}
|
||||
else if esVersion == "6.8.21" then
|
||||
fetchurl {
|
||||
url = "https://maven.search-guard.com/search-guard-release/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip";
|
||||
sha256 = "19nj513wigwd0mzq747zax4fzvv5vi24f7j0636rydd9iv9cyhg2";
|
||||
}
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
meta = with lib; {
|
||||
homepage = "https://search-guard.com";
|
||||
|
||||
@ -43,11 +43,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xwayland";
|
||||
version = "22.1.8";
|
||||
version = "23.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-0R7u5zKQuI6o2kKn2TUN7fq6hWzkrkTljARa2eyqL3M=";
|
||||
sha256 = "sha256-+5Rh9cuf6l4H6RiCMRsMiLQ+iEOwF+usBeta9pqjTBU=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
{ elk6Version
|
||||
, enableUnfree ? true
|
||||
, lib, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, nixosTests
|
||||
, jre
|
||||
}:
|
||||
|
||||
let this = stdenv.mkDerivation rec {
|
||||
version = elk6Version;
|
||||
pname = "logstash${lib.optionalString (!enableUnfree) "-oss"}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz";
|
||||
sha256 =
|
||||
if enableUnfree
|
||||
then "0hij1byw5b3xmk3vshr9p7gxwbjrywr7ylps05ydc2dmnz8q2a79"
|
||||
else "1fa236pvhj7spys54nqi3k64rwzf6zi6gaccmqg4p4sh92jzsybv";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
dontPatchELF = true;
|
||||
dontStrip = true;
|
||||
dontPatchShebangs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
jre
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
|
||||
|
||||
patchShebangs $out/bin/logstash
|
||||
patchShebangs $out/bin/logstash-plugin
|
||||
|
||||
wrapProgram $out/bin/logstash \
|
||||
--set JAVA_HOME "${jre}"
|
||||
|
||||
wrapProgram $out/bin/logstash-plugin \
|
||||
--set JAVA_HOME "${jre}"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A data pipeline that helps you process logs and other event data from a variety of systems";
|
||||
homepage = "https://www.elastic.co/products/logstash";
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # source bundles dependencies as jars
|
||||
binaryNativeCode # bundled jruby includes native code
|
||||
];
|
||||
license = if enableUnfree then licenses.elastic else licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ wjlroe offline basvandijk ];
|
||||
};
|
||||
passthru.tests =
|
||||
lib.optionalAttrs (!enableUnfree) (
|
||||
assert this.drvPath == nixosTests.elk.ELK-6.elkPackages.logstash.drvPath;
|
||||
{
|
||||
elk = nixosTests.elk.ELK-6;
|
||||
}
|
||||
);
|
||||
};
|
||||
in this
|
||||
@ -10,16 +10,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "ntfy-sh";
|
||||
version = "2.1.2";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "binwiederhier";
|
||||
repo = "ntfy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pBwlFkkXDgPhGfn2bhwuJTGQz+O0ADhPUU2Fogl98zA=";
|
||||
sha256 = "sha256-A3kL/1Q7BFGfzVn4wFrQf9VS+2rOgS4u8o1uEQI2vcw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XePJaXD83731r5CJG1PHnpU6s+443yq8mrqx7ZPU8Gs=";
|
||||
vendorSha256 = "sha256-0bmZmBYEHGIP9vd8O5rz0JyuKUu9VHeb8ErZ6VNsfxQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -32,6 +32,7 @@ buildGoModule rec {
|
||||
python3
|
||||
python3Packages.mkdocs-material
|
||||
python3Packages.mkdocs-minify
|
||||
python3Packages.mkdocs-simple-hooks
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
1035
pkgs/tools/misc/ntfy-sh/node-packages.nix
generated
1035
pkgs/tools/misc/ntfy-sh/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -2,15 +2,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vimv-rs";
|
||||
version = "1.7.7";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
crateName = "vimv";
|
||||
sha256 = "sha256-Y8xFoI/1zpaeT9jMuOME/g2vTLenhNSwGepncc1Ji+0=";
|
||||
hash = "sha256-HEWhWPLFIEo+sOz0pbvhoFRNhYh/x0ohqDs48sHgHHk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yJHOeIjbWQTxLkkVv+YALrAhP5HBZpmbPDiLd+/bWZA=";
|
||||
cargoHash = "sha256-ghO8HrHk5rjUiNbutWnrQLAd8vtVKV6pK12XZuSudSs=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Foundation ];
|
||||
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dnstwist";
|
||||
version = "20221213";
|
||||
version = "20230402";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elceef";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xYZGrlrEdot2l1SkXcT2IbeRWouaN6C+WwbBSHXhAtw=";
|
||||
hash = "sha256-WZj33QpiRo4C1p18Y/S6YQtCu7154w78HQZQsxV7QJ4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -9,19 +9,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "harmonia";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${pname}-v${version}";
|
||||
hash = "sha256-BD61xBNlHvw3gsgfU2FgNsGpqkHbGZ+qvVfBYgQ1TJY=";
|
||||
hash = "sha256-fT9CJ/WAH5ESU4Ja062U/qNWDmhEfHI1XctnFjgBJ+A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xok7LutDrrN+lg+Nj8bG/XjMytybo+DOrd7o64PXBIE=";
|
||||
cargoHash = "sha256-rcA94i7JDUBH2JrbWbEQLBMV9R1rBXnS3pNEmbOUr9c=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
pkg-config nix
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,26 +1,41 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, gotestwaf
|
||||
, testers
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gotestwaf";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wallarm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0c627bxx0mlxhc1fsd2k3x1lm5855pl215m88la662d70559z6k8";
|
||||
hash = "sha256-waYX7DMyLW0eSzpFRyiCJQdYLFGaAKSlvGYrdcRfCl4=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
# Some tests require networking as of v0.4.0
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/wallarm/gotestwaf/internal/version.Version=v${version}"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
# Rename binary
|
||||
mv $out/bin/cmd $out/bin/${pname}
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
command = "gotestwaf --version";
|
||||
package = gotestwaf;
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for API and OWASP attack simulation";
|
||||
homepage = "https://github.com/wallarm/gotestwaf";
|
||||
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://michaelrsweet.github.io/htmldoc";
|
||||
changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ shanemikel ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
longDescription = ''
|
||||
|
||||
24
pkgs/tools/typesetting/tex/gladtex/default.nix
Normal file
24
pkgs/tools/typesetting/tex/gladtex/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "gladtex";
|
||||
version = "unstable-2023-01-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "humenda";
|
||||
repo = "GladTeX";
|
||||
rev = "f84e63836622ff1325dfddc7c5649f11a795afa0";
|
||||
sha256 = "sha256-B5sNEmLO4iIJRDgcPhr9LFKV77dPJws8ITNz4R+FE08=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Embed LaTeX formulas into HTML documents as SVG images";
|
||||
homepage = "https://humenda.github.io/GladTeX";
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ alyaeanyx ];
|
||||
};
|
||||
}
|
||||
@ -411,6 +411,12 @@ mapAliases ({
|
||||
elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17
|
||||
elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09
|
||||
|
||||
elasticsearch-oss = throw "elasticsearch-oss has been removed because there is no oss version of elasticsearch anymore. Use opensearch instead."; # Added 2022-10-04
|
||||
elasticsearch6 = throw "elasticsearch6 has been removed because it reached end of life"; # Added 2022-10-04
|
||||
elasticsearch6-oss = throw "elasticsearch6-oss has been removed because it reached end of life"; # Added 2022-10-04
|
||||
elasticsearch6Plugins = throw "elasticsearch6Plugins has been removed because it reached end of life"; # Added 2022-10-04
|
||||
elasticsearch7Plugins = elasticsearchPlugins;
|
||||
|
||||
# Electron
|
||||
electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2022-01-06
|
||||
electron_4 = throw "electron_4 has been removed in favor of newer versions"; # added 2022-01-06
|
||||
@ -469,6 +475,7 @@ mapAliases ({
|
||||
ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22
|
||||
ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23";
|
||||
ffmpeg_3 = throw "ffmpeg_3 was removed from nixpkgs, because it was an outdated and insecure release"; # added 2022-01-17
|
||||
filebeat6 = throw "filebeat6 has been removed because it reached end of life"; # Added 2022-10-04
|
||||
finger_bsd = bsd-finger;
|
||||
fingerd_bsd = bsd-fingerd;
|
||||
firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25";
|
||||
@ -657,6 +664,7 @@ mapAliases ({
|
||||
haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15
|
||||
hdr-plus = throw "hdr-plus has been removed because it is unmaintained, often breaks and no longer consumed as a dependency"; # Added 2022-11-08
|
||||
heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05
|
||||
heartbeat6 = throw "heartbeat6 has been removed because it reached end of life"; # Added 2022-10-04
|
||||
heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22
|
||||
heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06
|
||||
hepmc = hepmc2; # Added 2019-08-05
|
||||
@ -727,7 +735,9 @@ mapAliases ({
|
||||
jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version"; # Added 2021-04-26
|
||||
jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28
|
||||
joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22
|
||||
journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead";
|
||||
journalbeat = throw "journalbeat7 has been removed upstream. Use filebeat with the journald input instead"; # Added 2022-10-04
|
||||
journalbeat6 = throw "journalbeat6 has been removed because it reached end of life"; # Added 2022-10-04
|
||||
journalbeat7 = throw "journalbeat7 has been removed upstream. Use filebeat with the journald input instead"; # Added 2022-10-04
|
||||
|
||||
# Julia
|
||||
julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15
|
||||
@ -952,6 +962,8 @@ mapAliases ({
|
||||
|
||||
loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
|
||||
lobster-two = google-fonts; # Added 2021-07-22
|
||||
logstash6 = throw "logstash6 has been removed because it reached end of life"; # Added 2022-10-04
|
||||
logstash6-oss = throw "logstash6 has been removed because it reached end of life"; # Added 2022-10-04
|
||||
love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15
|
||||
love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15
|
||||
love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15
|
||||
@ -990,6 +1002,7 @@ mapAliases ({
|
||||
mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
|
||||
mess = mame; # Added 2019-10-30
|
||||
metal = throw "metal has been removed due to lack of maintainers";
|
||||
metricbeat6 = throw "metricbeat6 has been removed because it reached end of life"; # Added 2022-10-04
|
||||
mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12
|
||||
midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22
|
||||
mime-types = mailcap; # Added 2022-01-21
|
||||
|
||||
@ -402,6 +402,8 @@ with pkgs;
|
||||
|
||||
cereal = callPackage ../development/libraries/cereal { };
|
||||
|
||||
cdecrypt = callPackage ../development/tools/cdecrypt { };
|
||||
|
||||
certgraph = callPackage ../tools/security/certgraph { };
|
||||
|
||||
cewl = callPackage ../tools/security/cewl { };
|
||||
@ -3779,22 +3781,16 @@ with pkgs;
|
||||
|
||||
bchunk = callPackage ../tools/cd-dvd/bchunk { };
|
||||
|
||||
inherit (callPackages ../misc/logging/beats/6.x.nix { })
|
||||
filebeat6
|
||||
heartbeat6
|
||||
metricbeat6
|
||||
journalbeat6;
|
||||
|
||||
inherit (callPackages ../misc/logging/beats/7.x.nix { })
|
||||
filebeat7
|
||||
heartbeat7
|
||||
metricbeat7
|
||||
packetbeat7;
|
||||
|
||||
filebeat = filebeat6;
|
||||
heartbeat = heartbeat6;
|
||||
metricbeat = metricbeat6;
|
||||
journalbeat = journalbeat6;
|
||||
filebeat = filebeat7;
|
||||
heartbeat = heartbeat7;
|
||||
metricbeat = metricbeat7;
|
||||
packetbeat = packetbeat7;
|
||||
|
||||
bfr = callPackage ../tools/misc/bfr { };
|
||||
|
||||
@ -4793,6 +4789,8 @@ with pkgs;
|
||||
|
||||
dblatexFull = dblatex.override { enableAllFeatures = true; };
|
||||
|
||||
gladtex = callPackage ../tools/typesetting/tex/gladtex { };
|
||||
|
||||
latexrun = callPackage ../tools/typesetting/tex/latexrun { };
|
||||
|
||||
lkproof = callPackage ../tools/typesetting/tex/lkproof { };
|
||||
@ -7158,36 +7156,17 @@ with pkgs;
|
||||
|
||||
# The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
|
||||
# When updating make sure to update all plugins or they will break!
|
||||
elk6Version = "6.8.21";
|
||||
elk7Version = "7.17.4";
|
||||
|
||||
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
|
||||
util-linux = util-linuxMinimal;
|
||||
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix {
|
||||
enableUnfree = false;
|
||||
util-linux = util-linuxMinimal;
|
||||
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix {
|
||||
util-linux = util-linuxMinimal;
|
||||
jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
elasticsearch = elasticsearch6;
|
||||
elasticsearch-oss = elasticsearch6-oss;
|
||||
elasticsearch = elasticsearch7;
|
||||
|
||||
elasticsearchPlugins = recurseIntoAttrs (
|
||||
callPackage ../servers/search/elasticsearch/plugins.nix {
|
||||
elasticsearch = elasticsearch-oss;
|
||||
}
|
||||
callPackage ../servers/search/elasticsearch/plugins.nix {}
|
||||
);
|
||||
elasticsearch6Plugins = elasticsearchPlugins.override {
|
||||
elasticsearch = elasticsearch6-oss;
|
||||
};
|
||||
elasticsearch7Plugins = elasticsearchPlugins.override {
|
||||
elasticsearch = elasticsearch7;
|
||||
};
|
||||
|
||||
elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { };
|
||||
|
||||
@ -9123,15 +9102,6 @@ with pkgs;
|
||||
|
||||
lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
|
||||
|
||||
logstash6 = callPackage ../tools/misc/logstash/6.x.nix {
|
||||
# https://www.elastic.co/support/matrix#logstash-and-jvm
|
||||
jre = jdk11_headless;
|
||||
};
|
||||
logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix {
|
||||
enableUnfree = false;
|
||||
# https://www.elastic.co/support/matrix#logstash-and-jvm
|
||||
jre = jdk11_headless;
|
||||
};
|
||||
logstash7 = callPackage ../tools/misc/logstash/7.x.nix {
|
||||
# https://www.elastic.co/support/matrix#logstash-and-jvm
|
||||
jre = jdk11_headless;
|
||||
@ -9141,7 +9111,7 @@ with pkgs;
|
||||
# https://www.elastic.co/support/matrix#logstash-and-jvm
|
||||
jre = jdk11_headless;
|
||||
};
|
||||
logstash = logstash6;
|
||||
logstash = logstash7;
|
||||
|
||||
logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { };
|
||||
|
||||
@ -30381,7 +30351,9 @@ with pkgs;
|
||||
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
|
||||
freenet = callPackage ../applications/networking/p2p/freenet { };
|
||||
freenet = callPackage ../applications/networking/p2p/freenet {
|
||||
gradle = gradle_7;
|
||||
};
|
||||
|
||||
freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };
|
||||
|
||||
|
||||
@ -18,6 +18,8 @@ let
|
||||
|
||||
alcotest-mirage = callPackage ../development/ocaml-modules/alcotest/mirage.nix {};
|
||||
|
||||
algaeff = callPackage ../development/ocaml-modules/algaeff { };
|
||||
|
||||
alsa = callPackage ../development/ocaml-modules/alsa { };
|
||||
|
||||
angstrom = callPackage ../development/ocaml-modules/angstrom { };
|
||||
|
||||
@ -2210,10 +2210,10 @@ self: super: with self; {
|
||||
cython = callPackage ../development/python-modules/Cython { };
|
||||
|
||||
cython_3 = self.cython.overridePythonAttrs (old: rec {
|
||||
version = "3.0.0a11";
|
||||
version = "3.0.0b2";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-5GckkfsxVGuau2Nnf2OOc4CF3JMhOYFwlW72+/wOFyY=";
|
||||
hash = "sha256-bEKAZWV56STBGURyR2ZLsi+v7cfezKWTqOogvdV9Z1U=";
|
||||
};
|
||||
patches = [ ];
|
||||
});
|
||||
@ -5002,6 +5002,8 @@ self: super: with self; {
|
||||
|
||||
jira = callPackage ../development/python-modules/jira { };
|
||||
|
||||
jiwer = callPackage ../development/python-modules/jiwer { };
|
||||
|
||||
jmespath = callPackage ../development/python-modules/jmespath { };
|
||||
|
||||
jmp = callPackage ../development/python-modules/jmp { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user