Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
6f038e8b11
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bjumblr";
|
||||
version = "1.6.6";
|
||||
version = "1.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = "BJumblr";
|
||||
rev = version;
|
||||
sha256 = "1nbxi54023vck3qgmr385cjzinmdnvz62ywb6bcksmc3shl080mg";
|
||||
sha256 = "sha256-qSoGmWUGaMjx/bkiCJ/qb4LBbuFPXXlJ0e9hrFBXzwE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bschaffl";
|
||||
version = "1.4.6";
|
||||
version = "1.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tD4LsIXb2II+TNEfzXBviMR2fq/FtCSsaL2YGun1vu0=";
|
||||
sha256 = "sha256-zczDqJdUAN2oSyIRt9m3OnwOWXlwL4Yod8UMCXs5zM0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "texmaker";
|
||||
version = "5.1.1";
|
||||
version = "5.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-gANJknSWIMN+B0uAOtPil8EbjyWt4E+xOxOseR87Dd4=";
|
||||
sha256 = "sha256-UmiW8sGuVhEw7seq6BW53Nqejut3K2VB0NyUzpGnEEQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtscript poppler zlib qtwebengine ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tty-solitaire";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpereira";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0kix7wfy2bda8cw5kfm7bm5acd5fqmdl9g52ms9bza4kf2jnb754";
|
||||
sha256 = "sha256-zMLNWJieHxHALFQoSkdAxGbUBGuZnznLX86lI3P21F0=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.1.1";
|
||||
commit = "57abbf95ed160c88b2634ec4d37df9555cc74fb3";
|
||||
version = "2.1.2";
|
||||
commit = "7af9dfb3524c13e941ab604e36e49a617fe47d2e";
|
||||
tag = "v${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = tag;
|
||||
sha256 = "0jh7kh4751kb7439vbbh5f03kcy56phdcvzypjw8n0w239n5xmmc";
|
||||
sha256 = "1pr48z1qhv7xxnllr00zz2v0ygxmq2hjdyk0j3zazflnqr2mc596";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KtLEN66Q5WpCi+COId+gPu2XHcs5/D04rYLHV6XohzQ=";
|
||||
vendorSha256 = "sha256-N45yRlBGZ/c9ve2YPcWA26pylV8hzxjPh6evKtkgnoc=";
|
||||
|
||||
nativeBuildInputs = [ packr makeWrapper installShellFiles ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-cliff";
|
||||
version = "0.2.6";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "git-cliff";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oQ23jvKR4HGIMnW56FVE0XlBpO4pnMBbRXVoc6OuiHo=";
|
||||
sha256 = "sha256-d0qY0yGvFf1V8NhS9cHEawkTqMAN6roReAHJ6FT9qJ4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-49RHGOhTaYrg+JKYZMWcgSL7dxe6H50G6n9tJyGaLMQ=";
|
||||
cargoSha256 = "sha256-UxV9trTm4vZ/boWB7Sl6Dbwhjk8jQnB0QT6bC+aCL+A=";
|
||||
|
||||
# attempts to run the program on .git in src which is not deterministic
|
||||
doCheck = false;
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitui";
|
||||
version = "0.17";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "extrawurst";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UM1L95VKmUh2E56dlKo3TkNYRlib5Hg5VHGokBqTP+s=";
|
||||
sha256 = "sha256-dRHlbxNV4nS50WbJP5lD1zB7NkZmv7nlPUm3RlQIBtc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-i/Z1pOrg7rKH5uDqkyh7V9jZRHXZ3Bhhw5UpzKWOjJ0=";
|
||||
cargoSha256 = "sha256-9uRvxax0SrvRkD89mbZPxsfRItde11joA/ZgnXK9XBE=";
|
||||
|
||||
nativeBuildInputs = [ python3 perl ];
|
||||
buildInputs = [ openssl ]
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "topgit";
|
||||
version = "0.19.12";
|
||||
version = "0.19.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mackyle";
|
||||
repo = "topgit";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1wvf8hmwwl7a2fr17cfs3pbxjccdsjw9ngzivxlgja0gvfz4hjd5";
|
||||
sha256 = "sha256-K0X1DGc1LQsoteUhoHLxVJRrZaaPLKSSF61OKyGB5Qg=";
|
||||
};
|
||||
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ];
|
||||
|
||||
@ -21,9 +21,9 @@
|
||||
let unwrapped = mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "thunar";
|
||||
version = "4.16.8";
|
||||
version = "4.16.9";
|
||||
|
||||
sha256 = "sha256-KFx01vbVeGR+0U3DkUVRhO7pTv3R2h7qSe5VQE2b+OQ=";
|
||||
sha256 = "sha256-TpazNC4TwNhcEGQ4AQICxbmfZ1i4RE9vXkM9Zln80vE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook_xsl
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
pname = "alembic";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alembic";
|
||||
repo = "alembic";
|
||||
rev = version;
|
||||
sha256 = "sha256-e87pnWIV8fbjEQa5iXRPXA9MkJN9NwY9PW/QI+cVSKo=";
|
||||
sha256 = "sha256-QnqUD8KmMDmEZ1REoKN70SwVICOdyGPZsB/lU9nojj4=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "lib" ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duckdb";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cwida";
|
||||
repo = "duckdb";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X8zk9D7BQQ6iHdfvpaTZ8wS779wt3nRthH7OG4p9bTg=";
|
||||
sha256 = "sha256-ID65xpNSDyi19OcOs9Gdf5xpK++UVWclp8pVggIWQNU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gbenchmark";
|
||||
version = "1.5.6";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "benchmark";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DFm5cQh1b2BX6qCDaQZ1/XBNDeIYXKWbIETYu1EjDww=";
|
||||
sha256 = "sha256-EAJk3JhLdkuGKRMtspTLejck8doWPd7Z0Lv/Mvf3KFY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -7,13 +7,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdal";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
rev = "v${version}";
|
||||
sha256 = "0832w40a92cl8ydkv0pk7nl1ivhfhbhqbhmpqmdjpi0126jlm2y0";
|
||||
sha256 = "sha256-fla3EMDmuW0+vmmU0sgtLsGfO7dDApLQ2EoKJeR/1IM=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/gdal";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simdjson";
|
||||
version = "0.9.7";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdjson";
|
||||
repo = "simdjson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3ZLEp2RQhQ7QsRGLimWlZQM8PMTv07NlFoe64ES2+Ug=";
|
||||
sha256 = "sha256-4I3w3sZRBdHVpUP0O7H7LGUM5uInyrSeHTe5ov5Qcyc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -15,11 +15,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "launchpadlib";
|
||||
version = "1.10.13";
|
||||
version = "1.10.14";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5804d68ec93247194449d17d187e949086da0a4d044f12155fad269ef8515435";
|
||||
sha256 = "5edfc7f615c88475b3d8549731cb57e2d9bf15d0b9bc21a43e88626b67deef4b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lazr.restfulclient";
|
||||
version = "0.14.3";
|
||||
version = "0.14.4";
|
||||
|
||||
disabled = isPy27; # namespace is broken for python2
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9f28bbb7c00374159376bd4ce36b4dacde7c6b86a0af625aa5e3ae214651a690";
|
||||
sha256 = "bf0fd6b2749b3a2d02711f854c9d23704756f7afed21fb5d5b9809d72aa6d087";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ distro httplib2 oauthlib setuptools six wadllib ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.12.25";
|
||||
version = "0.12.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2qYfev8x+DmtujIRNgwblTD31Lr+WvQQ/XXjjBOVusE=";
|
||||
sha256 = "sha256-UclUTfm6fxoYEEdEEmO/j+WLZLe8SFzt7+Tej4bR0RU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
|
||||
vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An extremely fast JavaScript bundler";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vultr-cli";
|
||||
version = "2.8.0";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vultr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BPeOud10cTsZ2flWRMf6F/i9JwnPPDFje3OZIAUa0O8=";
|
||||
sha256 = "sha256-fjmisTDW35aIFbWFF4gdyP8ygNd0o7sdsNr0NX1Hvfg=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.233";
|
||||
version = "0.0.238";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qDFO9QV6ItYv/QsnXFCViWo2CQj7hGZftVMD22QL+uQ=";
|
||||
sha256 = "sha256-dW5+Ga3/sfI33DUmJ3OwXvgbLqC1JkTXXauu0POc16s=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
@ -17,7 +17,7 @@ buildGoModule rec {
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-+g0VzgdArxUTT5wDw6ddZn9YDNOXHqysye6cIrCc3Iw=";
|
||||
vendorSha256 = "sha256-cKZk3SU/UAoA1XTegKG7/8XDNceQi+NTKML0UiiOTV0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkquake";
|
||||
version = "1.05.3";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Novum";
|
||||
repo = "vkQuake";
|
||||
rev = version;
|
||||
sha256 = "sha256-nrqxfJbTkaPgKozkS6ulUZNXymkpw0bbQBHUZEFnLhs=";
|
||||
sha256 = "sha256-FbHqpBiTJWeJPBHUBTOIuXRoLttmDIpip5wUvuVw8YI=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/Quake";
|
||||
|
||||
@ -7,7 +7,7 @@ index 5e4306f..9c975fc 100644
|
||||
@echo ---- Compiling:
|
||||
@echo ======================================
|
||||
- $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
|
||||
+ $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
|
||||
+ $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
|
||||
|
||||
analyze:
|
||||
@echo
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
{ pkgs
|
||||
, lib
|
||||
, stdenv
|
||||
, buildRustCrate
|
||||
, defaultCrateOverrides
|
||||
@ -27,7 +28,7 @@ let
|
||||
};
|
||||
};
|
||||
cargo_nix = import ./Cargo.nix {
|
||||
nixpkgs = ../../../..;
|
||||
inherit pkgs;
|
||||
buildRustCrateForPkgs = customBuildRustCrateForPkgs;
|
||||
};
|
||||
meilisearch-http = cargo_nix.workspaceMembers."meilisearch-http".build.override {
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From 7e75779eaeacdbb46a387a59d9aaf1481a1da3e5 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Gierakowski <agierakowski@gmail.com>
|
||||
Date: Sun, 19 Jul 2020 08:38:05 +0100
|
||||
Subject: [PATCH] fix dirent64 et al on darwin
|
||||
|
||||
---
|
||||
configure.ac | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b8faca9..cee1e4d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -139,6 +139,7 @@ if test "$ac_cv_func_signal" != yes; then
|
||||
[klibc has bsd_signal instead of signal])])
|
||||
fi
|
||||
|
||||
+dnl TODO: stat64 is deprecated since macOS 10.6
|
||||
dnl Check for stat64 (dietlibc/klibc).
|
||||
AC_CHECK_FUNC(stat64,, [
|
||||
AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit])
|
||||
@@ -155,6 +156,16 @@ AC_CHECK_FUNC(open64,, [
|
||||
AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit])
|
||||
])
|
||||
|
||||
+dnl OS X apparently has stat64 but not readdir64.
|
||||
+AC_CHECK_FUNC(readdir64,, [
|
||||
+ AC_DEFINE(readdir64, readdir, [64-bit operations are the same as 32-bit])
|
||||
+])
|
||||
+
|
||||
+dnl OS X apparently has stat64 but not dirent64.
|
||||
+AC_CHECK_TYPE(struct dirent64,, [
|
||||
+ AC_DEFINE(dirent64, dirent, [64-bit operations are the same as 32-bit])
|
||||
+],[#include <dirent.h>])
|
||||
+
|
||||
dnl Check if struct stat has st_mtim.
|
||||
AC_MSG_CHECKING(for stat::st_mtim)
|
||||
AC_COMPILE_IFELSE(
|
||||
--
|
||||
2.15.1
|
||||
|
||||
@ -1,30 +1,42 @@
|
||||
{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, libedit }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPackages
|
||||
, autoreconfHook
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, libedit
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dash";
|
||||
version = "0.5.11.2";
|
||||
version = "0.5.11.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0";
|
||||
sha256 = "13g06zqfy4n7jkrbb5l1vw0xcnjvq76i16al8fjc5g33afxbf5af";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
(fetchpatch {
|
||||
# Dash executes code when noexec ("-n") is specified
|
||||
# https://www.openwall.com/lists/oss-security/2020/11/11/3
|
||||
url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e";
|
||||
sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5";
|
||||
sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1";
|
||||
})
|
||||
|
||||
# aarch64-darwin fix from upstream; remove on next release
|
||||
(fetchpatch {
|
||||
url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=6f6d1f2da03468c0e131fdcbdcfa9771ffca2614";
|
||||
sha256 = "16iz2ylkyhpxqq411ns8pjk8rizh6afhavvsf052wvzsnmmlvfbw";
|
||||
})
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Temporary fix until a proper one is accepted upstream
|
||||
./0001-fix-dirent64-et-al-on-darwin.patch
|
||||
];
|
||||
|
||||
# configure.ac patched; remove on next release
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook;
|
||||
buildInputs = [ libedit ];
|
||||
|
||||
configureFlags = [ "--with-libedit" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "stripe-cli";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stripe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CO+2BpMIUSaOhdia75zDGR4RZQSaxY05Z6TOKxBlKIw=";
|
||||
sha256 = "sha256-nu4QcL6r7ivp8wQ8SFe4bOfYX6Iui2czHQ3ucy7K+dk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-LOSHoEP0YRjfHav3MXSYPPrrjX6/ItxeVMOihRx0DTQ=";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rsnapshot";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz";
|
||||
sha256 = "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b";
|
||||
sha256 = "sha256-wct8t0jFqWVsOGNivfbCZ5WXN3JKu1Bfv56UCp2YhXk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [perl openssh rsync logger];
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "s3backer";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "sha256-67sVT72i8tOMdGH/+Oh1N7Vh/2/qD56ImGWI+tprMOM=";
|
||||
sha256 = "sha256-b64EEES7gO9s24hk3sZMd9guEhJNfc3DV4/NnBIcJYw=";
|
||||
rev = version;
|
||||
repo = "s3backer";
|
||||
owner = "archiecobbs";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools
|
||||
{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools
|
||||
, python, git
|
||||
}:
|
||||
|
||||
@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2020-35476.patch";
|
||||
url = "https://github.com/OpenTSDB/opentsdb/commit/b89fded4ee326dc064b9d7e471e9f29f7d1dede9.patch";
|
||||
sha256 = "1vb9m0a4fsjqcjagiypvkngzgsw4dil8jrlhn5xbz7rwx8x96wvb";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ autoconf automake curl jdk nettools python git ];
|
||||
|
||||
@ -33,8 +41,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
knownVulnerabilities = [
|
||||
"CVE-2020-35476" # https://github.com/OpenTSDB/opentsdb/issues/2051
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnsproxy";
|
||||
version = "0.39.4";
|
||||
version = "0.39.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dF3xyyOqWzjHW8cFdGlb3BCCGVy+eWW5OesKEK7pEjw=";
|
||||
sha256 = "sha256-ID40+moRAdceiEOwB4tmBE6U1om/aWBXIlxzfLtm5E4=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
|
||||
|
||||
# Work around error from <stdio.h> on aarch64-darwin:
|
||||
# error: 'TARGET_OS_IPHONE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_]
|
||||
# TODO: this should probably be fixed at a lower level than this?
|
||||
NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-undef-prefix";
|
||||
|
||||
meta = {
|
||||
description = "A client for the WHOIS protocol allowing you to query the owner of a domain name";
|
||||
homepage = "https://www.gnu.org/software/jwhois/";
|
||||
|
||||
@ -36,14 +36,20 @@ stdenv.mkDerivation rec {
|
||||
"--sharedstatedir=/com"
|
||||
];
|
||||
|
||||
# Small fixes for ndb on darwin
|
||||
# https://github.com/rpm-software-management/rpm/pull/1465
|
||||
patches = [
|
||||
# Small fixes for ndb on darwin
|
||||
# https://github.com/rpm-software-management/rpm/pull/1465
|
||||
(fetchpatch {
|
||||
name = "darwin-support.patch";
|
||||
url = "https://github.com/rpm-software-management/rpm/commit/2d20e371d5e38f4171235e5c64068cad30bda557.patch";
|
||||
sha256 = "0p3j5q5a4hl357maf7018k3826jhcpqg6wfrnccrkv30g0ayk171";
|
||||
})
|
||||
# Fix build on aarch64-darwin
|
||||
# https://github.com/rpm-software-management/rpm/pull/1775
|
||||
(fetchpatch {
|
||||
url = "https://github.com/emilazy/rpm/commit/45120e756930b4787ea2e06fb8a9e623ea13f2f3.patch";
|
||||
sha256 = "0zzblwx9apxyjsri4cxd09y9b2hs57r2fck98939j1qgcwy732ar";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -14,11 +14,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rsyslog";
|
||||
version = "8.2102.0";
|
||||
version = "8.2108.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc=";
|
||||
sha256 = "sha256-SCbCttCBqclfRp+wEVvj+VEgZSl9PeAOxRN1jNswsdk=";
|
||||
};
|
||||
|
||||
#patches = [ ./fix-gnutls-detection.patch ];
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "basex";
|
||||
exec = "basexgui %f";
|
||||
icon = ./basex.svg; # icon copied from Ubuntu basex package
|
||||
icon = "${./basex.svg}"; # icon copied from Ubuntu basex package
|
||||
comment = "Visually query and analyse your XML data";
|
||||
desktopName = "BaseX XML Database";
|
||||
genericName = "XML database tool";
|
||||
|
||||
@ -6688,6 +6688,7 @@ with pkgs;
|
||||
|
||||
meilisearch = callPackage ../servers/search/meilisearch {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
inherit pkgs;
|
||||
};
|
||||
|
||||
memtester = callPackage ../tools/system/memtester { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user