Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-07-20 12:02:50 +00:00 committed by GitHub
commit 0e13cd9f49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
70 changed files with 646 additions and 164 deletions

View file

@ -7582,6 +7582,12 @@
githubId = 26231126;
name = "Nils ANDRÉ-CHANG";
};
nils-degroot = {
email = "nils@peeko.nl";
github = "nils-degroot";
githubId = 53556985;
name = "Nils de Groot";
};
ninjatrappeur = {
email = "felix@alternativebit.fr";
github = "ninjatrappeur";
@ -11326,6 +11332,12 @@
githubId = 19174984;
name = "Alex Whitt";
};
whonore = {
email = "wolfhonore@gmail.com";
github = "whonore";
githubId = 7121530;
name = "Wolf Honoré";
};
wildsebastian = {
name = "Sebastian Wild";
email = "sebastian@wild-siena.com";

View file

@ -108,8 +108,8 @@ in {
type = types.attrsOf (types.submodule ({config, options, ...}: {
freeformType = datasetSettingsType;
options = commonOptions // datasetOptions;
config.use_template = mkAliasDefinitions (options.useTemplate or {});
config.process_children_only = mkAliasDefinitions (options.processChildrenOnly or {});
config.use_template = mkAliasDefinitions (mkDefault options.useTemplate or {});
config.process_children_only = mkAliasDefinitions (mkDefault options.processChildrenOnly or {});
}));
default = {};
description = "Datasets to snapshot.";

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "bitwig-studio";
version = "4.0";
version = "4.0.1";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
sha256 = "38381c1a382abd9543931f34d5ae1789c31ec1217a1c852b5c5c442ccaf97063";
sha256 = "sha256-yhCAKlbLjyBywkSYY1aqbUGFlAHBLR8g8xPDIqoUIZk=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];

View file

@ -35,13 +35,13 @@
mkDerivation rec {
pname = "strawberry";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
sha256 = "sha256:0d9asg21j9ai23sb35cimws8bd8fsnpha777rgscraa7i09q0rx2";
sha256 = "sha256-OOdHsii6O4okVHDhrqCNJ7WVB0VKPs8q0AhEY+IvflE=";
};
buildInputs = [
@ -77,7 +77,10 @@ mkDerivation rec {
++ lib.optional withVlc libvlc;
nativeBuildInputs = [
cmake ninja pkg-config qttools
cmake
ninja
pkg-config
qttools
] ++ lib.optionals stdenv.isLinux [
util-linux
];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper,
dotnetPackages, dotnetCorePackages
dotnetPackages, dotnetCorePackages, altcoinSupport ? false
}:
let
@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
nuget sources Add -Name tmpsrc -Source $TMP/nuget
nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget
dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj
dotnet publish --no-restore --output $out/share/$pname -c Release BTCPayServer/BTCPayServer.csproj
dotnet restore --source $TMP/nuget ${lib.optionalString altcoinSupport ''/p:Configuration="Altcoins-Release"''} BTCPayServer/BTCPayServer.csproj
dotnet publish --no-restore --output $out/share/$pname ${lib.optionalString altcoinSupport "-c Altcoins-Release"} BTCPayServer/BTCPayServer.csproj
'';
# btcpayserver requires the publish directory as its working dir

View file

@ -84,6 +84,11 @@
version = "3.2.435";
sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk";
})
(fetchNuGet {
name = "Common.Logging.Core";
version = "3.4.1";
sha256 = "06h80c7l12nh6gnkzskcs4w8741xhprv72vf88f33ilzfy37h5jy";
})
(fetchNuGet {
name = "CsvHelper";
version = "15.0.5";
@ -759,6 +764,11 @@
version = "2.0.31";
sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm";
})
(fetchNuGet {
name = "NBitcoin";
version = "5.0.33";
sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a";
})
(fetchNuGet {
name = "NBitcoin";
version = "5.0.4";
@ -794,6 +804,86 @@
version = "3.0.21";
sha256 = "1asri2wsjq3ljf2p4r4x52ba9cirh8ccc5ysxpnv4cvladkdazbi";
})
(fetchNuGet {
name = "Nethereum.ABI";
version = "3.8.0";
sha256 = "10saq2qsqqgsf9d5cjji4lay74ydwkvkqgnns6gxikqicci8yx5c";
})
(fetchNuGet {
name = "Nethereum.Accounts";
version = "3.8.0";
sha256 = "03dq4l1gsd6r2hah5flas8d8pfys7hh5srd279kiidaaxrp8fv2m";
})
(fetchNuGet {
name = "Nethereum.BlockchainProcessing";
version = "3.8.0";
sha256 = "0sz6710a3rvzbj1ghx8dx9adfpsaydw8129c5nj2bqvvh6shi4ax";
})
(fetchNuGet {
name = "Nethereum.Contracts";
version = "3.8.0";
sha256 = "0989as81dqz4j0h8b5a9f5hnd4lrjdj851cfc4j5h6hd633a13f8";
})
(fetchNuGet {
name = "Nethereum.HdWallet";
version = "3.8.0";
sha256 = "0dy1bcm0gsp137286q3bx5q9gyd8lymrdmnh1ip3sszs5j31l9k2";
})
(fetchNuGet {
name = "Nethereum.Hex";
version = "3.8.0";
sha256 = "0sbi982jnfs39sp7w85wf8lb51mijpwr9mpsmws08zrm90n93kb6";
})
(fetchNuGet {
name = "Nethereum.JsonRpc.Client";
version = "3.8.0";
sha256 = "0gmdvsxhs398cj14f16r3dl8yv52iaxr9c9214k2ra28r14gfd1l";
})
(fetchNuGet {
name = "Nethereum.JsonRpc.RpcClient";
version = "3.8.0";
sha256 = "05k5f0dfcx4afbkc1w7cfnz514i7840j2haxyzsxkp8818yvfg0a";
})
(fetchNuGet {
name = "Nethereum.KeyStore";
version = "3.8.0";
sha256 = "05pj95vcfznlk4saq9dw19377gd1sqgmjcg5h92b5rzpgm9v811s";
})
(fetchNuGet {
name = "Nethereum.Model";
version = "3.8.0";
sha256 = "1qfhzqirj9bi49zb6rdcy7w5bm9jyv3a79q7crmgpq3qx4lmz5yh";
})
(fetchNuGet {
name = "Nethereum.RLP";
version = "3.8.0";
sha256 = "16142ag09h95394ip0ffkci09hchxh2i5xaw2rq46qcr8xd3kiym";
})
(fetchNuGet {
name = "Nethereum.RPC";
version = "3.8.0";
sha256 = "1m2p10dds1k0r3gci25lh6cxl9z7ciw18g6wwa4yqi1hsw7n59vb";
})
(fetchNuGet {
name = "Nethereum.Signer";
version = "3.8.0";
sha256 = "175acfqjqacc5zwh2kmrfnwd15jm3fjpv0xlgpyqry52mqxd9khf";
})
(fetchNuGet {
name = "Nethereum.StandardTokenEIP20";
version = "3.8.0";
sha256 = "0xqb32x5b9y9r380frhj52i1lxsfs92nfgcpmys3shjxz6fnwf6g";
})
(fetchNuGet {
name = "Nethereum.Util";
version = "3.8.0";
sha256 = "1ig1zkzpglq2q465n4c0ckv8w9gca9cfxz1qnrdhap0f1z90jyg8";
})
(fetchNuGet {
name = "Nethereum.Web3";
version = "3.8.0";
sha256 = "0n18chc9h1cxqp01kncik9lqfgiqrzl2zr8jgzbb05drlf6k0f3i";
})
(fetchNuGet {
name = "NETStandard.Library";
version = "1.6.1";
@ -914,6 +1004,11 @@
version = "2.2.1";
sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627";
})
(fetchNuGet {
name = "Portable.BouncyCastle";
version = "1.8.2";
sha256 = "0xqc8q40lr4r7ahsmzpa1q0jagp12abb6rsj80p37q34hsv5284q";
})
(fetchNuGet {
name = "QRCoder";
version = "1.4.1";

View file

@ -8,4 +8,5 @@ echo "Updating nbxplorer"
../nbxplorer/update.sh
echo
echo "Updating btcpayserver"
../nbxplorer/util/update-common.sh btcpayserver deps.nix
# Include Razor SDK packages in deps.nix
../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false'

View file

@ -1,21 +1,21 @@
{ buildGoModule
, fetchFromGitHub
, lib
, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" ]
, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" ]
}:
buildGoModule rec {
pname = "lnd";
version = "0.13.0-beta";
version = "0.13.1-beta";
src = fetchFromGitHub {
owner = "lightningnetwork";
repo = "lnd";
rev = "v${version}";
sha256 = "0fwidjkfzzd7k891x5z7jrx2arl0kwj6vm9z2acsyy7riv4zfjbq";
sha256 = "07cs9yq83laajmfwfv42xfkfai3q873wg4qg7bfzw18w5fllivkg";
};
vendorSha256 = "19myr9f5zh05y6lagd9pra60y8df7pz837310cbpq9a6zzwpdxk2";
vendorSha256 = "1hk67x8nlc0wm1pg8k8hywih623p4c0klfhfyy26b7mqq62lazia";
subPackages = ["cmd/lncli" "cmd/lnd"];

View file

@ -3,4 +3,4 @@ set -euo pipefail
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix
getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix ''

View file

@ -7,6 +7,7 @@ set -euo pipefail
pkgSrc=$1
depsFile=$(realpath "$2")
customFlags=$3
sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1)
[[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; }
@ -20,7 +21,7 @@ pushd "$tmpdir" > /dev/null
mkdir home
echo "Running dotnet restore for $sln"
HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \
dotnet restore -v normal --no-cache "$sln" > restore_log
dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log
echo "{ fetchNuGet }: [" > "$depsFile"
while read pkgSpec; do

View file

@ -8,6 +8,7 @@ set -euo pipefail
pkgName=$1
depsFile=$2
customFlags=$3
: ${getVersionFromTags:=}
: ${refetch:=}
@ -71,4 +72,4 @@ echo
# Create deps file
storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)"
. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile"
. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags"

View file

@ -2,6 +2,7 @@
, python3Packages
, fetchFromGitHub
, wrapQtAppsHook
, cups
}:
with python3Packages;
@ -17,6 +18,11 @@ buildPythonApplication rec {
sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32";
};
postPatch = ''
substituteInPlace inkcut/device/transports/printer/plugin.py \
--replace ", 'lpr', " ", '${cups}/bin/lpr', "
'';
nativeBuildInputs = [ wrapQtAppsHook ];
propagatedBuildInputs = [

View file

@ -29,7 +29,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.mpickering ];
platforms = with lib.platforms; linux;
# it probably needs https://proj.org/development/migration.html
broken = true;
};
}

View file

@ -0,0 +1,24 @@
{ fetchFromGitHub, rustPlatform, lib }:
with lib;
rustPlatform.buildRustPackage rec {
pname = "rm-improved";
version = "0.13.0";
cargoSha256 = "0wgpr6gx9dpvf02xgvrdbyiqfz1k9vipnvriz3jg0cz7n1afqisj";
src = fetchFromGitHub {
owner = "nivekuil";
repo = "rip";
rev = "0.13.0";
sha256 = "0d065xia4mwdhxkiqfg7pic6scfzipzmsvvx7l6l97w62lzpiqx3";
};
meta = {
description = "Replacement for rm with focus on safety, ergonomics and performance";
homepage = "https://github.com/nivekuil/rip";
maintainers = with maintainers; [ nils-degroot ];
license = licenses.gpl3Plus;
};
}

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0yfzr80pw632lkayg4qfmwzrqk02y30yz8br7isyhmgkswyp5rnx";
};
phases = "installPhase";
dontUnpack = true;
installPhase = ''
mkdir -p "$out"/{share/vue,bin}

View file

@ -18,9 +18,9 @@
}
},
"beta": {
"version": "92.0.4515.101",
"sha256": "1jcas265hhlqd9f63h4zw4n4xsl26c5zmjlmbf1px5icvcjfb2xd",
"sha256bin64": "0sb5l5nzfzisvrnhcfwhdh9rn6z6pkzqz4p92c40q2mlhmjrfhj0",
"version": "92.0.4515.107",
"sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf",
"sha256bin64": "179i18lckd85i6cc60mqpvv2jqdshc338m686yackdgz9qjrrlwd",
"deps": {
"gn": {
"version": "2021-05-07",

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "temporal";
version = "1.10.5";
version = "1.11.1";
src = fetchFromGitHub {
owner = "temporalio";
repo = "temporal";
rev = "v${version}";
sha256 = "sha256-+rU/Tn3k/VmAgZl169tVZsRf5SL4bI9r3p1svVfKN2E=";
sha256 = "sha256-upoWftm82QBdax0lbeu+Nmwscsj/fsOzGUPI+fzcKUM=";
};
vendorSha256 = "sha256-jbQPhGfZPPxjYTSJ9wMLzQIOhAwxJZypRzqwL421RfM=";
vendorSha256 = "sha256-eO/23MQpdXQNPCIzMC9nxvrgUFuEPABJ7vkBZKv+XZI";
# Errors:
# > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite

View file

@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
src = notmuch.src;
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
dontConfigure = true;
dontBuild = true;
installPhase = ''
${coreutils}/bin/install -Dm755 \
@ -36,7 +37,6 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
inherit version;
description = "Mutt support for notmuch";
homepage = "https://notmuchmail.org/";
license = with licenses; gpl3;

View file

@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "snakemake";
version = "6.5.3";
version = "6.6.1";
propagatedBuildInputs = with python3Packages; [
appdirs
@ -12,10 +12,13 @@ python3Packages.buildPythonApplication rec {
docutils
filelock
GitPython
jinja2
jsonschema
nbformat
networkx
psutil
pulp
pygraphviz
pyyaml
ratelimiter
requests
@ -28,7 +31,7 @@ python3Packages.buildPythonApplication rec {
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "a06839346425c74542e6e2e6047db3133cd747ef89e1ebd87dad1fbba041f62d";
sha256 = "91637a801342f3bc349c033b284fef7c0201b4e5e29d5650cb6c7f69096d4184";
};
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation {
aarch64-linux = "0m7xs12g97z1ipzaf7dgknf3azlah0p6bdr9i454azvzg955238b";
};
configurePhase = ":";
dontConfigure = true;
buildPhase = ''
mv firecracker-* firecracker

View file

@ -0,0 +1,21 @@
{ i3lock-color, lib, fetchFromGitHub }:
i3lock-color.overrideAttrs (oldAttrs : rec {
pname = "i3lock-blur";
version = "2.10";
src = fetchFromGitHub {
owner = "karulont";
repo = "i3lock-blur";
rev = version;
sha256 = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0=";
};
meta = with lib; {
description = "An improved screenlocker based upon XCB and PAM with background blurring filter";
homepage = "https://github.com/karulont/i3lock-blur/";
license = licenses.bsd3;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = platforms.all;
};
})

View file

@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];
phases = [ "installPhase" ];
installPhase = ''
osinfo-db-import --dir "$out/share/osinfo" "${src}"
'';

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "flat-remix-gnome";
version = "20210623";
version = "20210715";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
hash = "sha256-FKsbAvjhXb2ipe3XqACM6OwGYwbBbzvDjsUQYCIQ8NM=";
hash = "sha256-e7sXzmhfBfcp+KqIc9yuqqXLfYzVlQVn9TNYoa2lZcA=";
};
nativeBuildInputs = [ glib ];

View file

@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
version = "2021.Q2.5";
version = "2021.Q3.1";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
sha256 = "0NJoGk++SHt4dtoUj3UQeW4zFtwa7osczUr+vxi8DG8=";
sha256 = "HisJsG27UvVbe0w8zzZArqioQQRxfuK2TPEWggV3TNA=";
};
buildInputs = [

View file

@ -0,0 +1,53 @@
{ lib, stdenv
, fetchurl
, pkg-config
, cmake
, libdeflate
, libjpeg
, xz
, zlib
}:
stdenv.mkDerivation rec {
pname = "libtiff";
version = "4.2.0";
src = fetchurl {
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b";
};
cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_SKIP_BUILD_RPATH=OFF";
# FreeImage needs this patch
patches = [ ./headers-cmake.patch ];
outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ];
postFixup = ''
moveToOutput include/tif_dir.h $dev_private
moveToOutput include/tif_config.h $dev_private
moveToOutput include/tiffiop.h $dev_private
'';
nativeBuildInputs = [ cmake pkg-config ];
propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs.
enableParallelBuilding = true;
doInstallCheck = true;
installCheckTarget = "test";
meta = with lib; {
description = "Library and utilities for working with the TIFF image file format";
homepage = "https://libtiff.gitlab.io/libtiff";
changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html";
license = licenses.libtiff;
platforms = platforms.unix;
};
}

View file

@ -10,6 +10,8 @@
, zlib
}:
#FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix
stdenv.mkDerivation rec {
pname = "libtiff";
version = "4.3.0";

View file

@ -0,0 +1,13 @@
diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
--- a/libtiff/CMakeLists.txt 2019-05-31 13:05:22.849705817 +0000
+++ b/libtiff/CMakeLists.txt 2020-11-27 21:50:03.527831837 +0000
@@ -42,6 +42,9 @@
libtiffxx.map)
set(tiff_HEADERS
+ tiffiop.h
+ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h
+ tif_dir.h
tiff.h
tiffio.h
tiffvers.h)

View file

@ -26,8 +26,12 @@ let
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
postInstall = "rm -rf ${placeholder "out"}/share/libwebsockets-test-server";
disallowedReferences = [ stdenv.cc.cc ]; # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o
postInstall = ''
rm -r ${placeholder "out"}/share/libwebsockets-test-server
'';
# $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o
disallowedReferences = [ stdenv.cc.cc ];
meta = with lib; {
description = "Light, portable C library for websockets";

View file

@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "ode";
version = "0.12";
version = "0.16.2";
src = fetchurl {
url = "mirror://sourceforge/opende/ode-${version}.tar.bz2";
sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5";
url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz";
sha256 = "08hgh4gqdk77jcw8b7gq2mwsfg4a5v5y0j7g42bxiqhmn3ffnsmj";
};
meta = with lib; {
description = "Open Dynamics Engine";
homepage = "https://sourceforge.net/projects/opende";
homepage = "https://www.ode.org";
platforms = platforms.linux;
license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ];
};

View file

@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-MZTOIt468bdPCS7UVfr5hQZUsVy3TpY/TjRrNySIL70=";
excludes = [ "ChangeLog" ];
})
# fix a minor bug
# https://gitlab.com/hepcedar/yoda/-/merge_requests/45
(fetchpatch {
name = "yoda-fix-yodascale-for-gz.patch";
url = "https://gitlab.com/hepcedar/yoda/-/commit/b03162aeaa2c99e38512ba6e4818d2e0a825b757.diff";
sha256 = "sha256-IMuPalQ/GKcdJOKAlwE/IRWtxDdu0inoj+A9nbRl6Gs=";
})
];
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];

View file

@ -7,19 +7,28 @@
, libtiff
, curl
, gtest
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "proj";
version = "8.0.1";
version = "7.2.1";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "PROJ";
rev = version;
sha256 = "sha256-pgmv/mtqpKbgU1RuKtue7NAnMyXR1BwGJwoeA/MTrpY=";
sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
};
patches = [
(fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557
name = "gie_self_tests-fail.diff"; # included in >= 8.0.1
url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";
sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";
})
];
postPatch = lib.optionalString (version == "7.2.1") ''
substituteInPlace CMakeLists.txt \
--replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"

View file

@ -218,12 +218,12 @@ let
# remove node_ name prefix
(fetchpatch {
url = "https://github.com/svanderburg/node2nix/commit/b54d45207427ff46e90f16f2f32771fdc8bff5a4.patch";
sha256 = "03cg2xwryvdlvg299dg91qxicrw2r43grja80an9zkb875ps8jxh";
sha256 = "sha256-ubUdF0q3l4xxqZ7f9EiQEUQzyqxi9Q6zsRPETHlfzh8=";
})
# set meta platform
(fetchpatch {
url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch";
sha256 = "1c91qfqa6p4hzyafv5pq6rpgnny2805n007b1443gbqwrz5awz6n";
sha256 = "0sif7803c9g6gjmmdniw5qxrq5igiz9nqdmdrcf1hxfi5x43a32h";
})
];
};

View file

@ -22,6 +22,10 @@ buildPythonPackage rec {
propagatedBuildInputs = [ agate sqlalchemy ];
# crate is broken in nixpkgs, with SQLAlchemy > 1.3
# Skip tests for now as they rely on it.
doCheck = false;
checkInputs = [ crate nose geojson ];
checkPhase = ''

View file

@ -39,5 +39,11 @@ buildPythonPackage rec {
description = "A Python client library for CrateDB";
license = licenses.asl20;
maintainers = with maintainers; [ doronbehar ];
# 2021-07-12 (@layus): Please unbreak when an update fixes compatibility
# with the version of SQLAlchemy in nixpkgs
# And also re-enable tests in pythonPackages.agate-sql.
# The version string below is intentionally split, so nixpkgs-update does
# not change it. That would make this warning pretty useless.
broken = assert version == "0.2"+"6.0"; true;
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "earthly";
version = "0.5.17";
version = "0.5.18";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
sha256 = "sha256-SuHHeO2KFjB3HbLv1ODBGaXzNaDi/FNPOGg/lX8JLJE=";
sha256 = "sha256-YY4scGRMuvyEpeEgvoJJsTtROl11hMyGr7vYBYvJY/w=";
};
vendorSha256 = "sha256-D62fG+T3G1W7xteSGlTtEkXbQfGAmBTYJeATH2CVtwY=";
vendorSha256 = "sha256-aDkaOycQ/wPybSH5fnJIGtCOh+KV0wEF+qinRQQIdm4=";
buildFlagsArray = ''
-ldflags=

View file

@ -0,0 +1,31 @@
{ lib
, buildGoModule
, fetchFromGitHub
, git
}:
buildGoModule rec {
pname = "ko";
version = "0.8.3";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LoOXZY4uF7GSS3Dh/ozCsLJTxgmPmZZuEisJ4ShjCBc=";
};
vendorSha256 = null;
excludedPackages = "test";
checkInputs = [ git ];
preCheck = ''
git init
'';
meta = with lib; {
description = "A simple, fast container image builder for Go applications.";
homepage = "https://github.com/google/ko";
license = licenses.asl20;
maintainers = with maintainers; [ nickcao ];
};
}

View file

@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
version = "7.7.0";
version = "8.0.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897";
sha256 = "144mz37xhk7gkwhmf67q1h07f2biy5nnw78yb2syc7w28v48ng0z";
};
# don't remove runtime deps

View file

@ -1,34 +1,65 @@
{ lib, stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg
, libpng, freeglut, libGLU, libGL, SDL, SDL_mixer, SDL_image, SDL_net
, SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gettext, makeWrapper, bzip2
, curl, libjpeg, libxml2, xz, lua, ode, libGL, libpng, SDL, SDL_mixer, SDL_net
, SDL_ttf, sqlite, libxdg_basedir, zlib }:
stdenv.mkDerivation rec {
pname = "xmoto";
version = "0.5.11";
version = "0.6.1";
src = fetchurl {
url = "https://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
sha256 = "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "00f5ha79lfa2iiaz66wl0hl5dapa1l15qdr7m7knzi0ll7j6z66n";
};
patches = [
# Fix build with Nix
(fetchpatch {
url = "https://github.com/xmoto/xmoto/commit/536dcc7ec77a4c4c454b86220e85b1cb3cd1c7f7.patch";
sha256 = "0h9lld668jrbmrqva89zqwp63jiagjj86prkxzx6372p3kk9y7g7";
})
];
nativeBuildInputs = [
cmake
gettext
makeWrapper
];
buildInputs = [
chipmunk sqlite curl zlib bzip2 libjpeg libpng
freeglut libGLU libGL SDL SDL_mixer SDL_image SDL_net SDL_ttf
lua5 ode libxdg_basedir libxml2
bzip2
curl
libjpeg
libxml2
xz
lua
ode
libGL
libpng
SDL
SDL_mixer
SDL_net
SDL_ttf
sqlite
libxdg_basedir
zlib
];
CXXFLAGS = [
"-fpermissive"
# Build using the old C++ ABI to fix issue with missing text; the issue
# should be fixed in the next stable release (if that ever does happen)
"-D_GLIBCXX_USE_CXX11_ABI=0"
];
preFixup = ''
wrapProgram "$out/bin/xmoto" \
--prefix XDG_DATA_DIRS : "$out/share/"
'';
meta = with lib; {
description = "Obstacled race game";
description = "A challenging 2D motocross platform game, where physics play an important role";
longDescription = ''
X-Moto is a challenging 2D motocross platform game, where physics plays an all important role in the gameplay.
You need to control your bike to its limits, if you want to have a chance to finish the most difficult challenges.
'';
homepage = "http://xmoto.tuxfamily.org";
maintainers = with maintainers; [ raskin pSub ];
platforms = platforms.linux;
license = licenses.gpl2;
platforms = platforms.all;
license = licenses.gpl2Plus;
};
}

View file

@ -3,19 +3,19 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
version = "2.13.0";
version = "2.13.2";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix";
sha256 = "1wc4jl4h3ja4ivynf20yxzwqssi6yd7alvqvcjrkksic98480qcz";
sha256 = "0h7c6p2dcwsg7wlp49p2fsq0f164pzkx65929imd1m2df77aykqa";
};
patches = [ ./fix-terraform-ls.patch ];
postPatch = ''
substituteInPlace out/extension.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
substituteInPlace out/clientHandler.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
'';
meta = with lib; {

View file

@ -1,17 +1,30 @@
diff --git a/out/clientHandler.js b/out/clientHandler.js
index 7f9716d..a543d60 100644
--- a/out/clientHandler.js
+++ b/out/clientHandler.js
@@ -33,8 +33,7 @@ class ClientHandler {
this.reporter.sendTelemetryEvent('usePathToBinary');
}
else {
- const installPath = path.join(context.extensionPath, 'lsp');
- this.pathToBinary = path.join(installPath, 'terraform-ls');
+ this.pathToBinary = 'TERRAFORM-LS-PATH';
}
}
startClients(folders) {
diff --git a/out/extension.js b/out/extension.js
index e932d27..099126b 100644
index 7a271fc..726bbf8 100644
--- a/out/extension.js
+++ b/out/extension.js
@@ -143,25 +143,6 @@ function updateLanguageServer() {
return __awaiter(this, void 0, void 0, function* () {
const delay = 1000 * 60 * 60 * 24;
languageServerUpdater.timeout(updateLanguageServer, delay); // check for new updates every 24hrs
- // skip install if a language server binary path is set
@@ -149,24 +149,6 @@ function updateLanguageServer(clientHandler, installPath) {
updateLanguageServer(clientHandler, installPath);
}, 24 * hour);
// skip install if a language server binary path is set
- if (!vscodeUtils_1.config('terraform').get('languageServer.pathToBinary')) {
- const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter);
- const install = yield installer.needsInstall();
- if (install) {
- yield stopClients();
- yield clientHandler.stopClients();
- try {
- yield installer.install();
- }
@ -25,15 +38,6 @@ index e932d27..099126b 100644
- }
- }
- }
return startClients(); // on repeat runs with no install, this will be a no-op
return clientHandler.startClients(vscodeUtils_1.prunedFolderNames()); // on repeat runs with no install, this will be a no-op
});
}
@@ -259,7 +240,7 @@ function pathToBinary() {
reporter.sendTelemetryEvent('usePathToBinary');
}
else {
- command = path.join(installPath, 'terraform-ls');
+ command = 'TERRAFORM-LS-PATH';
}
_pathToBinaryPromise = Promise.resolve(command);
}

View file

@ -12,7 +12,7 @@
, Security
, nghttp2
, libgit2
, withStableFeatures ? true
, withExtraFeatures ? true
}:
rustPlatform.buildRustPackage rec {
@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-Ly59mdUzSI2pIPbckWn1WBz/o2zVzpAzaCDROLdjG7Y=";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ]
++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ]
++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
cargoBuildFlags = lib.optional withStableFeatures "--features stable";
cargoBuildFlags = lib.optional withExtraFeatures "--features=extra";
# TODO investigate why tests are broken on darwin
# failures show that tests try to write to paths

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0s7kirgh5iz91m3qy8xiq0j4gljy8zrcnylf4szl5h0lrsaqj7ya";
};
phases = [ "buildPhase" "installPhase" ];
dontUnpack = true;
buildInputs = [ libX11 ];

View file

@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
inherit (src.meta) homepage;
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ primeos ];
maintainers = with maintainers; [ ];
};
}

View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
version = "1.36.0";
version = "1.37.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-2pkSwr/8pmRedcsvl55wHskv0aSAjlIbmHFUoTXCTE0=";
sha256 = "sha256-ETj14xwCQJv3xNYXFY/Z0FsxjxLrlpcVkap2sRsLzVU=";
};
goPackagePath = "github.com/exoscale/cli";

View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
phases = [ "installPhase" ];
dontUnpack = true;
installPhase = let
env = bundlerEnv {

View file

@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ];
phases = [ "unpackPhase" "patchPhase" "installPhase" "installCheckPhase" ];
dontBuild = true;
patchPhase = ''
sed -i '1s;^;#!${python3.interpreter}\n;' ubidump.py

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l";
};
phases = [ "installPhase" ];
dontUnpack = true;
installPhase = ''
mkdir -p "$out/bin"

View file

@ -0,0 +1,24 @@
{ lib, stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "bitwise";
version = "0.42";
src = fetchFromGitHub {
owner = "mellowcandle";
repo = "bitwise";
rev = "v${version}";
sha256 = "154y0sn3z64z56k84ghsazkyihbkaz40hfwxcxdymnhvhh6m9f3g";
};
buildInputs = [ ncurses readline ];
nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {
description = "Terminal based bitwise calculator in curses";
homepage = "https://github.com/mellowcandle/bitwise";
license = licenses.gpl3Only;
maintainers = [ maintainers.whonore ];
platforms = platforms.unix;
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-dxNZk1pd6kfWgwbUmV5dqjTnhpHqYWGivupN8D+eBMU=";
sha256 = "sha256-EStR/tmbu95tptB7h3rHxoro87jlhu3i0XwRQNbIBvA=";
};
vendorSha256 = "sha256-Geeo/tqF+VJamIzgU1qz0iEjTKE8jwFQLGXPBuN9eN8=";

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "du-dust";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "bootandy";
repo = "dust";
rev = "v${version}";
sha256 = "sha256-15n8CpyyC41oJRrFlNHYXF5UjOyYPX93Zrq7jcU2DVM=";
sha256 = "sha256-SgTEawxuz9gRxSZ9edNz2NwfJWSAwxKXxDJVpU6oTBg=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "sha256-rqNj3EwszSIn2cMmslO6T3K5NxQJ9u56m37TU1GwtVI=";
cargoSha256 = "sha256-/kDF1ZOzu32Dwd5fWZGhMlEf65TAKLMPFu+ZnZxOAms=";
doCheck = false;

View file

@ -1,18 +1,18 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, callPackage }:
buildGoModule rec {
pname = "tfk8s";
version = "0.1.4";
version = "0.1.5";
tag = "v${version}";
src = fetchFromGitHub {
owner = "jrhouston";
repo = "tfk8s";
rev = tag;
sha256 = "sha256-Ha/F8rCGZqFYqJzfemmKRyEBI5khaSIerJxvf2Pf2ao=";
sha256 = "sha256-T0zM2JOmzk8YyS3+De6yGwiwLgyb6Rwy6hT9b44wNxQ=";
};
vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE=";
vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I=";
runVend = true;
buildFlagsArray = [
@ -30,6 +30,10 @@ buildGoModule rec {
$out/bin/tfk8s --version | grep ${tag} > /dev/null
'';
passthru.tests = {
sample1 = callPackage ./tests/sample1 { };
};
meta = with lib; {
description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format";
license = licenses.mit;

View file

@ -0,0 +1,11 @@
{ runCommandCC, tfk8s }:
runCommandCC "tfk8s-test-sample1" {
buildInputs = [
tfk8s
];
meta.timeout = 60;
}
''
cmp <(${tfk8s}/bin/tfk8s -f ${./input.yaml}) ${./output.tf} > $out
''

View file

@ -0,0 +1,7 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
name: test
data:
TEST: test

View file

@ -0,0 +1,12 @@
resource "kubernetes_manifest" "configmap_test" {
manifest = {
"apiVersion" = "v1"
"data" = {
"TEST" = "test"
}
"kind" = "ConfigMap"
"metadata" = {
"name" = "test"
}
}
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "yafetch";
version = "unstable-2021-06-15";
version = "unstable-2021-07-18";
src = fetchFromGitLab {
owner = "cyberkitty";
repo = pname;
rev = "423a7d1f1ef8f0e4caf586710828620d3cb593e3";
sha256 = "184yy7i8ca2fh6d1rxyhxi9gqb57fpz7ia0i56dl1zhg769m8b99";
rev = "f3efbca54df1ffea22cc40034114af141ccff9c1";
sha256 = "1cxhrjy9vzq87rzql4dcknkwca7nydysp1p1x4fh1qfw79dfdmxw";
};
# Use the provided NixOS logo automatically

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "amass";
version = "3.13.3";
version = "3.13.4";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = "v${version}";
sha256 = "sha256-uIqnylq99P9M8nOuqkKl7fGIVfYO6cO0DAQ4eaC2qyY=";
sha256 = "0zlkr0r06w3y34nx174wyfwk69i2q0bcq88kfvb0j3d28fdh5p31";
};
vendorSha256 = "sha256-LOnnvidUdDDhNPWM+o0Ef4NqRboi89s0DzDwuxi0nl8=";
vendorSha256 = "065n1vhj5003ay4pflp418w32s84jvza52lghj6cpcdzs0rwgc45";
outputs = [ "out" "wordlists" ];

View file

@ -9,7 +9,7 @@ let
in stdenv.mkDerivation {
name = "maphosts-${env.gems.maphosts.version}";
phases = ["installPhase"];
dontUnpack = true;
installPhase = ''
mkdir -p "$out/bin"

View file

@ -17,15 +17,13 @@
stdenv.mkDerivation rec {
pname = "gtk-gnutella";
# NOTE: Please remove hardeningDisable on the next release, see:
# https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "gtk-gnutella";
repo = "gtk-gnutella";
rev = "v${version}";
sha256 = "0j596dpajk68bkry0gmpqawsi61rphfciy4vji1dh890jyhkhdgy";
sha256 = "sha256-Hk5KPXSJ2s0J/stW3Qgvu6p6RG5VCvuWx1UlMR+3JO4=";
};
nativeBuildInputs = [
@ -54,8 +52,6 @@ stdenv.mkDerivation rec {
++ lib.optionals (!enableGui) [ "--topless" ]
;
hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ];
enableParallelBuilding = true;
postInstall = ''

View file

@ -0,0 +1,23 @@
{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }:
stdenv.mkDerivation rec {
pname = "userhosts";
version = "1.0.0";
src = fetchFromGitHub {
owner = "figiel";
repo = "hosts";
rev = "v${version}";
hash = "sha256-9uF0fYl4Zz/Ia2UKx7CBi8ZU8jfWoBfy2QSgTSwXo5A";
};
installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "A libc wrapper providing per-user hosts file";
homepage = "https://github.com/figiel/hosts";
maintainers = [ maintainers.bobvanderlinden ];
license = licenses.cc0;
platforms = platforms.linux;
};
}

View file

@ -1,24 +1,19 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
let
pname = "nar-serve";
version = "0.3.0";
in
buildGoModule rec {
inherit pname version;
pname = "nar-serve";
version = "0.4.0";
src = fetchFromGitHub {
owner = "numtide";
repo = "nar-serve";
rev = "v${version}";
sha256 = "000xxrar5ngrqqfi7ynx84i6wi27mirgm26brhyg0y4pygc9ykhz";
hash = "sha256-h/pzKRXgcGTpr1YUKppDa+iTLKak/PGhbYa8ZczWj1U=";
};
vendorSha256 = "0qkzbr85wkx3r7qgnzg9pdl7vsli10bzcdbj2gqd1kdzwb8khszs";
vendorSha256 = "sha256-eW+cul/5qJocpKV/6azxj7HTmkezDw6dNubPtAOP5HU=";
doCheck = false;

View file

@ -15,13 +15,20 @@ stdenv.mkDerivation {
(haskellPackages.ghcWithPackages (hs: with hs; [ posix-escape ]))
];
phases = [ "buildPhase" "installPhase" "fixupPhase" ];
buildPhase = ''
runHook preBuild
mkdir -p $out/bin
ghc -O2 $src/nix-script.hs -o $out/bin/nix-script -odir . -hidir .
runHook postBuild
'';
installPhase = ''
runHook preInstall
ln -s $out/bin/nix-script $out/bin/nix-scripti
runHook postInstall
'';
meta = with lib; {

View file

@ -1,4 +1,5 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub
, installShellFiles
, makeWrapper
, nix
, openssl
@ -8,18 +9,24 @@
rustPlatform.buildRustPackage rec {
pname = "nix-template";
version = "0.1.1";
version = "0.1.4";
src = fetchFromGitHub {
name = "${pname}-${version}-src";
owner = "jonringer";
repo = pname;
rev = "v${version}";
sha256 = "sha256-A1b/fgSr27sfMDnTi4R3PUZfhAdLA5wUOd4yh9/4Bnk=";
sha256 = "sha256-kNFhSfHUYBUOCXoD6m7thMho4tOIpRHfHGcsW8FTgkc=";
};
cargoSha256 = "sha256-resyY/moqLo4KWOKUvFJiOWealCmcEsLFgkN12slKN0=";
cargoSha256 = "sha256-7PthFLCEt+E/Gx5//aulHYYBKZqapNEWKtKfRlDr3Pw=";
nativeBuildInputs = [
installShellFiles
makeWrapper
pkg-config
];
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
@ -27,6 +34,11 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
wrapProgram $out/bin/nix-template \
--prefix PATH : ${lib.makeBinPath [ nix ]}
installShellCompletion --cmd nix-template \
--bash <($out/bin/nix-template completions bash) \
--fish <($out/bin/nix-template completions fish) \
--zsh <($out/bin/nix-template completions zsh)
'';
meta = with lib; {

View file

@ -1,18 +1,16 @@
{ lib, stdenv, fetchurl, which }:
stdenv.mkDerivation {
name = "ossec-client-2.6";
stdenv.mkDerivation rec {
pname = "ossec-client";
version = "2.6";
src = fetchurl {
url = "https://www.ossec.net/files/ossec-hids-2.6.tar.gz";
url = "https://www.ossec.net/files/ossec-hids-${version}.tar.gz";
sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip";
};
buildInputs = [ which ];
phases = [ "unpackPhase" "patchPhase" "buildPhase" ];
patches = [ ./no-root.patch ];
buildPhase = ''
@ -30,11 +28,12 @@ yes
" | ./install.sh
'';
meta = {
meta = with lib; {
description = "Open source host-based instrusion detection system";
homepage = "https://www.ossec.net";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,46 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, Security, libiconv, pkg-config, protobuf, which, buildPackages }:
rustPlatform.buildRustPackage rec {
pname = "quill";
version = "0.2.1";
src = fetchFromGitHub {
owner = "dfinity";
repo = "quill";
rev = "v${version}";
sha256 = "02ga2xkdxs36mfr4lv43cy6wkf27c28bdkzfkp3az5jvyk17mkfr";
};
ic = fetchFromGitHub {
owner = "dfinity";
repo = "ic";
rev = "779549eccfcf61ac702dfc2ee6d76ffdc2db1f7f";
sha256 = "1r31d5hab7k1n60a7y8fw79fjgfq04cgj9krwa6r9z4isi3919v6";
};
registry = "file://local-registry";
preBuild = ''
export REGISTRY_TRANSPORT_PROTO_INCLUDES=${ic}/rs/registry/transport/proto
export IC_BASE_TYPES_PROTO_INCLUDES=${ic}/rs/types/base_types/proto
export IC_PROTOBUF_PROTO_INCLUDES=${ic}/rs/protobuf/def
export IC_NNS_COMMON_PROTO_INCLUDES=${ic}/rs/nns/common/proto
export PROTOC=${buildPackages.protobuf}/bin/protoc
export OPENSSL_DIR=${openssl.dev}
export OPENSSL_LIB_DIR=${openssl.out}/lib
'';
cargoSha256 = "142pzhyi73ljlqas5vbhjhn4vmp9w9ps1mv8q7s3kzg0h7jcvm1k";
nativeBuildInputs = [ pkg-config protobuf ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security libiconv ];
meta = with lib; {
homepage = "https://github.com/dfinity/quill";
changelog = "https://github.com/dfinity/quill/releases/tag/v${version}";
description = "Minimalistic ledger and governance toolkit for cold wallets on the Internet Computer.";
license = licenses.asl20;
maintainers = with maintainers; [ imalison ];
};
}

View file

@ -5,20 +5,27 @@
buildGoModule rec {
pname = "step-cli";
version = "0.15.16";
version = "0.16.1";
src = fetchFromGitHub {
owner = "smallstep";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-/HqCG3LscwogLXvZlL2CVo2Pj1hVRnOMPCmG1hxrG/I=";
sha256 = "sha256-gMXvHPqWvaZmzWiWrxlknaMkUraS64yrKl+RzAF7c4I=";
};
ldflags = [
"-w"
"-s"
"-X main.Version=${version}"
];
preCheck = ''
# Tries to connect to smallstep.com
rm command/certificate/remote_test.go
'';
vendorSha256 = "sha256-plQgIqs6QUbzndn8C0ByKceGtz/JxZ1Rx0fXWHNJ0kM=";
vendorSha256 = "sha256-WF2UD0LwzCMkoW1EfcjV+9ZboPp1oWhmsSEryj13Kg0=";
meta = with lib; {
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation {
pname = "collectd-data";
phases = [ "installPhase" ];
dontUnpack = true;
installPhase = ''
mkdir -p $out/share/collectd

View file

@ -26,11 +26,7 @@ in stdenv.mkDerivation rec {
sha256 = "0kimp8l9ax37grfv5r5iw0g0xnrpkak022fl10y3i7kc4nyi1s99";
};
phases = [
"unpackPhase"
"installPhase"
"fixupPhase"
];
dontBuild = true;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perlPackages.perl beancount ] ++ perlDeps;

View file

@ -11,7 +11,7 @@ let
in stdenv.mkDerivation {
name = "papertrail-${(import ./gemset.nix).papertrail.version}";
phases = [ "installPhase" ];
dontUnpack = true;
installPhase = ''
mkdir -p $out/bin

View file

@ -1253,6 +1253,8 @@ in
betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { };
bitwise = callPackage ../tools/misc/bitwise { };
brakeman = callPackage ../development/tools/analysis/brakeman { };
brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ;
@ -3218,6 +3220,8 @@ in
rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };
rm-improved = callPackage ../applications/misc/rm-improved { };
remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
restream = callPackage ../applications/misc/remarkable/restream { };
@ -13783,6 +13787,8 @@ in
khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { };
ko = callPackage ../development/tools/ko { };
krankerl = callPackage ../development/tools/krankerl { };
krew = callPackage ../development/tools/krew { };
@ -17088,7 +17094,9 @@ in
libtifiles2 = callPackage ../development/libraries/libtifiles2 { };
libtiff = callPackage ../development/libraries/libtiff { };
libtiff = if stdenv.isDarwin && stdenv.isAarch64
then callPackage ../development/libraries/libtiff/aarch64-darwin.nix { }
else callPackage ../development/libraries/libtiff { };
libtiger = callPackage ../development/libraries/libtiger { };
@ -18092,6 +18100,10 @@ in
quicksynergy = callPackage ../applications/misc/quicksynergy { };
quill = callPackage ../tools/security/quill {
inherit (darwin.apple_sdk.frameworks) Security;
};
qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {};
qwt = callPackage ../development/libraries/qwt {};
@ -21933,6 +21945,8 @@ in
usbutils = callPackage ../os-specific/linux/usbutils { };
userhosts = callPackage ../tools/networking/userhosts { };
usermount = callPackage ../os-specific/linux/usermount { };
util-linux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { }
@ -24832,6 +24846,8 @@ in
cairo = cairo.override { xcbSupport = true; };
};
i3lock-blur = callPackage ../applications/window-managers/i3/lock-blur.nix { };
i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { };
i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { };

View file

@ -1328,12 +1328,12 @@ let
propagatedBuildInputs = [ CarpClan ];
};
BKeywords = buildPerlPackage {
BKeywords = buildPerlPackage rec {
pname = "B-Keywords";
version = "1.21";
version = "1.22";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.21.tar.gz";
sha256 = "12481z1z1nyrjlkizzqn4cdmcrfjkc3hvxppqipsf6r5gnffh9as";
url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-${version}.tar.gz";
sha256 = "0i2ksp0w9wv1qc22hrdl3k48cww64syhmv8zf6x0kgyd4081hr56";
};
meta = {
description = "Lists of reserved barewords and symbol names";