Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
Martin Weinelt
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.28.0";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YbWh4ZIlcxAD/8F/fsYIWjv5hKaHNNi+sNrD7Ax/xDw=";
|
||||
sha256 = "sha256-yTsmgRs3H5do1lG28RU/OY5QJFcwvkrsV/HGuVzD+3M=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.17.2";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ub3rIiOJUh3vNCC+82rCSzKSovMnRW2jo8HbI02ouws=";
|
||||
sha256 = "sha256-D4oqLyH5JU8AycRZuA0isQmE3UP/0WmBmKW3xvSzk2M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-xL0wqKFMQksaLkTAxV72SWh0PPTbOqWcd6deJ9RVeEA=";
|
||||
vendorSha256 = "sha256-R50alGFyb2ZR7PT1jIsYWMIO45CPet+A5wq+clC1NIY=";
|
||||
|
||||
excludedPackages = "misc";
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
, libheif
|
||||
, librsvg
|
||||
, ApplicationServices
|
||||
, Foundation
|
||||
, python27
|
||||
, libpng
|
||||
, fetchFromGitHub
|
||||
@@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
|
||||
python27
|
||||
libpng
|
||||
expat
|
||||
] ++ lib.optional stdenv.isDarwin ApplicationServices;
|
||||
] ++ lib.optionals stdenv.isDarwin [ApplicationServices Foundation];
|
||||
|
||||
# Required by .pc file
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, libiconv
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -16,6 +20,8 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoSha256 = "0vy6q3hjp374lyg00zxim8aplh83iq3f4rrmpz5vnpwbag1fdql3";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines";
|
||||
homepage = "https://github.com/ellie/atuin";
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, libiconv
|
||||
, Security
|
||||
}:
|
||||
|
||||
@@ -19,7 +20,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoSha256 = "1g15v13ysx09fy0b8qddw5fwql2pvwzc2g2h1ndhzpxvfy7fzpr1";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
cargoPatches = [
|
||||
# Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1
|
||||
@@ -30,6 +31,9 @@ rustPlatform.buildRustPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
# Tries to send large UDP packets that Darwin rejects.
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "UDP-based load generator";
|
||||
homepage = "https://github.com/rozgo/anevicon";
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "9.1.2";
|
||||
version = "9.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7v8vz0n35ATWdmMcM2U7z1sONbmsaWQahHsramivm88=";
|
||||
sha256 = "rVR2KfrK7M74kZUm5q23Lbj7hTLCN+p12RBaf3JAEXM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-IAyiD4v2UEGlWj8oZ0E3YhqyThJTjwjWjOzQKuj6Q9s=";
|
||||
vendorSha256 = "sha256-f0KiXHspGX96k5ViCwI62Qs+rHowpqm+gLy7/iqdnE4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -25,11 +25,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "network-manager-applet";
|
||||
version = "1.20.0";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0lsjkbv66hn7acl2pg9h6hz4b700zzv4cjwrwjvy7043blw0bcla";
|
||||
sha256 = "sha256-xw2AtI1AqcuZ7JZ8xDifZ+fwMBUopp1IFXIEEzGmRr4=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -1,21 +1,39 @@
|
||||
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs
|
||||
, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
|
||||
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config
|
||||
, encfs, libsecret , glib , libgee, gtk3, vala, wrapGAppsHook, xorg
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.8.19";
|
||||
version = "1.9";
|
||||
pname = "gnome-encfs-manager";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz";
|
||||
sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i";
|
||||
url = with lib.versions;
|
||||
"https://launchpad.net/gencfsm/trunk/${major version}.${minor version}/+download/gnome-encfs-manager_${version}.tar.xz";
|
||||
sha256 = "RXVwg/xhfAQv3pWp3UylOhMKDh9ZACTuKM4lPrn1dk8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ autoconf automake intltool libtool vala glib encfs
|
||||
gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE
|
||||
wrapGAppsHook gobject-introspection ];
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
intltool
|
||||
libtool
|
||||
pkg-config
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
glib
|
||||
encfs
|
||||
gtk3
|
||||
libgee
|
||||
xorg.libSM
|
||||
xorg.libICE
|
||||
gobject-introspection
|
||||
libsecret
|
||||
];
|
||||
|
||||
# Fix hardcoded paths to /bin/mkdir
|
||||
patches = [ ./makefile-mkdir.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3,
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3,
|
||||
boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml,
|
||||
nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "poedit";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz";
|
||||
sha256 = "1kry3xphrdccx8znfm9pw5872c5w0ri7cknlad4qcps54b25nnzk";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vslavik";
|
||||
repo = "poedit";
|
||||
rev = "v${version}-oss";
|
||||
sha256 = "02xf2w3d2lnr3vqmil9vvg9pir7d21x4zrj9xwpgb7dhs0gimj0x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
|
||||
@@ -41,6 +43,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.poedit.net/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ dasj19 ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user