Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
23e36c6679
52 changed files with 771 additions and 596 deletions
|
|
@ -15215,6 +15215,12 @@
|
|||
githubId = 74881555;
|
||||
name = "Fofanov Sergey";
|
||||
};
|
||||
sitaaax = {
|
||||
email = "johannes@kle1n.com";
|
||||
github = "SitAAAx";
|
||||
githubId = 74413170;
|
||||
name = "Johannes Klein";
|
||||
};
|
||||
sivteck = {
|
||||
email = "sivaram1992@gmail.com";
|
||||
github = "sivteck";
|
||||
|
|
|
|||
|
|
@ -441,6 +441,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `pkgs.haskell-language-server` will now by default be linked dynamically to improve TemplateHaskell compatibility. To mitigate the increased closure size it will now by default only support our current default ghc (at the moment 9.0.2). Add other ghc versions via e.g. `pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }`.
|
||||
|
||||
- `pkgs.redis` is now built using the system jemalloc. This disables the experimental active defragmentation feature of redis. Users who require this feature can switch back to redis' vendored version of jemalloc by setting `services.redis.package = pkgs.redis.override { useSystemJemalloc = false; };`.
|
||||
|
||||
## Other Notable Changes {#sec-release-21.11-notable-changes}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@
|
|||
|
||||
- `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms).
|
||||
|
||||
- The `services.ananicy.extraRules` option now has the type of `listOf attrs` instead of `string`.
|
||||
|
||||
- `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides
|
||||
|
||||
- `consul` has been updated to `1.16.0`. See the [release note](https://github.com/hashicorp/consul/releases/tag/v1.16.0) for more details. Once a new Consul version has started and upgraded its data directory, it generally cannot be downgraded to the previous version.
|
||||
|
|
|
|||
|
|
@ -5,7 +5,9 @@ with lib;
|
|||
let
|
||||
cfg = config.services.ananicy;
|
||||
configFile = pkgs.writeText "ananicy.conf" (generators.toKeyValue { } cfg.settings);
|
||||
extraRules = pkgs.writeText "extraRules" cfg.extraRules;
|
||||
extraRules = pkgs.writeText "extraRules" (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.extraRules);
|
||||
extraTypes = pkgs.writeText "extraTypes" (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.extraTypes);
|
||||
extraCgroups = pkgs.writeText "extraCgroups" (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.extraCgroups);
|
||||
servicename = if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then "ananicy-cpp" else "ananicy";
|
||||
in
|
||||
{
|
||||
|
|
@ -23,6 +25,16 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
rulesProvider = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.ananicy;
|
||||
defaultText = literalExpression "pkgs.ananicy";
|
||||
example = literalExpression "pkgs.ananicy-cpp";
|
||||
description = lib.mdDoc ''
|
||||
Which package to copy default rules,types,cgroups from.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = with types; attrsOf (oneOf [ int bool str ]);
|
||||
default = { };
|
||||
|
|
@ -35,20 +47,40 @@ in
|
|||
};
|
||||
|
||||
extraRules = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
type = with types; listOf attrs;
|
||||
default = [ ];
|
||||
description = lib.mdDoc ''
|
||||
Extra rules in json format on separate lines. See:
|
||||
Rules to write in 'nixRules.rules'. See:
|
||||
<https://github.com/Nefelim4ag/Ananicy#configuration>
|
||||
<https://gitlab.com/ananicy-cpp/ananicy-cpp/#global-configuration>
|
||||
'';
|
||||
example = literalExpression ''
|
||||
'''
|
||||
{ "name": "eog", "type": "Image-View" }
|
||||
{ "name": "fdupes", "type": "BG_CPUIO" }
|
||||
'''
|
||||
example = [
|
||||
{ name = "eog"; type = "Image-Viewer"; }
|
||||
{ name = "fdupes"; type = "BG_CPUIO"; }
|
||||
];
|
||||
};
|
||||
extraTypes = mkOption {
|
||||
type = with types; listOf attrs;
|
||||
default = [ ];
|
||||
description = lib.mdDoc ''
|
||||
Types to write in 'nixTypes.types'. See:
|
||||
<https://gitlab.com/ananicy-cpp/ananicy-cpp/#types>
|
||||
'';
|
||||
|
||||
example = [
|
||||
{ type = "my_type"; nice = 19; other_parameter = "value"; }
|
||||
{ type = "compiler"; nice = 19; sched = "batch"; ioclass = "idle"; }
|
||||
];
|
||||
};
|
||||
extraCgroups = mkOption {
|
||||
type = with types; listOf attrs;
|
||||
default = [ ];
|
||||
description = lib.mdDoc ''
|
||||
Cgroups to write in 'nixCgroups.cgroups'. See:
|
||||
<https://gitlab.com/ananicy-cpp/ananicy-cpp/#cgroups>
|
||||
'';
|
||||
example = [
|
||||
{ cgroup = "cpu80"; CPUQuota = 80; }
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -59,10 +91,18 @@ in
|
|||
etc."ananicy.d".source = pkgs.runCommandLocal "ananicyfiles" { } ''
|
||||
mkdir -p $out
|
||||
# ananicy-cpp does not include rules or settings on purpose
|
||||
cp -r ${pkgs.ananicy}/etc/ananicy.d/* $out
|
||||
rm $out/ananicy.conf
|
||||
if [[ -d "${cfg.rulesProvider}/etc/ananicy.d/00-default" ]]; then
|
||||
cp -r ${cfg.rulesProvider}/etc/ananicy.d/* $out
|
||||
else
|
||||
cp -r ${cfg.rulesProvider}/* $out
|
||||
fi
|
||||
|
||||
# configured through .setings
|
||||
rm -f $out/ananicy.conf
|
||||
cp ${configFile} $out/ananicy.conf
|
||||
${optionalString (cfg.extraRules != "") "cp ${extraRules} $out/nixRules.rules"}
|
||||
${optionalString (cfg.extraRules != [ ]) "cp ${extraRules} $out/nixRules.rules"}
|
||||
${optionalString (cfg.extraTypes != [ ]) "cp ${extraTypes} $out/nixTypes.types"}
|
||||
${optionalString (cfg.extraCgroups != [ ]) "cp ${extraCgroups} $out/nixCgroups.cgroups"}
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -85,6 +125,7 @@ in
|
|||
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/blob/master/src/config.cpp#L12
|
||||
loglevel = mkOD "warn"; # default is info but its spammy
|
||||
cgroup_realtime_workaround = mkOD config.systemd.enableUnifiedCgroupHierarchy;
|
||||
log_applied_rule = mkOD false;
|
||||
} else {
|
||||
# https://github.com/Nefelim4ag/Ananicy/blob/master/ananicy.d/ananicy.conf
|
||||
check_disks_schedulers = mkOD true;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tesseract";
|
||||
version = "5.3.1";
|
||||
version = "5.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tesseract-ocr";
|
||||
repo = "tesseract";
|
||||
rev = version;
|
||||
sha256 = "sha256-Glpu6CURCL3kI8MAeXbF9OWCRjonQZvofWsv1wVWz08=";
|
||||
sha256 = "sha256-49pTs9r9ebERC0S663+h/f70s693zDseKRziafCIaTo=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery-dl";
|
||||
version = "1.25.7";
|
||||
version = "1.25.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "gallery_dl";
|
||||
sha256 = "sha256-iBv7Zh/kWY/kY01mniabGNSIp3PLiYK6IMINw51fNdk=";
|
||||
sha256 = "sha256-6q2F9zSGZp0iZoBvOUIuIEqNs97hbsbzE23XJyTZUDc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "avalanchego";
|
||||
version = "1.10.3";
|
||||
version = "1.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-i6oAh/mDug2tuPoCa1pJEBd6jVPz2CxWlX6FCowxBwU=";
|
||||
hash = "sha256-aeO1rjKYoO6KF+oe0FKIa8D3j6G01uyC79OvUg9Qpfk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kXbKxNptKFfZ2iPkd+cPZNRPIMnNCWNrJXq6itJXG44=";
|
||||
vendorHash = "sha256-Rh3S7Qy89ctsKlFz0lNNs8pZ5lHG5yB//DQzffD6eL8=";
|
||||
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -51,11 +51,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opera";
|
||||
version = "100.0.4815.21";
|
||||
version = "100.0.4815.47";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
hash = "sha256-bDCj4ZtULO1JkuAsqy2ppcWOshgGRG03qlb3KV3CtSE=";
|
||||
hash = "sha256-746imLXqxzf9zK2QEVRuWkLA6m+HHXBYZFUwTD0HEVc=";
|
||||
};
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2023.6.1";
|
||||
version = "2023.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ZqiIt5zWEfw6Edi+q5/kAh/g3W/+OPNxKf/NWOnpCqY=";
|
||||
hash = "sha256-/ELKUjo16BbPhQu1Gzj68peaAy83sGteqolR+BDIA2k=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.14.10";
|
||||
version = "1.14.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eBfguD4vugGdLj6Qs1VkJVyhXYMrpcqsdTdYEDM86cc=";
|
||||
hash = "sha256-c9JYrStbYhFWVAHHYz036k7DzKfVjy3LD4wg+GYcKkE=";
|
||||
};
|
||||
|
||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes-helm";
|
||||
version = "3.12.1";
|
||||
version = "3.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = "helm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vhBxs/EjJ+X3jT1799VqC4NF8To5N5nfcsE/Jc5mYM8=";
|
||||
sha256 = "sha256-nUkUb41UX9kCIjBrz3AMnaHZSgNoEc+lS6J8Edy6lVA=";
|
||||
};
|
||||
vendorHash = "sha256-kNdrfNcUQ6EMbYNV+ZRi+ylwbLZsVyKMdPVH/r3yhgM=";
|
||||
vendorHash = "sha256-4NsGosKFyl3T3bIndYRP0hhJQ5oj6KuSv4kYH9b83WE=";
|
||||
|
||||
subPackages = [ "cmd/helm" ];
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, check
|
||||
, flex
|
||||
|
|
@ -12,17 +11,18 @@
|
|||
, libffi
|
||||
, llvm
|
||||
, zlib
|
||||
, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.9.2";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = pname;
|
||||
repo = "nvc";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-xB2COtYgbg00rrOWTbcBocRnqF5682jUG2eS7I71Ln4=";
|
||||
hash = "sha256-WwO46x6McV18ebGFjXQ8fvqRh6ih1Wt5JTbfTxVWTi0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
|
|||
libffi
|
||||
llvm
|
||||
zlib
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
elfutils
|
||||
] ++ lib.optionals (!stdenv.isLinux) [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luau";
|
||||
version = "0.583";
|
||||
version = "0.584";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roblox";
|
||||
repo = "luau";
|
||||
rev = version;
|
||||
hash = "sha256-uyD3j5Xf5pGoqler1oi2IHuvt4xv6rFjQHJpmods4Qc=";
|
||||
hash = "sha256-yRKx+hKbi9T8O7kFnEmLYbMwhLaiWh0fHRieZzgYPSI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "clize";
|
||||
version = "5.0.0";
|
||||
version = "5.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/cFpEvAN/Movd38xaE53Y+D9EYg/SFyHeqtlVUo1D0I=";
|
||||
hash = "sha256-BH9aRHNgJxirG4VnKn4VMDOHF41agcJ13EKd+sHstRA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "diff-cover";
|
||||
version = "7.6.0";
|
||||
version = "7.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "diff_cover";
|
||||
inherit version;
|
||||
hash = "sha256-0QBzA/a/uhSSX2AvxzXKjWslTYtXMg8rSzijphhFP0A=";
|
||||
hash = "sha256-YGFM9+ciz3+xveSXr6wLUUKU4eJlNESWItrE2ilhI/s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dm-haiku";
|
||||
version = "0.0.9";
|
||||
version = "0.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmind";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-d5THbfMRrbBL/2sQ99l2yeaTI9gT+bSkcxmVdRJT5bA=";
|
||||
hash = "sha256-EZx3o6PgTeFjTwI9Ko9H39EqPSE0yLWWpsdqX6ALlo4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datacatalog";
|
||||
version = "3.13.1";
|
||||
version = "3.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-alCuqR65Xpa5RYsUMouJrmyYJ52AFWlyN/rO1Nue+ZU=";
|
||||
hash = "sha256-4+zlMv5GJCKuXTck2QmaEctu6mkZKXeiY4SgM+7RYSk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-logging";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8RVEoh6jVW9w66x7wzj/qKGXkTg07N2IU9F2uHCCOqo=";
|
||||
hash = "sha256-QhNCI5VoUN3WSHfIgELTH3hljnsGelqOPdKCNrcfPDI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hcloud";
|
||||
version = "1.24.0";
|
||||
version = "1.25.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-VqC9ckhVW4ypLnF2aKCN8yDAkflaXu7MlS5hZChWJdw=";
|
||||
hash = "sha256-xKoyRwMeyU+qQ0wXsVCTXdQatxQCc5re2Iv6KGjusuA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nitransforms";
|
||||
version = "23.0.0";
|
||||
version = "23.0.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Jzb0W3HHxkNPyPcAT2G9T8zLOfq7xQTwGA6IUO5a6KA=";
|
||||
hash = "sha256-Lty4aPzSlwRJSqCXeIVICF+gudYqto1OS4cVZyrB2nY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nsz";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicoboss";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-It815Uxxs4T9BM9EypAfPuq4Oy8rgGLpKA79m2xM8N4=";
|
||||
hash = "sha256-azmUJ3ofLdNwNeIQL/TuPYE98FZ8yXwbJx3wHCo8lw4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [pycryptodome enlighten zstandard ]
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytorch-lightning";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lightning-AI";
|
||||
repo = "pytorch-lightning";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gF0Tx/G06SwwrtIM7RPz/P+Qhmc3zgFQPsAT7qf8RtI=";
|
||||
hash = "sha256-sjRJzov7P8B0kg7+T+JKCpx6TsaOr1N3TYIeKayI0+8=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvista";
|
||||
version = "0.40.0";
|
||||
version = "0.40.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vZmZh/wD6Np/0ZxTm81Ai3zWZHrQ4qykDw/+xKBUUZg=";
|
||||
hash = "sha256-nGLguMbenfKONcY1W5S+BZ6zHmnW/Sivs2/NpDqrEck=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-rf";
|
||||
version = "0.27.1";
|
||||
version = "0.28.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = "scikit-rf";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oCdcj0rByNKIVqXoG3zJMTA5PCNlYfroV2kQUACGAuY=";
|
||||
hash = "sha256-cTvWNfIs2bAOYpXDg6ghZA4tRXlaNbUZwcaZMjCi/YY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.211.1";
|
||||
version = "0.212.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-edfNDy6LvlHlNloDTSmHCaHZFdBpBkUQG757gweqquk=";
|
||||
sha256 = "sha256-0ratY4ZR+OD7lbf0fKJXrGFKzXgp+GRDS+WsJeb7gIU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -6,30 +6,32 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "aws-sam-cli";
|
||||
version = "1.53.0";
|
||||
version = "1.90.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kIW+aGYuS+JgOMsPbeLgPSgLFNKLSqHaZ1CHpjs/IVI=";
|
||||
hash = "sha256-JXUfc37O6cTTOCTTtWE05m+GR4iDyBsmRPyXoTRxFmo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aws-lambda-builders
|
||||
aws-sam-translator
|
||||
boto3
|
||||
cfn-lint
|
||||
chevron
|
||||
click
|
||||
cookiecutter
|
||||
dateparser
|
||||
python-dateutil
|
||||
docker
|
||||
flask
|
||||
jmespath
|
||||
requests
|
||||
pyopenssl
|
||||
pyyaml
|
||||
rich
|
||||
ruamel-yaml
|
||||
serverlessrepo
|
||||
tomlkit
|
||||
watchdog
|
||||
typing-extensions
|
||||
regex
|
||||
tzlocal
|
||||
watchdog
|
||||
];
|
||||
|
||||
postFixup = if enableTelemetry then "echo aws-sam-cli TELEMETRY IS ENABLED" else ''
|
||||
|
|
@ -37,39 +39,21 @@ python3.pkgs.buildPythonApplication rec {
|
|||
wrapProgram $out/bin/sam --set SAM_CLI_TELEMETRY 0
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Click 8.1 removed `get_terminal_size`, recommending
|
||||
# `shutil.get_terminal_size` instead.
|
||||
# (https://github.com/pallets/click/pull/2130)
|
||||
./support-click-8-1.patch
|
||||
# Werkzeug >= 2.1.0 breaks the `sam local start-lambda` command because
|
||||
# aws-sam-cli uses a "WERKZEUG_RUN_MAIN" hack to suppress flask output.
|
||||
# (https://github.com/cs01/gdbgui/issues/425)
|
||||
./use_forward_compatible_log_silencing.patch
|
||||
];
|
||||
|
||||
# fix over-restrictive version bounds
|
||||
postPatch = ''
|
||||
substituteInPlace requirements/base.txt \
|
||||
--replace "aws_lambda_builders==" "aws-lambda-builders #" \
|
||||
--replace "aws-sam-translator==1.46.0" "aws-sam-translator~=1.46" \
|
||||
--replace "click~=7.1" "click~=8.1" \
|
||||
--replace "cookiecutter~=1.7.2" "cookiecutter>=1.7.2" \
|
||||
--replace "dateparser~=1.0" "dateparser>=0.7" \
|
||||
--replace "docker~=4.2.0" "docker>=4.2.0" \
|
||||
--replace "Flask~=1.1.4" "Flask~=2.0" \
|
||||
--replace "jmespath~=0.10.0" "jmespath" \
|
||||
--replace "MarkupSafe==2.0.1" "MarkupSafe #" \
|
||||
--replace "PyYAML~=5.3" "PyYAML #" \
|
||||
--replace "regex==" "regex #" \
|
||||
--replace "requests==" "requests #" \
|
||||
--replace "typing_extensions==" "typing-extensions #" \
|
||||
--replace "tzlocal==3.0" "tzlocal #" \
|
||||
--replace "tomlkit==0.7.2" "tomlkit #" \
|
||||
--replace "watchdog==" "watchdog #"
|
||||
--replace 'PyYAML>=' 'PyYAML>=5.4.1 #' \
|
||||
--replace 'aws-sam-translator==1.70.0' 'aws-sam-translator>=1.60.1' \
|
||||
--replace 'boto3>=' 'boto3>=1.26.79 #' \
|
||||
--replace 'cfn-lint~=0.77.9' 'cfn-lint~=0.73.2' \
|
||||
--replace 'docker~=6.1.0' 'docker~=6.0.1' \
|
||||
--replace 'pyopenssl~=23.2.0' 'pyopenssl~=23.1.0' \
|
||||
--replace 'ruamel_yaml~=0.17.32' 'ruamel_yaml~=0.17.21' \
|
||||
--replace 'tomlkit==0.11.8' 'tomlkit~=0.11.6' \
|
||||
--replace 'typing_extensions~=4.4.0' 'typing_extensions~=4.4' \
|
||||
--replace 'tzlocal==3.0' 'tzlocal>=3.0' \
|
||||
--replace 'watchdog==' 'watchdog>=2.1.2 #'
|
||||
'';
|
||||
|
||||
# Tests are not included in the PyPI package
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
diff --git a/samcli/commands/_utils/table_print.py b/samcli/commands/_utils/table_print.py
|
||||
index de63af29..a9d0f2fe 100644
|
||||
--- a/samcli/commands/_utils/table_print.py
|
||||
+++ b/samcli/commands/_utils/table_print.py
|
||||
@@ -7,6 +7,7 @@ from functools import wraps
|
||||
from typing import Sized
|
||||
|
||||
import click
|
||||
+import shutil
|
||||
|
||||
MIN_OFFSET = 20
|
||||
|
||||
@@ -30,7 +31,7 @@ def pprint_column_names(
|
||||
|
||||
def pprint_wrap(func):
|
||||
# Calculate terminal width, number of columns in the table
|
||||
- width, _ = click.get_terminal_size()
|
||||
+ width, _ = shutil.get_terminal_size()
|
||||
# For UX purposes, set a minimum width for the table to be usable
|
||||
# and usable_width keeps margins in mind.
|
||||
width = max(width, min_width)
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
diff --git a/samcli/local/services/base_local_service.py b/samcli/local/services/base_local_service.py
|
||||
index 7b1ab95895d1..76812f02e00a 100644
|
||||
--- a/samcli/local/services/base_local_service.py
|
||||
+++ b/samcli/local/services/base_local_service.py
|
||||
@@ -56,9 +56,11 @@ class BaseLocalService:
|
||||
|
||||
LOG.debug("Localhost server is starting up. Multi-threading = %s", multi_threaded)
|
||||
|
||||
- # This environ signifies we are running a main function for Flask. This is true, since we are using it within
|
||||
- # our cli and not on a production server.
|
||||
- os.environ["WERKZEUG_RUN_MAIN"] = "true"
|
||||
+ # Suppress flask dev server output in a forward-compatible way
|
||||
+ # Source: https://github.com/cs01/gdbgui/issues/425#issuecomment-1119836533
|
||||
+ import flask.cli
|
||||
+
|
||||
+ flask.cli.show_server_banner = lambda *args: None
|
||||
|
||||
self._app.run(threaded=multi_threaded, host=self.host, port=self.port)
|
||||
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "devbox";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetpack-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-GDOp6gmkRXwUJ0x+o1VzwCR0PZ6nmG0/FGstBhwU8OY=";
|
||||
hash = "sha256-dGBkLWF/lzE1WxC7BG52N2zJZJNL+wZGI/H+9Dy9zZk=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
# integration tests want file system access
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-HgGqCCcIv/sE51GnUTsOpblZZAfp31BpU+u4JFfYiLU=";
|
||||
vendorHash = "sha256-wsVJZEaLdx/rhVcl0LQwc7fw2H6S336kfP3eFuGd4tA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
25
pkgs/development/tools/protoc-gen-prost-crate/default.nix
Normal file
25
pkgs/development/tools/protoc-gen-prost-crate/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ fetchCrate
|
||||
, lib
|
||||
, rustPlatform
|
||||
, protobuf
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "protoc-gen-prost-crate";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MtGeU2PnVYPXb3nly2UaryjmjMz1lxcvYDjFiwf58FA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-dcKJRX/iHIWEmBD2nTMyQozxld8b7dhxxB85quPUysg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A protoc plugin that generates Cargo crates and include files for `protoc-gen-prost`";
|
||||
homepage = "https://github.com/neoeinstein/protoc-gen-prost";
|
||||
changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ felschr sitaaax ];
|
||||
};
|
||||
}
|
||||
25
pkgs/development/tools/protoc-gen-prost-serde/default.nix
Normal file
25
pkgs/development/tools/protoc-gen-prost-serde/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ fetchCrate
|
||||
, lib
|
||||
, rustPlatform
|
||||
, protobuf
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "protoc-gen-prost-serde";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-V2Z6m9y/bBwrr1mgKXKZjVg+LqTe+GalN/AeaICyE64=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-l27+Rs4TYIJXZVLj7Tjw8M5+7ivWEY0TXbLtbuzwxLw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A protoc plugin that generates serde serialization implementations for `protoc-gen-prost`";
|
||||
homepage = "https://github.com/neoeinstein/protoc-gen-prost";
|
||||
changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ felschr sitaaax ];
|
||||
};
|
||||
}
|
||||
25
pkgs/development/tools/protoc-gen-prost/default.nix
Normal file
25
pkgs/development/tools/protoc-gen-prost/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ fetchCrate
|
||||
, lib
|
||||
, rustPlatform
|
||||
, protobuf
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "protoc-gen-prost";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QTt5mSUe41r2fxrgWj1l6fHC/utMVIgMi2ySsdGyl/Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ghXcyxG9zqUOFKGvUza29OgC3XiEtesqsAsfI/lFT08=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Protocol Buffers compiler plugin powered by Prost";
|
||||
homepage = "https://github.com/neoeinstein/protoc-gen-prost";
|
||||
changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ felschr sitaaax ];
|
||||
};
|
||||
}
|
||||
25
pkgs/development/tools/protoc-gen-tonic/default.nix
Normal file
25
pkgs/development/tools/protoc-gen-tonic/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ fetchCrate
|
||||
, lib
|
||||
, rustPlatform
|
||||
, protobuf
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "protoc-gen-tonic";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jgU1XvUxIrZ72dLNPqDGHCONMlHsjW4k4vkO626iqxs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-FrkvL/uJitMkSyOytVSmlwr26yMVM12S2n+EaSw11CE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A protoc plugin that generates Tonic gRPC server and client code using the Prost code generation engine";
|
||||
homepage = "https://github.com/neoeinstein/protoc-gen-prost";
|
||||
changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ felschr sitaaax ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,18 +5,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-insta";
|
||||
version = "1.30.0";
|
||||
version = "1.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = "insta";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Gh0RdWCYIYhur+nuHx68B2LllInx5Lx+5GeooWkB4dc=";
|
||||
hash = "sha256-hQaVUBw8X60DW1Ox4GzO+OCWMHmVYuCkjH5x/sMULiE=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/cargo-insta";
|
||||
|
||||
cargoHash = "sha256-bV8LzYIQuSDg8ZETzF28PTuonvI+2QsPn7uTF8kn4fA=";
|
||||
cargoHash = "sha256-q6Ups4SDGjT5Zc9ujhRpRdh3uWq99lizgA7gpPVSl+A=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Cargo subcommand for snapshot testing";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stylua";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnnymorganz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BrXdULBwsdfjtG/r/V7SEDvT7k7lgUc0s1187/EdGP4=";
|
||||
sha256 = "sha256-R/GFAbaR/f3kO1n4jQyCPOkfG9fRubnuQy0VUg0NqKw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-v4Ip1jgq0YhYkdxkcdYDCBgN81bmstC0M89UkirudAQ=";
|
||||
cargoSha256 = "sha256-Ca6HNhdT5/CAI3qyzM7wBuCYYOPOHEyP+QyDia1csUo=";
|
||||
|
||||
# remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "naev";
|
||||
version = "0.10.5";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "naev";
|
||||
repo = "naev";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2jCGRZxa2N8J896YYPAN7it3uvNGYtoIH75HNqy0kEE=";
|
||||
sha256 = "sha256-nUQhpKl1aIsoJZtQGyHuwPhRBeb7nSs6+MfmTtX17mY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tome4";
|
||||
version = "1.7.5";
|
||||
version = "1.7.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2";
|
||||
sha256 = "sha256-SjZbENFcEGXiDhk4h7TAHhzOEmlpnp0bPkUzvVjISto=";
|
||||
sha256 = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw=";
|
||||
};
|
||||
|
||||
desktop = makeDesktopItem {
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "4.7.6-patch1";
|
||||
version = "4.7.8-patch1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
hash = "sha256-+h9SD4uTWCHA9DQy6QbmBe+wJpGhJrUi9pFVlZLSITc=";
|
||||
hash = "sha256-y4mCv4bSz9hMGt/ZAAjbhF1tBy4l3r3GMi0jJr3mnVc=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
32
pkgs/misc/ananicy-rules-cachyos/default.nix
Normal file
32
pkgs/misc/ananicy-rules-cachyos/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ananicy";
|
||||
version = "unstable-2023-06-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "b2b4342d769bc3c6abc4ce77bd53d6ca06d659e5";
|
||||
sha256 = "sha256-TGX7GlfSeKu68mVM71/kdJH31gzMmhzCAqA390aEq8U=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preBuild
|
||||
mkdir -p $out
|
||||
cp -r * $out
|
||||
rm $out/README.md
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/CachyOS/ananicy-rules";
|
||||
description = "ananicy-cpp-rules for CachyOS ";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ artturin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ananicy";
|
||||
version = "unstable-2021-11-05";
|
||||
version = "unstable-2023-03-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nefelim4ag";
|
||||
repo = "ananicy";
|
||||
rev = "b8968e9b32b0e4e6a01dc2314e43de8fee9da691";
|
||||
sha256 = "sha256-tlPY81xdUpZrDYdApXooZ0Mst0n7ARVHyUrmymqg0rk=";
|
||||
rev = "1e2cc9a62ba3b6793e59da66aa0039f89e1ad49f";
|
||||
sha256 = "sha256-nHp47eYI36edka+cBMzayPHEflAzpgLx0VehhsyYpwI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -20,12 +20,6 @@ stdenv.mkDerivation rec {
|
|||
# only used for debian packaging. lets exclude it so the patch applies even when that file is changed
|
||||
excludes = [ "package.sh" ];
|
||||
})
|
||||
# https://github.com/Nefelim4ag/Ananicy/pull/439
|
||||
# fix syntax error
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Nefelim4ag/Ananicy/commit/0f8b809298ccfd88d0e2ab952d6e4131865246da.patch";
|
||||
sha256 = "sha256-PWE4F0G97gecgc9HnG7ScA78+QVc8u8aF9u74qVChX0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kernelshark";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/";
|
||||
rev = "kernelshark-v${version}";
|
||||
sha256 = "sha256-VkUah8qAlOck9245f/zngtVpHmJdx6eQXqwzLwK2xjU=";
|
||||
hash = "sha256-V25IzPDOt6V03wgIa/AJ0T8mRaGmXYuMCcvbSOKleY0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, lua, pkg-config, nixosTests
|
||||
{ lib, stdenv, fetchurl, fetchpatch, lua, jemalloc, pkg-config, nixosTests
|
||||
, tcl, which, ps, getconf
|
||||
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
|
||||
# dependency ordering is broken at the moment when building with openssl
|
||||
, tlsSupport ? !stdenv.hostPlatform.isStatic, openssl
|
||||
|
||||
# Using system jemalloc fixes cross-compilation and various setups.
|
||||
# However the experimental 'active defragmentation' feature of redis requires
|
||||
# their custom patched version of jemalloc.
|
||||
, useSystemJemalloc ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -20,19 +25,23 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/redis/redis/commit/bfe50a30edff6837897964ac3374c082b0d9e5da.patch";
|
||||
sha256 = "sha256-0GMiygbO7LbL1rnuOByOJYE2BKUSI+yy6YH781E2zBw=";
|
||||
})
|
||||
];
|
||||
] ++ lib.optional useSystemJemalloc
|
||||
# use system jemalloc
|
||||
(fetchurl {
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch";
|
||||
hash = "sha256-VPRfoSnctkkkzLrXEWQX3Lh5HmZaCXoJafyOG007KzM=";
|
||||
})
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ lua ]
|
||||
++ lib.optional useSystemJemalloc jemalloc
|
||||
++ lib.optional withSystemd systemd
|
||||
++ lib.optionals tlsSupport [ openssl ];
|
||||
# More cross-compiling fixes.
|
||||
# Note: this enables libc malloc as a temporary fix for cross-compiling.
|
||||
# Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator.
|
||||
# It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ]
|
||||
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]
|
||||
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ]
|
||||
++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]
|
||||
++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,14 +10,13 @@ let cross = if crossSystem != null
|
|||
custom-bootstrap = if bootstrapFiles != null
|
||||
then { stdenvStages = args:
|
||||
let args' = args // { bootstrapFiles = bootstrapFiles; };
|
||||
in (import "${pkgspath}/pkgs/stdenv/darwin" args').stagesDarwin;
|
||||
in (import "${pkgspath}/pkgs/stdenv/darwin" args');
|
||||
}
|
||||
else {};
|
||||
in with import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap);
|
||||
|
||||
let
|
||||
llvmPackages = llvmPackages_11;
|
||||
storePrefixLen = builtins.stringLength builtins.storeDir;
|
||||
in rec {
|
||||
coreutils_ = coreutils.override (args: {
|
||||
# We want coreutils without ACL support.
|
||||
|
|
@ -207,8 +206,6 @@ in rec {
|
|||
'';
|
||||
};
|
||||
|
||||
bootstrapLlvmVersion = llvmPackages.llvm.version;
|
||||
|
||||
bootstrapFiles = {
|
||||
tools = "${build}/pack";
|
||||
};
|
||||
|
|
@ -313,13 +310,16 @@ in rec {
|
|||
};
|
||||
|
||||
# The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it
|
||||
# TODO: uncomment once https://github.com/NixOS/nixpkgs/issues/222717 is resolved
|
||||
/*
|
||||
test-pkgs = import test-pkgspath {
|
||||
# if the bootstrap tools are for another platform, we should be testing
|
||||
# that platform.
|
||||
localSystem = if crossSystem != null then crossSystem else localSystem;
|
||||
|
||||
stdenvStages = args: let
|
||||
args' = args // { inherit bootstrapLlvmVersion bootstrapFiles; };
|
||||
in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stagesDarwin;
|
||||
args' = args // { inherit bootstrapFiles; };
|
||||
in (import (test-pkgspath + "/pkgs/stdenv/darwin") args');
|
||||
};
|
||||
*/
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vgmtools";
|
||||
version = "unstable-2023-06-29";
|
||||
version = "unstable-2023-07-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vgmrips";
|
||||
repo = "vgmtools";
|
||||
rev = "e1f3e053e390bde6bd53b81bd853a0298ccb0ab4";
|
||||
hash = "sha256-evIvW9Nk9g7R+EmaQXLmr0ecpAS5Ashditk3komBwyw=";
|
||||
rev = "1b880040e0f730f180ecd019cb06c3db717420d2";
|
||||
hash = "sha256-6JNBQGVAs49l80ITKDabPFeN3XQtIH/RGhR7vIlMNxs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mmctl";
|
||||
version = "7.10.3";
|
||||
version = "7.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattermost";
|
||||
repo = "mmctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ANoisFJnTEUgL0xKGaS19jqAHX3MT9RR4BO7hz/vm6E=";
|
||||
sha256 = "sha256-N3WvVVx4djmW6+Nh2XAgv0fJgVVp2I0I3vnUuoEUXjo=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
32
pkgs/tools/misc/url-parser/default.nix
Normal file
32
pkgs/tools/misc/url-parser/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "url-parser";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "url-parser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rOL6merwQ6CQkdsYGOpFttkJIy2EXCKMGIbAqqmYdvM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZaZlIGk44eX0ER2sdLdSvN2qdKVyEPsXjfCuJzJGspE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X" "main.BuildVersion=${version}"
|
||||
"-X" "main.BuildDate=1970-01-01"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple command-line URL parser";
|
||||
homepage = "https://github.com/thegeeklab/url-parser";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2023-06-28T21-54-17Z";
|
||||
version = "2023-07-07T05-25-51Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-Z+P3MW+q4fycyDTb0LCQw0PSsh4Lw/KhhkBOU2nbcgI=";
|
||||
sha256 = "sha256-r++4DQFqFjhTfNBRG/4qr2AeQAWKdJu8mzv6uYGovLk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZpLaZsJhRWqS7Gw8lKwqJdJpgq2Av3iGmdWjJBOGorY=";
|
||||
vendorHash = "sha256-W3FenwPwfEQxJWym6QzqMczWtygPN65Hp4gjj/karMw=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nfpm";
|
||||
version = "2.31.0";
|
||||
version = "2.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-49MhTCc+LCfw1tOvLFaagMnQITeCeG+xfH5FmF4/u/c=";
|
||||
hash = "sha256-qxxa7V96cJJLu9Ki2NL5UreRyiR9sPhIVA9cllF4y70=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eHNdtK3OZRi+oujuC4yToPdNL5GyRqNu09nRRP5cYK4=";
|
||||
vendorHash = "sha256-lVejUufXI5Ihv7hU1N8/MHrwUgIfaHmcj1MR0RTsKVU=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "doppler";
|
||||
version = "3.63.1";
|
||||
version = "3.65.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dopplerhq";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-ESh35VSxFeg8d9cu4FJZi4m1/3cb2iRkngUDrInljV4=";
|
||||
sha256 = "sha256-0OFHPF3O6uIlf6X6oo+nIalj2PVOoRXb0dV5AjRDxR4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yuGjaUHfXCJnMvxfaSwbVAApflwfsvX2W7iEZdruMDE=";
|
||||
vendorHash = "sha256-FOmaK6S61fkzybpDx6qfi6m4e2IaqBpavaFhEgIvmqw=";
|
||||
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "step-kms-plugin";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smallstep";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-b8YYLsEmbr/XP04aB5u2DMPc0hpgaYYspyWzSGuYccQ=";
|
||||
hash = "sha256-pbSv3qTQkeYWtg5HKu9kUIWYw6t6yKKA4GQuiwGEPD8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Zv70C1JkOjOrncNuox8yh2LB31gVcXxr01l+o7HRXm0=";
|
||||
vendorHash = "sha256-hb1Nn/+PVhhBByQ8I9MuUEd5di5jEZVMtSpm0+qBXQk=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -682,8 +682,16 @@ with pkgs;
|
|||
|
||||
protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { };
|
||||
|
||||
protoc-gen-prost = callPackage ../development/tools/protoc-gen-prost { };
|
||||
|
||||
protoc-gen-prost-crate = callPackage ../development/tools/protoc-gen-prost-crate { };
|
||||
|
||||
protoc-gen-prost-serde = callPackage ../development/tools/protoc-gen-prost-serde { };
|
||||
|
||||
protoc-gen-rust = callPackage ../development/tools/protoc-gen-rust { };
|
||||
|
||||
protoc-gen-tonic = callPackage ../development/tools/protoc-gen-tonic { };
|
||||
|
||||
protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { };
|
||||
|
||||
protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { };
|
||||
|
|
@ -13778,6 +13786,8 @@ with pkgs;
|
|||
|
||||
urlview = callPackage ../applications/misc/urlview { };
|
||||
|
||||
url-parser = callPackage ../tools/misc/url-parser { };
|
||||
|
||||
urn-timer = callPackage ../tools/misc/urn-timer { };
|
||||
|
||||
ursadb = callPackage ../servers/ursadb { };
|
||||
|
|
@ -28548,6 +28558,8 @@ with pkgs;
|
|||
|
||||
ananicy-cpp = callPackage ../misc/ananicy-cpp { };
|
||||
|
||||
ananicy-rules-cachyos = callPackage ../misc/ananicy-rules-cachyos { };
|
||||
|
||||
andagii = callPackage ../data/fonts/andagii { };
|
||||
|
||||
andika = callPackage ../data/fonts/andika { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue