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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-17 07:01:38 -07:00
parent 3ff6965554 631cbc3de7
commit c227fb4b17
113 changed files with 1041 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/keepassx/community.nix
+16 -7
View File
@@ -23,6 +23,7 @@
, qtsvg
, qtx11extras
, quazip
, readline
, wrapQtAppsHook
, yubikey-personalization
, zlib
@@ -51,13 +52,13 @@ stdenv.mkDerivation rec {
sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3";
};
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [
NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [
"-Wno-old-style-cast"
"-Wno-error"
"-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
];
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
patches = [
./darwin.patch
@@ -108,12 +109,14 @@ stdenv.mkDerivation rec {
qtbase
qtsvg
qtx11extras
readline
yubikey-personalization
zlib
]
++ lib.optional withKeePassKeeShareSecure quazip
++ lib.optional stdenv.isDarwin qtmacextras
++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication;
++ optional withKeePassKeeShareSecure quazip
++ optional stdenv.isDarwin qtmacextras
++ optional (stdenv.isDarwin && withKeePassTouchID)
darwin.apple_sdk.frameworks.LocalAuthentication;
preFixup = optionalString stdenv.isDarwin ''
# Make it work without Qt in PATH.
@@ -123,8 +126,14 @@ stdenv.mkDerivation rec {
passthru.tests = nixosTests.keepassxc;
meta = {
description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications";
longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser).";
description = "Offline password manager with many features.";
longDescription = ''
A community fork of KeePassX, which is itself a port of KeePass Password Safe.
The goal is to extend and improve KeePassX with new features and bugfixes,
to provide a feature-rich, fully cross-platform and modern open-source password manager.
Accessible via native cross-platform GUI, CLI, has browser integration
using the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)
'';
homepage = "https://keepassxc.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jonafato turion ];
pkgs/applications/misc/slade/git.nix
+24 -6
View File
@@ -1,18 +1,36 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }:
{ lib, stdenv, fetchFromGitHub
, cmake
, pkg-config
, wxGTK
, sfml
, fluidsynth
, curl
, freeimage
, ftgl
, glew
, zip
, lua
, fmt
, mpg123
}:
stdenv.mkDerivation {
name = "slade-git-3.1.2.2018.01.29";
name = "slade-git-3.2.0.2021.05.13";
src = fetchFromGitHub {
owner = "sirjuddington";
repo = "SLADE";
rev = "f7409c504b40c4962f419038db934c32688ddd2e";
sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld";
rev = "d2e249c89062a44c912a9b86951526edc8735ba0";
sha256 = "08dsvx7m7c97jm8fxzivmi1fr47hj53y0lv57clqc35bh2gi62dg";
};
cmakeFlags = ["-DNO_WEBVIEW=1"];
cmakeFlags = [
"-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config"
"-DWX_GTK3=OFF"
"-DNO_WEBVIEW=1"
];
nativeBuildInputs = [ cmake pkg-config zip ];
buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ];
buildInputs = [ wxGTK wxGTK.gtk sfml fluidsynth curl freeimage ftgl glew lua fmt mpg123 ];
meta = with lib; {
description = "Doom editor";