Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
915c0fab84
36 changed files with 1807 additions and 2279 deletions
|
|
@ -9,7 +9,7 @@ let
|
|||
"--smartctl.path=\"${pkgs.smartmontools}/bin/smartctl\" "
|
||||
"--smartctl.interval=\"${cfg.maxInterval}\" "
|
||||
"${concatMapStringsSep " " (device: "--smartctl.device=${device}") cfg.devices}"
|
||||
];
|
||||
] ++ cfg.extraFlags;
|
||||
in {
|
||||
port = 9633;
|
||||
|
||||
|
|
|
|||
|
|
@ -10098,18 +10098,6 @@ final: prev:
|
|||
meta.homepage = "https://github.com/rhysd/vim-clang-format/";
|
||||
};
|
||||
|
||||
vim-clap = buildVimPluginFrom2Nix {
|
||||
pname = "vim-clap";
|
||||
version = "2023-04-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "liuchengxu";
|
||||
repo = "vim-clap";
|
||||
rev = "5a3667644ca1beada1c6add865b3f8329b4727bc";
|
||||
sha256 = "1066xdimc4vpqar95hnbwl1f2wijr3yss6z1s16k07ymvi02dgxs";
|
||||
};
|
||||
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
|
||||
};
|
||||
|
||||
vim-clojure-highlight = buildVimPluginFrom2Nix {
|
||||
pname = "vim-clojure-highlight";
|
||||
version = "2015-07-05";
|
||||
|
|
|
|||
|
|
@ -90,9 +90,7 @@
|
|||
, makeWrapper
|
||||
, procps
|
||||
|
||||
# vim-clap dependencies
|
||||
, libgit2
|
||||
, libiconv
|
||||
# sg-nvim dependencies
|
||||
, openssl
|
||||
, pkg-config
|
||||
|
||||
|
|
@ -1159,35 +1157,7 @@ self: super: {
|
|||
passthru.python3Dependencies = ps: with ps; [ beancount ];
|
||||
});
|
||||
|
||||
vim-clap = super.vim-clap.overrideAttrs (old: {
|
||||
preFixup =
|
||||
let
|
||||
maple-bin = rustPlatform.buildRustPackage {
|
||||
name = "maple";
|
||||
inherit (old) src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
curl
|
||||
libgit2
|
||||
libiconv
|
||||
];
|
||||
|
||||
cargoHash = "sha256-BFUC6fQ5LpTKx2ztCuFVzXTWzSDl03VYsmVcxBXbiT4=";
|
||||
};
|
||||
in
|
||||
''
|
||||
ln -s ${maple-bin}/bin/maple $target/bin/maple
|
||||
'';
|
||||
|
||||
meta.platforms = lib.platforms.all;
|
||||
});
|
||||
vim-clap = callPackage ./vim-clap { };
|
||||
|
||||
vim-codefmt = super.vim-codefmt.overrideAttrs (old: {
|
||||
dependencies = with self; [ vim-maktaba ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
66
pkgs/applications/editors/vim/plugins/vim-clap/default.nix
Normal file
66
pkgs/applications/editors/vim/plugins/vim-clap/default.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libgit2
|
||||
, zlib
|
||||
, stdenv
|
||||
, darwin
|
||||
, vimUtils
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liuchengxu";
|
||||
repo = "vim-clap";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Vd0T8RrpJb2aybuxIY2PaLT7bDtbkZF/N9VgbcZfPIE=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern performant fuzzy picker for Vim and NeoVim";
|
||||
homepage = "https://github.com/liuchengxu/vim-clap";
|
||||
changelog = "https://github.com/liuchengxu/vim-clap/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
maple = rustPlatform.buildRustPackage {
|
||||
pname = "maple";
|
||||
inherit version src meta;
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"subprocess-0.2.10" = "sha256-WcGrJ103ofGlQwi32kRGM3Z+uvKSCFBmFZbZXAtuWwM=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgit2
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
};
|
||||
in
|
||||
|
||||
vimUtils.buildVimPluginFrom2Nix {
|
||||
pname = "vim-clap";
|
||||
inherit version src meta;
|
||||
|
||||
postInstall = ''
|
||||
ln -s ${maple}/bin/maple $out/bin/maple
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit maple;
|
||||
};
|
||||
}
|
||||
|
|
@ -850,7 +850,6 @@ https://github.com/kristijanhusak/vim-carbon-now-sh/,,
|
|||
https://github.com/m-pilia/vim-ccls/,,
|
||||
https://github.com/t9md/vim-choosewin/,,
|
||||
https://github.com/rhysd/vim-clang-format/,,
|
||||
https://github.com/liuchengxu/vim-clap/,,
|
||||
https://github.com/guns/vim-clojure-highlight/,,
|
||||
https://github.com/guns/vim-clojure-static/,,
|
||||
https://github.com/rstacruz/vim-closer/,,
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
, icu
|
||||
, stdenv
|
||||
, openssl
|
||||
, coreutils
|
||||
}:
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
||||
version = "1.25.0";
|
||||
|
||||
version = "1.25.4";
|
||||
|
||||
vsixInfo =
|
||||
let
|
||||
|
|
@ -27,7 +27,7 @@ let
|
|||
".debugger/arm64/vsdbg"
|
||||
];
|
||||
omniSharpBins = [
|
||||
".omnisharp/1.39.0-net6.0/OmniSharp"
|
||||
".omnisharp/1.39.4-net6.0/OmniSharp"
|
||||
];
|
||||
razorBins = [
|
||||
".razor/createdump"
|
||||
|
|
@ -37,22 +37,22 @@ let
|
|||
{
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-x64.vsix";
|
||||
sha256 = "1cqqjg8q6v56b19aabs9w1kxly457mpm0akbn5mis9nd1mrdmydl";
|
||||
sha256 = "08k0wxyj8wz8npw1yqrkdpbvwbnrdnsngdkrd2p5ayn3v608ifc2";
|
||||
binaries = linuxDebuggerBins ++ omniSharpBins ++ razorBins;
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-arm64.vsix";
|
||||
sha256 = "0nsjgrb7y4w71w1gnrf50ifwbmjidi4vrw2fyfmch7lgjl8ilnhd";
|
||||
binaries = linuxDebuggerBins ++ omniSharpBins; # Linux aarch64 version has no Razor Language Server
|
||||
sha256 = "09r2d463dk35905f2c3msqzxa7ylcf0ynhbp3n6d12y3x1200pr2";
|
||||
binaries = linuxDebuggerBins ++ omniSharpBins ++ razorBins;
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-x64.vsix";
|
||||
sha256 = "01qn398vmjfi9imzlmzm0qi7y2h214wx6a8la088lfkhyj3gfjh8";
|
||||
sha256 = "0mp550kq33zwmlvrhymwnixl4has62imw3ia5z7a01q7mp0w9wpn";
|
||||
binaries = darwinX86DebuggerBins ++ omniSharpBins ++ razorBins;
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-arm64.vsix";
|
||||
sha256 = "020j451innh7jzarbv1ij57rfmqnlngdxaw6wdgp8sjkgbylr634";
|
||||
sha256 = "08406xz2raal8f10bmnkz1mwdfprsbkjxzc01v0i4sax1hr2a2yl";
|
||||
binaries = darwinAarch64DebuggerBins ++ darwinX86DebuggerBins ++ omniSharpBins ++ razorBins;
|
||||
};
|
||||
}.${system} or (throw "Unsupported system: ${system}");
|
||||
|
|
@ -89,6 +89,11 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
|
|||
-E -e 's/(this\._pipePath=[a-zA-Z0-9_]+\.join\()([a-zA-Z0-9_]+\.getExtensionPath\(\)[^,]*,)/\1require("os").tmpdir(), "'"$ext_unique_id"'"\+/g' \
|
||||
"$PWD/dist/extension.js"
|
||||
|
||||
# Fix reference to uname
|
||||
sed -i \
|
||||
-E -e 's_uname -m_${coreutils}/bin/uname -m_g' \
|
||||
"$PWD/dist/extension.js"
|
||||
|
||||
patchelf_add_icu_as_needed() {
|
||||
declare elf="''${1?}"
|
||||
declare icu_major_v="${
|
||||
|
|
|
|||
|
|
@ -18,17 +18,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0znr64f0rs513vkj7f3by2dzllxk3msic5sajc5scv9cwy3j6xld";
|
||||
x86_64-darwin = "0qqqbmmhr1r7rxij6cc4d7shyjvm3ni4cwv0xy3qikfr7v9w948a";
|
||||
aarch64-linux = "0qjrz73q0ilshhqcgk6lxzkpd617p5153nrba9islxrashsqb9bj";
|
||||
aarch64-darwin = "0cdrkn756817whr476inn5j9myhbz6dq11bli0byn829g2jh8s4h";
|
||||
armv7l-linux = "1dqw1ha69zsdhvf2n2ps0mvqbamqs90wnc6z02pzs3jz9cxxl15j";
|
||||
x86_64-linux = "0sf8kkhvz73b8q7dxy53vikgpksgdffzj9qbkd9mbx6qjv0k60yw";
|
||||
x86_64-darwin = "1223c05vinlkm6y7f9k31wlsncg3c0yz8j8ja5xilgjgq8ynr1kw";
|
||||
aarch64-linux = "013bhl630zvdxwxgjs7rzd3a254jx4axp2mavar06fwgysz83q3y";
|
||||
aarch64-darwin = "0hqjcrdy7x8pc6zvzx7rv8dp39dwpmmkri36jwxaq86zhqhf650c";
|
||||
armv7l-linux = "1vb068c2aqjihdhsrd42vy60aw4ffrqbmisajm3yz84b2hcfmjy2";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.77.1";
|
||||
version = "1.77.3";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
let
|
||||
|
||||
pname = "golden-cheetah";
|
||||
version = "3.6-RC3";
|
||||
version = "3.6-RC4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v3.6-DEV_x64.AppImage";
|
||||
hash = "sha256-Bp1IFql96tHc5ssg9nhTrFQqNtaM+5iYJguPGkguvns=";
|
||||
hash = "sha256-I5GafK/W1djSx67xrjcMyPqMSqGW9AfrcPYcGcf0Pag=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname src version; };
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -29,11 +29,11 @@ rec {
|
|||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "112.0b9";
|
||||
version = "113.0b2";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "95d17d5c7415d98b24d41b4419c76adb757f552957a69126c0031cb1c8f16a55b765f66b2e7a45531a643d5c713dea883bde4d436b82cb6661b44f113e890127";
|
||||
sha512 = "96b1ce4616c0f7337a22803fbdc86fb791c817a452fbf61eb7470a4c4b6c81a8be32d9db18ace5770a99335fb03bfbcdbf73d86257a9404c1f169d4a907ea4e3";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -56,12 +56,12 @@ rec {
|
|||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "112.0b9";
|
||||
version = "113.0b2";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "d798803dca258007d355a181263b803365a13385a1bc09bdada07336add019bd36db197cdfa3749240f563641167a9d9e5c0539e58ecd369f575a219a4064b74";
|
||||
sha512 = "634271b19a0a5369fb91a286da2c476b6570e501bb7d8b05efe22eea1ecff66a7fbf62ef21ac9dcfd863be2d63a3be117615b5c0b1b1fc8c7d746d720b3d9876";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -466,13 +466,13 @@
|
|||
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
|
||||
},
|
||||
"grafana": {
|
||||
"hash": "sha256-2Ig0ZwU9ZzsfAq5XCFMvL1NCmfnhVjoIrgl74hQypGE=",
|
||||
"hash": "sha256-7WonpFvk9jKPUGRanCmo5H6L01rDBuZN4DGjdaQaBq4=",
|
||||
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
|
||||
"owner": "grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v1.36.1",
|
||||
"rev": "v1.37.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-zPO+TbJsFrgfjSaSrX5YRop/0LDDw/grNNntaIGiBU0="
|
||||
"vendorHash": "sha256-Mv3BKYS1j5AAHbXVCP5C3OQpEmOBea2ru3ONbJ0pYyc="
|
||||
},
|
||||
"gridscale": {
|
||||
"hash": "sha256-61LZyXqb+1kWHBk1/lw5C5hmeL4aHwSSS++9/9L/tDw=",
|
||||
|
|
@ -484,13 +484,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"hcloud": {
|
||||
"hash": "sha256-FrZdypcyjF3DMWHIb4ijYfbI2VcFeZMu5QJlZt4EMSg=",
|
||||
"hash": "sha256-oFJ2+0qWWmt+lL+Nt0wEPL/G7P8YDtssnLN4K0Pjdsk=",
|
||||
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
|
||||
"owner": "hetznercloud",
|
||||
"repo": "terraform-provider-hcloud",
|
||||
"rev": "v1.37.0",
|
||||
"rev": "v1.38.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WDnaUBTf8KTCuTdjKd598azjCg4hPDzrrijRknkVV2g="
|
||||
"vendorHash": "sha256-popuZxLqK7NB2dt7xC5aP6sWyo8BsuhvVoAPZYWsSXU="
|
||||
},
|
||||
"helm": {
|
||||
"hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=",
|
||||
|
|
@ -810,11 +810,11 @@
|
|||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-r+GmKd+kOnx9xwuSORbcCamb1ea1/YZaTvyw59e0nZg=",
|
||||
"hash": "sha256-27vdHG/FRWGPZclW9Q0z/6ntY+of/5/PGIsKsePhF4k=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.115.0",
|
||||
"rev": "v4.116.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -882,11 +882,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"pagerduty": {
|
||||
"hash": "sha256-MouU1SOCHNf4krqZ3CABS1nCne3I+taHh9tbPGoSM6U=",
|
||||
"hash": "sha256-ZjqxXsLHmTbQp5QVsQN6Wj6ff7dOKceuMWsQ9SXSNPE=",
|
||||
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
|
||||
"owner": "PagerDuty",
|
||||
"repo": "terraform-provider-pagerduty",
|
||||
"rev": "v2.12.2",
|
||||
"rev": "v2.13.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -936,11 +936,11 @@
|
|||
"vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y="
|
||||
},
|
||||
"random": {
|
||||
"hash": "sha256-eZ2K8kmR5QE/ijAzlIbZl5OI7dw1P2GdQBtoXsbGglM=",
|
||||
"hash": "sha256-IsXKdS3B5kWY5LlNKM0fYjp2uM96ngi6vZ9F46MmfcA=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/random",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-random",
|
||||
"rev": "v3.5.0",
|
||||
"rev": "v3.5.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ScY/hAb14SzEGhKLpnJ8HrWOccwc2l0XW6t+f62LyWM="
|
||||
},
|
||||
|
|
@ -963,11 +963,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"scaleway": {
|
||||
"hash": "sha256-pNiDT5yV+0nnNrwLbgq68csegGyvkqnOOgm9M+WKc0Y=",
|
||||
"hash": "sha256-QIrIL0vqiZafggdfWchlSOzLRDCF5Zubh6MqwOzfr3Y=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.16.2",
|
||||
"rev": "v2.16.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-KUbE00fajvs4p8QxmuKV5IoRfCdWtfZTrOftcRAPSws="
|
||||
},
|
||||
|
|
|
|||
|
|
@ -38,12 +38,12 @@
|
|||
|
||||
let
|
||||
pname = "pcloud";
|
||||
version = "1.11.0";
|
||||
code = "XZspqgVZxM1CCER1we0esiDGuAxshjRSY77X";
|
||||
version = "1.12.0";
|
||||
code = "XZyc9wVZAbFzyV8ElP71D5v170CvEmVtmrB7";
|
||||
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
|
||||
src = fetchzip {
|
||||
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip";
|
||||
hash = "sha256-EXJ+5LwVF5lTXc5zlppRQLCm0EZwqG3ndfK4LIjmWwc=";
|
||||
hash = "sha256-QzBlpF+qtNdSZFv3gU0mQhpVyPTWdGH3c+UHKKGfvKc=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mafft";
|
||||
version = "7.515";
|
||||
version = "7.520";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sysimm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ssZvjOHJLsBjB48sKr1U7VrRZUIduFkme22MdVbzoNk=";
|
||||
sha256 = "sha256-H+EcKahJWwidAx+IUT4uCZEty+S8hUeMSB8VbTu5SmQ=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -10,24 +10,24 @@ with lib;
|
|||
|
||||
let
|
||||
pname = "gitkraken";
|
||||
version = "9.2.1";
|
||||
version = "9.3.0";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchzip {
|
||||
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
|
||||
sha256 = "sha256-JyfbCFh76b2ZWQ8J1xhsp8LYeFGdgJcUDgBCJWHf0Rk=";
|
||||
sha256 = "sha256-OX/taX+eYHPWTNNGfZhoiBEG8pFSnjCaTshM+z6MhDU=";
|
||||
};
|
||||
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
|
||||
sha256 = "sha256-sXWgxl+j78r/OhkMkQMQ6iUPz+SY+QDS4pvLErJTeRQ=";
|
||||
sha256 = "sha256-miUcV35HX73b5YnwMnkqYdQtxfSHJaMdMcgVVBkZs6A=";
|
||||
};
|
||||
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
|
||||
sha256 = "sha256-1IsNJMfqpi+s2bHkB6Uo6FacvuRdLpkF+ctmi5b2Lto=";
|
||||
sha256 = "sha256-yAwvuwxtGQh7/bV/7wShdCVHgZCtRCfmXrdT4dI6+cM=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
40
pkgs/data/themes/nixos-bgrt-plymouth/default.nix
Normal file
40
pkgs/data/themes/nixos-bgrt-plymouth/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nixos-bgrt-plymouth";
|
||||
version = "unstable-2023-03-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "plymouth-theme-nixos-bgrt";
|
||||
owner = "helsinki-systems";
|
||||
rev = "0771e04f13b6b908d815b506472afb1c9a2c81ae";
|
||||
hash = "sha256-aF4Ro5z4G6LS40ENwFDH8CgV7ldfhzqekuSph/DMQoo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/plymouth/themes/nixos-bgrt
|
||||
cp -r $src/{*.plymouth,images} $out/share/plymouth/themes/nixos-bgrt/
|
||||
substituteInPlace $out/share/plymouth/themes/nixos-bgrt/*.plymouth --replace '@IMAGES@' "$out/share/plymouth/themes/nixos-bgrt/images"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "BGRT theme with a spinning NixOS logo";
|
||||
homepage = "https://github.com/helsinki-systems/plymouth-theme-nixos-bgrt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sc3-plugins";
|
||||
version = "3.11.1";
|
||||
version = "3.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/supercollider/sc3-plugins/releases/download/Version-${version}/sc3-plugins-${version}-Source.tar.bz2";
|
||||
sha256 = "sha256-JjUmu7PJ+x3yRibr+Av2gTREng51fPo7Rk+B4y2JvkQ=";
|
||||
sha256 = "sha256-+N7rhh1ALipy21HUC0jEQ2kCYbWlOveJg9TPe6dnF6I=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.44.0";
|
||||
version = "3.45.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
hash = "sha256-mEs1HnMn+3p4+YAyOmqFGrcMpeUwMbpkGQAx/pdDqhk=";
|
||||
hash = "sha256-xhcwEEUAgk1QJjmdAglfLnUlQpG3Pxof4g8c4NuyuPo=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aliyun-python-sdk-config";
|
||||
version = "2.2.3";
|
||||
version = "2.2.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rSywGyd9xpR11u9C0kJsx8RSzYhzZ4mF41ZPQ9PWWqQ=";
|
||||
hash = "sha256-IJMU16RySVo6nw5PwreZBLETzF8mH5PdZyE+YgoUVYo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "frigidaire";
|
||||
version = "0.18.4";
|
||||
version = "0.18.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,14 +19,14 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "bm1549";
|
||||
repo = pname;
|
||||
rev = "regs/tags/${version}";
|
||||
hash = "sha256-U2ixBtigY15RzMNIeUK71uNOndUepK2kE/CTFwl855w=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mmHcS0cjj43hCHLiCO8cGPfQoh+nqlNK3MdFP8IhD4w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/bm1549/frigidaire/pull/13
|
||||
# https://github.com/bm1549/frigidaire/issues/14
|
||||
substituteInPlace setup.py \
|
||||
--replace "urllib3>==1.26.42" "urllib3" \
|
||||
--replace "urllib3>=1.26.42" "urllib3" \
|
||||
--replace 'version = "SNAPSHOT"' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nc-dnsapi";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "nc_dnsapi";
|
||||
hash = "sha256-1fvzr3e0ZAbSDOovhLz5GHJCS6l+K89fbYHoaWxO9cA=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nbuchwitz";
|
||||
repo = "nc_dnsapi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OE4+wJbJbUZ+YB5J5OyvytLFCcrnXCeZEqmphHKKprQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
|
|
|||
|
|
@ -1,49 +1,49 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, mock
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, yanc
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ovh";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IQzwu0gwfPNPOLQLCO99KL5Hu2094Y+acQBFXVGzHhU=";
|
||||
hash = "sha256-EI+bWjtHEZPOSkWJx3gvS8y//gugMWl3TrBHKsKO9nk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
nose
|
||||
yanc
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# requires network
|
||||
checkPhase = ''
|
||||
nosetests . \
|
||||
-e test_config_get_conf \
|
||||
-e test_config_get_custom_conf \
|
||||
-e test_endpoints \
|
||||
-e test_init_from_custom_config
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"ovh"
|
||||
];
|
||||
|
||||
meta = {
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_config_from_files"
|
||||
"test_config_from_given_config_file"
|
||||
"test_config_from_invalid_ini_file"
|
||||
"test_config_from_only_one_file"
|
||||
"test_endpoints"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Thin wrapper around OVH's APIs";
|
||||
homepage = "https://github.com/ovh/python-ovh";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ lib.maintainers.makefu ];
|
||||
changelog = "https://github.com/ovh/python-ovh/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ makefu ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,14 +7,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zipstream-ng";
|
||||
version = "1.3.4";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pR0Ps";
|
||||
repo = "zipstream-ng";
|
||||
rev = "v${version}";
|
||||
sha256 = "NTsnGCddGDUxdHbEoM2ew756psboex3sb6MkYKtaSjQ=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4pS2t5IEIUHGJRaO6f9r8xnvXWA6p1EsDQ/jpD8CMLI=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
@ -32,6 +34,7 @@ buildPythonPackage rec {
|
|||
and folders on the fly without needing temporary files or excessive memory
|
||||
'';
|
||||
homepage = "https://github.com/pR0Ps/zipstream-ng";
|
||||
changelog = "https://github.com/pR0Ps/zipstream-ng/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ buildGoModule, fetchFromGitHub, pandoc, lib }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, pandoc
|
||||
, go
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "checkmake";
|
||||
|
|
@ -8,37 +14,42 @@ buildGoModule rec {
|
|||
owner = "mrtazz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Ql8XSQA/w7wT9GbmYOM2vG15GVqj9LxOGIu8Wqp9Wao=";
|
||||
hash = "sha256-Ql8XSQA/w7wT9GbmYOM2vG15GVqj9LxOGIu8Wqp9Wao=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
nativeBuildInputs = [ pandoc ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pandoc
|
||||
];
|
||||
|
||||
preBuild =
|
||||
let
|
||||
buildVars = {
|
||||
version = version;
|
||||
buildTime = "N/A";
|
||||
builder = "nix";
|
||||
goversion = "$(go version | egrep -o 'go[0-9]+[.][^ ]*')";
|
||||
};
|
||||
buildVarsFlags = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "-X main.${k}=${v}") buildVars);
|
||||
in
|
||||
''
|
||||
buildFlagsArray+=("-ldflags=${buildVarsFlags}")
|
||||
'';
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.version=${version}"
|
||||
"-X=main.buildTime=1970-01-01T00:00:00Z"
|
||||
"-X=main.builder=nixpkgs"
|
||||
"-X=main.goversion=go${go.version}"
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
postPatch = ''
|
||||
substituteInPlace man/man1/checkmake.1.md \
|
||||
--replace REPLACE_DATE 1970-01-01T00:00:00Z
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
pandoc man/man1/checkmake.1.md -st man -o man/man1/checkmake.1
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/man/man1
|
||||
pandoc -s -t man -o $out/share/man/man1/checkmake.1 man/man1/checkmake.1.md
|
||||
installManPage man/man1/checkmake.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Experimental tool for linting and checking Makefiles";
|
||||
homepage = "https://github.com/mrtazz/checkmake";
|
||||
changelog = "https://github.com/mrtazz/checkmake/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ vidbina ];
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.32.0";
|
||||
version = "1.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sYoi33Pmre8NHcew/DTKk8eNFqo89Rw19r5akNfm26Y=";
|
||||
sha256 = "sha256-Itu/VS6wpEHWLmDiGq9m7qyUr6lMr4uQm8SJNAkOPsQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RP4hSHIKeVJVrpauxgTo9caxO57i9IG9geLKAz5ZHyY=";
|
||||
vendorHash = "sha256-gz8vSVWh9wyM91rjJT102UJXBpeDoU895lTrHHZpj3I=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
|
@ -28,6 +28,7 @@ buildGoModule rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/hetznercloud/cli/releases/tag/v${version}";
|
||||
description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers";
|
||||
homepage = "https://github.com/hetznercloud/cli";
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.13.8";
|
||||
version = "0.13.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6RmC54DsL31/SBrA16p+iub7VTQvc1nG+ml+6Xaj0NM=";
|
||||
hash = "sha256-fkbYPn7GmnOgLvJqbizVKKLBnzVn0Ji6jQc23DimIX4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-u3hv1phSwZ4oILFMWIAqWhdt0jI8ao3gje1WZA3ZFo8=";
|
||||
cargoHash = "sha256-WHr2Ky0LlK/EVOrSK3MF9Yt/Qe/6o7Ftx7X8iECj6pM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-generate";
|
||||
version = "0.18.1";
|
||||
version = "0.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-generate";
|
||||
repo = "cargo-generate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0o7kemIxKCf+oNCl2ryKT02w49LQUuKaFIQUDt5mIw4=";
|
||||
sha256 = "sha256-FtYdhnw8QrW2wHjLLIXVcByiVFQ97eyrZWsaxt7mmPE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-DnPf75MEIbX4UQ6XeGLRE4giu+DxgWWmKJY34jrPwpc=";
|
||||
cargoSha256 = "sha256-UM9sf4LMR7x6haDH7/DFjsZZCng+9E5EnLt6HtTLvCU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-temp";
|
||||
version = "0.2.15";
|
||||
version = "0.2.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yozhgoor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z6qmtZfnpEZ1/XkmAijDo4nRfZOPW9hEIFTycdOYILk=";
|
||||
sha256 = "sha256-9rFczpVboJ+TPQzuegFj8RGYBel+4n5iY4B0sruK5wc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-EDdOnkOk5VIrzjJSTojdjmGAEDPMqW4PPE0JP+GUYnE=";
|
||||
cargoSha256 = "sha256-uIgDs7dFJjZgOE/y3T11N3zl8AwRvIyJbIC7wD7Nr7Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies";
|
||||
|
|
|
|||
|
|
@ -29,12 +29,12 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.7.8";
|
||||
version = "2.7.9";
|
||||
pname = "dar";
|
||||
|
||||
src = fetchzip {
|
||||
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-W/6kSkIaeHumE2yGGbU4Z2lk1d2toQ1AM012TUI1EZw=";
|
||||
sha256 = "sha256-q5ZfX0bybyvJ0NjrJQ2/+o0n7dBLGxdIDevls3xOQMg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
|
|||
patches = [ ./xmlcatalog_patch.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
substituteInPlace ./autogen.sh --replace pkg-config '$PKG_CONFIG'
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags = [ "--enable-man"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
{ lib, stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkg-config, libgsf
|
||||
, libxml2, bzip2 }:
|
||||
, libxml2, bzip2
|
||||
, autoreconfHook
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wv";
|
||||
|
|
@ -10,11 +13,20 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ zlib imagemagick libpng glib libgsf libxml2 bzip2 ];
|
||||
|
||||
configureFlags = [
|
||||
"PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# autoreconfHook fails hard if these two files do not exist
|
||||
postPatch = ''
|
||||
touch AUTHORS ChangeLog
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Converter from Microsoft Word formats to human-editable ones";
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -6,20 +6,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "aardvark-dns";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N439ubEayoyfGrzkXE7+TeJQkddy8PZn5Lhmc/X5VxU=";
|
||||
hash = "sha256-l240kejJjv3rVb4S9ngXo88kmByuS/Co3AB/SSv+iIA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cIHz672jd8NKLyLvwsZInLerdA9MXRgWdpJFgMSgs9Q=";
|
||||
cargoHash = "sha256-d3u/He8+Ei+tX37EgYTGW5gjcalawlTdPekV9iLK7XI=";
|
||||
|
||||
passthru.tests = { inherit (nixosTests) podman; };
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/containers/aardvark-dns/releases/tag/${src.rev}";
|
||||
description = "Authoritative dns server for A/AAAA container records";
|
||||
homepage = "https://github.com/containers/aardvark-dns";
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -9,21 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "netavark";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EuhnI7N8Ry6qV4q3QxdHdTuJ7F4gIA3a9NZnb33KWZ8=";
|
||||
hash = "sha256-USGmYLBv2ynnLx5jg+WkRle0AMtO7dDgf41VIepoHN0=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"netavark_proxy-0.1.0" = "sha256-Rhnry2Y33ogpK1hQSyWD90BDzIJHzlgn8vtHu2t3KLw=";
|
||||
};
|
||||
};
|
||||
cargoHash = "sha256-zj1eE7f4/wSVe+78abMePqsIrCPl6Uhtavn8hq7+ZRY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles mandown protobuf ];
|
||||
|
||||
|
|
@ -35,6 +30,7 @@ rustPlatform.buildRustPackage rec {
|
|||
passthru.tests = { inherit (nixosTests) podman; };
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/containers/netavark/releases/tag/${src.rev}";
|
||||
description = "Rust based network stack for containers";
|
||||
homepage = "https://github.com/containers/netavark";
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trurl";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "curl";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-z7Na7lXDzSmBTuSBaizyG892D3IfbN43ytPjOEQ9CAA=";
|
||||
sha256 = "sha256-f9z0gPtHcn3iWFA6MT6ngok0nXBcd6zJ8Tjnb5Lzf6c=";
|
||||
};
|
||||
|
||||
separateDebugInfo = stdenv.isLinux;
|
||||
|
|
|
|||
|
|
@ -38824,6 +38824,8 @@ with pkgs;
|
|||
nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { };
|
||||
nixos-grub2-theme = callPackage ../data/misc/nixos-artwork/grub2-theme.nix { };
|
||||
|
||||
nixos-bgrt-plymouth = callPackage ../data/themes/nixos-bgrt-plymouth { };
|
||||
|
||||
nixos-container = callPackage ../tools/virtualization/nixos-container { };
|
||||
|
||||
nixos-generators = callPackage ../tools/nix/nixos-generators { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue