public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2020-06-10 04:10:34 +02:00
parent 0b4afef84a 986ff168c7
commit c637cbe992
169 changed files with 5627 additions and 11437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/audio/pulseaudio-modules-bt/default.nix
View File

@@ -24,18 +24,17 @@ let
in stdenv.mkDerivation rec {
pname = "pulseaudio-modules-bt";
version = "1.3";
version = "1.4";
src = fetchFromGitHub {
owner = "EHfive";
repo = "pulseaudio-modules-bt";
rev = "v${version}";
sha256 = "00xmidcw4fvpbmg0nsm2gk5zw26fpyjbc0pjk6mzr570zbnyqqbn";
sha256 = "0bzg6x405j39axnkvc6n6vkl1hv1frk94y1i9sl170081bk23asd";
};
patches = [
./fix-install-path.patch
./fix-aac-defaults.patch
];
nativeBuildInputs = [
@@ -63,6 +62,10 @@ in stdenv.mkDerivation rec {
# Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions
substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version}
substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version}
# Fraunhofer recommends to enable afterburner but upstream has it set to false by default
substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \
--replace "info->aac_afterburner = false;" "info->aac_afterburner = true;"
'';
postFixup = ''

15
pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch
View File

@@ -1,15 +0,0 @@
diff --git a/src/modules/bluetooth/a2dp/a2dp_aac.c b/src/modules/bluetooth/a2dp/a2dp_aac.c
index 394a7a0..cf5abaf 100644
--- a/src/modules/bluetooth/a2dp/a2dp_aac.c
+++ b/src/modules/bluetooth/a2dp/a2dp_aac.c
@@ -90,8 +90,8 @@ pa_aac_encoder_init(pa_a2dp_source_read_cb_t read_cb, pa_a2dp_source_read_buf_fr
info->read_pcm = read_cb;
info->read_buf_free = free_cb;
info->aacenc_handle_opened = false;
- info->aac_enc_bitrate_mode = 5;
- info->aac_afterburner = false;
+ info->aac_enc_bitrate_mode = 0;
+ info->aac_afterburner = true;
info->force_pa_fmt = PA_SAMPLE_INVALID;
return true;
}

6
pkgs/applications/blockchains/go-ethereum.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-ethereum";
version = "1.9.14";
version = "1.9.15";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "0vqsx4q7jn6vhmrm9kkk810d5nvnmyb6bni38ynkxcwlrp3qs6v2";
sha256 = "1c69rfnx9130b87pw9lnaxyrbzwfhqb2dxyl7qyiscq85hqs16f9";
};
usb = fetchFromGitHub {
@@ -18,7 +18,7 @@ buildGoModule rec {
sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2";
};
vendorSha256 = "01mbmc8qlp08127dlmcqz0viasmg7mrzqzmyw21an69sabcr112n";
vendorSha256 = "1pjgcx6sydfipsx8s0kl7n6r3lk61klsfrkd7cg4l934k590q2n7";
overrideModAttrs = (_: {
postBuild = ''

4
pkgs/applications/graphics/avocode/default.nix
View File

@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
version = "4.6.3";
version = "4.6.4";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "1s8i82963fdx5q4wgh0cn211h0p1r1mzyss0g99bplp8d9ll40kw";
sha256 = "1hkqv2lix58my009i61cy0vpazxqpzapfhxkw5439ndn6qk1782d";
};
libPath = stdenv.lib.makeLibraryPath (with xorg; [

21
pkgs/applications/misc/blender/darwin.patch
View File

@@ -9,7 +9,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
endif()
if(WITH_OPENAL)
@@ -79,7 +78,7 @@ endif()
@@ -86,7 +85,7 @@ endif()
if(WITH_CODEC_SNDFILE)
set(LIBSNDFILE ${LIBDIR}/sndfile)
set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
@@ -18,7 +18,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate
endif()
@@ -90,7 +89,7 @@ if(WITH_PYTHON)
@@ -97,7 +96,7 @@ if(WITH_PYTHON)
# normally cached but not since we include them with blender
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
@@ -27,7 +27,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
else()
@@ -155,10 +154,7 @@ if(WITH_CODEC_FFMPEG)
@@ -162,10 +161,7 @@ if(WITH_CODEC_FFMPEG)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
set(FFMPEG_LIBRARIES
avcodec avdevice avformat avutil
@@ -39,7 +39,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
endif()
@@ -199,14 +195,14 @@ if(WITH_OPENCOLLADA)
@@ -206,14 +202,14 @@ if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/opencollada)
set(OPENCOLLADA_INCLUDE_DIRS
@@ -60,16 +60,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
set(OPENCOLLADA_LIBRARIES
OpenCOLLADASaxFrameworkLoader
-lOpenCOLLADAFramework
@@ -215,7 +211,7 @@ if(WITH_OPENCOLLADA)
-lMathMLSolver
-lGeneratedSaxParser
-lbuffer -lftoa -lUTF
- ${OPENCOLLADA_LIBPATH}/libxml2.a
+ xml2
)
# PCRE is bundled with openCollada
# set(PCRE ${LIBDIR}/pcre)
@@ -276,14 +272,13 @@ if(WITH_BOOST)
@@ -277,14 +273,13 @@ if(WITH_BOOST)
endif()
if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
@@ -85,7 +76,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
${PNG_LIBRARIES}
${JPEG_LIBRARIES}
${TIFF_LIBRARY}
@@ -306,7 +301,7 @@ endif()
@@ -307,7 +302,7 @@ endif()
if(WITH_OPENCOLORIO)
set(OPENCOLORIO ${LIBDIR}/opencolorio)
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)

6
pkgs/applications/misc/blender/default.nix
View File

@@ -17,11 +17,11 @@ let python = python3Packages.python; in
stdenv.mkDerivation rec {
pname = "blender";
version = "2.82a";
version = "2.83.0";
src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
sha256 = "18zbdgas6qf2kmvvlimxgnq7y9kj7hdxcgixrs6fj50x40q01q2d";
sha256 = "07rzm4xaj94pjxy2vlqfhi1adsqpshfkrzrq8kljmcbnw22vrqhl";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;
@@ -142,6 +142,6 @@ stdenv.mkDerivation rec {
# say: "We've decided to cancel the BL offering for an indefinite period."
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = [ maintainers.goibhniu ];
maintainers = with maintainers; [ goibhniu veprbl ];
};
}

6
pkgs/applications/networking/browsers/chromium/common.nix
View File

@@ -80,7 +80,7 @@ let
# "ffmpeg" # https://crbug.com/731766
# "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
] ++ optional (upstream-info.channel != "dev") "yasm";
] ++ optional (versionRange "0" "84") "yasm";
opusWithCustomModes = libopus.override {
withCustomModes = true;
@@ -95,7 +95,7 @@ let
ffmpeg libxslt libxml2
# harfbuzz # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
] ++ (if upstream-info.channel == "dev" then [ nasm ] else [ yasm ]);
] ++ (if (versionRange "0" "84") then [ yasm ] else [ nasm ]);
# build paths and release info
packageName = extraAttrs.packageName or extraAttrs.name;
@@ -226,7 +226,7 @@ let
ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar
'';
gnFlags = mkGnFlags (optionalAttrs (upstream-info.channel != "dev") {
gnFlags = mkGnFlags (optionalAttrs (versionRange "0" "84") {
linux_use_bundled_binutils = false;
} // {
use_lld = false;

6
pkgs/applications/networking/cluster/helmfile/default.nix
View File

@@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
let version = "0.114.0"; in
let version = "0.118.6"; in
buildGoModule {
pname = "helmfile";
@@ -10,12 +10,12 @@ buildGoModule {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
sha256 = "0486wcfizi8xljr29mznc4p11ggz4rvk5n53qvb30f7ry4ncc8n5";
sha256 = "0zbvz8kn52c1q4yn8n9z4rrf761h495fhjw72x9q1nh44hr7npwd";
};
goPackagePath = "github.com/roboll/helmfile";
vendorSha256 = "0m16l3px2ykdsrmlirf7c4lwgmigs6p3rdr61l49acwsmniz2m8a";
vendorSha256 = "0xj14f0yx7x9ziijd1yka1n6kbmmhbibsk3ppp8cn1pqrwgqk7pr";
nativeBuildInputs = [ makeWrapper ];

418
pkgs/applications/networking/cluster/terraform-providers/data.nix
View File

@@ -4,9 +4,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-aci";
rev = "v0.2.1";
version = "0.2.1";
sha256 = "1ylc3w5m68q7vvdignrgw3kwdmrw7w0blmfffxc4cam0a6a7q05l";
rev = "v0.2.3";
version = "0.2.3";
sha256 = "0sk0pp178w03fhsb65b9mpim1l4wqfnv9r9x64kiapjnvfb1rz3j";
};
acme =
{
@@ -20,17 +20,17 @@
{
owner = "terraform-providers";
repo = "terraform-provider-akamai";
rev = "v0.5.0";
version = "0.5.0";
sha256 = "18l1ik10pn4aq0911sqnfjw9a5zxrm0qbsgynvf5vxc02zds13n5";
rev = "v0.7.1";
version = "0.7.1";
sha256 = "0mg81147yz0m24xqljpw6v0ayhvb4fwf6qwaj7ii34hy2gjwv405";
};
alicloud =
{
owner = "terraform-providers";
repo = "terraform-provider-alicloud";
rev = "v1.80.1";
version = "1.80.1";
sha256 = "0d483lp3rwz99f77sds717hafzbz1z7gq58dw52qzqagam8lrc10";
rev = "v1.86.0";
version = "1.86.0";
sha256 = "1hbv9ah7fd173sapwgsbg7790piwxw9zx90wfj5vz5b96ggbg28d";
};
archive =
{
@@ -52,49 +52,49 @@
{
owner = "terraform-providers";
repo = "terraform-provider-auth0";
rev = "v0.9.3";
version = "0.9.3";
sha256 = "04dd7jxhpw2dqj6h3sbknbl1fa92jzshznm8icxrjajpxhcnbc32";
};
avi =
{
owner = "terraform-providers";
repo = "terraform-provider-avi";
rev = "18.2.8";
version = "18.2.8";
sha256 = "0vpa6wksvb4gz65hgq0vizw0bky400bqh9zgf41g0mqkhv3wwb4i";
rev = "v0.11.0";
version = "0.11.0";
sha256 = "1dkcgzvvwmw5z5q4146jk0gj5b1zrv51vvkhhjd8qh9ipinipn97";
};
aviatrix =
{
owner = "terraform-providers";
repo = "terraform-provider-aviatrix";
rev = "v2.13.0";
version = "2.13.0";
sha256 = "1913fp3lfvdr3npwr0vbdhb4xsvyyr1r76hv3h7rg5fidf3vpw5a";
rev = "v2.14.1";
version = "2.14.1";
sha256 = "137z7fgy5gp9n9fdvllyjh3nkbalrs2giqljfldbllymhvrv7xgr";
};
avi =
{
owner = "terraform-providers";
repo = "terraform-provider-avi";
rev = "v0.2.2";
version = "0.2.2";
sha256 = "0dgpjg6iw21vfcn4i0x6x1l329a09wrd2jwghrjigwlq68wd835d";
};
aws =
{
owner = "terraform-providers";
repo = "terraform-provider-aws";
rev = "v2.59.0";
version = "2.59.0";
sha256 = "0hkvjvabw8phl5mb9km2dxm64a5lf56g9aq9qf593zsij1rsjwkk";
rev = "v2.65.0";
version = "2.65.0";
sha256 = "005vs1qd6payicxldc9lr4w6kzr58xw9b930j52g1q7hlddl5mbb";
};
azuread =
{
owner = "terraform-providers";
repo = "terraform-provider-azuread";
rev = "v0.8.0";
version = "0.8.0";
sha256 = "0vljhjbizxh5s8f2ki7yn6hzf5xbn5swhxmq9wpxmg7jw5z0k6ha";
rev = "v0.10.0";
version = "0.10.0";
sha256 = "0i9xrsqgh1024189hihm2nqrcy2pcyf1bwxnamwmwph5cas6hfb3";
};
azurerm =
{
owner = "terraform-providers";
repo = "terraform-provider-azurerm";
rev = "v2.7.0";
version = "2.7.0";
sha256 = "0w4bafj3kn5kvkrc26ix1y9rgf3w4810x7la7g1aclpg7507fcv3";
rev = "v2.13.0";
version = "2.13.0";
sha256 = "0aj19vy1flpb2233rxaypjcfimjr1wfqri1m3p15dy1r108q84r7";
};
azurestack =
{
@@ -116,9 +116,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-bigip";
rev = "v1.12";
version = "1.12";
sha256 = "0yjv0xldplx7jfld1izzc7i93bzwdqrjjzymq02isy2xyfh8by35";
rev = "v1.2.0";
version = "1.2.0";
sha256 = "0z0l4j8sn8yf6kw5sbyhp6s0046f738lsm650skcspqa5f63mbd9";
};
bitbucket =
{
@@ -132,17 +132,17 @@
{
owner = "terraform-providers";
repo = "terraform-provider-brightbox";
rev = "v1.2.0";
version = "1.2.0";
sha256 = "0s1b2k58r2kmjrdqrkw2dlfpby79i81gml9rpa10y372bwq314zd";
rev = "v1.3.0";
version = "1.3.0";
sha256 = "127l1ic70fkcqr0h23qhbpl1j2mzp44p9593x8jl936xz4ll8l70";
};
checkpoint =
{
owner = "terraform-providers";
repo = "terraform-provider-checkpoint";
rev = "v1.0.1";
version = "1.0.1";
sha256 = "1z2m8lbnplcfaij1xnclyhl4zlchx6bmvrc2fr4hwfzc58m9v7ra";
rev = "v1.0.2";
version = "1.0.2";
sha256 = "0zypjcg1z8fkz31lfhysxx42lpw8ak4aqgdis6rxzqbnkk491fjp";
};
chef =
{
@@ -180,9 +180,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-cloudflare";
rev = "v2.6.0";
version = "2.6.0";
sha256 = "01z2znif5yy4bawcf76b6d0j3b67fljbx87b4b2cb5vqy4l4aamk";
rev = "v2.7.0";
version = "2.7.0";
sha256 = "1r18lxhfi2sd42ja4bzxbkf5bli8iljrpqbgdcn1a7rcf44vnxa2";
};
cloudinit =
{
@@ -216,13 +216,29 @@
version = "1.1.0";
sha256 = "08ljqibfi6alpvv8f7pzvjl2k4w6br6g6ac755x4xw4ycrr24xw9";
};
cohesity =
{
owner = "terraform-providers";
repo = "terraform-provider-cohesity";
rev = "v0.1.0";
version = "0.1.0";
sha256 = "1yifipjf51n8q9xyqcmc4zjpszmpyzb330f4zas81hahjml78hgx";
};
constellix =
{
owner = "terraform-providers";
repo = "terraform-provider-constellix";
rev = "v0.1.0";
version = "0.1.0";
sha256 = "14y0v8ilbrjj0aymrw50fkz2mihnwyv83z8a9f8dh399s8l624w1";
};
consul =
{
owner = "terraform-providers";
repo = "terraform-provider-consul";
rev = "v2.7.0";
version = "2.7.0";
sha256 = "11c54waq7w34l79ak4kizjkmh8zjca5ygh9yib691hdmxsx2cifj";
rev = "v2.8.0";
version = "2.8.0";
sha256 = "1brd0fp9ksc3x8cygxm0k2q1sh4v5x89298pnidg6xirn41lvcr4";
};
ct =
{
@@ -244,9 +260,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-digitalocean";
rev = "v1.16.0";
version = "1.16.0";
sha256 = "0yymgkn66a9mif0wic4rais7ap6d4gfxij835ssr2pr3rb49ay8d";
rev = "v1.19.0";
version = "1.19.0";
sha256 = "0plfkwkfb19f7bzky4jfa2kmkqvbah02c6j6applsd3jyiawpbgy";
};
dme =
{
@@ -260,9 +276,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-dnsimple";
rev = "v0.3.0";
version = "0.3.0";
sha256 = "1m38whc6jx5mccaisnbnkawwlz1bxvy991rqy6h9xb10zyvqar62";
rev = "v0.4.0";
version = "0.4.0";
sha256 = "1f1cpfa30frghp4yxp9n313yaf2mm1hnjq4kzmn6n9210prab9h1";
};
dns =
{
@@ -276,17 +292,17 @@
{
owner = "terraform-providers";
repo = "terraform-provider-docker";
rev = "v2.7.0";
version = "2.7.0";
sha256 = "0pl515xjnic7mhfvqbml1z1win5mrhjdqb84jhd5n09j39lb24gx";
rev = "v2.7.1";
version = "2.7.1";
sha256 = "1jqnlc3dfy354yjdkj8iyxv0vamyxgmwxmhjim11alwzwjafbv9s";
};
dome9 =
{
owner = "terraform-providers";
repo = "terraform-provider-dome9";
rev = "v1.18.1";
version = "1.18.1";
sha256 = "0m4fxpik55z9ah5nlhvy314xyxvlaldqbwdp3bx1xs9kpm3znvyl";
rev = "v1.19.0";
version = "1.19.0";
sha256 = "190q74aaa1v7n7pqcri8kib0g0d4njf9dzm3cygyzmsjs3pxj1lc";
};
dyn =
{
@@ -316,25 +332,25 @@
{
owner = "terraform-providers";
repo = "terraform-provider-fastly";
rev = "v0.14.0";
version = "0.14.0";
sha256 = "1ak5gyrv66dnf5qy54hvwc4478n3cs5nxd0nwa2vf0gn2zp55bhy";
rev = "v0.16.1";
version = "0.16.1";
sha256 = "1pjrcw03a86xgkzcx778f7kk79svv8csy05b7qi0m5x77zy4pws7";
};
flexibleengine =
{
owner = "terraform-providers";
repo = "terraform-provider-flexibleengine";
rev = "v1.11.1";
version = "1.11.1";
sha256 = "12kgnq2ydwi2n29y0dc7r251zrnq8kkskiq8p5ypsrm23j3jm6dw";
rev = "v1.12.1";
version = "1.12.1";
sha256 = "0klxi40dd3a4dp7gjsjjwh6zv2m94hh6mk5m9g0dyhvn0r28w5j2";
};
fortios =
{
owner = "terraform-providers";
repo = "terraform-provider-fortios";
rev = "v1.1.0";
version = "1.1.0";
sha256 = "0m006ah351f2ih7zvd3pnpga4d8mh42i4m8af4wflhvyzkw50xnf";
rev = "v1.2.0";
version = "1.2.0";
sha256 = "0sqp23pyldxjkfw33xn5l5fqs4vn00kkfhy9wnl690wn0cwmldbx";
};
genymotion =
{
@@ -348,17 +364,17 @@
{
owner = "terraform-providers";
repo = "terraform-provider-github";
rev = "v2.6.1";
version = "2.6.1";
sha256 = "1hg5pij2hllj6m6x8salsgw404ap7pw6yccvgynw4y4k26dl0jlr";
rev = "v2.8.0";
version = "2.8.0";
sha256 = "11aw9wqnayl786hvbgnb9ijijaipaggj18vkn5y0kcj2v4dwq4wg";
};
gitlab =
{
owner = "terraform-providers";
repo = "terraform-provider-gitlab";
rev = "v2.6.0";
version = "2.6.0";
sha256 = "0qy58fgwipcjwxz473rpcnpkb22n9hqsjckx88lhc2br4pgbcbrd";
rev = "v2.9.0";
version = "2.9.0";
sha256 = "0l0b69nxxskpsylcgli2sm9qq7p4hw96dsri24w38shhnxmpysbb";
};
google-beta =
{
@@ -388,9 +404,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-gridscale";
rev = "v1.5.1";
version = "1.5.1";
sha256 = "0m5j9y26a7jl3frnw1j8gll999brprgf0i29p201d3c9b02pxnla";
rev = "v1.6.0";
version = "1.6.0";
sha256 = "00l3cwvyyjk0n3j535qfj3bsf1s5l07786gnxycj0f8vz3a06bcq";
};
hcloud =
{
@@ -410,19 +426,19 @@
};
helm =
{
owner = "terraform-providers";
owner = "hashicorp";
repo = "terraform-provider-helm";
rev = "v1.1.1";
version = "1.1.1";
sha256 = "0sna0xaibdh1aw3lxs1r2hidw95lxkpm4fqdw0hzmdqxwdmg4b40";
rev = "v1.2.2";
version = "1.2.2";
sha256 = "1hjlf0pzc9jkcvqi52kvqwmd8v0cvnhhcbahzxmv0zkdwh310c12";
};
heroku =
{
owner = "terraform-providers";
repo = "terraform-provider-heroku";
rev = "v2.4.0";
version = "2.4.0";
sha256 = "1rhny1mbkqkfiqshps5mc5f3ykxnpypsdi72hw4g1k29pbvr4hh8";
rev = "v2.4.1";
version = "2.4.1";
sha256 = "10dacnd0y8q952s53n5myy08slw349pbfddjz63wcblcjyhvq0df";
};
http =
{
@@ -436,9 +452,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-huaweicloudstack";
rev = "v1.1.0";
version = "1.1.0";
sha256 = "1zzf7jbvdlccfbb4cmw2k3mlfj4hh0lv59zahq2zy8afiajsb68i";
rev = "v1.2.0";
version = "1.2.0";
sha256 = "0jhx9rap4128j8sfkvpp8lbdmvdba0rkd3nxvy38wr3n18m7v1xg";
};
huaweicloud =
{
@@ -452,9 +468,9 @@
{
owner = "IBM-Cloud";
repo = "terraform-provider-ibm";
rev = "v1.4.0";
version = "1.4.0";
sha256 = "147vl55g6c49ihk8z2hwfq2v7g1yj35id1qfjlz0dxalm7cwa3l6";
rev = "v1.7.0";
version = "1.7.0";
sha256 = "1kb2dxdygvph65hh7qiba9kl9k5aygxxvx3x1qi28jwny594j82a";
};
icinga2 =
{
@@ -504,21 +520,37 @@
version = "1.1.0";
sha256 = "04vz0m3z9rfw2hp0h3jhn625r2v37b319krznvhqylqzksv39dzf";
};
ksyun =
{
owner = "terraform-providers";
repo = "terraform-provider-ksyun";
rev = "v1.0.0";
version = "1.0.0";
sha256 = "1vcx612bz2p0rjsrx11j6fdc0f0q2jm5m3xl94wrpx9jjb7aczvc";
};
kubernetes-alpha =
{
owner = "hashicorp";
repo = "terraform-provider-kubernetes-alpha";
rev = "nightly20200608";
version = "nightly20200608";
sha256 = "1g171sppf3kq5qlp6g0qqdm0x8lnpizgw8bxjlhp9b6cl4kym70m";
};
kubernetes =
{
owner = "terraform-providers";
repo = "terraform-provider-kubernetes";
rev = "v1.11.1";
version = "1.11.1";
sha256 = "13m0g52i2z4s58grk22rv0yqbrfszfbxxhwisb5mi7cma4cp7506";
rev = "v1.11.3";
version = "1.11.3";
sha256 = "13j4xwibjgiqpzwbwd0d3z1idv0lwz78ip38khhmhwa78mjjb4zz";
};
launchdarkly =
{
owner = "terraform-providers";
repo = "terraform-provider-launchdarkly";
rev = "v1.2.2";
version = "1.2.2";
sha256 = "0rvyzn2a8bh8hvd3f6whfwzpx2frqnfmh8nwlasb0r4xya8lv3bc";
rev = "v1.3.2";
version = "1.3.2";
sha256 = "0vgkivzbf6hcl9by6l0whpwidva7zmmgdabkshjjk0npl2cj8f9n";
};
librato =
{
@@ -532,9 +564,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-linode";
rev = "v1.9.3";
version = "1.9.3";
sha256 = "12jwvpnv4xl9crq6jynking2rcl4ci8ci22db3fadigxqs98hb4w";
rev = "v1.12.3";
version = "1.12.3";
sha256 = "17hnm7wivd75psap2qdmlnmmlf964s7jf4jrfgsm6njx32wwwfpp";
};
local =
{
@@ -588,9 +620,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-mongodbatlas";
rev = "v0.5.0";
version = "0.5.0";
sha256 = "15m7qmn1gd7gmzlqgf2q70kmihf8ihqabpkf122pxhb3iyikwh77";
rev = "v0.5.1";
version = "0.5.1";
sha256 = "0sl5yd1bqj79f7pj49aqh7l3fvdrbf8r7a4g7cv15qbc8g3lr1dh";
};
mysql =
{
@@ -620,9 +652,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-newrelic";
rev = "v1.16.0";
version = "1.16.0";
sha256 = "0ddfffyrw28syg0y2q9j7xh4k2sjb8l40167rwgz19w39p1caffv";
rev = "v1.19.0";
version = "1.19.0";
sha256 = "0nmbgw4qyzsw8kxi7p8dy4j1lkxcz7qfs56qsvwf2w07y4qm382p";
};
nixos =
{
@@ -644,9 +676,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ns1";
rev = "v1.8.1";
version = "1.8.1";
sha256 = "04s46f40md8hrqqiwj6wcq4qpx0115qk8hwbln9a7lsrh0zmmmb3";
rev = "v1.8.3";
version = "1.8.3";
sha256 = "18mq6r8sw2jjvngay0zyvzlfiln8c0xb8hcrl2wcmnpqv2iinbkl";
};
nsxt =
{
@@ -676,9 +708,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-oci";
rev = "v3.72.0";
version = "3.72.0";
sha256 = "05sl702b0j9lpsy3bjac104qngjlsln0v2ni8a78j97xif8jb0an";
rev = "v3.79.0";
version = "3.79.0";
sha256 = "11n2v537zniiv5xvhpypqrm09my8zybirvq4ly94hp69v73xj89c";
};
oktaasa =
{
@@ -692,9 +724,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-okta";
rev = "v3.2.0";
version = "3.2.0";
sha256 = "13z5srra4pj5p2dwzrqiny2ph4vmmp8q59ycmd7x2yi93fd02mcl";
rev = "v3.3.0";
version = "3.3.0";
sha256 = "1z557z1yagp2caf85hmcr6sddax9a5h47jja17082qmmr1qy0i07";
};
oneandone =
{
@@ -724,25 +756,25 @@
{
owner = "terraform-providers";
repo = "terraform-provider-openstack";
rev = "v1.27.0";
version = "1.27.0";
sha256 = "0d6dms5y8vndcm10zfid1g13c5fi19z7hqll8z07jr0hgvhbzp2v";
rev = "v1.28.0";
version = "1.28.0";
sha256 = "1g2nxv312ddvkgpph17m9sh4zmy5ddj8gqwnfb3frbfbbamrgar6";
};
opentelekomcloud =
{
owner = "terraform-providers";
repo = "terraform-provider-opentelekomcloud";
rev = "v1.16.0";
version = "1.16.0";
sha256 = "1bxkh8qnm1mw37wi4rxf29q8lksp864124nwbyn14fwb4h6m1yj4";
rev = "v1.17.1";
version = "1.17.1";
sha256 = "1d4w35hpvxy5wkb6n9wrh2nfcsy0xgk6d4jbk4sy7dn44w3nkqbg";
};
opsgenie =
{
owner = "terraform-providers";
repo = "terraform-provider-opsgenie";
rev = "v0.3.1";
version = "0.3.1";
sha256 = "1ciqhibij0fk2z20yabl464mj9srp1v6dy04dyazmxkw46bm1lc5";
rev = "v0.3.4";
version = "0.3.4";
sha256 = "11pbkhn7yhz2mfa01ikn7rdajl28zwxfq9g9qdf9lvkdrv88gwh0";
};
oraclepaas =
{
@@ -756,25 +788,25 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ovh";
rev = "v0.7.0";
version = "0.7.0";
sha256 = "167msjsl8xh8zy7lrxvkq2h98xpvxpsjzlil8lcxqmz8qq8a0q5f";
rev = "v0.8.0";
version = "0.8.0";
sha256 = "1ww4ng8w5hm50rbxd83xzbkq8qsn04dqwpdjhs587v9d0x2vwrf1";
};
packet =
{
owner = "terraform-providers";
repo = "terraform-provider-packet";
rev = "v2.8.1";
version = "2.8.1";
sha256 = "1idrvkc2bbp3vwz2w45nazr1hq10f7bmyamb57q7mlswydcyk6b2";
rev = "v2.9.0";
version = "2.9.0";
sha256 = "0d9r272gidkwn4zr130ml047512qq5d5d599s63blzy6m38vilha";
};
pagerduty =
{
owner = "terraform-providers";
repo = "terraform-provider-pagerduty";
rev = "v1.7.0";
version = "1.7.0";
sha256 = "168v1mpl9df63yp8zjq79hyxcjj4imyzg20rdn6n71d6iz8v85g8";
rev = "v1.7.2";
version = "1.7.2";
sha256 = "1a8g8rpn52wibrxhnvhlda7ja38vw9aadgdc8nbj7zs50x4aj3ic";
};
panos =
{
@@ -796,25 +828,25 @@
{
owner = "terraform-providers";
repo = "terraform-provider-postgresql";
rev = "v1.5.0";
version = "1.5.0";
sha256 = "1c9vn1jpfan04iidzn030q21bz3xabrd5pdhlbblblf558ykn4q0";
rev = "v1.6.0";
version = "1.6.0";
sha256 = "0m9x60hrry0cqx4bhmql081wjcbay3750jwzqiph5vpj9717banf";
};
powerdns =
{
owner = "terraform-providers";
repo = "terraform-provider-powerdns";
rev = "v1.3.0";
version = "1.3.0";
sha256 = "0in8f9vfi9y71qac643lfgapbnxi40cwq9b3l82fl1r8ghg7kgri";
rev = "v1.4.0";
version = "1.4.0";
sha256 = "1mfcj32v66w5gnzbrdkampydl3m9f1155vcdw8l1f2nba59irkgw";
};
profitbricks =
{
owner = "terraform-providers";
repo = "terraform-provider-profitbricks";
rev = "v1.5.0";
version = "1.5.0";
sha256 = "0v9x8sj9c6acmbnkv4bnjvz93dd1fmg9b98rwghiakf968hxx6hl";
rev = "v1.5.2";
version = "1.5.2";
sha256 = "0gass4gzv8axlzn5rgg35nqvd61q82k041r0sr6x6pv6j8v1ixln";
};
pureport =
{
@@ -884,17 +916,17 @@
{
owner = "terraform-providers";
repo = "terraform-provider-scaleway";
rev = "v1.14.0";
version = "1.14.0";
sha256 = "0j428pinwyyldg1jhlkad32213z98q3891yv906d6n7jg2bk5m6a";
rev = "v1.15.0";
version = "1.15.0";
sha256 = "0bdhjrml14f5z4spkl7l305g0vdzpgama7ahngws8jhvl8yfa208";
};
secret =
{
owner = "tweag";
repo = "terraform-provider-secret";
rev = "v1.1.0";
version = "1.1.0";
sha256 = "09gv0fpsrxzgna0xrhrdk8d4va9s0gvdbz596r306qxb4mip4w3r";
rev = "v1.1.1";
version = "1.1.1";
sha256 = "1pr0amzgv1i1lxniqlx8spdb73q522l7pm8a4m25hwy1kwby37sd";
};
segment =
{
@@ -908,17 +940,17 @@
{
owner = "terraform-providers";
repo = "terraform-provider-selectel";
rev = "v3.1.0";
version = "3.1.0";
sha256 = "1ajhnjlx4bf91z04cp8245j3h2h9c30ajf934zr29jvwli0y3piw";
rev = "v3.3.0";
version = "3.3.0";
sha256 = "1fs96qd2b4glk8hhn5m9r04ap679g0kf3nnhjx1a2idqwrv71gcl";
};
signalfx =
{
owner = "terraform-providers";
repo = "terraform-provider-signalfx";
rev = "v4.19.4";
version = "4.19.4";
sha256 = "15cf9paqrcznj99gv6mxqvgvkd8qbxkwz2145h2qxp5vdcykj78g";
rev = "v4.23.0";
version = "4.23.0";
sha256 = "1v3whvqb6nilfvw4c0xziq6yrlkl96d2cya094c7bd7wp9hzif1l";
};
skytap =
{
@@ -940,17 +972,17 @@
{
owner = "carlpett";
repo = "terraform-provider-sops";
rev = "v0.5.0";
version = "0.5.0";
sha256 = "18zhqjkw1639a1vrxniws3sf5p91vrf5m7kksaj3yfiavsr5q2ki";
rev = "v0.5.1";
version = "0.5.1";
sha256 = "1x32w1qw46rwa8bjhkfn6ybr1dkbdqk0prlm0bnwn3gvvj0hc7kh";
};
spotinst =
{
owner = "terraform-providers";
repo = "terraform-provider-spotinst";
rev = "v1.14.3";
version = "1.14.3";
sha256 = "06brm0bvr13f31km55y8bp4z1xj3imfi11k7l5nirjp73cbvcpmg";
rev = "v1.17.0";
version = "1.17.0";
sha256 = "0pmbr2xdqrzkd66zv4gpyxzahs7p2m2xl5qyvqpg0apxn91z3ra7";
};
stackpath =
{
@@ -972,9 +1004,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-sumologic";
rev = "v2.0.0";
version = "2.0.0";
sha256 = "0j6lq9xcc3znjd4yd8gyzsbhwbbwi95k16kj1la9cicbvgra8iap";
rev = "v2.0.3";
version = "2.0.3";
sha256 = "0d7xsfdfs6dj02bh90bhwsa2jgxf84df3pqmsjlmxvpv65dv4vs8";
};
telefonicaopencloud =
{
@@ -996,9 +1028,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-tencentcloud";
rev = "v1.32.0";
version = "1.32.0";
sha256 = "014zgslr14r446qifk4slq9g5qydxs7bk181gw227k9mr6krgba1";
rev = "v1.36.0";
version = "1.36.0";
sha256 = "1sqynm0g1al5hnxzccv8iiqcgd07ys0g828f3xfw53b6f5vzbhfr";
};
terraform =
{
@@ -1012,9 +1044,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-tfe";
rev = "v0.16.0";
version = "0.16.0";
sha256 = "0c9csyp655wijlnr3rbmymg6gaa23y4fyav0b1y99qsxaa358af5";
rev = "v0.18.0";
version = "0.18.0";
sha256 = "1cl83afm00fflsd3skynjvncid3r74fkxfznrs1v8qypcg1j79g1";
};
tls =
{
@@ -1028,25 +1060,25 @@
{
owner = "terraform-providers";
repo = "terraform-provider-triton";
rev = "v0.6.0";
version = "0.6.0";
sha256 = "10z032fa64sd8d6r4v2f4m7gp93v8wb2zk2r13fflzg5rfk5740z";
rev = "v0.7.0";
version = "0.7.0";
sha256 = "14wbdm2rlmjld9y7iizdinhk1fnx5s8fgjgd3jcs1b4g126s0pl0";
};
turbot =
{
owner = "terraform-providers";
repo = "terraform-provider-turbot";
rev = "v1.1.0";
version = "1.1.0";
sha256 = "1wb5n17rv1r5jn6xdzjjafw7s96i826x9ww8w6llllihgl798zn7";
rev = "v1.3.0";
version = "1.3.0";
sha256 = "0z56s3kmx84raiwiny9jing8ac9msfd5vk8va24k8czwj2v5gb0f";
};
ucloud =
{
owner = "terraform-providers";
repo = "terraform-provider-ucloud";
rev = "v1.19.0";
version = "1.19.0";
sha256 = "17wkhhxvriqix520nv4q4jrk7gah8kkq3l4nj0rzp1kdwxphmsz0";
rev = "v1.20.0";
version = "1.20.0";
sha256 = "1s3xgdrngiy7slxwk5cmhij681yyfvc8185yig7jmrm21q2981f6";
};
ultradns =
{
@@ -1060,9 +1092,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vault";
rev = "v2.10.0";
version = "2.10.0";
sha256 = "1yg8ck9z5ycw8akfhnv4pnxyfzav9dzbhizv4dp78xi2gnddrawi";
rev = "v2.11.0";
version = "2.11.0";
sha256 = "1yzakc7jp0rs9axnfdqw409asrbjhq0qa7xn4xzpi7m94g1ii12d";
};
vcd =
{
@@ -1092,9 +1124,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vsphere";
rev = "v1.17.3";
version = "1.17.3";
sha256 = "109rg8w6szdqq2hb9jg4j3i79z5ppb6vayikl1cg8m8dsv2whhrj";
rev = "v1.18.3";
version = "1.18.3";
sha256 = "1cvfmkckigi80cvv826m0d8wzd98qny0r5nqpl7nkzz5kybkb5qp";
};
vthunder =
{
@@ -1108,24 +1140,24 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vultr";
rev = "v1.1.5";
version = "1.1.5";
sha256 = "06sxcqklqqsninqach05fzilh6k2h9bv66mgfhf9s53ggs5nm8z7";
rev = "v1.3.0";
version = "1.3.0";
sha256 = "0swc2fvp83d6w0cqvyxs346c756wr48xbn8m8jqkmma5s4ab2y4k";
};
wavefront =
{
owner = "spaceapegames";
owner = "terraform-providers";
repo = "terraform-provider-wavefront";
rev = "v2.1.1";
version = "2.1.1";
sha256 = "0cbs74kd820i8f13a9jfbwh2y5zmmx3c2mp07qy7m0xx3m78jksn";
rev = "v2.3.0";
version = "2.3.0";
sha256 = "0aci96852bd4y8bi9y68p550jiji0c69kiw4zhf9qfld0sjz44j2";
};
yandex =
{
owner = "terraform-providers";
repo = "terraform-provider-yandex";
rev = "v0.38.0";
version = "0.38.0";
sha256 = "16s9ffbdgws5hglfr6f48ipjv2sbkdpkg20m9s1m6v2f055nxwak";
rev = "v0.40.0";
version = "0.40.0";
sha256 = "0dymhdrdm00m9xn4xka3zbvjqnckhl06vz5zm6rqivkmw8m2q0mz";
};
}

8
pkgs/applications/networking/cluster/terraform-providers/default.nix
View File

@@ -82,6 +82,14 @@ let
'';
});
# https://github.com/hashicorp/terraform-provider-helm/pull/522
helm = automated-providers.helm.overrideAttrs (attrs: {
prePatch = attrs.prePatch or "" + ''
substituteInPlace go.mod --replace terraform-providers/terraform-provider-helm hashicorp/terraform-provider-helm
substituteInPlace main.go --replace terraform-providers/terraform-provider-helm hashicorp/terraform-provider-helm
'';
});
# https://github.com/hashicorp/terraform-provider-http/pull/40
http = automated-providers.http.overrideAttrs (attrs: {
prePatch = attrs.prePatch or "" + ''

1
pkgs/applications/networking/cluster/terraform-providers/update-all
View File

@@ -117,7 +117,6 @@ slugs=(
camptocamp/terraform-provider-pass
carlpett/terraform-provider-sops
poseidon/terraform-provider-matchbox
spaceapegames/terraform-provider-wavefront
poseidon/terraform-provider-ct
tweag/terraform-provider-nixos
tweag/terraform-provider-secret

4
pkgs/applications/networking/flexget/default.nix
View File

@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
version = "3.1.57";
version = "3.1.59";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "661663726f75b12ba2e67db1276a9abf586b41db1ff313488ca35a439ec5d721";
sha256 = "19vp2395sl6gdv54zn0k4vf1j6b902khvm44q5hfr805jd3fc11h";
};
postPatch = ''

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@@ -19,12 +19,12 @@ with lib;
mkDerivation rec {
pname = "telegram-desktop";
version = "2.1.10";
version = "2.1.11";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "0z2mlrbzknjnkgmpyaiw80cjd5cjymdvl3a0wjaippn7xhilbh52";
sha256 = "1sd6nrcjg5gpq6ynvwnz8f4jz8flknybx6b0pfxqrqqpzy7wjl5m";
};
postPatch = ''

4
pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wee-slack";
version = "2.5.0";
version = "2.6.0";
src = fetchFromGitHub {
repo = "wee-slack";
owner = "wee-slack";
rev = "v${version}";
sha256 = "0sxgi5fg8qvzqmxy7sdma6v0wj93xwh21av10n8nxvdskacw5dxz";
sha256 = "0s4qd1z40c1bczkvc840jwjmzbv7nyj06xqs1si9v54qmkh4gaq4";
};
patches = [

4
pkgs/applications/networking/mumble/default.nix
View File

@@ -128,14 +128,14 @@ let
} source;
source = rec {
version = "1.3.0";
version = "1.3.1";
# Needs submodules
src = fetchFromGitHub {
owner = "mumble-voip";
repo = "mumble";
rev = version;
sha256 = "0g5ri84gg0x3crhpxlzawf9s9l4hdna6aqw6qbdpx1hjlf5k6g8k";
sha256 = "1xsla9g7xbq6xniwcsjik5hbjh0xahv44qh4z9hjn7p70b8vgnwc";
fetchSubmodules = true;
};
};

16
pkgs/applications/science/logic/boolector/cmake-gtest.patch Normal file
View File

@@ -0,0 +1,16 @@
diff --git a/cmake/googletest-download.cmake b/cmake/googletest-download.cmake
index 0ec4d558..d0910313 100644
--- a/cmake/googletest-download.cmake
+++ b/cmake/googletest-download.cmake
@@ -9,10 +9,7 @@ ExternalProject_Add(
googletest
SOURCE_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-src"
BINARY_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-build"
- GIT_REPOSITORY
- https://github.com/google/googletest.git
- GIT_TAG
- release-1.10.0
+ URL REPLACEME
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""

41
pkgs/applications/science/logic/boolector/default.nix
View File

@@ -1,37 +1,31 @@
{ stdenv, fetchFromGitHub, fetchpatch
, cmake, lingeling, btor2tools
{ stdenv, fetchFromGitHub, lib, python3
, cmake, lingeling, btor2tools, gtest, gmp
}:
stdenv.mkDerivation rec {
pname = "boolector";
version = "3.0.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = "boolector";
repo = "boolector";
rev = "refs/tags/${version}";
sha256 = "15i3ni5klss423m57wcy1gx0m5wfrjmglapwg85pm7fb3jj1y7sz";
sha256 = "0jkmaw678njqgkflzj9g374yk1mci8yqvsxkrqzlifn6bwhwb7ci";
};
patches = [
(fetchpatch {
name = "CVE-2019-7560.patch";
url = "https://github.com/Boolector/boolector/commit/8d979d02e0482c7137c9f3a34e6d430dbfd1f5c5.patch";
sha256 = "1a1g02mk8b0azzjcigdn5zpshn0dn05fciwi8sd5q38yxvnvpbbi";
})
];
postPatch = ''
sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ lingeling btor2tools ];
buildInputs = [ lingeling btor2tools gmp ];
cmakeFlags =
[ "-DSHARED=ON"
[ "-DBUILD_SHARED_LIBS=ON"
"-DUSE_LINGELING=YES"
"-DBTOR2_INCLUDE_DIR=${btor2tools.dev}/include"
"-DBTOR2_LIBRARIES=${btor2tools.lib}/lib/libbtor2parser.so"
"-DLINGELING_INCLUDE_DIR=${lingeling.dev}/include"
"-DLINGELING_LIBRARIES=${lingeling.lib}/lib/liblgl.a"
];
"-DBtor2Tools_INCLUDE_DIR=${btor2tools.dev}/include"
"-DBtor2Tools_LIBRARIES=${btor2tools.lib}/lib/libbtor2parser.so"
] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES");
installPhase = ''
mkdir -p $out/bin $lib/lib $dev/include
@@ -39,13 +33,22 @@ stdenv.mkDerivation rec {
cp -vr bin/* $out/bin
cp -vr lib/* $lib/lib
rm -rf $out/bin/{examples,test}
rm -rf $out/bin/{examples,tests}
# we don't care about gtest related libs
rm -rf $lib/lib/libg*
cd ../src
find . -iname '*.h' -exec cp --parents '{}' $dev/include \;
rm -rf $dev/include/tests
'';
checkInputs = [ python3 ];
doCheck = true;
preCheck = ''
export LD_LIBRARY_PATH=$(readlink -f lib)
patchShebangs ..
'';
outputs = [ "out" "dev" "lib" ];
meta = with stdenv.lib; {

16
pkgs/applications/science/logic/btor2tools/default.nix
View File

@@ -1,24 +1,24 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, cmake, fetchFromGitHub }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "btor2tools";
version = "pre55_8c150b39";
version = "1.0.0-pre_${src.rev}";
src = fetchFromGitHub {
owner = "boolector";
repo = "btor2tools";
rev = "8c150b39cdbcdef4247344acf465d75ef642365d";
sha256 = "1r5pid4x567nms02ajjrz3v0zj18k0fi5pansrmc2907rnx2acxx";
rev = "9831f9909fb283752a3d6d60d43613173bd8af42";
sha256 = "0mfqmkgvyw8fa2c09kww107dmk180ch1hp98r5kv41vnc04iqb0s";
};
configurePhase = "./configure.sh -shared";
nativeBuildInputs = [ cmake ];
installPhase = ''
mkdir -p $out $dev/include/btor2parser/ $lib/lib
cp -vr bin $out
cp -v src/btor2parser/btor2parser.h $dev/include/btor2parser
cp -v build/libbtor2parser.* $lib/lib
cp -v ../src/btor2parser/btor2parser.h $dev/include/btor2parser
cp -v lib/libbtor2parser.* $lib/lib
'';
outputs = [ "out" "dev" "lib" ];

2
pkgs/applications/science/misc/sasview/xhtml2pdf.nix
View File

@@ -2,7 +2,7 @@
let
#xhtml2pdf specifically requires version "1.0b10" of html5lib
html5 = html5lib.overrideAttrs( oldAttrs: rec{
html5 = html5lib.overrideAttrs( oldAttrs: rec {
name = "${oldAttrs.pname}-${version}";
version = "1.0b10";
src = oldAttrs.src.override {

6
pkgs/applications/version-management/git-and-tools/ghq/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ghq";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "x-motemen";
repo = "ghq";
rev = "v${version}";
sha256 = "1i0q9lxdxbyj0l0510cbkwkbycawrx8cxlbdrhb2p2fnk0vqnyiv";
sha256 = "1gfpvaf10kqgxx1clzsn38n9r4p171zf0z1pf0dybihh6g6hgylj";
};
vendorSha256 = "1r8lvy2xk0gvlwy6k86wh14ajb6hgs9f1fwfqk17ra1cb404l2lz";
vendorSha256 = "0k2hhx3l3cj3lv2y4w8286sbl7d11cssb99jy7hzskbxbhmalvcj";
buildFlagsArray = ''
-ldflags=

6
pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
View File

@@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "git-absorb";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "tummychow";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "1xjs5yjb0wj0nf3k3mpgh3hm16544gq7954k1y2r5lwammp0fsxk";
sha256 = "0kvb9nzjlxhnrd2ir3zjd99v7zcq4bch1i9nqsn3505j5m0wv0hh";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
cargoSha256 = "194ic3f60gpx35rs665vrnjsc3047f0msx1qp797xsz6pg0jx1zq";
cargoSha256 = "0bppb1ng77ynhlxnhgz9qx4x5j0lyzcxw3zshfpgjc03fxcwl6cz";
postInstall = ''
installManPage Documentation/git-absorb.1

5
pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "git-filter-repo";
version = "2.26.0";
version = "2.27.0";
src = fetchurl {
url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "15d07i66b090bhjfj9s4s2s38k75mhxmddzyn44bnnyb967w6yjk";
sha256 = "1vry0pqwi0p82m3wflr0wyf88wn75l049w18xf9f5z43xd9vpva1";
};
buildInputs = [ pythonPackages.python ];
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/newren/git-filter-repo";
description = "Quickly rewrite git repository history (filter-branch replacement)";
license = licenses.mit;
inherit (pythonPackages.python.meta) platforms;
maintainers = [ maintainers.marsam ];
};
}

2
pkgs/applications/virtualization/8086tiny/default.nix
View File

@@ -4,7 +4,7 @@
assert sdlSupport -> (SDL != null);
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "8086tiny";
version = "1.25";

16
pkgs/applications/window-managers/i3/status-rust.nix
View File

@@ -1,25 +1,17 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio, fetchpatch }:
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }:
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.14.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "0d2xigm932x6pc9z24g5cg8xq2crd9n3wq1bwi96h35w799lagjg";
sha256 = "11qhzjml04njhfa033v98m4yd522zj91s6ffvrm0m6sk7m0wyjsc";
};
cargoPatches = [
# https://github.com/greshake/i3status-rust/pull/732/ (Update Cargo.lock)
(fetchpatch {
url = "https://github.com/greshake/i3status-rust/commit/7762a5c7ad668272fb8bb8409f12242094b032b8.patch";
sha256 = "097f6w91cn53cj1g3bbdqm9jjib5fkb3id91jqvq88h43x14b8zb";
})
];
cargoSha256 = "1k50yhja73w91h6zjmkb5kh1hknpjzrqd3ilvjjyynll513m1sfd";
cargoSha256 = "0jmmxld4rsjj6p5nazi3d8j1hh7r34q6kyfqq4wv0sjc77gcpaxd";
nativeBuildInputs = [ pkgconfig ];