Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/applications/window-managers/sway/default.nix
This commit is contained in:
Jonathan Ringer
commit
09e494f4c2
@ -10587,6 +10587,12 @@
|
||||
githubId = 251028;
|
||||
name = "Shell Turner";
|
||||
};
|
||||
shikanime = {
|
||||
name = "William Phetsinorath";
|
||||
email = "deva.shikanime@protonmail.com";
|
||||
github = "shikanime";
|
||||
githubId = 22115108;
|
||||
};
|
||||
shlevy = {
|
||||
email = "shea@shealevy.com";
|
||||
github = "shlevy";
|
||||
@ -13244,4 +13250,10 @@
|
||||
github = "sei40kr";
|
||||
githubId = 11665236;
|
||||
};
|
||||
vdot0x23 = {
|
||||
name = "Victor Büttner";
|
||||
email = "nix.victor@0x23.dk";
|
||||
github = "vdot0x23";
|
||||
githubId = 40716069;
|
||||
};
|
||||
}
|
||||
|
||||
@ -123,6 +123,8 @@ in {
|
||||
];
|
||||
environment = {
|
||||
systemPackages = [ swayPackage ] ++ cfg.extraPackages;
|
||||
# Needed for the default wallpaper:
|
||||
pathsToLink = [ "/share/backgrounds/sway" ];
|
||||
etc = {
|
||||
"sway/config".source = mkOptionDefault "${swayPackage}/etc/sway/config";
|
||||
"sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" ''
|
||||
|
||||
@ -13,6 +13,15 @@ with lib;
|
||||
|
||||
enable = mkEnableOption "ClickHouse database server";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.clickhouse;
|
||||
defaultText = "pkgs.clickhouse";
|
||||
description = ''
|
||||
ClickHouse package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
@ -45,21 +54,21 @@ with lib;
|
||||
AmbientCapabilities = "CAP_SYS_NICE";
|
||||
StateDirectory = "clickhouse";
|
||||
LogsDirectory = "clickhouse";
|
||||
ExecStart = "${pkgs.clickhouse}/bin/clickhouse-server --config-file=${pkgs.clickhouse}/etc/clickhouse-server/config.xml";
|
||||
ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=${cfg.package}/etc/clickhouse-server/config.xml";
|
||||
};
|
||||
};
|
||||
|
||||
environment.etc = {
|
||||
"clickhouse-server/config.xml" = {
|
||||
source = "${pkgs.clickhouse}/etc/clickhouse-server/config.xml";
|
||||
source = "${cfg.package}/etc/clickhouse-server/config.xml";
|
||||
};
|
||||
|
||||
"clickhouse-server/users.xml" = {
|
||||
source = "${pkgs.clickhouse}/etc/clickhouse-server/users.xml";
|
||||
source = "${cfg.package}/etc/clickhouse-server/users.xml";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.clickhouse ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
# startup requires a `/etc/localtime` which only if exists if `time.timeZone != null`
|
||||
time.timeZone = mkDefault "UTC";
|
||||
|
||||
@ -103,11 +103,12 @@ let
|
||||
|
||||
plugin {
|
||||
quota_rule = *:storage=${cfg.quotaGlobalPerUser}
|
||||
quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working
|
||||
quota = count:User quota # per virtual mail user quota
|
||||
quota_status_success = DUNNO
|
||||
quota_status_nouser = DUNNO
|
||||
quota_status_overquota = "552 5.2.2 Mailbox is full"
|
||||
quota_grace = 10%%
|
||||
quota_vsizes = yes
|
||||
}
|
||||
''
|
||||
)
|
||||
|
||||
@ -51,7 +51,7 @@ in
|
||||
|
||||
extraSettingsPaths = mkOption {
|
||||
type = types.listOf types.path;
|
||||
default = [];
|
||||
default = [ ];
|
||||
description = ''
|
||||
Additional settings paths used to configure nomad. These can be files or directories.
|
||||
'';
|
||||
@ -60,9 +60,21 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
extraSettingsPlugins = mkOption {
|
||||
type = types.listOf (types.either types.package types.path);
|
||||
default = [ ];
|
||||
description = ''
|
||||
Additional plugins dir used to configure nomad.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
[ "<pluginDir>" "pkgs.<plugins-name>"]
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
settings = mkOption {
|
||||
type = format.type;
|
||||
default = {};
|
||||
default = { };
|
||||
description = ''
|
||||
Configuration for Nomad. See the <link xlink:href="https://www.nomadproject.io/docs/configuration">documentation</link>
|
||||
for supported values.
|
||||
@ -128,7 +140,8 @@ in
|
||||
DynamicUser = cfg.dropPrivileges;
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json" +
|
||||
concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths;
|
||||
concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths +
|
||||
concatMapStrings (path: " -plugin-dir=${path}/bin") cfg.extraSettingsPlugins;
|
||||
KillMode = "process";
|
||||
KillSignal = "SIGINT";
|
||||
LimitNOFILE = 65536;
|
||||
|
||||
@ -17,6 +17,13 @@ in
|
||||
services.sabnzbd = {
|
||||
enable = mkEnableOption "the sabnzbd server";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.sabnzbd;
|
||||
defaultText = "pkgs.sabnzbd";
|
||||
description = "The sabnzbd executable package run by the service.";
|
||||
};
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/lib/sabnzbd/sabnzbd.ini";
|
||||
@ -63,7 +70,7 @@ in
|
||||
GuessMainPID = "no";
|
||||
User = "${cfg.user}";
|
||||
Group = "${cfg.group}";
|
||||
ExecStart = "${sabnzbd}/bin/sabnzbd -d -f ${cfg.configFile}";
|
||||
ExecStart = "${lib.getBin cfg.package}/bin/sabnzbd -d -f ${cfg.configFile}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -76,8 +76,8 @@ let
|
||||
def assemble_qemu_flags():
|
||||
flags = "-cpu max"
|
||||
${if (system == "x86_64-linux" || system == "i686-linux")
|
||||
then ''flags += " -m 1024"''
|
||||
else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"''
|
||||
then ''flags += " -m 1500"''
|
||||
else ''flags += " -m 1000 -enable-kvm -machine virt,gic-version=host"''
|
||||
}
|
||||
return flags
|
||||
|
||||
@ -288,7 +288,7 @@ let
|
||||
# builds stuff in the VM, needs more juice
|
||||
virtualisation.diskSize = 8 * 1024;
|
||||
virtualisation.cores = 8;
|
||||
virtualisation.memorySize = 2048;
|
||||
virtualisation.memorySize = 3096;
|
||||
|
||||
# Use a small /dev/vdb as the root disk for the
|
||||
# installer. This ensures the target disk (/dev/vda) is
|
||||
|
||||
@ -1,41 +1,83 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoreconfHook
|
||||
, db5
|
||||
, openssl
|
||||
, boost
|
||||
, zlib
|
||||
, miniupnpc
|
||||
, libevent
|
||||
, protobuf
|
||||
, pkg-config
|
||||
, util-linux
|
||||
, hexdump
|
||||
, autoSignDarwinBinariesHook
|
||||
, wrapQtAppsHook ? null
|
||||
, boost
|
||||
, libevent
|
||||
, miniupnpc
|
||||
, zeromq
|
||||
, zlib
|
||||
, db48
|
||||
, sqlite
|
||||
, qrencode
|
||||
, qtbase ? null
|
||||
, qttools ? null
|
||||
, python3
|
||||
, nixosTests
|
||||
, withGui
|
||||
, withWallet ? true
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitcoind-knots";
|
||||
version = "0.20.0";
|
||||
versionDate = "20200614";
|
||||
pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
|
||||
version = "22.0.knots20211108";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitcoinknots";
|
||||
repo = "bitcoin";
|
||||
rev = "v${version}.knots${versionDate}";
|
||||
sha256 = "0c8k1154kcwz6q2803wx0zigvqaij1fi5akgfqlj3yl57jjw48jj";
|
||||
src = fetchurl {
|
||||
url = "https://bitcoinknots.org/files/22.x/${version}/guix/bitcoin-${version}.tar.gz";
|
||||
sha256 = "04sqbx4sp3bzwbl8z53nz96n3s0590h327ih0mbgyvfvl3b8pj4i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ openssl db5 openssl util-linux
|
||||
protobuf boost zlib miniupnpc libevent ];
|
||||
nativeBuildInputs =
|
||||
[ autoreconfHook pkg-config ]
|
||||
++ optionals stdenv.isLinux [ util-linux ]
|
||||
++ optionals stdenv.isDarwin [ hexdump ]
|
||||
++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]
|
||||
++ optionals withGui [ wrapQtAppsHook ];
|
||||
|
||||
configureFlags = [ "--with-incompatible-bdb"
|
||||
"--with-boost-libdir=${boost.out}/lib" ];
|
||||
buildInputs = [ boost libevent miniupnpc zeromq zlib ]
|
||||
++ optionals withWallet [ db48 sqlite ]
|
||||
++ optionals withGui [ qrencode qtbase qttools ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An enhanced Bitcoin node software";
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--disable-bench"
|
||||
] ++ optionals (!doCheck) [
|
||||
"--disable-tests"
|
||||
"--disable-gui-tests"
|
||||
] ++ optionals (!withWallet) [
|
||||
"--disable-wallet"
|
||||
] ++ optionals withGui [
|
||||
"--with-gui=qt5"
|
||||
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
|
||||
];
|
||||
|
||||
checkInputs = [ python3 ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkFlags =
|
||||
[ "LC_ALL=en_US.UTF-8" ]
|
||||
# QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
|
||||
# See also https://github.com/NixOS/nixpkgs/issues/24256
|
||||
++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
smoke-test = nixosTests.bitcoind-knots;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A derivative of Bitcoin Core with a collection of improvements";
|
||||
homepage = "https://bitcoinknots.org/";
|
||||
maintainers = with maintainers; [ prusnak mmahut ];
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.mmahut ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
checkFlags =
|
||||
[ "LC_ALL=C.UTF-8" ]
|
||||
[ "LC_ALL=en_US.UTF-8" ]
|
||||
# QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
|
||||
# See also https://github.com/NixOS/nixpkgs/issues/24256
|
||||
++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
|
||||
@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '2a #include <array>' src/InputSource.h
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ halide libpng libjpeg libtiff libraw ];
|
||||
|
||||
@ -6,7 +6,7 @@ let
|
||||
|
||||
versions = {
|
||||
stable = { version = "2.3.56.9"; sha256 = "sha256-vv01wGQkrasKKjpGSDeDqZbd1X5/iTfGXYN5Jwz+FKE="; };
|
||||
staging = { version = "2.3.57.6"; sha256 = "sha256-ZCOtVmvNXDWLo9UMzxARCp+iyRTcy/ogd5sV0k86JG8="; };
|
||||
latest = { version = "2.3.57.6"; sha256 = "sha256-ZCOtVmvNXDWLo9UMzxARCp+iyRTcy/ogd5sV0k86JG8="; };
|
||||
};
|
||||
|
||||
override = { version, sha256 }: super: {
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
, pango
|
||||
|
||||
, audioSupport ? mediaSupport
|
||||
, pulseaudioSupport ? false
|
||||
, pulseaudioSupport ? mediaSupport
|
||||
, libpulseaudio
|
||||
, apulse
|
||||
|
||||
|
||||
@ -18,6 +18,10 @@ stdenv.mkDerivation {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/30.patch";
|
||||
sha256 = "Y6jBraKvVQAiScbvLwezSKeWY3vaAbhaNXEGNaItigQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/31.patch";
|
||||
sha256 = "1ig054rxn5r0ph4w4fhmrxlh158c97iqqc7dbnc819adn9nw96l5";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ wrapPython ];
|
||||
|
||||
@ -1,20 +1 @@
|
||||
0001-rfc6544.patch
|
||||
0002-rfc2466.patch
|
||||
0003-add-tcp-keep-alive.patch
|
||||
0004-multiple_listeners.patch
|
||||
0005-fix_ebusy_turn.patch
|
||||
0006-ignore_ipv6_on_transport_check.patch
|
||||
0007-upnp-srflx-nat-assisted-cand.patch
|
||||
0008-fix_ioqueue_ipv6_sendto.patch
|
||||
0009-add-config-site.patch
|
||||
0010-fix-tcp-death-detection.patch
|
||||
0011-fix-turn-shutdown-crash.patch
|
||||
0012-ignore-down-interfaces.patch
|
||||
0013-ignore-addresses-for-RFC7335.patch
|
||||
0014-fix-socket-leak.patch
|
||||
0015-fix-socktype-and-duplicate-checking.patch
|
||||
0016-use-larger-Ta-interval.patch
|
||||
0017-auto-register-thread.patch
|
||||
0018-fix-ioqueue-lock-acquire.patch
|
||||
0019-resort-check-list-after-adding-prflx.patch
|
||||
0020-avoid-immediate-nominating-triggered-check.patch
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, jami-meta
|
||||
, stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, perl # for pod2man
|
||||
@ -57,9 +58,15 @@ let
|
||||
|
||||
pjsip-jami = pjsip.overrideAttrs (old:
|
||||
let
|
||||
src-args = import ./pjproject-src.nix;
|
||||
version = lib.concatStrings (lib.lists.take 7 (lib.stringToCharacters src-args.rev));
|
||||
patch-src = src + "/daemon/contrib/src/pjproject/";
|
||||
in
|
||||
{
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub src-args;
|
||||
|
||||
patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));
|
||||
});
|
||||
|
||||
@ -68,7 +75,8 @@ let
|
||||
enablePushNotifications = true;
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "jami-daemon";
|
||||
inherit src version;
|
||||
sourceRoot = "source/daemon";
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
}:
|
||||
|
||||
rec {
|
||||
version = "20211005.2.251ac7d";
|
||||
version = "20211104.2.e80361d";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz";
|
||||
sha256 = "12ppbwhnk5zajb73szd04sz80bp17q577bkb9j8p45apvq201db3";
|
||||
sha256 = "1l48svppshh8mg7y1dymnh0rgwswy4qwdyl7qlg25mmh4y1li21f";
|
||||
|
||||
stripRoot = false;
|
||||
extraPostFetch = ''
|
||||
|
||||
@ -0,0 +1,6 @@
|
||||
{
|
||||
owner = "savoirfairelinux";
|
||||
repo = "pjproject";
|
||||
rev = "e1f389d0b905011e0cb62cbdf7a8b37fc1bcde1a";
|
||||
sha256 = "sha256-6t+3b7pvvwi+VD05vxtujabEJmWmJTAeyD/Dapav10Y=";
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p coreutils curl gnused common-updater-scripts
|
||||
#!nix-shell -i bash -p coreutils curl gnused common-updater-scripts nix-prefetch
|
||||
|
||||
set -e
|
||||
|
||||
@ -40,3 +40,11 @@ echo "${ffmpeg_args_x86}" > "$config_dir/ffmpeg_args_x86"
|
||||
pjsip_patches=$(sed -n '/UNPACK/,/HAVE_ANDROID/p' ${src}/daemon/contrib/src/pjproject/rules.mak | sed -n -E 's/.*pjproject\/(00.*patch).*/\1/p')
|
||||
echo -e "Patches for pjsip:\n${pjsip_patches}\n"
|
||||
echo "${pjsip_patches}" > "$config_dir/pjsip_patches"
|
||||
|
||||
# Update pjsip version
|
||||
pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak)
|
||||
nix-prefetch fetchFromGitHub \
|
||||
--owner savoirfairelinux \
|
||||
--repo pjproject \
|
||||
--rev ${pjsip_version} \
|
||||
--output nix > "${jami_dir}/pjproject-src.nix"
|
||||
|
||||
@ -62,6 +62,8 @@ in {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace vaapidev.c --replace /usr/bin/X ${xorgserver}/bin/X
|
||||
# https://github.com/rofafor/vdr-plugin-vaapidevice/issues/5
|
||||
substituteInPlace Makefile --replace libva libva-x11
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
picom.overrideAttrs (oldAttrs: rec {
|
||||
pname = "picom-next";
|
||||
version = "unstable-2021-10-31";
|
||||
version = "unstable-2021-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yshui";
|
||||
repo = "picom";
|
||||
rev = "fade045eadf171d2c732820d6ebde7d1943a1397";
|
||||
sha256 = "fPiLZ63+Bw5VCxVNqj9i5had2YLa+jFMMf85MYdqvHU=";
|
||||
rev = "1c7a4ff5a3cd5f3e25abcac0196896eea5939dce";
|
||||
sha256 = "sha256-2uy2ofXhEWKuM+nEUqU16c85UGt6fJGtPZj+az907aw=";
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];
|
||||
})
|
||||
|
||||
@ -22,27 +22,24 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
patches = [
|
||||
./sway-config-no-nix-store-references.patch
|
||||
./load-configuration-from-etc.patch
|
||||
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit swaybg;
|
||||
})
|
||||
] ++ lib.optionals (!isNixOS) [
|
||||
# References to /nix/store/... will get GC'ed which causes problems when
|
||||
# copying the default configuration:
|
||||
./sway-config-no-nix-store-references.patch
|
||||
] ++ lib.optionals isNixOS [
|
||||
# Use /run/current-system/sw/share and /etc instead of /nix/store
|
||||
# references:
|
||||
./sway-config-nixos-paths.patch
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString isNixOS ''
|
||||
echo -e '\ninclude /etc/sway/config.d/*' >> config.in
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# Pkg-config binary for machine MachineChoice.BUILD not found. Giving up.
|
||||
# has to be in both depsBuildBuild and nativeBuildInputs
|
||||
depsBuildBuild = [ pkg-config scdoc ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkg-config wayland-scanner
|
||||
meson ninja pkg-config wayland-scanner scdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -53,7 +50,6 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddefault-wallpaper=false"
|
||||
"-Dsd-bus-provider=libsystemd"
|
||||
]
|
||||
++ lib.optional (!enableXWayland) "-Dxwayland=disabled"
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
diff --git a/config.in b/config.in
|
||||
index 08703bef..f3872730 100644
|
||||
--- a/config.in
|
||||
+++ b/config.in
|
||||
@@ -22,8 +22,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec --
|
||||
|
||||
### Output configuration
|
||||
#
|
||||
-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)
|
||||
-output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
|
||||
+# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/)
|
||||
+output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
|
||||
#
|
||||
# Example configuration:
|
||||
#
|
||||
@@ -214,4 +214,4 @@ bar {
|
||||
}
|
||||
}
|
||||
|
||||
-include @sysconfdir@/sway/config.d/*
|
||||
+include /etc/sway/config.d/*
|
||||
@ -2,70 +2,70 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nordic";
|
||||
version = "unstable-2021-08-13";
|
||||
version = "unstable-2021-11-19";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "937ca200e8148a61c73228030ec260abecc27fb2";
|
||||
sha256 = "0h7z7jh5p0916i9lx4n94r6vbydafnikdi6d9p4djvpyhn5nizgy";
|
||||
rev = "0112af91943b8819f7a1af9a508cda7fe3d74051";
|
||||
sha256 = "sha256-ccOA5/jXTx20495NpTgVu7DvsjfTEULqL3IyJ+Pd/ug";
|
||||
name = "Nordic";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "e736846a130be7907e977b16d0b3a0ab19631015";
|
||||
sha256 = "0dv7z31zw1r3iac5bvwapf9lm99y5l0xfzaw93hn8msh10w5crx8";
|
||||
rev = "b30d2c844cc6ef5d020308f1c02791de45b607a7";
|
||||
sha256 = "sha256-g5yCCFXzipZLmUat+1r6QWHB7DWQvMKhMexHPV/DJHM";
|
||||
name = "Nordic-standard-buttons";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "8ff12077f28e25f4e57f055a51e5e3b9b1bf53fd";
|
||||
sha256 = "082k0na39qb97kbvc15g3mdfh8d8ricql84i4wdjy3rjfbfwq0pl";
|
||||
rev = "6d38d6af363528f42619f663e3ecd4c08dfd2411";
|
||||
sha256 = "sha256-jaRiSE6yfTltzZ2vr8w4d+YtSz7REOcL7vOOhQvIMlQ";
|
||||
name = "Nordic-darker";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "8c422e4bfdf5680ff323938f49f411680154d3d6";
|
||||
sha256 = "1w540zlmsxpwa455wpxy1dpgv2fjr36xwjqbyc8x4y0ya0qfify0";
|
||||
rev = "4142817c14c27b371d42796445bedc84dc94672c";
|
||||
sha256 = "sha256-FAb1+EREcwYrfSxAl6LrPaJtkHMt67NV3bG87g1cFT4";
|
||||
name = "Nordic-darker-standard-buttons";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "ce31d794fe1c6b72d3cff2e9513e08ddce014118";
|
||||
sha256 = "09d41wllr9hgxshgvpgngx9rlg8pvx5aqgkk5q8jra4jz2a92fhq";
|
||||
rev = "2a91d6f3db70412b0a80ed33546fbe93075627d8";
|
||||
sha256 = "sha256-Su+amS7moc2IDONNvqw3bjL6Q0WLJWzHu6WvfcVDcDY";
|
||||
name = "Nordic-bluish-accent";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "8ca4fe244c31775effacc77f0a25ae10c6bee60c";
|
||||
sha256 = "1cby8wmaqdqpd9c40wiy7i9wmrazwfhb3h818hg0ni7yfcm2fr58";
|
||||
rev = "3ebd334f97d638fdc888b16d69851e3ee31131f2";
|
||||
sha256 = "sha256-h0IXtWcdDvAEVi/1cLZF4Vacdl6VAY+5uo0LGPNe0bg";
|
||||
name = "Nordic-bluish-accent-standard-buttons";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = "${pname}-polar";
|
||||
rev = "a2d1c633ac2bfe261e8f612c8af14af0311c7f67";
|
||||
sha256 = "05llvix671i6128vbr3jiik8mipaab7bn0v9i89ydwyfhw822n7v";
|
||||
rev = "803926882f8178c72b433466a377aaa33c5b372a";
|
||||
sha256 = "sha256-G7Vu03PoFOEU9uxb5JiHR4Tr8qk47fPo7Gg7Vt9Zzns";
|
||||
name = "Nordic-Polar";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = "${pname}-polar";
|
||||
rev = "62a1702a17e7ea96e9b692832d68a0a7f26aabb6";
|
||||
sha256 = "0r1qn1rj322b44h15hcfbx79hhmb1m4pkv2fpdsn3s2klcxwr1ql";
|
||||
rev = "988cb8a16ece3901b8b0e7a5b86503400491cb1e";
|
||||
sha256 = "sha256-Zx1mrzJm5o4wQwOR8ZU2OEcjD3/6UXwLrBYpMtCkQbg";
|
||||
name = "Nordic-Polar-standard-buttons";
|
||||
})
|
||||
];
|
||||
|
||||
@ -19,6 +19,16 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix include guard name
|
||||
substituteInPlace lib/dpx/dpx_raw.hh \
|
||||
--replace CRL_DPX_RAW_INTERNAL_INCLUDE CTL_DPX_RAW_INTERNAL_INCLUDE
|
||||
|
||||
# Fix undefined symbols (link with Imath)
|
||||
substituteInPlace lib/IlmCtlMath/CMakeLists.txt \
|
||||
--replace "( IlmCtlMath IlmCtl )" "( IlmCtlMath IlmCtl Imath)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ libtiff ilmbase openexr ];
|
||||
|
||||
|
||||
@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ libxml2 ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/# --enable-new-dtags:/,/--enable-new-dtags is required/ d' configure.ac
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/clusterlabs/libqb";
|
||||
description = "A library providing high performance logging, tracing, ipc, and poll";
|
||||
|
||||
@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
|
||||
--replace "# define MakeCmd gmake" "# define MakeCmd make"
|
||||
substituteInPlace 2006/src/config/lnxLib.rules \
|
||||
--replace "# lib" "// lib"
|
||||
# binutils 2.37 fix
|
||||
substituteInPlace 2006/src/config/Imake.tmpl --replace "clq" "cq"
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
@ -39,12 +41,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cd $CERN_ROOT/build
|
||||
$CVSCOSRC/config/imake_boot
|
||||
make bin/kuipc
|
||||
make scripts/Makefile
|
||||
make -j $NIX_BUILD_CORES bin/kuipc
|
||||
make -j $NIX_BUILD_CORES scripts/Makefile
|
||||
pushd scripts
|
||||
make install.bin
|
||||
make -j $NIX_BUILD_CORES install.bin
|
||||
popd
|
||||
make
|
||||
make -j $NIX_BUILD_CORES
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopvpc";
|
||||
version = "2.2.2";
|
||||
version = "2.2.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "azogue";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wNMHzeKJ1kG0jnoI5fO3d5CBXE0cyoK92BkGunXK3pI=";
|
||||
sha256 = "sha256-39cGDbaBS5we+WbqvABe6tKwTmbgd+NYLssKQCOuBsc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-eventhub";
|
||||
version = "5.6.0";
|
||||
version = "5.6.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "aa6d9e3e9b8b1a5ad211a828de867b85910720722577a4d51cd5aa6889d1d9e9";
|
||||
sha256 = "sha256-ssjTesjPFITaB5Uy061podqL14ojeCIVm3LWsF3kY40=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,29 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, uamqp
|
||||
, azure-common
|
||||
, azure-core
|
||||
, msrestazure
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, futures ? null
|
||||
, isodate
|
||||
, isPy3k
|
||||
, msrestazure
|
||||
, uamqp
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-servicebus";
|
||||
version = "7.3.3";
|
||||
version = "7.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "1c2133909a086bd4329135d6affcc05628e3a7da27afca584a0de8c21fc4e1ac";
|
||||
sha256 = "sha256-nlt4wNHI613tK7JB85fBW2LE/FOa8+2aLeT6wzP1PQ4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
uamqp
|
||||
azure-common
|
||||
azure-core
|
||||
isodate
|
||||
msrestazure
|
||||
uamqp
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
futures
|
||||
];
|
||||
@ -32,7 +35,9 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
# python2 will fail due to pep 420
|
||||
pythonImportsCheck = lib.optionals isPy3k [ "azure.servicebus" ];
|
||||
pythonImportsCheck = lib.optionals isPy3k [
|
||||
"azure.servicebus"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Microsoft Azure Service Bus Client Library";
|
||||
|
||||
@ -31,8 +31,13 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ contextlib2 ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pkg-config'" "'${stdenv.cc.targetPrefix}pkg-config'"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
${python.interpreter} setup.py build_cython
|
||||
${python.pythonForBuild.interpreter} setup.py build_cython
|
||||
'';
|
||||
|
||||
# On Darwin, the test requires macFUSE to be installed outside of Nix.
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyiqvia";
|
||||
version = "2021.10.0";
|
||||
version = "2021.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FCavSy33fkXlboRAmGr0BkEkXLTOzsyGXQkws0LqiJk=";
|
||||
sha256 = "sha256-Cqc3zRJ2VpKKCGF4y+4IYfvfANblCEmh0sJ3tXH1AAA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyopenuv";
|
||||
version = "2021.10.0";
|
||||
version = "2021.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-3zTyW3eXOA9frSAy4g7iWhymc1hBo0hrxIgPLMqrLTs=";
|
||||
sha256 = "sha256-J0YIq00/GcWEL23UHmN98Jp/imOAz8NLzhMdk8WFozk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -43,7 +43,6 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Ignore the examples as they are prefixed with test_
|
||||
disabledTestPaths = [
|
||||
# Ignore the examples as they are prefixed with test_
|
||||
"examples/"
|
||||
|
||||
@ -7,19 +7,26 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvesync";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f8bc6ebbe2c2bf37009b50b16e34747b0cfe35dd249aed4525b68c3af061941f";
|
||||
sha256 = "sha256-O5zt1FiCQAlCaGaiEyrannqZjm4oGq36d4Fa77ys+HE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
# Test are not available (not in PyPI tarball and there are no GitHub releases)
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pyvesync" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyvesync"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to manage Etekcity Devices and Levoit Air Purifier";
|
||||
|
||||
@ -14,8 +14,13 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dictionary wrapper for quick access to deeply nested keys";
|
||||
homepage = "https://github.com/pawelzny/dotty_dict";
|
||||
description = "Dictionary wrapper for quick access to deeply nested keys";
|
||||
longDescription = ''
|
||||
This is a version of dotty-dict by QMK (https://qmk.fm) since the original
|
||||
dotty-dict published to pypi has non-ASCII characters that breaks with
|
||||
some non-UTF8 locale settings.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ babariviere ];
|
||||
};
|
||||
|
||||
@ -9,13 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sense-energy";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scottbonline";
|
||||
repo = "sense";
|
||||
rev = version;
|
||||
sha256 = "sha256-XZvx/GWpz49dsiY9pgMfX+6gUfWA8q6IpnzmCRPFHus=";
|
||||
sha256 = "sha256-LUM7SP03U3mRxCTjgxPRXh/ZLz15R04zBWOxLKnan98=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -28,7 +29,9 @@ buildPythonPackage rec {
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "sense_energy" ];
|
||||
pythonImportsCheck = [
|
||||
"sense_energy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "API for the Sense Energy Monitor";
|
||||
|
||||
@ -1,28 +1,46 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, isPy3k
|
||||
, certifi
|
||||
, cmake
|
||||
, enum34
|
||||
, openssl
|
||||
, six
|
||||
, CFNetwork
|
||||
, cmake
|
||||
, CoreFoundation
|
||||
, enum34
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, openssl
|
||||
, Security
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uamqp";
|
||||
version = "1.4.1";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-JNGlpu2HvwTGV77WnAQFyvJImHesE2R+ZwMAlhlyk2U=";
|
||||
sha256 = "sha256-L4IQWnxRRL3yopNT91Mk8KKdph9Vg2PHkGH+86uDu7c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreFoundation
|
||||
CFNetwork
|
||||
Security
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
openssl
|
||||
six
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
enum34
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Azure/azure-c-shared-utility/commit/52ab2095649b5951e6af77f68954209473296983.patch";
|
||||
@ -32,27 +50,15 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
certifi
|
||||
six
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
enum34
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreFoundation
|
||||
CFNetwork
|
||||
Security
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
# has no tests
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"uamqp"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An AMQP 1.0 client library for Python";
|
||||
homepage = "https://github.com/Azure/azure-uamqp-python";
|
||||
|
||||
@ -56,13 +56,13 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.591";
|
||||
version = "2.0.594";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-p8pEw3vH3W62MmlZsSqWoUKf7QjEQhlV5bSjYr1Wwm0=";
|
||||
sha256 = "sha256-wbqFEeqe0RXLfiaIIG6UyBLgFOG3kUWKLVoeKoSktuI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
||||
@ -1,28 +1,35 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ncurses }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "2048-in-terminal";
|
||||
version = "2017-11-29";
|
||||
version = "2021-09-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1cqv5z1i5zcrvj0w6pdfnnff8m6kjndqxwkwsw5ma9jz503bmyc6";
|
||||
rev = "4e525066b0ef3442e92d2ba8dd373bdc205ece28";
|
||||
sha256 = "1jgacyimn59kxqhrk8jp13qayc2mncxhx393spqcxbz0sj6lxq9p";
|
||||
rev = "466abe827638598e40cb627d2b017fe8f76b3a14";
|
||||
repo = "2048-in-terminal";
|
||||
owner = "alewmoose";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
# Fix pending upstream inclusion for ncurses-6.3 support:
|
||||
# https://github.com/alewmoose/2048-in-terminal/pull/6
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/alewmoose/2048-in-terminal/commit/b1c78dc4b3cca3a193b1afea1ab85a75966823cf.patch";
|
||||
sha256 = "05ibpgr83r7zxsak2l0gaf33858bp0sp0mjfdpmcmw745z3jw7q1";
|
||||
})
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
sed -i '1i#include <fcntl.h>\n' save.c
|
||||
'';
|
||||
buildInputs = [ ncurses ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin
|
||||
'';
|
||||
installFlags = [ "DESTDIR=$(out)/bin" ];
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl
|
||||
, poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC
|
||||
, xxHash, zstd
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -64,6 +65,8 @@ stdenv.mkDerivation rec {
|
||||
# Builds in 7+h with 2 cores, and ~20m with a big-parallel builder.
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
passthru.tests.clickhouse = nixosTests.clickhouse;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://clickhouse.tech/";
|
||||
description = "Column-oriented database management system";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGo117Module rec {
|
||||
pname = "grafana";
|
||||
version = "8.2.4";
|
||||
version = "8.2.5";
|
||||
|
||||
excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";
|
||||
|
||||
@ -10,15 +10,15 @@ buildGo117Module rec {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-dOV22xwdNLt0TnONzyDw0skGKuAYmiHafhFwhtRMN5M=";
|
||||
sha256 = "sha256-Bi4z8HqKUeVOxbkKXazNIzFBFy7lW0T27ROVC6enrZE=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "sha256-nfHUpAnFc2lDGAoHB1fJjF08ndfNlaMJAlsMH+TJNy0=";
|
||||
sha256 = "sha256-ngQA8580rvH3C04TfuIsdiStbvk7/HRDDtS04gR92M4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-VvmSNSChbxeLWEQDE4JPfoZckQZ7nG7ElupNCc175Fk=";
|
||||
vendorSha256 = "sha256-adWWL2shdsp1hGxhYvxBbr1YFM89Ym1J0kBNGUrj6vc=";
|
||||
|
||||
nativeBuildInputs = [ wire ];
|
||||
|
||||
|
||||
@ -128,6 +128,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace environ.c \
|
||||
--replace " #include <sys/statfs.h>" " #include <sys/mount.h>"
|
||||
'';
|
||||
|
||||
preAutoreconf = ''
|
||||
cd gnu
|
||||
'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, autoreconfHook, bison, flex, pkg-config
|
||||
, bzip2, check, ncurses, util-linux, zlib
|
||||
}:
|
||||
@ -12,6 +12,20 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-gwKxBBG5PtG4/RxX4sUC25ZeG8K2urqVkFDKL7NS4ZI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# pull pending upstream inclusion fix for ncurses-6.3: sent upstream over email.
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://pagure.io/fork/slyfox/gfs2-utils/c/c927b635f380cca77665195a3aaae804d92870a4.patch";
|
||||
sha256 = "sha256-0M1xAqRXoUi2el03WODF/nqEe9JEE5GehMWs776QZNI=";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
# Apply fix for ncurses-6.3. Upstream development branch already reworked the code.
|
||||
# To be removed on next reelase.
|
||||
substituteInPlace gfs2/edit/gfs2hex.c --replace 'printw(title);' 'printw("%s",title);'
|
||||
'';
|
||||
|
||||
outputs = [ "bin" "doc" "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook bison flex pkg-config ];
|
||||
|
||||
@ -1,16 +1,12 @@
|
||||
{ lib, python3, fetchpatch, writeText }:
|
||||
{ lib
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python3.pkgs) buildPythonApplication fetchPypi;
|
||||
setuppy = writeText "setup.py" ''
|
||||
from setuptools import setup
|
||||
setup()
|
||||
'';
|
||||
in buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "qmk";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2mLuxzxFSMw3sLm+OTcgLcOjAdwvJmNhDsynUaYQ+co=";
|
||||
};
|
||||
@ -36,8 +32,12 @@ in buildPythonApplication rec {
|
||||
pyusb
|
||||
];
|
||||
|
||||
# buildPythonApplication requires setup.py; the setup.py file crafted below
|
||||
# acts as a wrapper to setup.cfg
|
||||
postConfigure = ''
|
||||
cp ${setuppy} setup.py
|
||||
touch setup.py
|
||||
echo "from setuptools import setup" >> setup.py
|
||||
echo "setup()" >> setup.py
|
||||
'';
|
||||
|
||||
# no tests implemented
|
||||
|
||||
26
pkgs/tools/networking/netdiscover/default.nix
Normal file
26
pkgs/tools/networking/netdiscover/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, stdenv, fetchFromGitHub, libpcap, libnet, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "netdiscover";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdiscover-scanner";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "13fp9rfr9vh756m5wck76zbcr0296ir52dahzlqdr52ha9vrswbb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ libpcap libnet ];
|
||||
|
||||
# Running update-oui-database.sh would probably make the build irreproducible
|
||||
|
||||
meta = with lib; {
|
||||
description = "A network address discovering tool, developed mainly for those wireless networks without dhcp server, it also works on hub/switched networks";
|
||||
homepage = "https://github.com/netdiscover-scanner/netdiscover";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ vdot0x23 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2,21 +2,25 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jwt-cli";
|
||||
version = "4.0.0";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mike-engel";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-82Le0kdt/fnSQwsRRYHy4Jv9rsCPGf5dIWmoZE2cPxY=";
|
||||
sha256 = "0za4mpzry6i5gki524kp4by0n74pbc96cvzrkq286v8w033wj01i";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sCauVxc6JPJ4dBi5LOt+v9bdlRW+oF4cd/sfG5Xdv70=";
|
||||
cargoSha256 = "1l5fhr5c2ygdlnpwsx62fm8di8li0wf15nvvcnnivjcic7f9b5j0";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = "$out/bin/jwt --version";
|
||||
installCheckPhase = ''
|
||||
$out/bin/jwt --version > /dev/null
|
||||
$out/bin/jwt decode eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c \
|
||||
| grep -q 'John Doe'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Super fast CLI tool to decode and encode JWTs";
|
||||
|
||||
@ -1,21 +1,54 @@
|
||||
{ lib, python3Packages, xpdf, imagemagick, tesseract }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, imagemagick
|
||||
, python3
|
||||
, tesseract
|
||||
, xpdf
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "invoice2data";
|
||||
version = "0.2.93";
|
||||
version = "0.3.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1phz0a8jxg074k0im7shrrdfvdps7bn1fa4zwcf8q3sa2iig26l4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "invoice-x";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t1jgLyKtQsLINlnkCdSbVfTM6B/EiD1yGtx9UHjyZVE=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ imagemagick xpdf tesseract ]) ];
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools-git
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ unidecode dateparser pyyaml pillow chardet pdfminer ];
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
chardet
|
||||
dateparser
|
||||
pdfminer
|
||||
pillow
|
||||
pyyaml
|
||||
unidecode
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "pytest-runner" ""
|
||||
'';
|
||||
|
||||
makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [
|
||||
imagemagick
|
||||
tesseract
|
||||
xpdf
|
||||
])];
|
||||
|
||||
# Tests fails even when ran manually on my ubuntu machine !!
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"invoice2data"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Data extractor for PDF invoices";
|
||||
homepage = "https://github.com/invoice-x/invoice2data";
|
||||
|
||||
@ -1281,7 +1281,9 @@ with pkgs;
|
||||
|
||||
argyllcms = callPackage ../tools/graphics/argyllcms {};
|
||||
|
||||
arj = callPackage ../tools/archivers/arj { };
|
||||
arj = callPackage ../tools/archivers/arj {
|
||||
stdenv = gccStdenv;
|
||||
};
|
||||
|
||||
arp-scan = callPackage ../tools/misc/arp-scan { };
|
||||
|
||||
@ -7813,6 +7815,8 @@ with pkgs;
|
||||
|
||||
netcat-gnu = callPackage ../tools/networking/netcat { };
|
||||
|
||||
netdiscover = callPackage ../tools/networking/netdiscover { };
|
||||
|
||||
nethogs = callPackage ../tools/networking/nethogs { };
|
||||
|
||||
netkittftp = callPackage ../tools/networking/netkit/tftp { };
|
||||
@ -28202,7 +28206,7 @@ with pkgs;
|
||||
|
||||
super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { };
|
||||
|
||||
super-slicer-staging = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).staging;
|
||||
super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).latest;
|
||||
|
||||
snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { };
|
||||
|
||||
@ -29562,7 +29566,12 @@ with pkgs;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; };
|
||||
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots {
|
||||
boost = boost17x;
|
||||
miniupnpc = miniupnpc_2;
|
||||
withGui = false;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
cgminer = callPackage ../applications/blockchains/cgminer { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user