Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
2aa5735c09
|
|
@ -3669,6 +3669,12 @@
|
|||
githubId = 10353047;
|
||||
name = "Tobias Happ";
|
||||
};
|
||||
gfrascadorio = {
|
||||
email = "gfrascadorio@tutanota.com";
|
||||
github = "gfrascadorio";
|
||||
githubId = 37602871;
|
||||
name = "Galois";
|
||||
};
|
||||
ggpeti = {
|
||||
email = "ggpeti@gmail.com";
|
||||
github = "ggpeti";
|
||||
|
|
@ -5196,6 +5202,12 @@
|
|||
githubId = 546087;
|
||||
name = "Kristoffer K. Føllesdal";
|
||||
};
|
||||
kho-dialga = {
|
||||
email = "ivandashenyou@gmail.com";
|
||||
github = "kho-dialga";
|
||||
githubId = 55767703;
|
||||
name = "Iván Brito";
|
||||
};
|
||||
khumba = {
|
||||
email = "bog@khumba.net";
|
||||
github = "khumba";
|
||||
|
|
@ -7471,6 +7483,12 @@
|
|||
githubId = 1538622;
|
||||
name = "Michael Reilly";
|
||||
};
|
||||
onixie = {
|
||||
email = "onixie@gmail.com";
|
||||
github = "onixie";
|
||||
githubId = 817073;
|
||||
name = "Yc. Shen";
|
||||
};
|
||||
onsails = {
|
||||
email = "andrey@onsails.com";
|
||||
github = "onsails";
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ in
|
|||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.atop;
|
||||
defaultText = "pkgs.atop";
|
||||
description = ''
|
||||
Which package to use for Atop.
|
||||
'';
|
||||
|
|
@ -36,6 +37,7 @@ in
|
|||
package = mkOption {
|
||||
type = types.package;
|
||||
default = config.boot.kernelPackages.netatop;
|
||||
defaultText = "config.boot.kernelPackages.netatop";
|
||||
description = ''
|
||||
Which package to use for netatop.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -58,8 +58,8 @@ in
|
|||
# Link some extra directories in /run/current-system/software/share
|
||||
environment.pathsToLink = [ "/share" ];
|
||||
|
||||
# virtual file systems support for PCManFM-QT
|
||||
services.gvfs.enable = true;
|
||||
services.gvfs.package = pkgs.gvfs;
|
||||
|
||||
services.upower.enable = config.powerManagement.enable;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,7 +14,10 @@ let assertions = rec {
|
|||
'';
|
||||
unit = name: state: ''
|
||||
with subtest("Unit ${name} should be ${state}"):
|
||||
machine.require_unit_state("${name}", "${state}")
|
||||
if "${state}" == "active":
|
||||
machine.wait_for_unit("${name}")
|
||||
else:
|
||||
machine.require_unit_state("${name}", "${state}")
|
||||
'';
|
||||
version = ''
|
||||
import re
|
||||
|
|
@ -44,9 +47,19 @@ let assertions = rec {
|
|||
if present then
|
||||
unit "atop.service" "active"
|
||||
+ ''
|
||||
with subtest("atop.service should have written some data to /var/log/atop"):
|
||||
files = int(machine.succeed("ls -1 /var/log/atop | wc -l"))
|
||||
assert files > 0, "Expected at least 1 data file"
|
||||
with subtest("atop.service should write some data to /var/log/atop"):
|
||||
|
||||
def has_data_files(last: bool) -> bool:
|
||||
files = int(machine.succeed("ls -1 /var/log/atop | wc -l"))
|
||||
if files == 0:
|
||||
machine.log("Did not find at least one 1 data file")
|
||||
if not last:
|
||||
machine.log("Will retry...")
|
||||
return False
|
||||
return True
|
||||
|
||||
with machine.nested("Waiting for data files"):
|
||||
retry(has_data_files)
|
||||
'' else unit "atop.service" "inactive";
|
||||
atopRotateTimer = present:
|
||||
unit "atop-rotate.timer" (if present then "active" else "inactive");
|
||||
|
|
@ -55,11 +68,21 @@ let assertions = rec {
|
|||
unit "atopacct.service" "active"
|
||||
+ ''
|
||||
with subtest("atopacct.service should enable process accounting"):
|
||||
machine.succeed("test -f /run/pacct_source")
|
||||
machine.wait_until_succeeds("test -f /run/pacct_source")
|
||||
|
||||
with subtest("atopacct.service should write data to /run/pacct_shadow.d"):
|
||||
files = int(machine.succeed("ls -1 /run/pacct_shadow.d | wc -l"))
|
||||
assert files >= 1, "Expected at least 1 pacct_shadow.d file"
|
||||
|
||||
def has_data_files(last: bool) -> bool:
|
||||
files = int(machine.succeed("ls -1 /run/pacct_shadow.d | wc -l"))
|
||||
if files == 0:
|
||||
machine.log("Did not find at least one 1 data file")
|
||||
if not last:
|
||||
machine.log("Will retry...")
|
||||
return False
|
||||
return True
|
||||
|
||||
with machine.nested("Waiting for data files"):
|
||||
retry(has_data_files)
|
||||
'' else unit "atopacct.service" "inactive";
|
||||
netatop = present:
|
||||
if present then
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@
|
|||
, lame
|
||||
, ffmpeg
|
||||
, vlc
|
||||
, xdg-utils
|
||||
, which
|
||||
|
||||
, jackSupport ? true, libjack2
|
||||
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
|
||||
|
|
@ -15,14 +17,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "6.25";
|
||||
version = "6.28";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
|
||||
sha256 = "0i1idlr4ar28wvwcvwn9hqzb63kki1x1995cr87a9slxfa7zcshb";
|
||||
hash = "sha256-38HSjR+rQWPzMOjq1abLn/MP3DCz5YzBg0v2kBsQmR4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
xdg-utils # Required for desktop integration
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsaLib
|
||||
|
|
@ -41,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
XDG_DATA_HOME="$out/share" ./install-reaper.sh \
|
||||
HOME="$out/share" XDG_DATA_HOME="$out/share" ./install-reaper.sh \
|
||||
--install $out/opt \
|
||||
--integrate-user-desktop
|
||||
rm $out/opt/REAPER/uninstall-reaper.sh
|
||||
|
|
|
|||
|
|
@ -14,13 +14,12 @@ let
|
|||
sha256Hash = "074y6i0h8zamjgvvs882im44clds3g6aq8rssl7sq1wx6hrn5q36";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "4.2.0.24"; # "Android Studio 4.2.0"
|
||||
build = "202.7322048";
|
||||
sha256Hash = "1ii1zf8mv7xyql56wwkcdj5l4g3zaprdszv6r9md9r5zh78k4ccz";
|
||||
version = "2020.3.1.16"; # "Android Studio Arctic Fox (2020.3.1) Beta 1"
|
||||
sha256Hash = "0mp1cmxkqc022nv8cggywbwcf8lp6r802nh8hcw5j00hcdnhkcq0";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "2020.3.1.15"; # "Android Studio Arctic Fox (2020.3.1) Canary 15"
|
||||
sha256Hash = "0k66ibflqwdlgapir5w2v1d4zjwn6464yk2hvlmif9lsfdvd0ivv";
|
||||
version = "2021.1.1.1"; # "Android Studio Bumblebee (2021.1.1) Canary 1"
|
||||
sha256Hash = "0aavmk8byw817356jm28rl998gcp3zm7x3fq14hm2awzhk5jaklm";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
SKIA_OFFLINE_NINJA_COMMAND = "${ninja}/bin/ninja";
|
||||
SKIA_OFFLINE_GN_COMMAND = "${gn}/bin/gn";
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
# test needs a valid fontconfig file
|
||||
FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "12.3";
|
||||
version = "12.4";
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "netbeans";
|
||||
exec = "netbeans";
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
|||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
|
||||
sha512 = "2fy696qrfbdkzmq4cwd6l7v6rsc0bf9akh61w3azc544bq3vxl3v6s31hvg3ba0nsh0jv3nbdrk6jp1l4hwgcg9zg7kf2012a1vv2nk";
|
||||
sha512 = "2jwfyq5ik0pwjd61mh0dhyw4xgpzfmgsjc947xg84n7xmns4mzgb8k5ggrss6hgqiqk7jl3psv7v837c2dxk1xdrdnkzs31cg9symbs";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ let
|
|||
'' + (if system == "x86_64-darwin" then ''
|
||||
mkdir -p "$out/Applications/${longName}.app" $out/bin
|
||||
cp -r ./* "$out/Applications/${longName}.app"
|
||||
ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName}
|
||||
ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${executableName}" $out/bin/${executableName}
|
||||
'' else ''
|
||||
mkdir -p $out/lib/vscode $out/bin
|
||||
cp -r ./* $out/lib/vscode
|
||||
|
|
@ -159,4 +159,3 @@ let
|
|||
};
|
||||
in
|
||||
unwrapped
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,24 @@
|
|||
{ lib, stdenv, fetchurl, appimageTools, undmg, libsecret, libxshmfence }:
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
||||
pname = "keeweb";
|
||||
version = "1.17.0";
|
||||
version = "1.18.6";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
suffix = {
|
||||
x86_64-linux = "linux.AppImage";
|
||||
x86_64-darwin = "mac.x64.dmg";
|
||||
aarch64-darwin = "mac.arm64.dmg";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "1c7zvwnd46d3lrlcdigv341flz44jl6mnvr6zqny5mfz221ynbj7";
|
||||
x86_64-darwin = "1n4haxychm5jjhjnpncavjh0wr4dagqi78qfsx5gwlv86hzryzwy";
|
||||
aarch64-darwin = "1j7z63cbfms02f2lhl949wy3lc376jw8kqmjfn9j949s0l5fanpb";
|
||||
}.${system} or throwSystem;
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.AppImage";
|
||||
sha256 = "sha256-hxXs8Dfh5YQy1zaFb20KDWNl8eqFjuN5QY7tsO6+E/U=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg";
|
||||
sha256 = "sha256-8+7NzaHVcLinKb57SAcJmF2Foy9RfxFhcTxzvL0JSJQ=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg";
|
||||
sha256 = "sha256-1BNY6kRS0F+AUI+80ZGFi/ek28NMP1uexo1UORz5D6g=";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit name src;
|
||||
|
|
@ -32,7 +30,7 @@ let
|
|||
changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
platforms = builtins.attrNames srcs;
|
||||
};
|
||||
|
||||
linux = appimageTools.wrapType2 rec {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
version = "4.4.3";
|
||||
version = "4.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = "k3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G8oaJtfsbSi5WaJobxUpNu9DchHfzbkpPvq23GYM99s=";
|
||||
sha256 = "sha256-pfyU25MASKQMwd49IbNyyEiz3gmSOBmLdWtIKhYU2wg=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
37
pkgs/applications/networking/cluster/multus-cni/default.nix
Normal file
37
pkgs/applications/networking/cluster/multus-cni/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "multus-cni";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k8snetworkplumbingwg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "04rn7ypd0cw2c33wqb9wqy1dp6ajvcp7rcv7zybffb1d40mdlds1";
|
||||
};
|
||||
|
||||
buildFlagsArray = let
|
||||
multus = "gopkg.in/intel/multus-cni.v3/pkg/multus";
|
||||
commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7";
|
||||
in [
|
||||
"-ldflags=-s -w -X '${multus}.version=v${version}' -X '${multus}.commit=${commit}'"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mv $GOPATH/bin/cmd $GOPATH/bin/multus
|
||||
'';
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
# Some of the tests require accessing a k8s cluster
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods. ";
|
||||
homepage = "https://github.com/k8snetworkplumbingwg/multus-cni";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ onixie ];
|
||||
};
|
||||
}
|
||||
|
|
@ -42,11 +42,11 @@ let
|
|||
|
||||
pname = "slack";
|
||||
|
||||
x86_64-darwin-version = "4.15.0";
|
||||
x86_64-darwin-sha256 = "12mfha0f7nciszsv7fb0zk4y10p63mh7kaw8gbk3q2fmyp8aij6l";
|
||||
x86_64-darwin-version = "4.16.0";
|
||||
x86_64-darwin-sha256 = "078f49sgazfa99vn0yyacfya3jl2vhqz7kgxh0qp56b66pnzwbxz";
|
||||
|
||||
x86_64-linux-version = "4.15.0";
|
||||
x86_64-linux-sha256 = "1xzp7ql4i3n3fqfwk0400hkg4xn0pi66sy5jzqn68z33zzf7raii";
|
||||
x86_64-linux-version = "4.16.0";
|
||||
x86_64-linux-sha256 = "0dj5k7r044mibis0zymh6wryhbw2fzsch30nddfrnn6ij89hhirv";
|
||||
|
||||
version = {
|
||||
x86_64-darwin = x86_64-darwin-version;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{ lib, stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor
|
||||
, libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring
|
||||
, makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib
|
||||
, libpulseaudio, libopus, libogg, jansson, libsodium }:
|
||||
, libpulseaudio, libopus, libogg, jansson, libsodium
|
||||
|
||||
, postgresqlSupport ? false, postgresql }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnunet";
|
||||
|
|
@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
adns curl gmp gnutls libextractor libgcrypt libgnurl libidn
|
||||
libmicrohttpd libunistring libxml2 ncurses gettext libsodium
|
||||
sqlite zlib libpulseaudio libopus libogg jansson
|
||||
];
|
||||
] ++ lib.optional postgresqlSupport postgresql;
|
||||
|
||||
preConfigure = ''
|
||||
# Brute force: since nix-worker chroots don't provide
|
||||
|
|
|
|||
57
pkgs/applications/networking/taler/default.nix
Normal file
57
pkgs/applications/networking/taler/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{ lib, stdenv, fetchurl, curl, gnunet, jansson, libgcrypt, libmicrohttpd
|
||||
, qrencode, libsodium, libtool, pkg-config, postgresql, sqlite }:
|
||||
|
||||
let
|
||||
gnunet' = gnunet.override { postgresqlSupport = true; };
|
||||
|
||||
mkTaler = { pname, version, sha256 }:
|
||||
extraAttrs:
|
||||
stdenv.mkDerivation (extraAttrs // {
|
||||
inherit pname version;
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/taler/${pname}-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
enableParallelBuilding = true;
|
||||
meta = with lib; {
|
||||
description = "Anonymous, taxable payment system.";
|
||||
homepage = "https://taler.net/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
};
|
||||
});
|
||||
|
||||
in rec {
|
||||
|
||||
taler-exchange = mkTaler {
|
||||
pname = "taler-exchange";
|
||||
version = "0.8.1";
|
||||
sha256 = "sha256-MPt3n1JXd0Y89b1qCuF6YxptSr7henfYp97JTq1Z+x4=";
|
||||
} {
|
||||
buildInputs = [
|
||||
curl
|
||||
jansson
|
||||
libgcrypt
|
||||
libmicrohttpd
|
||||
libsodium
|
||||
libtool
|
||||
postgresql
|
||||
# sqlite
|
||||
];
|
||||
propagatedBuildInputs = [ gnunet' ];
|
||||
patches = [ ./exchange-fix-6665.patch ];
|
||||
};
|
||||
|
||||
taler-merchant = mkTaler {
|
||||
pname = "taler-merchant";
|
||||
version = "0.8.0";
|
||||
sha256 = "sha256-scrFLXeoQirGqhc+bSQKRl84PfUvjrp1uxF7pfOIB9Q=";
|
||||
} {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = taler-exchange.buildInputs ++ [ qrencode taler-exchange ];
|
||||
propagatedBuildInputs = [ gnunet' ];
|
||||
PKG_CONFIG = "${pkg-config}/bin/pkg-config";
|
||||
};
|
||||
|
||||
}
|
||||
48
pkgs/applications/networking/taler/exchange-fix-6665.patch
Normal file
48
pkgs/applications/networking/taler/exchange-fix-6665.patch
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
commit 9911b327ac299ec7eeae81b98cb520f4153071f2
|
||||
Author: Christian Grothoff <christian@grothoff.org>
|
||||
Date: Wed Dec 9 07:25:26 2020 +0100
|
||||
|
||||
fix #6665
|
||||
|
||||
diff --git a/src/testing/testing_api_cmd_rewind.c b/src/testing/testing_api_cmd_rewind.c
|
||||
index e1b17fa9..979607cd 100644
|
||||
--- a/src/testing/testing_api_cmd_rewind.c
|
||||
+++ b/src/testing/testing_api_cmd_rewind.c
|
||||
@@ -24,7 +24,6 @@
|
||||
*/
|
||||
#include "platform.h"
|
||||
#include "taler_exchange_service.h"
|
||||
-#include "taler/taler_testing_lib.h"
|
||||
#include "taler_testing_lib.h"
|
||||
|
||||
|
||||
diff --git a/src/testing/testing_api_cmd_twister_exec_client.c b/src/testing/testing_api_cmd_twister_exec_client.c
|
||||
index 2cb92a8f..b3903f29 100644
|
||||
--- a/src/testing/testing_api_cmd_twister_exec_client.c
|
||||
+++ b/src/testing/testing_api_cmd_twister_exec_client.c
|
||||
@@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include "platform.h"
|
||||
-#include <taler/taler_testing_lib.h>
|
||||
+#include "taler_testing_lib.h"
|
||||
#include "taler_twister_testing_lib.h"
|
||||
|
||||
|
||||
diff --git a/src/testing/testing_api_trait_uuid.c b/src/testing/testing_api_trait_uuid.c
|
||||
index c9b73a5b..4d5003ec 100644
|
||||
--- a/src/testing/testing_api_trait_uuid.c
|
||||
+++ b/src/testing/testing_api_trait_uuid.c
|
||||
@@ -22,9 +22,9 @@
|
||||
* @author Jonathan Buchanan
|
||||
*/
|
||||
#include "platform.h"
|
||||
-#include <taler/taler_signatures.h>
|
||||
-#include <taler/taler_exchange_service.h>
|
||||
-#include <taler/taler_testing_lib.h>
|
||||
+#include "taler_signatures.h"
|
||||
+#include "taler_exchange_service.h"
|
||||
+#include "taler_testing_lib.h"
|
||||
|
||||
|
||||
#define TALER_TESTING_TRAIT_UUID "uuid"
|
||||
|
|
@ -1,27 +1,28 @@
|
|||
{ mkDerivation, lib, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets, stdenv, qtx11extras }:
|
||||
{ mkDerivation, lib, stdenv, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets, qtx11extras
|
||||
, qtwayland }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qownnotes";
|
||||
version = "21.4.0";
|
||||
version = "21.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
|
||||
# Can grab official version like so:
|
||||
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-21.4.0.tar.xz.sha256
|
||||
sha256 = "bda454031a79a768b472677036ada7501ea430482277f1694757066922428eec";
|
||||
# Fetch the checksum of current version with curl:
|
||||
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
|
||||
sha256 = "cf68dc78e641ca66403621cef4002ddd09463ead2eb060812d8124d6749ba03b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
buildInputs = [
|
||||
qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras
|
||||
] ++ lib.optional stdenv.isLinux qtwayland;
|
||||
|
||||
buildInputs = [ qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras ]
|
||||
++ lib.optionals stdenv.isLinux [ qtwayland ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plain-text file notepad and todo-list manager with markdown support and ownCloud / Nextcloud integration";
|
||||
|
||||
description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration.";
|
||||
longDescription = "QOwnNotes is a plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration.";
|
||||
homepage = "https://www.qownnotes.org/";
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ dtzWill totoroot ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,25 @@
|
|||
{ lib, stdenv, fetchurl, perl, libxcb }:
|
||||
{ lib, stdenv, fetchFromGitHub, perl, libxcb }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "lemonbar-1.4";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lemonbar";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz";
|
||||
sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LemonBoy";
|
||||
repo = "bar";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lmppcnQ8r4jEuhegpTBxYqxfTTS/IrbtQVZ44HqnoWo=";
|
||||
};
|
||||
|
||||
buildInputs = [ libxcb perl ];
|
||||
|
||||
prePatch = ''sed -i "s@/usr@$out@" Makefile'';
|
||||
installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight xcb based bar";
|
||||
homepage = "https://github.com/LemonBoy/bar";
|
||||
maintainers = [ maintainers.meisternu ];
|
||||
license = "Custom";
|
||||
maintainers = with maintainers; [ meisternu fortuneteller2k ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,25 @@
|
|||
{ lib, stdenv, fetchFromGitHub, perl, libxcb, libXft }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "lemonbar-xft-unstable-2016-02-17";
|
||||
pname = "lemonbar-xft";
|
||||
version = "unstable-2020-09-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "krypt-n";
|
||||
repo = "bar";
|
||||
rev = "a43b801ddc0f015ce8b1211f4c062fad12cd63a9";
|
||||
sha256 = "0iqas07qjvabxyvna2m9aj5bcwnkdii1izl9jxha63vz0zlsc4gd";
|
||||
owner = "drscream";
|
||||
repo = "lemonbar-xft";
|
||||
rev = "481e12363e2a0fe0ddd2176a8e003392be90ed02";
|
||||
sha256 = "sha256-BNYBbUouqqsRQaPkpg+UKg62IV9uI34gKJuiAM94CBU=";
|
||||
};
|
||||
|
||||
buildInputs = [ libxcb libXft perl ];
|
||||
|
||||
prePatch = ''sed -i "s@/usr@$out@" Makefile'';
|
||||
installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A lightweight xcb based bar with XFT-support";
|
||||
homepage = "https://github.com/krypt-n/bar";
|
||||
license = "Custom";
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "https://github.com/drscream/lemonbar-xft";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fortuneteller2k ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ let
|
|||
lxqt-archiver = callPackage ./lxqt-archiver {};
|
||||
|
||||
preRequisitePackages = [
|
||||
pkgs.gvfs # virtual file systems support for PCManFM-QT
|
||||
libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
|
||||
libsForQt5.libkscreen # provides plugins for screen management software
|
||||
pkgs.libfm
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ let
|
|||
};
|
||||
|
||||
"2.13" = {
|
||||
version = "2.13.5";
|
||||
sha256 = "1ah5rw6xqksiayi5i95r3pcff961q71ilishzn2kmg673z0j2b7d";
|
||||
version = "2.13.6";
|
||||
sha256 = "Sd+SUDzRHMPGSWg9s2jlh4t+eS5AFW0jd+UjJuk17UM=";
|
||||
pname = "scala_2_13";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.0-RC3";
|
||||
version = "3.0.0";
|
||||
pname = "dotty-bare";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz";
|
||||
sha256 = "1xp9nql2l62fra8p29fgk3srdbvza9g5inxr8p0sihsrp0bgxa0m";
|
||||
sha256 = "/F2yv4XH0I3oC3IFqj+jwpzShCtTEfTzg+J26Xl+P+Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ncurses.dev ] ;
|
||||
|
|
|
|||
|
|
@ -1,25 +1,26 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical
|
||||
, libuv, raft-canonical, sqlite-replication }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv
|
||||
, raft-canonical, sqlite-replication }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dqlite";
|
||||
version = "1.5.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0h7ypigj1b6xbspzc35y89jkp84v8rqiv9qgkyqlqylr7mcw952a";
|
||||
sha256 = "sha256-lCMTmKnDv/fb5fP/Ch8AwpuNfmR+gecxeIweO6hHj5U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook file pkg-config ];
|
||||
buildInputs = [
|
||||
libco-canonical.dev
|
||||
libuv
|
||||
raft-canonical.dev
|
||||
sqlite-replication
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# tests fail
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc
|
||||
{ stdenv, lib, fetchzip, pkg-config, meson, ninja, scdoc
|
||||
, freetype, fontconfig, pixman, tllist, check
|
||||
, withHarfBuzz ? true
|
||||
, harfbuzz
|
||||
|
|
@ -6,12 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcft";
|
||||
version = "2.3.3";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/dnkl/fcft.git";
|
||||
rev = version;
|
||||
sha256 = "0314r038jl17hrhc9nrbx30jk0pz8ckbdnizws4r46b1rf4h0b1f";
|
||||
src = fetchzip {
|
||||
url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz";
|
||||
sha256 = "0z1r0s5s3dr1g4f3ylxfcmy3xb0ax02rw9mg7z8hzh0gxazrpndx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja scdoc ];
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config }:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libco-canonical";
|
||||
version = "20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "libco";
|
||||
rev = "v${version}";
|
||||
sha256 = "0r5b1r0sxngx349s5a3zkkvfw5by9y492kr34b25gjspzvjchlxq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
||||
patchPhase = ''
|
||||
# upstream project assumes all build products will go into single directory
|
||||
# `$prefix` but we need `includedir` to point to "dev", not "out"
|
||||
#
|
||||
# pkgs/build-support/setup-hooks/multiple-outputs.sh would normally patch
|
||||
# this automatically, but it fails here due to use of absolute paths
|
||||
|
||||
substituteInPlace Makefile \
|
||||
--replace "@includedir@|\$(PREFIX)" "@includedir@|${placeholder "dev"}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A cooperative multithreading library written in C89";
|
||||
homepage = "https://github.com/canonical/libco";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ wucke13 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -37,6 +37,9 @@ stdenv.mkDerivation rec {
|
|||
mesonFlags = [
|
||||
# There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway
|
||||
"-Dtests=disabled"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-Dintrospection=disabled"
|
||||
"-Dvapi=disabled"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }:
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, git
|
||||
, asio, catch2, spdlog
|
||||
, IOKit, udev
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pc-ble-driver";
|
||||
version = "4.1.1";
|
||||
version = "4.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NordicSemiconductor";
|
||||
repo = "pc-ble-driver";
|
||||
rev = "v${version}";
|
||||
sha256 = "1llhkpbdbsq9d91m873vc96bprkgpb5wsm5fgs1qhzdikdhg077q";
|
||||
sha256 = "1609x17sbfi668jfwyvnfk9z29w6cgzvgv67xcpvpx5jv0czpcdj";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -16,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [ cmake git ];
|
||||
buildInputs = [ catch2 asio ];
|
||||
buildInputs = [ asio catch2 spdlog ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
|
|
|
|||
|
|
@ -2,18 +2,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "raft-canonical";
|
||||
version = "0.9.23";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "raft";
|
||||
rev = "v${version}";
|
||||
sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr";
|
||||
sha256 = "sha256-Q4m0CCIArgsobhmhqLvkr7fK40SX/qBk6K5Qu0eRLaI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook file pkg-config ];
|
||||
buildInputs = [ libuv ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace configure --replace /usr/bin/ " "
|
||||
'';
|
||||
|
|
|
|||
46
pkgs/development/python-modules/envoy-reader/default.nix
Normal file
46
pkgs/development/python-modules/envoy-reader/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, httpx
|
||||
, pytest-asyncio
|
||||
, pytest-raises
|
||||
, pytest-runner
|
||||
, pytestCheckHook
|
||||
, respx
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "envoy-reader";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesserizzo";
|
||||
repo = "envoy_reader";
|
||||
rev = version;
|
||||
sha256 = "0jyrgm7dc6k66c94gadc69a6xsv2b48wn3b3rbpwgbssi5s7iiz6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-raises
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
respx
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "envoy_reader" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to read from Enphase Envoy units";
|
||||
homepage = "https://github.com/jesserizzo/envoy_reader";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
28
pkgs/development/python-modules/mercantile/default.nix
Normal file
28
pkgs/development/python-modules/mercantile/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub
|
||||
, click
|
||||
, pytestCheckHook
|
||||
, hypothesis
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mercantile";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapbox";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ];
|
||||
|
||||
checkInputs = [ pytestCheckHook hypothesis ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Spherical mercator tile and coordinate utilities";
|
||||
homepage = "https://github.com/mapbox/mercantile";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykeepass";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libkeepass";
|
||||
repo = "pykeepass";
|
||||
rev = version;
|
||||
sha256 = "1zw5hjk90zfxpgq2fz4h5qzw3kmvdnlfbd32gw57l034hmz2i08v";
|
||||
sha256 = "sha256-D+loaPBpKdXyiqpdth3ANDjH6IewuKYhj/DzRE2hDn4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ufonormalizer";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0ijc697nv9rff9j1nhbf5vnyaryxlndq13msi94px8aq9gzxfrbi";
|
||||
sha256 = "11l8475p3nq7azim35l5lck8vrgjgd01plnji6gg1hf9ckswr2pb";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
diff --git a/src/toolchains.rs b/src/toolchains.rs
|
||||
index 4d85e7c..b1353c6 100644
|
||||
--- a/src/toolchains.rs
|
||||
+++ b/src/toolchains.rs
|
||||
@@ -259,6 +259,8 @@ impl Toolchain {
|
||||
.map_err(InstallError::Download)?;
|
||||
}
|
||||
|
||||
+ nix_patchelf(tmpdir.path().to_path_buf())
|
||||
+ .expect("failed to patch toolchain for NixOS");
|
||||
fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)?;
|
||||
|
||||
Ok(())
|
||||
@@ -557,3 +559,42 @@ pub(crate) fn download_tarball(
|
||||
}
|
||||
download_tar_gz(client, name, &format!("{}.gz", url,), strip_prefix, dest)
|
||||
}
|
||||
+
|
||||
+fn nix_patchelf(mut toolchain_path: PathBuf) -> Result<(), Error> {
|
||||
+ toolchain_path.push("bin");
|
||||
+
|
||||
+ for entry in toolchain_path.read_dir()? {
|
||||
+ let entry = entry?;
|
||||
+ if !entry.file_type()?.is_file() {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ eprintln!("info: you seem to be running NixOS. Attempting to patch {}",
|
||||
+ entry.path().to_str().unwrap());
|
||||
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
|
||||
+ .arg("--set-interpreter")
|
||||
+ .arg("@dynamicLinker@")
|
||||
+ .arg(entry.path())
|
||||
+ .output();
|
||||
+ }
|
||||
+
|
||||
+ toolchain_path.pop();
|
||||
+ toolchain_path.push("lib");
|
||||
+
|
||||
+ for entry in toolchain_path.read_dir()? {
|
||||
+ let entry = entry?;
|
||||
+ if !entry.file_type()?.is_file() {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ eprintln!("info: you seem to be running NixOS. Attempting to patch {}",
|
||||
+ entry.path().to_str().unwrap());
|
||||
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
|
||||
+ .arg("--set-rpath")
|
||||
+ .arg("@libPath@")
|
||||
+ .arg(entry.path())
|
||||
+ .output();
|
||||
+ }
|
||||
+
|
||||
+ Ok(())
|
||||
+}
|
||||
56
pkgs/development/tools/rust/cargo-bisect-rustc/default.nix
Normal file
56
pkgs/development/tools/rust/cargo-bisect-rustc/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, runCommand
|
||||
, patchelf
|
||||
, zlib
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-bisect-rustc";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LEmILWVU6hbh2FmdnQVV1Ob2MQvj+/lCr1hdRoTIOkI=";
|
||||
};
|
||||
|
||||
patches =
|
||||
let
|
||||
patchelfPatch = runCommand "0001-dynamically-patchelf-binaries.patch" {
|
||||
CC = stdenv.cc;
|
||||
patchelf = patchelf;
|
||||
libPath = "$ORIGIN/../lib:${lib.makeLibraryPath [ zlib ]}";
|
||||
}
|
||||
''
|
||||
export dynamicLinker=$(cat $CC/nix-support/dynamic-linker)
|
||||
substitute ${./0001-dynamically-patchelf-binaries.patch} $out \
|
||||
--subst-var patchelf \
|
||||
--subst-var dynamicLinker \
|
||||
--subst-var libPath
|
||||
'';
|
||||
in
|
||||
lib.optionals stdenv.isLinux [ patchelfPatch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
cargoSha256 = "Ls51DQ0yScRhpkuEInCfR45+/WeaUoG935w4BJvwSRk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bisects rustc, either nightlies or CI artifacts";
|
||||
homepage = "https://github.com/rust-lang/${pname}";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ davidtwco ];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,14 +19,14 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
zig build -Drelease-safe --prefix $out install
|
||||
zig build -Drelease-safe -Dtarget=${stdenv.hostPlatform.parsed.cpu.name}-native --prefix $out install
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Zig LSP implementation + Zig Language Server";
|
||||
changelog = "https://github.com/zigtools/zls/releases/tag/${version}";
|
||||
homepage = "https://github.com/zigtools/zls";
|
||||
license = [ licenses.mit ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fortuneteller2k ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@
|
|||
|
||||
let
|
||||
pname = "shattered-pixel-dungeon";
|
||||
version = "0.9.2";
|
||||
version = "0.9.2b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "00-Evan";
|
||||
repo = "shattered-pixel-dungeon";
|
||||
# NOTE: always use the commit sha, not the tag. Tags _will_ disappear!
|
||||
# https://github.com/00-Evan/shattered-pixel-dungeon/issues/596
|
||||
rev = "5be9ee815f1fc6e3511a09a367d3f9d8dc55c783";
|
||||
sha256 = "0wknrf7jjnkshj4gmb1ksqiqif1rq53ffi3y29ynhcz68sa0frx6";
|
||||
rev = "eba806ef561921b86637cf26818e095556edec0d";
|
||||
sha256 = "05m4sfchccr437pxjvgzjk6nd9r3n4c4p3q8lxcc5pj6qrppk49j";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
31
pkgs/misc/emulators/proton-caller/default.nix
Normal file
31
pkgs/misc/emulators/proton-caller/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proton-caller";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "caverym";
|
||||
repo = pname;
|
||||
rev = "version";
|
||||
sha256 = "0968pmapg6157q4rvfp690l1sjnws8hm62lvm8kaaqysac339z7z";
|
||||
};
|
||||
|
||||
cargoSha256 = "1vp2vvgy8z350a59k1c3s5ww6w2wikiha4s7jkkz9khl0spn19a8";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage manual/proton-call.6
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Run Windows programs with Proton";
|
||||
changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}";
|
||||
homepage = "https://github.com/caverym/proton-caller";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ kho-dialga ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python37, retroarch
|
||||
{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch
|
||||
, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
|
||||
, ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
|
||||
, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
|
||||
, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
|
||||
, buildPackages }:
|
||||
|
||||
|
|
@ -831,15 +831,24 @@ in with lib.licenses;
|
|||
|
||||
ppsspp = mkLibRetroCore {
|
||||
core = "ppsspp";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hrydgard/ppsspp";
|
||||
rev = "bf1777f7d3702e6a0f71c7ec1fc51976e23c2327";
|
||||
sha256 = "17sym0vk72lzbh9a1501mhw98c78x1gq7k1fpy69nvvb119j37wa";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "v1.11";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix_ffmpeg_4.4.patch"; # to be removed with next release
|
||||
url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch";
|
||||
sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo=";
|
||||
})
|
||||
];
|
||||
description = "ppsspp libretro port";
|
||||
license = gpl2;
|
||||
extraNativeBuildInputs = [ cmake pkg-config ];
|
||||
extraBuildInputs = [ libGLU libGL libzip ffmpeg_3 python37 snappy xorg.libX11 ];
|
||||
extraNativeBuildInputs = [ cmake pkg-config python3 ];
|
||||
extraBuildInputs = [ libGLU libGL libzip ffmpeg snappy xorg.libX11 ];
|
||||
makefile = "Makefile";
|
||||
cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ];
|
||||
postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "betterlockscreen";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pavanjadhaw";
|
||||
repo = "betterlockscreen";
|
||||
rev = version;
|
||||
sha256 = "14vkgdzw7mprjsvmhm3aav8gds73ngn2xxij4syq7l1mhk701wak";
|
||||
sha256 = "sha256-TA4YSd/elFuLU1ZMu+dqIOt6hK9pnzgoJudaMpIwh+U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,17 +1,49 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, xorgproto, libX11, libXext, libXi, libXrandr, libXrender
|
||||
, ncurses, pkg-config, xorgserver, udev, libXinerama, pixman }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, autoreconfHook
|
||||
, fetchFromGitHub
|
||||
, xorgproto
|
||||
, libX11
|
||||
, libXext
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, ncurses
|
||||
, pixman
|
||||
, pkg-config
|
||||
, udev
|
||||
, utilmacros
|
||||
, xorgserver
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xf86-input-wacom-0.36.0";
|
||||
pname = "xf86-input-wacom";
|
||||
version = "0.40.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
|
||||
sha256 = "1xi39hl8ddgj9m7m2k2ll2r3wh0k0aq45fvrsv43651bhz9cbrza";
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxwacom";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-0U4pAB5vsIlBewCBqQ4SLHDrwqtr9nh7knZpXZMkzck=";
|
||||
};
|
||||
|
||||
buildInputs = [ xorgproto libX11 libXext libXi libXrandr libXrender
|
||||
ncurses pkg-config xorgserver udev libXinerama pixman ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXext
|
||||
libXi
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXrender
|
||||
ncurses
|
||||
udev
|
||||
utilmacros
|
||||
pixman
|
||||
xorgproto
|
||||
xorgserver
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p $out/share/X11/xorg.conf.d
|
||||
|
|
@ -22,10 +54,10 @@ stdenv.mkDerivation rec {
|
|||
CFLAGS = "-I${pixman}/include/pixman-1";
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
maintainers = with maintainers; [ goibhniu fortuneteller2k ];
|
||||
description = "Wacom digitizer driver for X11";
|
||||
homepage = "http://linuxwacom.sourceforge.net";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux; # Probably, works with other unices as well
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux; # Probably, works with other unixes as well
|
||||
};
|
||||
}
|
||||
|
|
|
|||
28
pkgs/servers/heisenbridge/default.nix
Normal file
28
pkgs/servers/heisenbridge/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "heisenbridge";
|
||||
version = "unstable-2021-05-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hifi";
|
||||
repo = "heisenbridge";
|
||||
rev = "1f8df49b7e89aaeb2cbb5fee68bd29cf3eda079a";
|
||||
sha256 = "sha256-ta6n9hXRdIjfxsLy9jrzZkz6TS50/TYpFOb/BLrRWK4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
aiohttp
|
||||
irc
|
||||
pyyaml
|
||||
];
|
||||
|
||||
checkInputs = [ python3Packages.pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A bouncer-style Matrix-IRC bridge.";
|
||||
homepage = "https://github.com/hifi/heisenbridge";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.sumnerevans ];
|
||||
};
|
||||
}
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
"emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku
|
||||
"enigma2" = ps: with ps; [ openwebifpy ];
|
||||
"enocean" = ps: with ps; [ ]; # missing inputs: enocean
|
||||
"enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader
|
||||
"enphase_envoy" = ps: with ps; [ envoy-reader ];
|
||||
"entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient
|
||||
"environment_canada" = ps: with ps; [ ]; # missing inputs: env_canada
|
||||
"envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat
|
||||
|
|
|
|||
|
|
@ -325,6 +325,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"efergy"
|
||||
"emonitor"
|
||||
"emulated_hue"
|
||||
"enphase_envoy"
|
||||
"esphome"
|
||||
"everlights"
|
||||
"ezviz"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, apacheHttpd, apr, avahi }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mod_dnssd-0.6";
|
||||
pname = "mod_dnssd";
|
||||
version = "0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://0pointer.de/lennart/projects/mod_dnssd/${name}.tar.gz";
|
||||
url = "http://0pointer.de/lennart/projects/mod_dnssd/${pname}-${version}.tar.gz";
|
||||
sha256 = "2cd171d76eba398f03c1d5bcc468a1756f4801cd8ed5bd065086e4374997c5aa";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, apacheHttpd, jdk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tomcat-connectors-1.2.48";
|
||||
pname = "tomcat-connectors";
|
||||
version = "1.2.48";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/tomcat/tomcat-connectors/jk/${name}-src.tar.gz";
|
||||
url = "mirror://apache/tomcat/tomcat-connectors/jk/${pname}-${version}-src.tar.gz";
|
||||
sha256 = "15wfj1mvad15j1fqw67qbpbpwrcz3rb0zdhrq6z2sax1l05kc6yb";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ lib, stdenv, fetchurl, jdk }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "jboss-as-7.1.1.Final";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jboss-as";
|
||||
version = "7.1.1.Final";
|
||||
src = fetchurl {
|
||||
url = "https://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz";
|
||||
url = "https://download.jboss.org/jbossas/${lib.versions.majorMinor version}/jboss-as-${version}/jboss-as-${version}.tar.gz";
|
||||
sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,10 +15,11 @@ assert enableWebDAV -> libuuid != null;
|
|||
assert enableExtendedAttrs -> attr != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lighttpd-1.4.59";
|
||||
pname = "lighttpd";
|
||||
version = "1.4.59";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
|
||||
url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-+5U9snPa7wjttuICVWyuij0H7tYIHJa9mQPblX0QhNU=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, boost }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mini-httpd-1.7";
|
||||
pname = "mini-httpd";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download-mirror.savannah.gnu.org/releases/mini-httpd/${name}.tar.gz";
|
||||
url = "https://download-mirror.savannah.gnu.org/releases/mini-httpd/${pname}-${version}.tar.gz";
|
||||
sha256 = "0jggmlaywjfbdljzv5hyiz49plnxh0har2bnc9dq4xmj1pmjgs49";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clamsmtp-" + version;
|
||||
pname = "clamsmtp";
|
||||
version = "1.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://thewalter.net/stef/software/clamsmtp/${name}.tar.gz";
|
||||
url = "http://thewalter.net/stef/software/clamsmtp/${pname}-${version}.tar.gz";
|
||||
sha256 = "0apr1pxifw6f1rbbsdrrwzs1dnhybg4hda3qqhqcw7p14r5xnbx5";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
{ lib, stdenv, perlPackages, fetchurl }:
|
||||
|
||||
let
|
||||
pkg = "dkimproxy";
|
||||
version = "1.4.1";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pkg}-${version}";
|
||||
pname = "dkimproxy";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dkimproxy/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/dkimproxy/${pname}-${version}.tar.gz";
|
||||
sha256 = "1gc5c7lg2qrlck7b0lvjfqr824ch6jkrzkpsn0gjvlzg7hfmld75";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,10 +18,11 @@ let
|
|||
maintenancePath = lib.makeBinPath [ gawk gnused gnugrep coreutils which ];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "dspam-3.10.2";
|
||||
pname = "dspam";
|
||||
version = "3.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dspam/dspam/${name}/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/dspam/dspam/${pname}-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1acklnxn1wvc7abn31l3qdj8q6k13s51k5gv86vka7q20jb5cxmf";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/bin/sendmail" }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "petidomo-4.3";
|
||||
pname = "petidomo";
|
||||
version = "4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/petidomo/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/petidomo/${pname}-${version}.tar.gz";
|
||||
sha256 = "0x4dbxc4fcfg1rw5ywpcypvylnzn3y4rh0m6fz4h4cdnzb8p1lvm";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "popa3d-1.0.3";
|
||||
pname = "popa3d";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.openwall.com/popa3d/${name}.tar.gz";
|
||||
url = "http://www.openwall.com/popa3d/${pname}-${version}.tar.gz";
|
||||
sha256 = "1g48cd74sqhl496wmljhq44iyfpghaz363a1ip8nyhpjz7d57f03";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@ let script = writeText "script" ''
|
|||
fi
|
||||
''; in
|
||||
stdenv.mkDerivation {
|
||||
name = "system-sendmail-1.0";
|
||||
pname = "system-sendmail";
|
||||
version = "1.0";
|
||||
|
||||
src = script;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mtail";
|
||||
version = "3.0.0-rc43";
|
||||
version = "3.0.0-rc46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "mtail";
|
||||
rev = "v${version}";
|
||||
sha256 = "1lw7gz6fh3z7j4hin4q6y3wxxl4sgd4li1c0z60hmvfs671n6dg9";
|
||||
sha256 = "sha256-/PiwrXr/oG/euWDOqcXvKKvyvQbp11Ks8LjmmJjDtdU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0zymch6xfnyzjzizrjljmscqf8m99580zxjwc2rb9hn0324shcwq";
|
||||
vendorSha256 = "sha256-aBGJ+JJjm9rt7Ic90iWY7vGtZQN0u6jlBnAMy1nivQM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "riak-2.2.0";
|
||||
pname = "riak";
|
||||
version = "2.2.0";
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ fetchurl, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pies-1.3";
|
||||
pname = "pies";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/pies/${name}.tar.bz2";
|
||||
url = "mirror://gnu/pies/${pname}-${version}.tar.bz2";
|
||||
sha256 = "12r7rjjyibjdj08dvwbp0iflfpzl4s0zhn6cr6zj3hwf9gbzgl1g";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,10 +5,11 @@ let
|
|||
"-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "prayer-1.3.5";
|
||||
pname = "prayer";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${name}.tar.gz";
|
||||
url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${pname}-${version}.tar.gz";
|
||||
sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ fetchurl, lib, stdenv, flex, bison }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "unfs3-0.9.22";
|
||||
pname = "unfs3";
|
||||
version = "0.9.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/unfs3/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/unfs3/${pname}-${version}.tar.gz";
|
||||
sha256 = "076zkyqkn56q0a8n3h65n1a68fknk4hrrp6mbhajq5s1wp5248j8";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, cmake, zeromq, cppzmq }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ursadb";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ursadb";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/CERT-Polska/ursadb/archive/v1.2.0.tar.gz";
|
||||
url = "https://github.com/CERT-Polska/ursadb/archive/v${version}.tar.gz";
|
||||
sha256 = "10dax3mswq0x4cfrpi31b7ii7bxl536wz1j11b7f5c0zw9pjxzym";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl
|
||||
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
|
||||
, squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap
|
||||
, libco-canonical, dqlite, raft-canonical, sqlite-replication, udev
|
||||
, dqlite, raft-canonical, sqlite-replication, udev
|
||||
, writeShellScriptBin, apparmor-profiles, apparmor-parser
|
||||
, criu
|
||||
, bash
|
||||
|
|
@ -38,9 +38,9 @@ buildGoPackage rec {
|
|||
rm _dist/src/github.com/lxc/lxd
|
||||
cp -r _dist/src/* ../../..
|
||||
popd
|
||||
'';
|
||||
|
||||
buildFlags = [ "-tags libsqlite3" ];
|
||||
makeFlagsArray+=("-tags libsqlite3")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# test binaries, code generation
|
||||
|
|
@ -59,8 +59,8 @@ buildGoPackage rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ];
|
||||
buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev
|
||||
raft-canonical.dev sqlite-replication udev.dev ];
|
||||
buildInputs = [ lxc acl libcap dqlite.dev raft-canonical.dev
|
||||
sqlite-replication udev.dev ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Daemon based on liblxc offering a REST API to manage containers";
|
||||
|
|
|
|||
30
pkgs/tools/misc/opentelemetry-collector/default.nix
Normal file
30
pkgs/tools/misc/opentelemetry-collector/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector-contrib";
|
||||
rev = "v${version}";
|
||||
sha256 = "03713b4bkhcz61maz0r5mkd36kv3rq8rji3qcpi9zf5bkkjs1yzb";
|
||||
};
|
||||
|
||||
vendorSha256 = if stdenv.isDarwin
|
||||
then "0anw3l6pq8yys2g2607ndhklb9m1i9krgjrw4wb99igavjzp3wpj"
|
||||
else "04h463d2d7g6wqp5mzkqlszwzdbq0pix6j7n2s9s80lwg7nh8k3h";
|
||||
|
||||
subPackages = [ "cmd/otelcontribcol" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-collector";
|
||||
description = "OpenTelemetry Collector";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.uri-canva ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lynis";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CISOfy";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-+RkzsBcQhHrfY8gEiJK3ptDeulJzA3IuVXiYEpyAsmk=";
|
||||
sha256 = "sha256-/pF1V8ZsylQOCW7K/O0R3HYYDdsdNDVmmUar21EzpcQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Security auditing tool for Linux, macOS, and UNIX-based systems";
|
||||
homepage = "https://cisofy.com/lynis/";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.ryneeverett ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terrascan";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accurics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pQuCVDXO9sXqCayoSAuxnzUBURJN+W2MZlzC/nV0wUc=";
|
||||
sha256 = "sha256-AIHfG5Z5I91zcogHxGRP7pLauYHICX6NL0bJTp982sQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-W3RXjjR90nfidkUldKNK0QAmI78SvtgHrZTWMzpqtMs=";
|
||||
vendorSha256 = "sha256-XzZ3RudyD6YKyc3e3HvUrkXToXs2aFSSCScQgmCfxgQ=";
|
||||
|
||||
# tests want to download a vulnerable Terraform project
|
||||
doCheck = false;
|
||||
|
|
|
|||
23
pkgs/tools/system/retry/default.nix
Normal file
23
pkgs/tools/system/retry/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, txt2man }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "retry";
|
||||
version = "1.0.4";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook which txt2man ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minfrin";
|
||||
repo = "retry";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256:0jrx4yrwlf4fn3309kxraj7zgwk7gq6rz5ibswq3w3b3jfvxi8qb";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/minfrin/retry";
|
||||
description = "Retry a command until the command succeeds";
|
||||
platforms = platforms.all;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ gfrascadorio ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -379,6 +379,7 @@ mapAliases ({
|
|||
libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
|
||||
libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
|
||||
libcap_progs = libcap.out; # added 2016-04-29
|
||||
libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # added 2021-05-16
|
||||
libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19
|
||||
libdbusmenu-glib = libdbusmenu; # added 2018-05-01
|
||||
liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12
|
||||
|
|
|
|||
|
|
@ -313,6 +313,8 @@ in
|
|||
|
||||
protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { };
|
||||
|
||||
proton-caller = callPackage ../misc/emulators/proton-caller { };
|
||||
|
||||
ptags = callPackage ../development/tools/misc/ptags { };
|
||||
|
||||
ptouch-print = callPackage ../misc/ptouch-print { };
|
||||
|
|
@ -5582,6 +5584,8 @@ in
|
|||
|
||||
heimdall-gui = heimdall.override { enableGUI = true; };
|
||||
|
||||
heisenbridge = callPackage ../servers/heisenbridge { };
|
||||
|
||||
helio-workstation = callPackage ../applications/audio/helio-workstation { };
|
||||
|
||||
hevea = callPackage ../tools/typesetting/hevea { };
|
||||
|
|
@ -7442,6 +7446,8 @@ in
|
|||
|
||||
opae = callPackage ../development/libraries/opae { };
|
||||
|
||||
opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { };
|
||||
|
||||
opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { };
|
||||
|
||||
openvswitch = callPackage ../os-specific/linux/openvswitch { };
|
||||
|
|
@ -8883,6 +8889,9 @@ in
|
|||
inherit (darwin.apple_sdk.frameworks) IOKit;
|
||||
};
|
||||
|
||||
inherit (callPackages ../applications/networking/taler { })
|
||||
taler-exchange taler-merchant;
|
||||
|
||||
tangram = callPackage ../applications/networking/instant-messengers/tangram { };
|
||||
|
||||
t1utils = callPackage ../tools/misc/t1utils { };
|
||||
|
|
@ -11636,6 +11645,9 @@ in
|
|||
cargo-audit = callPackage ../tools/package-management/cargo-audit {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-c = callPackage ../development/tools/rust/cargo-c {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
|
@ -13677,6 +13689,8 @@ in
|
|||
lua = lua5;
|
||||
} // (config.radare or {}));
|
||||
|
||||
retry = callPackage ../tools/system/retry { };
|
||||
|
||||
rizin = pkgs.callPackage ../development/tools/analysis/rizin { };
|
||||
|
||||
cutter = libsForQt515.callPackage ../development/tools/analysis/rizin/cutter.nix { };
|
||||
|
|
@ -15791,8 +15805,6 @@ in
|
|||
|
||||
libclxclient = callPackage ../development/libraries/libclxclient { };
|
||||
|
||||
libco-canonical = callPackage ../development/libraries/libco-canonical { };
|
||||
|
||||
libconfuse = callPackage ../development/libraries/libconfuse { };
|
||||
|
||||
libcangjie = callPackage ../development/libraries/libcangjie { };
|
||||
|
|
@ -22841,6 +22853,8 @@ in
|
|||
cni = callPackage ../applications/networking/cluster/cni {};
|
||||
cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {};
|
||||
|
||||
multus-cni = callPackage ../applications/networking/cluster/multus-cni {};
|
||||
|
||||
cntr = callPackage ../applications/virtualization/cntr { };
|
||||
|
||||
communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
|
||||
|
|
|
|||
|
|
@ -847,13 +847,12 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
|
|||
# };
|
||||
|
||||
NDeskOptions = stdenv.mkDerivation rec {
|
||||
baseName = "NDesk.Options";
|
||||
pname = "NDesk.Options";
|
||||
version = "0.2.1";
|
||||
name = "${baseName}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${baseName}-${version}.tar.gz";
|
||||
url = "http://www.ndesk.org/archive/ndesk-options/ndesk-options-0.2.1.tar.gz";
|
||||
name = "${pname}-${version}.tar.gz";
|
||||
url = "http://www.ndesk.org/archive/ndesk-options/ndesk-options-${version}.tar.gz";
|
||||
sha256 = "1y25bfapafwmifakjzyb9c70qqpvza8g5j2jpf08j8wwzkrb6r28";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2221,6 +2221,8 @@ in {
|
|||
|
||||
envs = callPackage ../development/python-modules/envs { };
|
||||
|
||||
envoy-reader = callPackage ../development/python-modules/envoy-reader { };
|
||||
|
||||
enzyme = callPackage ../development/python-modules/enzyme { };
|
||||
|
||||
epc = callPackage ../development/python-modules/epc { };
|
||||
|
|
@ -4213,6 +4215,8 @@ in {
|
|||
|
||||
memory_profiler = callPackage ../development/python-modules/memory_profiler { };
|
||||
|
||||
mercantile = callPackage ../development/python-modules/mercantile { };
|
||||
|
||||
mercurial = toPythonModule (pkgs.mercurial.override {
|
||||
python3Packages = self;
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue