Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
dae6d3bb73
78 changed files with 812 additions and 765 deletions
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
trivialBuild {
|
||||
pname = "ement";
|
||||
version = "unstable-2022-05-05";
|
||||
version = "unstable-2022-05-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alphapapa";
|
||||
repo = "ement.el";
|
||||
rev = "84739451afa8355360966dfa788d469d9dc4a8e3";
|
||||
sha256 = "sha256-XdegBKZfoKbFaMM/l8249VD9KKC5/4gQIK6ggPcoOaE=";
|
||||
rev = "961d650377f9e7440e47c36c0386e899f5b2d86b";
|
||||
sha256 = "sha256-4KTSPgso7UvzCRKNFI3YaPR1t4DUwggO4KtBYLm0W4Y=";
|
||||
};
|
||||
|
||||
packageRequires = [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/ement.el b/ement.el
|
||||
index c9596a7..1b33045 100644
|
||||
--- a/ement.el
|
||||
+++ b/ement.el
|
||||
@@ -682,14 +682,15 @@ can cause undesirable underlining."
|
||||
diff --git a/ement-lib.el b/ement-lib.el
|
||||
index f0b2738..025a191 100644
|
||||
--- a/ement-lib.el
|
||||
+++ b/ement-lib.el
|
||||
@@ -644,14 +644,15 @@ can cause undesirable underlining."
|
||||
"Return a copy of IMAGE set to MAX-WIDTH and MAX-HEIGHT.
|
||||
IMAGE should be one as created by, e.g. `create-image'."
|
||||
;; It would be nice if the image library had some simple functions to do this sort of thing.
|
||||
|
|
@ -24,5 +24,5 @@ index c9596a7..1b33045 100644
|
|||
+ (image-property new-image :max-height) max-height)
|
||||
+ new-image)))
|
||||
|
||||
;;;;; Reading/writing sessions
|
||||
|
||||
(defun ement--room-alias (room)
|
||||
"Return latest m.room.canonical_alias event in ROOM."
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -845,7 +845,7 @@ self: super: {
|
|||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "035v8mm8v7aj8qwhvxsp6k0afn05gi2xb1achzsvm0m4a8a9xs65";
|
||||
cargoSha256 = "0l1x7kprnxa95pbf8ml9ixmj0cmbnnv6nd0v6qry8j67rx8plpmp";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
|
@ -974,7 +974,7 @@ self: super: {
|
|||
vim-markdown-composer-bin = rustPlatform.buildRustPackage rec {
|
||||
pname = "vim-markdown-composer-bin";
|
||||
inherit (super.vim-markdown-composer) src version;
|
||||
cargoSha256 = "03d7kap6vha1jmyfrjqaja5439x6mhnvjjbz3rmxb3x4dpppbpj1";
|
||||
cargoSha256 = "0q0i6kyihswrjrfdj4p3z54b779sdg2wz38z943ypj6dqphhcklx";
|
||||
};
|
||||
in
|
||||
super.vim-markdown-composer.overrideAttrs (oldAttrs: rec {
|
||||
|
|
|
|||
|
|
@ -533,6 +533,7 @@ https://github.com/chr4/sslsecure.vim/,,
|
|||
https://github.com/luukvbaal/stabilize.nvim/,,
|
||||
https://github.com/eigenfoo/stan-vim/,,
|
||||
https://github.com/darfink/starsearch.vim/,,
|
||||
https://github.com/teto/stylish.nvim/,HEAD,
|
||||
https://github.com/lambdalisue/suda.vim/,,
|
||||
https://github.com/ervandew/supertab/,,
|
||||
https://github.com/ur4ltz/surround.nvim/,,
|
||||
|
|
@ -786,6 +787,7 @@ https://github.com/maksimr/vim-jsbeautify/,,
|
|||
https://github.com/heavenshell/vim-jsdoc/,,
|
||||
https://github.com/elzr/vim-json/,,
|
||||
https://github.com/google/vim-jsonnet/,,
|
||||
https://github.com/mogelbrod/vim-jsonpath/,HEAD,
|
||||
https://github.com/MaxMEllon/vim-jsx-pretty/,,
|
||||
https://github.com/peitalin/vim-jsx-typescript/,,
|
||||
https://github.com/knubie/vim-kitty-navigator/,,
|
||||
|
|
|
|||
|
|
@ -1,29 +1,49 @@
|
|||
{ lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core
|
||||
, qtbase, qttools, qtsvg, perlPackages, docbook_xml_dtd_45
|
||||
, docbook_xsl_ns }:
|
||||
{ lib, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, docbook_xml_dtd_45
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, boost
|
||||
, clucene_core_2
|
||||
, docbook_xsl_ns
|
||||
, perlPackages
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qttools
|
||||
, sword
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "bibletime";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-/JNjnU/DGD4YRtrKzX7t6MgNCZYihdgTJc+Jbr9IYJ4=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bibletime";
|
||||
repo = "bibletime";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8X5LkquALFnG0yRayZYjeymHDcOzINBv0MXeVBsOnfI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
docbook_xml_dtd_45
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
sword
|
||||
boost
|
||||
clucene_core
|
||||
qtbase
|
||||
qttools
|
||||
qtsvg
|
||||
clucene_core_2
|
||||
perlPackages.Po4a
|
||||
qtbase
|
||||
qtsvg
|
||||
qttools
|
||||
sword
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export CLUCENE_HOME=${clucene_core};
|
||||
export CLUCENE_HOME=${clucene_core_2};
|
||||
export SWORD_HOME=${sword};
|
||||
'';
|
||||
|
||||
|
|
@ -35,7 +55,7 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Qt4 Bible study tool";
|
||||
description = "A powerful cross platform Bible study tool";
|
||||
homepage = "http://www.bibletime.info/";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -23,18 +23,6 @@ let
|
|||
sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig=";
|
||||
};
|
||||
|
||||
workaround-opencollective-buildfailures = stdenv.mkDerivation {
|
||||
# FIXME: This should be removed when a complete fix is available
|
||||
# https://github.com/svanderburg/node2nix/issues/145
|
||||
name = "workaround-opencollective-buildfailures";
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
touch $out/bin/opencollective-postinstall
|
||||
chmod +x $out/bin/opencollective-postinstall
|
||||
'';
|
||||
};
|
||||
|
||||
client = nodePackages.epgstation-client.override (drv: {
|
||||
# FIXME: remove this option if possible
|
||||
#
|
||||
|
|
@ -49,21 +37,14 @@ let
|
|||
server = nodePackages.epgstation.override (drv: {
|
||||
inherit src;
|
||||
|
||||
bypassCache = false;
|
||||
|
||||
# This is set to false to keep devDependencies at build time. Build time
|
||||
# dependencies are pruned afterwards.
|
||||
production = false;
|
||||
|
||||
buildInputs = [ bash ];
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
workaround-opencollective-buildfailures
|
||||
buildInputs = (drv.buildInputs or [ ]) ++ [ bash ];
|
||||
nativeBuildInputs = (drv.nativeBuildInputs or [ ]) ++ [
|
||||
makeWrapper
|
||||
] ++ (with nodePackages; [
|
||||
node-pre-gyp
|
||||
node-gyp-build
|
||||
]);
|
||||
];
|
||||
|
||||
preRebuild = ''
|
||||
# Fix for not being able to connect to mysql using domain sockets.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ type
|
||||
, version
|
||||
, srcs
|
||||
, icu #passing icu as an argument, because dotnet 3.1 has troubles with icu71
|
||||
}:
|
||||
|
||||
assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
|
||||
|
|
@ -11,7 +12,6 @@ assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
|
|||
, writeText
|
||||
, libunwind
|
||||
, openssl
|
||||
, icu
|
||||
, libuuid
|
||||
, zlib
|
||||
, curl
|
||||
|
|
@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
|
|||
rpath = lib.makeLibraryPath ([
|
||||
stdenv.cc.cc
|
||||
zlib
|
||||
|
||||
curl
|
||||
icu
|
||||
libunwind
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_5_0 aspn
|
|||
Hashes and urls below are retrieved from:
|
||||
https://dotnet.microsoft.com/download/dotnet
|
||||
*/
|
||||
{ callPackage }:
|
||||
{ callPackage, icu70, icu }:
|
||||
let
|
||||
buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {};
|
||||
buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; });
|
||||
|
|
@ -20,8 +20,11 @@ rec {
|
|||
sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)";
|
||||
sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)";
|
||||
|
||||
##### Following attributes with urls and hashes should be auto-generated by print-hashes.sh #####
|
||||
|
||||
# v3.1 (lts)
|
||||
aspnetcore_3_1 = buildAspNetCore {
|
||||
icu = icu70;
|
||||
version = "3.1.21";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
|
|
@ -40,6 +43,7 @@ rec {
|
|||
};
|
||||
|
||||
runtime_3_1 = buildNetRuntime {
|
||||
icu = icu70;
|
||||
version = "3.1.21";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
|
|
@ -58,6 +62,7 @@ rec {
|
|||
};
|
||||
|
||||
sdk_3_1 = buildNetSdk {
|
||||
icu = icu70;
|
||||
version = "3.1.415";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
|
|
@ -77,6 +82,7 @@ rec {
|
|||
|
||||
# v5.0 (current)
|
||||
aspnetcore_5_0 = buildAspNetCore {
|
||||
inherit icu;
|
||||
version = "5.0.12";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
|
|
@ -95,6 +101,7 @@ rec {
|
|||
};
|
||||
|
||||
runtime_5_0 = buildNetRuntime {
|
||||
inherit icu;
|
||||
version = "5.0.12";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
|
|
@ -113,6 +120,7 @@ rec {
|
|||
};
|
||||
|
||||
sdk_5_0 = buildNetSdk {
|
||||
inherit icu;
|
||||
version = "5.0.403";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
|
|
@ -132,6 +140,7 @@ rec {
|
|||
|
||||
# v6.0 (lts)
|
||||
aspnetcore_6_0 = buildAspNetCore {
|
||||
inherit icu;
|
||||
version = "6.0.4";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
|
|
@ -154,6 +163,7 @@ rec {
|
|||
};
|
||||
|
||||
runtime_6_0 = buildNetRuntime {
|
||||
inherit icu;
|
||||
version = "6.0.4";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
|
|
@ -176,6 +186,7 @@ rec {
|
|||
};
|
||||
|
||||
sdk_6_0 = buildNetSdk {
|
||||
inherit icu;
|
||||
version = "6.0.202";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
|
|
|
|||
|
|
@ -84,6 +84,11 @@ Examples:
|
|||
aspnetcore_files="$(release_files "$release_content" "aspnetcore-runtime")"
|
||||
runtime_files="$(release_files "$release_content" "runtime")"
|
||||
sdk_files="$(release_files "$release_content" "sdk")"
|
||||
if [ $major_minor = "3.1" ]; then
|
||||
icu_attr="icu = icu70;"
|
||||
else
|
||||
icu_attr="inherit icu;"
|
||||
fi
|
||||
|
||||
major_minor_underscore=${major_minor/./_}
|
||||
channel_version=$(jq -r '."channel-version"' <<< "$content")
|
||||
|
|
@ -91,16 +96,19 @@ Examples:
|
|||
echo "
|
||||
# v$channel_version ($support_phase)
|
||||
aspnetcore_$major_minor_underscore = buildAspNetCore {
|
||||
$icu_attr
|
||||
version = \"${aspnetcore_version}\";
|
||||
$(platform_sources "$aspnetcore_files")
|
||||
};
|
||||
|
||||
runtime_$major_minor_underscore = buildNetRuntime {
|
||||
$icu_attr
|
||||
version = \"${runtime_version}\";
|
||||
$(platform_sources "$runtime_files")
|
||||
};
|
||||
|
||||
sdk_$major_minor_underscore = buildNetSdk {
|
||||
$icu_attr
|
||||
version = \"${sdk_version}\";
|
||||
$(platform_sources "$sdk_files")
|
||||
}; "
|
||||
|
|
|
|||
|
|
@ -1,40 +1,37 @@
|
|||
{ stdenv, lib, fetchFromGitHub, fetchpatch
|
||||
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
|
||||
{ stdenv, lib
|
||||
, fetchFromGitHub
|
||||
, gcc-arm-embedded
|
||||
, pkg-config
|
||||
, python3
|
||||
, hidapi
|
||||
, libftdi1
|
||||
, libusb1
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackmagic";
|
||||
version = "unstable-2020-08-05";
|
||||
version = "unstable-2022-04-16";
|
||||
# `git describe --always`
|
||||
firmwareVersion = "v1.6.1-539-gdd74ec8";
|
||||
firmwareVersion = "v1.7.1-415-gc4869a5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blacksphere";
|
||||
repo = "blackmagic";
|
||||
rev = "dd74ec8e6f734302daa1ee361af88dfb5043f166";
|
||||
sha256 = "18w8y64fs7wfdypa4vm3migk5w095z8nbd8qp795f322mf2bz281";
|
||||
rev = "c4869a54733ae92099a7316954e34d1ab7b6097c";
|
||||
hash = "sha256-0MC1v/5u/txSshxkOI5TErMRRrYCcHly3qbVTAk9Vc0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix deprecation warning with libftdi 1.5
|
||||
(fetchpatch {
|
||||
url = "https://github.com/blacksphere/blackmagic/commit/dea4be2539c5ea63836ec78dca08b52fa8b26ab5.patch";
|
||||
sha256 = "0f81simij1wdhifsxaavalc6yxzagfbgwry969dbjmxqzvrsrds5";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gcc-arm-embedded pkg-config
|
||||
gcc-arm-embedded
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
hidapi
|
||||
libftdi1
|
||||
libusb-compat-0_1
|
||||
libusb1
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -50,12 +47,17 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
buildPhase = "${stdenv.shell} ${./helper.sh}";
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
${stdenv.shell} ${./helper.sh}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
dontInstall = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "In-application debugger for ARM Cortex microcontrollers";
|
||||
longDescription = ''
|
||||
The Black Magic Probe is a modern, in-application debugging tool
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, lib
|
||||
, fetchurl
|
||||
, unzip
|
||||
, version ? "2.15.1"
|
||||
, version ? "2.17.0"
|
||||
, sources ? let
|
||||
base = "https://storage.googleapis.com/dart-archive/channels";
|
||||
x86_64 = "x64";
|
||||
|
|
@ -10,28 +10,28 @@
|
|||
aarch64 = "arm64";
|
||||
# Make sure that if the user overrides version parameter they're
|
||||
# also need to override sources, to avoid mistakes
|
||||
version = "2.15.1";
|
||||
version = "2.17.0";
|
||||
in
|
||||
{
|
||||
"${version}-aarch64-darwin" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip";
|
||||
sha256 = "sha256-DDE4DpA2m8wKkUZuQDn4NpXVvtaJ6sIHeKNjk3RbpYE=";
|
||||
sha256 = "sha256-WXf0SdSEHMaJRfVFgKzb9SY4LBjf1xO5Oki/dzKMEMY=";
|
||||
};
|
||||
"${version}-x86_64-darwin" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
|
||||
sha256 = "sha256-s6bkwh2m5KdRr/WxWXwItO9YaDpp/HI3xjnS2UHmN+I=";
|
||||
sha256 = "sha256-PwaxUQHIUhRWCOy3IVdGtRyP9LtscqoUJPOZfevN7xs=";
|
||||
};
|
||||
"${version}-x86_64-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
||||
sha256 = "sha256-D0XcqlO0CQtpsne4heqaTLOkFYnJEZET4bl4rVXOM18=";
|
||||
sha256 = "sha256-V7j9lk5HyB1GeuuVsJmmcKt+j1ShzXTUW80f3HeRPYY=";
|
||||
};
|
||||
"${version}-i686-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
|
||||
sha256 = "sha256-SRq5TtxS+bwCqVxa0U2Zhn8J1Wtm4Onq+3uQS+951sw=";
|
||||
sha256 = "sha256-YWxFwbcGvssOSL4S5O4jqLzxdUHvbVd9i4cLNyFn/cs=";
|
||||
};
|
||||
"${version}-aarch64-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
||||
sha256 = "sha256-iDbClCNDUsxT6K6koc4EQuu7dppTbOfzCVedpQIKI5U=";
|
||||
sha256 = "sha256-BaHbD9hFhYd9YYCFg0bXxTx++JQzZn2zuF8/Ll+nA2s=";
|
||||
};
|
||||
}
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -119,6 +119,11 @@ let
|
|||
sha256 = "sha256-1KnYHz9ntKbgfLeoDcsQrV6RdvzDB2LHCoFYCmS4sLY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://savannah.gnu.org/bugs/?func=detailitem&item_id=62436
|
||||
./patches/bug62436.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
readline
|
||||
ncurses
|
||||
|
|
|
|||
27
pkgs/development/interpreters/octave/patches/bug62436.patch
Normal file
27
pkgs/development/interpreters/octave/patches/bug62436.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
# HG changeset patch
|
||||
# User John Donoghue <john.donoghue@ieee.org>
|
||||
# Date 1652358904 14400
|
||||
# Thu May 12 08:35:04 2022 -0400
|
||||
# Branch stable
|
||||
# Node ID 8c940cfcce257369677c09154da2aab2c56eaa79
|
||||
# Parent 63710f3bd9811c2d206ac9e7b4f47cf06c47e153
|
||||
* scripts/pkg/private/build.m: check configure and Makefile exist before trying to unlink them (Bug #62436)
|
||||
|
||||
diff -r 63710f3bd981 -r 8c940cfcce25 scripts/pkg/private/build.m
|
||||
--- a/scripts/pkg/private/build.m Wed May 11 09:44:55 2022 -0700
|
||||
+++ b/scripts/pkg/private/build.m Thu May 12 08:35:04 2022 -0400
|
||||
@@ -77,8 +77,12 @@
|
||||
else
|
||||
arch_abi = getarch ();
|
||||
configure_make (desc, build_root, verbose);
|
||||
- unlink (fullfile (build_root, "src", "configure"));
|
||||
- unlink (fullfile (build_root, "src", "Makefile"));
|
||||
+ if exist (fullfile (build_root, "src", "configure"), "file")
|
||||
+ unlink (fullfile (build_root, "src", "configure"));
|
||||
+ endif
|
||||
+ if exist (fullfile (build_root, "src", "Makefile"), "file")
|
||||
+ unlink (fullfile (build_root, "src", "Makefile"));
|
||||
+ endif
|
||||
endif
|
||||
tar_name = [desc.name "-" desc.version "-" arch_abi ".tar"];
|
||||
tar_path = fullfile (builddir, tar_name);
|
||||
|
|
@ -10,9 +10,19 @@
|
|||
, libuuid
|
||||
, numactl
|
||||
, openssl
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
# The old version has some CVEs howver they should not affect SPDK's usage of the framework: https://github.com/NixOS/nixpkgs/pull/171648#issuecomment-1121964568
|
||||
dpdk' = dpdk.overrideAttrs (old: rec {
|
||||
name = "dpdk-21.11";
|
||||
src = fetchurl {
|
||||
url = "https://fast.dpdk.org/rel/${name}.tar.xz";
|
||||
sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E=";
|
||||
};
|
||||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "spdk";
|
||||
version = "21.10";
|
||||
|
||||
|
|
@ -40,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
cunit dpdk libaio libbsd libuuid numactl openssl ncurses
|
||||
cunit dpdk' libaio libbsd libuuid numactl openssl ncurses
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -49,7 +59,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [ "--with-dpdk=${dpdk}" ];
|
||||
configureFlags = [ "--with-dpdk=${dpdk'}" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.
|
||||
# otherwise does not find strncpy when compiling
|
||||
|
|
|
|||
|
|
@ -119,6 +119,7 @@ let
|
|||
# NOTE: this is a stub package to fetch npm dependencies for
|
||||
# ../../applications/video/epgstation
|
||||
epgstation = super."epgstation-../../applications/video/epgstation".override (drv: {
|
||||
buildInputs = [ self.node-pre-gyp self.node-gyp-build ];
|
||||
meta = drv.meta // {
|
||||
platforms = pkgs.lib.platforms.none;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,9 +17,10 @@ buildDunePackage rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mjambon/atd";
|
||||
description = "Syntax for cross-language type definitions";
|
||||
homepage = "https://github.com/mjambon/atd";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ aij jwilberding ];
|
||||
mainProgram = "atdcat";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,9 +32,10 @@ buildDunePackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "SSH implementation in OCaml";
|
||||
license = licenses.isc;
|
||||
homepage = "https://github.com/mirage/awa-ssh";
|
||||
changelog = "https://github.com/mirage/awa-ssh/raw/v${version}/CHANGES.md";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
mainProgram = "awa_lwt_server";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,9 @@ buildDunePackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested.";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/aantron/bisect_ppx";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "bisect-ppx-report";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,9 +43,10 @@ buildDunePackage rec {
|
|||
checkInputs = [ alcotest ];
|
||||
|
||||
meta = with lib; {
|
||||
license = licenses.isc;
|
||||
description = "X.509 trust anchors extracted from Mozilla's NSS";
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
homepage = "https://github.com/mirage/ca-certs-nss";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
mainProgram = "extract-from-certdata";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,9 +39,10 @@ buildDunePackage rec {
|
|||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/mirage/checkseum";
|
||||
description = "ADLER-32 and CRC32C Cyclic Redundancy Check";
|
||||
homepage = "https://github.com/mirage/checkseum";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
mainProgram = "checkseum.checkseum";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,8 +30,9 @@ buildDunePackage rec {
|
|||
|
||||
meta = {
|
||||
description = "A library to normalize an KOI8-{U,R} input to Unicode";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/mirage/coin";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "coin.generate";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,10 +31,11 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.coherentpdf.com/";
|
||||
inherit (ocaml.meta) platforms;
|
||||
description = "PDF Command Line Tools";
|
||||
homepage = "https://www.coherentpdf.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
mainProgram = "cpdf";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,8 +23,9 @@ buildDunePackage rec {
|
|||
|
||||
meta = {
|
||||
description = "Pure OCaml implementation of Zlib";
|
||||
homepage = "https://github.com/mirage/decompress";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
homepage = "https://github.com/mirage/decompress";
|
||||
mainProgram = "decompress.pipe";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,5 +16,6 @@ buildDunePackage {
|
|||
|
||||
meta = dns.meta // {
|
||||
description = "Pure DNS resolver API";
|
||||
mainProgram = "dns-client.unix";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,9 +24,10 @@ buildDunePackage rec {
|
|||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/vbmithr/ocaml-hidapi";
|
||||
description = "Bindings to Signal11's hidapi library";
|
||||
homepage = "https://github.com/vbmithr/ocaml-hidapi";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.alexfmpe ];
|
||||
mainProgram = "ocaml-hid-enumerate";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ buildDunePackage rec {
|
|||
|
||||
meta = irmin.meta // {
|
||||
description = "Irmin backend which stores values in a pack file";
|
||||
mainProgram = "irmin_fsck";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ buildDunePackage rec {
|
|||
|
||||
meta = irmin.meta // {
|
||||
description = "Unix backends for Irmin";
|
||||
mainProgram = "irmin";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -405,7 +405,10 @@ with self;
|
|||
pname = "ppx_base";
|
||||
hash = "1wv3q0qyghm0c5izq03y97lv3czqk116059mg62wx6valn22a000";
|
||||
minimumOCamlVersion = "4.04.2";
|
||||
meta.description = "Base set of ppx rewriters";
|
||||
meta = {
|
||||
description = "Base set of ppx rewriters";
|
||||
mainProgram = "ppx-base";
|
||||
};
|
||||
propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ];
|
||||
};
|
||||
|
||||
|
|
@ -519,7 +522,10 @@ with self;
|
|||
pname = "ppx_jane";
|
||||
hash = "1kk238fvrcylymwm7xwc7llbyspmx1y662ypq00vy70g112rir7j";
|
||||
minimumOCamlVersion = "4.04.2";
|
||||
meta.description = "Standard Jane Street ppx rewriters";
|
||||
meta = {
|
||||
description = "Standard Jane Street ppx rewriters";
|
||||
mainProgram = "ppx-jane";
|
||||
};
|
||||
propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_expect ppx_fixed_literal ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_typerep_conv ppx_variants_conv ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -39,10 +39,11 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html";
|
||||
description = "OpenGL bindings for ocaml";
|
||||
homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ pSub vbgl ];
|
||||
mainProgram = "lablglut";
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ buildDunePackage rec {
|
|||
|
||||
propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ];
|
||||
|
||||
meta = { description = "Terminal manipulation library for OCaml";
|
||||
meta = {
|
||||
description = "Terminal manipulation library for OCaml";
|
||||
longDescription = ''
|
||||
Lambda-term is a cross-platform library for
|
||||
manipulating the terminal. It provides an abstraction for keys,
|
||||
|
|
@ -43,8 +44,7 @@ buildDunePackage rec {
|
|||
|
||||
inherit (src.meta) homepage;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [
|
||||
lib.maintainers.gal_bolle
|
||||
];
|
||||
maintainers = [ lib.maintainers.gal_bolle ];
|
||||
mainProgram = "lambda-term-actions";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,5 +43,6 @@ buildDunePackage {
|
|||
|
||||
meta = letsencrypt.meta // {
|
||||
description = "An ACME client implementation of the ACME protocol (RFC 8555) for OCaml";
|
||||
mainProgram = "oacmel";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,9 +20,10 @@ buildDunePackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www-verimag.imag.fr/lustre-v6.html";
|
||||
description = "Lustre V6 compiler";
|
||||
homepage = "https://www-verimag.imag.fr/lustre-v6.html";
|
||||
license = lib.licenses.cecill21;
|
||||
maintainers = [ lib.maintainers.delta ];
|
||||
mainProgram = "lv6";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,5 +21,6 @@ buildDunePackage rec {
|
|||
homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/";
|
||||
description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)";
|
||||
license = lib.licenses.cecill21;
|
||||
mainProgram = "gnuplot-rif";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,8 +67,9 @@ buildDunePackage rec {
|
|||
|
||||
meta = {
|
||||
description = "Parser and generator of mail in OCaml";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/mirage/mrmime";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
mainProgram = "mrmime.generate";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,5 +17,6 @@ buildDunePackage rec {
|
|||
|
||||
meta = lsp.meta // {
|
||||
description = "OCaml Language Server Protocol implementation";
|
||||
mainProgram = "ocamllsp";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,8 +34,9 @@ stdenv.mkDerivation {
|
|||
of them.
|
||||
'';
|
||||
homepage = webpage;
|
||||
inherit (ocaml.meta) platforms;
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.jirkamarsik ];
|
||||
mainProgram = "otftrip";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,9 +46,10 @@ buildDunePackage rec {
|
|||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/biocaml/phylogenetics";
|
||||
description = "Algorithms and datastructures for phylogenetics";
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
homepage = "https://github.com/biocaml/phylogenetics";
|
||||
license = licenses.cecill-b;
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
mainProgram = "phylosim";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@ buildDunePackage rec {
|
|||
|
||||
meta = {
|
||||
description = "Bindings to the UNIX tuntap facility";
|
||||
license = lib.licenses.isc;
|
||||
homepage = "https://github.com/mirage/ocaml-tuntap";
|
||||
license = lib.licenses.isc;
|
||||
mainProgram = "otunctl";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,8 +32,9 @@ buildDunePackage rec {
|
|||
|
||||
meta = {
|
||||
description = "A library to normalize an ISO-8859 input to Unicode code-point";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/mirage/uuuu";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
mainProgram = "uuuu.generate";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,8 +57,9 @@ stdenv.mkDerivation {
|
|||
module. An API allows to implement new renderers.
|
||||
'';
|
||||
homepage = webpage;
|
||||
inherit (ocaml.meta) platforms;
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.jirkamarsik ];
|
||||
mainProgram = "vecho";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,8 +42,9 @@ buildDunePackage rec {
|
|||
|
||||
meta = {
|
||||
description = "Pure OCaml Wayland protocol library";
|
||||
homepage = "https://github.com/talex5/ocaml-wayland";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
homepage = "https://github.com/talex5/ocaml-wayland";
|
||||
mainProgram = "wayland-scanner-ocaml";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://erratique.ch/software/webbrowser";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
mainProgram = "browse";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,9 @@ buildDunePackage rec {
|
|||
moveToOutput bin "''${!outputBin}"
|
||||
'';
|
||||
|
||||
meta = wodan.meta // { description = "Wodan clients with Unix integration"; };
|
||||
meta = wodan.meta // {
|
||||
description = "Wodan clients with Unix integration";
|
||||
mainProgram = "wodanc";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-containerservice";
|
||||
version = "19.0.0";
|
||||
version = "19.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "sha256-UHkSUoNzXWomr4vczGRRXVJplVRfqDjwFczkOP2Jwsc=";
|
||||
sha256 = "sha256-t06Cesxvjk31aDxkX2Yj0VzFubWbiAc26LzNTIgVEqs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-datafactory";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-oCDh7tWsBA6z/auQm3AtkRzT9IUrq8HJ+R//HDJ+1nw=";
|
||||
hash = "sha256-vV+VAK+lesBylrIsGB+MZCT4kW84beFSIYJZfOzPoTY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "blocksat-cli";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-hz5BGE+gqOrPiXvmeOTOecm2RUrTvM/xxvV3cnO2QSc=";
|
||||
sha256 = "sha256-HHalq64pgjobnPwjXMi57OumHxOuf7wjuw0d6arMoAI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cirq-core";
|
||||
version = "0.13.1";
|
||||
version = "0.14.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -38,32 +38,17 @@ buildPythonPackage rec {
|
|||
owner = "quantumlib";
|
||||
repo = "cirq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MVfJ8iEeW8gFvCNTqrWfYpNNYuDAufHgcjd7Nh3qp8U=";
|
||||
sha256 = "sha256-cIDwV3IBXrTJ4jC1/HYmduY3tLe/f6wj8CWZ4cnThG8=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/${pname}";
|
||||
|
||||
patches = [
|
||||
# present in upstream master - remove after 0.13.1
|
||||
(fetchpatch {
|
||||
name = "fix-test-tolerances.part-1.patch";
|
||||
url = "https://github.com/quantumlib/Cirq/commit/eb1d9031e55d3c8801ea44abbb6a4132b2fc5126.patch";
|
||||
sha256 = "0ka24v6dfxnap9p07ni32z9zccbmw0lbrp5mcknmpsl12hza98xm";
|
||||
stripLen = 1;
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-test-tolerances.part-2.patch";
|
||||
url = "https://github.com/quantumlib/Cirq/commit/a28d601b2bcfc393336375c53e5915fd16455395.patch";
|
||||
sha256 = "0k2dqsm4ydn6556d40kc8j04jgjn59z4wqqg1jn1r916a7yxw493";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "matplotlib~=3.0" "matplotlib" \
|
||||
--replace "networkx~=2.4" "networkx" \
|
||||
--replace "numpy~=1.16" "numpy"
|
||||
--replace "numpy~=1.16" "numpy" \
|
||||
--replace "sympy<1.10" "sympy"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -93,9 +78,9 @@ buildPythonPackage rec {
|
|||
freezegun
|
||||
];
|
||||
|
||||
pytestFlagsArray = lib.optionals (!withContribRequires) [
|
||||
disabledTestPaths = lib.optionals (!withContribRequires) [
|
||||
# requires external (unpackaged) libraries, so untested.
|
||||
"--ignore=cirq/contrib/"
|
||||
"cirq/contrib/"
|
||||
];
|
||||
disabledTests = [
|
||||
"test_metadata_search_path" # tries to import flynt, which isn't in Nixpkgs
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ buildPythonPackage
|
||||
, fetchpatch
|
||||
, cirq-aqt
|
||||
, cirq-core
|
||||
, cirq-google
|
||||
|
|
@ -14,6 +15,14 @@ buildPythonPackage rec {
|
|||
pname = "cirq";
|
||||
inherit (cirq-core) version src meta;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/quantumlib/Cirq/commit/b832db606e5f1850b1eda168a6d4a8e77d8ec711.patch";
|
||||
name = "pr-5330-prevent-implicit-packages.patch";
|
||||
sha256 = "sha256-HTEH3fFxPiBedaz5GxZjXayvoiazwHysKZIOzqwZmbg=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cirq-aqt
|
||||
cirq-core
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-033iPQfFF26Ly8OVdjExDZDoQ35DXuVF7dXqokA7k/s=";
|
||||
sha256 = "sha256-RgjsaGtji5vSQcv+npOYcXJNYUhx9Snz56BXnfoc2QY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hatasmota";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "emontnemery";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-So3wnz6HBGlgBgBJiU4m+fFx7f8Y+6c15OCD8GFGQaE=";
|
||||
sha256 = "sha256-pIMao1zZXJJVEG9J9ypWlo/JF0nmci49ANcqHJSY2AY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "huggingface-hub";
|
||||
version = "0.4.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "huggingface_hub";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rrkubNy60e/1VcGacYQang4yWxUzIBGySxZyq6G1arw=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-jR4aqMAAQJ5a7pOe3RpCtLgdm5JVVSPsBQtube6FeqM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ packaging ];
|
||||
|
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/huggingface/huggingface_hub";
|
||||
description = "Download and publish models and other files on the huggingface.co hub";
|
||||
changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/${version}";
|
||||
changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.18.8";
|
||||
version = "1.19.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tZrvWMt0qdOFTNeL99mZGFl8bVDGCqj25zVl7QvXQLw=";
|
||||
sha256 = "sha256-0UOU4arSCh+5l258mwZQLNf/JUbPcTgcHtusiTyYPwg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "motionblinds";
|
||||
version = "0.6.5";
|
||||
version = "0.6.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "starkillerOG";
|
||||
repo = "motion-blinds";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-RAGsVHi/f+0gIzVomhC8h3JvoD4EEe6dK9PBi5daTgU=";
|
||||
sha256 = "sha256-c6+kctEB4gwLGTgTA+sUA3v9ST4dn4RFPbyaXSgGvoQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.22.8";
|
||||
version = "1.23.0.post1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Br7HlymKuQUbI+iw90HWi1lSnEFwQbziBLokAHTzGEk=";
|
||||
hash = "sha256-eF0ChMOqisXsMWLlKCAWGMrTUe4sGfZxWo5uc/ZKAQk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pip-tools";
|
||||
version = "6.6.0";
|
||||
version = "6.6.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-mKokAERAocBInXGlZ6Tor98jx3gr/0g9EhmIHnMC3oM=";
|
||||
sha256 = "sha256-Y04+jUcHJXwAQxPRap1sFMHOlNPA+h+Tw40mRAHy5PI=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.18.2";
|
||||
version = "0.18.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-l97GF5dZlwps2mhw84A+8IBmTmvnaJ/5MeWYdeAu4Zw=";
|
||||
sha256 = "sha256-aNlPOgUChLFkPPZtb3o4A49uoSBjxKaq3WtuupHlmi8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyTelegramBotAPI";
|
||||
version = "4.5.0";
|
||||
version = "4.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Jonbb26MbK/LKztFkB7IlaHQm98DPYn4lYK4ikDPpaE=";
|
||||
hash = "sha256-ClzdkvH1uz1qh/q3prfn8n0eosY3y3mUscbb4EKbmJQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyomo";
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,8 +17,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
repo = "pyomo";
|
||||
owner = "pyomo";
|
||||
rev = version;
|
||||
hash = "sha256-FdUhne5Dn5hTIXMce1G6Zu6nx+AuP/JdK0a5fCE3hg8=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LwlUib/CeVCCmgpTHtYHcFyxk9Esx1zhZ3yGHeGpugY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcs-api-client";
|
||||
version = "0.20.10";
|
||||
version = "0.20.12";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "rigetti";
|
||||
repo = "qcs-api-client-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pBC8pFrk6iNYPS3/LKaVo+ds2okN56bxzvffEfs6SrU=";
|
||||
hash = "sha256-4462T2WIBdWjtd51YfslYZOcJg9f0nrSOKTi2ed6WvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ let
|
|||
in
|
||||
|
||||
rr.overrideAttrs (old: {
|
||||
version = "unstable-2021-07-06";
|
||||
version = "unstable-2022-05-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "rr";
|
||||
rev = "0fc21a8d654dabc7fb1991d76343824cb7951ea0";
|
||||
sha256 = "0s851rflxmvxcfw97zmplcwzhv86xmd3my78pi4c7gkj18d621i5";
|
||||
rev = "c96cb688106634ad09af6214aa91252c3a4f74b1";
|
||||
sha256 = "sha256-K4cEQnvBXr/j9qXCgIHLqMrRzm96ushTO5STivRj+Mk=";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
{ lib, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep
|
||||
, src, version, hasBootstrapScript, postPatch ? ""
|
||||
, ... }:
|
||||
let
|
||||
goPackagePath = "github.com/buildkite/agent";
|
||||
in
|
||||
buildGoPackage {
|
||||
pname = "buildkite-agent";
|
||||
inherit version;
|
||||
|
||||
inherit goPackagePath src postPatch;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
${lib.optionalString hasBootstrapScript ''
|
||||
# Install bootstrap.sh
|
||||
mkdir -p $out/libexec/buildkite-agent
|
||||
cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent
|
||||
sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $out/libexec/buildkite-agent/bootstrap.sh
|
||||
''}
|
||||
|
||||
# Fix binary name
|
||||
mv $out/bin/{agent,buildkite-agent}
|
||||
|
||||
# These are runtime dependencies
|
||||
wrapProgram $out/bin/buildkite-agent \
|
||||
${lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \
|
||||
--prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Build runner for buildkite.com";
|
||||
longDescription = ''
|
||||
The buildkite-agent is a small, reliable, and cross-platform build runner
|
||||
that makes it easy to run automated builds on your own infrastructure.
|
||||
It’s main responsibilities are polling buildkite.com for work, running
|
||||
build jobs, reporting back the status code and output log of the job,
|
||||
and uploading the job's artifacts.
|
||||
'';
|
||||
homepage = "https://buildkite.com/docs/agent";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pawelpacana zimbatm rvl ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,80 +2,35 @@
|
|||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, gdb
|
||||
, flask
|
||||
, six
|
||||
, bidict
|
||||
, python-engineio
|
||||
, python-socketio
|
||||
, flask-socketio
|
||||
, flask-compress
|
||||
, pygdbmi
|
||||
, pygments
|
||||
, gevent
|
||||
, gevent-websocket
|
||||
, eventlet
|
||||
, }:
|
||||
|
||||
let
|
||||
# gdbgui only works with the latest previous major version of flask-socketio,
|
||||
# which depends itself on the latest previous major versions of dependencies.
|
||||
python-engineio' = python-engineio.overridePythonAttrs (old: rec {
|
||||
version = "3.14.2";
|
||||
src = fetchPypi {
|
||||
inherit (old) pname;
|
||||
inherit version;
|
||||
sha256 = "119halljynqsgswlhlh750qv56js1p7j52sc0nbwxh8450zmbd7a";
|
||||
};
|
||||
propagatedBuildInputs = [ six ];
|
||||
doCheck = false;
|
||||
});
|
||||
python-socketio' = python-socketio.overridePythonAttrs (old: rec {
|
||||
version = "4.6.1";
|
||||
src = fetchPypi {
|
||||
inherit (old) pname;
|
||||
inherit version;
|
||||
sha256 = "047syhrrxh327p0fnab0d1zy25zijnj3gs1qg3kjpsy1jaj5l7yd";
|
||||
};
|
||||
propagatedBuildInputs = [ bidict python-engineio' ];
|
||||
doCheck = false;
|
||||
});
|
||||
flask-socketio' = flask-socketio.overridePythonAttrs (old: rec {
|
||||
version = "4.3.2";
|
||||
src = fetchPypi {
|
||||
inherit (old) pname;
|
||||
inherit version;
|
||||
sha256 = "0s2xs9kv9cbwy8bcxszhdwlcb9ldv0fj33lwilf5vypj0wsin01p";
|
||||
};
|
||||
propagatedBuildInputs = [ flask python-socketio' ];
|
||||
doCheck = false;
|
||||
});
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "gdbgui";
|
||||
version = "0.14.0.2";
|
||||
|
||||
version = "0.15.0.1";
|
||||
|
||||
|
||||
buildInputs = [ gdb ];
|
||||
propagatedBuildInputs = [
|
||||
flask
|
||||
flask-socketio'
|
||||
flask-socketio
|
||||
flask-compress
|
||||
pygdbmi
|
||||
pygments
|
||||
gevent
|
||||
gevent-websocket
|
||||
eventlet
|
||||
];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1v6wwsncgnhlg5c7gsmzcp52hfblfnz5kf5pk4d0zybflsxak02d";
|
||||
sha256 = "sha256-bwrleLn3GBx4Mie2kujtaUo+XCALM+hRLySIZERlBg0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
echo ${version} > gdbgui/VERSION.txt
|
||||
# remove upper version bound
|
||||
sed -ie 's!, <.*"!"!' setup.py
|
||||
sed -i 's/greenlet==/greenlet>=/' setup.py
|
||||
sed -ie 's!,.*<.*!!' requirements.in
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -27,9 +27,10 @@ buildDunePackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/serokell/ocaml-recovery-parser";
|
||||
description = "A simple fork of OCaml parser with support for error recovery";
|
||||
homepage = "https://github.com/serokell/ocaml-recovery-parser";
|
||||
license = with licenses; [ lgpl2Only mit mpl20 ];
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
mainProgram = "menhir-recover";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
|
|||
inherit (ocaml.meta) platforms;
|
||||
description = "Natively-compiled OCaml scripts";
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
mainProgram = "ocamlscript";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
let
|
||||
# Poetry2nix version
|
||||
version = "1.29.0";
|
||||
version = "1.29.1";
|
||||
|
||||
inherit (poetryLib) isCompatible readTOML moduleName;
|
||||
|
||||
|
|
|
|||
|
|
@ -801,6 +801,9 @@
|
|||
"notebook-shim": [
|
||||
"jupyter-packaging"
|
||||
],
|
||||
"notify-py": [
|
||||
"poetry-core"
|
||||
],
|
||||
"notus-scanner": [
|
||||
"poetry-core"
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1891,7 +1891,7 @@ lib.composeManyExtensions [
|
|||
|
||||
# Fix library paths
|
||||
postPatch = old.postPatch or "" + ''
|
||||
${self.python.pythonForBuild.interpreter} ${./shapely-rewrite.py} shapely/geos.py
|
||||
${pkgs.python3.interpreter} ${./shapely-rewrite.py} shapely/geos.py
|
||||
'';
|
||||
}
|
||||
);
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "goku";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip";
|
||||
sha256 = "7c9304a5b4265575ca154bc0ebc04fcf812d14981775966092946cf82f65c782";
|
||||
sha256 = "506eccdabedc68c112778b13ded65099327267c2e3fd488916e3a340bc312954";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
let
|
||||
mod = kernel != null;
|
||||
dpdkVersion = "21.11";
|
||||
dpdkVersion = "22.03";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "dpdk";
|
||||
version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz";
|
||||
sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E=";
|
||||
sha256 = "sha256-st5fCLzVcz+Q1NfmwDJRWQja2PyNJnrGolNELZuDp8U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,27 +1,50 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config
|
||||
, luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc
|
||||
, libyamlcpp, nlohmann_json
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
# Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake
|
||||
libsRev = "2160111cd088aea9ae2235d3385ecb0b1ab6623c";
|
||||
libsSha256 = "sha256-TOuxXtrxujyAjzAtlX3/eCfM16mwxnmZ6Wg44SG0dTs=";
|
||||
libsRev = "e5c53d648f3c4694385bbe488e7d47eaa36c229a";
|
||||
libsSha256 = "sha256-pG10y5PpDqaF/cq8oAvax5B/ls2UTRQd7tCfBjWVf0U=";
|
||||
|
||||
# Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17
|
||||
valijson = fetchFromGitHub {
|
||||
owner = "tristanpenman";
|
||||
repo = "valijson";
|
||||
rev = "v0.6";
|
||||
sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM=";
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sysdig";
|
||||
version = "0.28.0";
|
||||
version = "0.29.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "draios";
|
||||
repo = "sysdig";
|
||||
rev = version;
|
||||
sha256 = "sha256-oE3vCmOw+gcmvGqj7Xk5injpNC/YThckJMNg5XRFhME=";
|
||||
sha256 = "sha256-dMLeroOd9CgvmgQdPfX8oBxQSyksZi/hP4vO03JhlF0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl installShellFiles pkg-config ];
|
||||
buildInputs = [
|
||||
luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb protobuf grpc
|
||||
luajit
|
||||
ncurses
|
||||
libb64
|
||||
openssl
|
||||
curl
|
||||
jq
|
||||
gcc
|
||||
elfutils
|
||||
tbb
|
||||
protobuf
|
||||
grpc
|
||||
libyamlcpp
|
||||
jsoncpp
|
||||
nlohmann_json
|
||||
] ++ optionals (kernel != null) kernel.moduleBuildDependencies;
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
|
@ -34,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = libsSha256;
|
||||
}} libs
|
||||
chmod -R +w libs
|
||||
cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs")
|
||||
cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include")
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -47,6 +70,10 @@ stdenv.mkDerivation rec {
|
|||
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))";
|
||||
|
||||
preConfigure = ''
|
||||
if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then
|
||||
echo "falcosecurity-libs checksum needs to be updated!"
|
||||
exit 1
|
||||
fi
|
||||
cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization")
|
||||
'' + optionalString (kernel != null) ''
|
||||
export INSTALL_MOD_PATH="$out"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }:
|
||||
{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire, fetchpatch }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "8.5.1";
|
||||
version = "8.5.2";
|
||||
|
||||
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ];
|
||||
|
||||
|
|
@ -10,14 +10,22 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-GwvJA+lcbUuVbzniDW6gYbxQO5uXSP6rjzgmcJ5YYxk=";
|
||||
sha256 = "sha256-9m6fu+wwmKpw/ehAIfgLe5YzOqTP3BC6/9mUgLL9XS0=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "030zl5k8b4hcay06a2lvlmq8swbix88ii4gz9yd4kywcjy5vhnyf";
|
||||
sha256 = "1gq0wyqpgc7crbz8cd4dnwixhx7chnmbl2di4zcqs26g8y30q7rj";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# skip a flaky test, remove on the next update
|
||||
(fetchpatch {
|
||||
url = "https://github.com/grafana/grafana/commit/9e3a01a1bea3f4d5d99e53d55128d79160610349.patch";
|
||||
sha256 = "sha256-rzZxNLn074JBb4DW3QC1zWNGe1uLGIlXvnjh60e8B3Q=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-ZL+A6Sz0uHg7ZzYHmA4EU5ZxfRXBLyKglk135iQT600=";
|
||||
|
||||
nativeBuildInputs = [ wire ];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,19 @@ let
|
|||
version = "21.11.15";
|
||||
platform = if stdenv.isLinux then "linux" else "darwin";
|
||||
arch = if stdenv.isAarch64 then "arm" else "amd";
|
||||
sha256s = {
|
||||
darwin.amd = "sha256-Yf4O7lVcf+nmb0wFTx7jLjUSmdAItoUfPlkhHveI9UY=";
|
||||
darwin.arm = "sha256-vKfFBheDZtvcbg0zbj3rqUEQczZvySuGuM3RopnDJG8=";
|
||||
linux.amd = "sha256:0vpxn7kcpqylk0nc74m6yxgwwf8ns8pyb6kxnmnmv2x58f8x4c8n";
|
||||
linux.arm = "sha256-1AQSB2V5zGivU0UinTST2kOydQf/bmLbpjdW0Yo4ptE=";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "redpanda";
|
||||
inherit version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/redpanda-data/redpanda/releases/download/v${version}/rpk-${platform}-${arch}64.zip";
|
||||
sha256 = "sha256-Yf4O7lVcf+nmb0wFTx7jLjUSmdAItoUfPlkhHveI9UY=";
|
||||
sha256 = sha256s.${platform}.${arch};
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,19 +1,25 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "lazydocker";
|
||||
version = "0.13";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesseduffield";
|
||||
repo = "lazydocker";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-thUm33AdP9Huc2vcTRatC1ULHZd0edEQggEGTqOV3a0=";
|
||||
sha256 = "sha256-qtGPsfZVu5ZuCusO5nYgxR/qHiwyhzMmBMLMDpKzKDA=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/jesseduffield/lazydocker";
|
||||
vendorSha256 = null;
|
||||
|
||||
subPackages = [ "." ];
|
||||
postPatch = ''
|
||||
rm -f pkg/config/app_config_test.go
|
||||
'';
|
||||
|
||||
excludedPackages = [ "scripts" "test/printrandom" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple terminal UI for both docker and docker-compose";
|
||||
|
|
|
|||
|
|
@ -1,26 +1,28 @@
|
|||
{ lib, buildGoPackage, fetchgit }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "gohai";
|
||||
version = "2018-05-23";
|
||||
rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1";
|
||||
version = "unstable-2022-04-12";
|
||||
|
||||
goPackagePath = "github.com/DataDog/gohai";
|
||||
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/DataDog/gohai";
|
||||
sha256 = "15hdw195f6ayrmj1nbyfpfswdai1r1z3qjw927mbma7rwql24dkr";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DataDog";
|
||||
repo = "gohai";
|
||||
rev = "c614f513e87f04d3d19b2d4ae853cc5703f3a9bc";
|
||||
sha256 = "sha256-vdzGGTg9SHYS0OQUn3VvrQGpKxzqxBRXDKOm0c7FvYY=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "sha256-aN1fwGbBm45e6qdRu+4wnv2ZI7SOsIPONB4vF9o2vlI=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "System information collector";
|
||||
homepage = "https://github.com/DataDog/gohai";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.tazjin ];
|
||||
platforms = platforms.unix;
|
||||
description = "System information collector";
|
||||
homepage = "https://github.com/DataDog/gohai";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tazjin ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
longDescription = ''
|
||||
Gohai is a tool which collects an inventory of system
|
||||
|
|
|
|||
30
pkgs/tools/system/gohai/deps.nix
generated
30
pkgs/tools/system/gohai/deps.nix
generated
|
|
@ -1,30 +0,0 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/cihub/seelog";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/cihub/seelog";
|
||||
rev = "f561c5e57575bb1e0a2167028b7339b3a8d16fb4";
|
||||
sha256 = "0r3228hvgljgpaggj6b9mvxfsizfw25q2c1761wsvcif8gz49cvl";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/shirou/gopsutil";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/shirou/gopsutil";
|
||||
rev = "eeb1d38d69593f121e060d24d17f7b1f0936b203";
|
||||
sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "77b0e4315053a57ed2962443614bdb28db152054";
|
||||
sha256 = "1024gcv1b40i2rgvpgyw2hgy1k5g7473pn29yavwysj37m1rrplp";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -1,10 +1,8 @@
|
|||
{ lib, fetchFromGitHub, buildGoPackage }:
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "govc";
|
||||
version = "0.25.0";
|
||||
|
||||
goPackagePath = "github.com/vmware/govmomi";
|
||||
version = "0.28.0";
|
||||
|
||||
subPackages = [ "govc" ];
|
||||
|
||||
|
|
@ -12,9 +10,17 @@ buildGoPackage rec {
|
|||
rev = "v${version}";
|
||||
owner = "vmware";
|
||||
repo = "govmomi";
|
||||
sha256 = "sha256-Ri8snbmgcAZmdumKzBl3P6gf/eZgwdgg7V+ijyeZjks=";
|
||||
sha256 = "sha256-uK1JsBJC9O8dEJbAnyeMoolKZ2WhEPsDo/is/I+gfHg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/vmware/govmomi/govc/flags.BuildVersion=${version}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A vSphere CLI built on top of govmomi";
|
||||
homepage = "https://github.com/vmware/govmomi/tree/master/govc";
|
||||
|
|
|
|||
|
|
@ -750,7 +750,9 @@ with pkgs;
|
|||
|
||||
installShellFiles = callPackage ../build-support/install-shell-files {};
|
||||
|
||||
lazydocker = callPackage ../tools/misc/lazydocker { };
|
||||
lazydocker = callPackage ../tools/misc/lazydocker {
|
||||
buildGoModule = buildGo118Module;
|
||||
};
|
||||
|
||||
ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; }
|
||||
../build-support/setup-hooks/ld-is-cc-hook.sh;
|
||||
|
|
|
|||
Loading…
Reference in a new issue