Merge master into staging
This commit is contained in:
Frederik Rietdijk
commit
dc0e21d900
@ -718,6 +718,7 @@
|
||||
vandenoever = "Jos van den Oever <jos@vandenoever.info>";
|
||||
vanschelven = "Klaas van Schelven <klaas@vanschelven.com>";
|
||||
vanzef = "Ivan Solyankin <vanzef@gmail.com>";
|
||||
varunpatro = "Varun Patro <varun.kumar.patro@gmail.com>";
|
||||
vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>";
|
||||
vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>";
|
||||
vcunat = "Vladimír Čunát <vcunat@gmail.com>";
|
||||
|
||||
@ -70,9 +70,21 @@ $ ./result/bin/run-*-vm
|
||||
</screen>
|
||||
|
||||
The VM does not have any data from your host system, so your existing
|
||||
user accounts and home directories will not be available. You can
|
||||
forward ports on the host to the guest. For instance, the following
|
||||
will forward host port 2222 to guest port 22 (SSH):
|
||||
user accounts and home directories will not be available unless you
|
||||
have set <literal>mutableUsers = false</literal>. Another way is to
|
||||
temporarily add the following to your configuration:
|
||||
|
||||
<screen>
|
||||
users.extraUsers.your-user.initialPassword = "test"
|
||||
</screen>
|
||||
|
||||
<emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you
|
||||
have started the virtual machine at least once without the right
|
||||
users, otherwise the changes will not get picked up.
|
||||
|
||||
You can forward ports on the host to the guest. For
|
||||
instance, the following will forward host port 2222 to guest port 22
|
||||
(SSH):
|
||||
|
||||
<screen>
|
||||
$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
|
||||
|
||||
@ -43,11 +43,18 @@ in
|
||||
sdImage = {
|
||||
populateBootCommands = let
|
||||
configTxt = pkgs.writeText "config.txt" ''
|
||||
# Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
|
||||
# when attempting to show low-voltage or overtemperature warnings.
|
||||
avoid_warnings=1
|
||||
|
||||
[pi2]
|
||||
kernel=u-boot-rpi2.bin
|
||||
|
||||
[pi3]
|
||||
kernel=u-boot-rpi3.bin
|
||||
|
||||
# U-Boot used to need this to work, regardless of whether UART is actually used or not.
|
||||
# TODO: check when/if this can be removed.
|
||||
enable_uart=1
|
||||
'';
|
||||
in ''
|
||||
|
||||
@ -303,6 +303,7 @@
|
||||
restya-board = 284;
|
||||
mighttpd2 = 285;
|
||||
hass = 286;
|
||||
monero = 287;
|
||||
|
||||
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
|
||||
|
||||
@ -574,6 +575,7 @@
|
||||
restya-board = 284;
|
||||
mighttpd2 = 285;
|
||||
hass = 286;
|
||||
monero = 287;
|
||||
|
||||
# When adding a gid, make sure it doesn't match an existing
|
||||
# uid. Users and groups with the same name should have equal
|
||||
|
||||
@ -492,6 +492,7 @@
|
||||
./services/networking/minidlna.nix
|
||||
./services/networking/miniupnpd.nix
|
||||
./services/networking/mosquitto.nix
|
||||
./services/networking/monero.nix
|
||||
./services/networking/miredo.nix
|
||||
./services/networking/mstpd.nix
|
||||
./services/networking/murmur.nix
|
||||
|
||||
@ -9,8 +9,27 @@ let
|
||||
|
||||
availableComponents = pkgs.home-assistant.availableComponents;
|
||||
|
||||
# Given component "parentConfig.platform", returns whether config.parentConfig
|
||||
# is a list containing a set with set.platform == "platform".
|
||||
#
|
||||
# For example, the component sensor.luftdaten is used as follows:
|
||||
# config.sensor = [ {
|
||||
# platform = "luftdaten";
|
||||
# ...
|
||||
# } ];
|
||||
useComponentPlatform = component:
|
||||
let
|
||||
path = splitString "." component;
|
||||
parentConfig = attrByPath (init path) null cfg.config;
|
||||
platform = last path;
|
||||
in isList parentConfig && any
|
||||
(item: item.platform or null == platform)
|
||||
parentConfig;
|
||||
|
||||
# Returns whether component is used in config
|
||||
useComponent = component: hasAttrByPath (splitString "." component) cfg.config;
|
||||
useComponent = component:
|
||||
hasAttrByPath (splitString "." component) cfg.config
|
||||
|| useComponentPlatform component;
|
||||
|
||||
# List of components used in config
|
||||
extraComponents = filter useComponent availableComponents;
|
||||
|
||||
238
nixos/modules/services/networking/monero.nix
Normal file
238
nixos/modules/services/networking/monero.nix
Normal file
@ -0,0 +1,238 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.monero;
|
||||
dataDir = "/var/lib/monero";
|
||||
|
||||
listToConf = option: list:
|
||||
concatMapStrings (value: "${option}=${value}\n") list;
|
||||
|
||||
login = (cfg.rpc.user != null && cfg.rpc.password != null);
|
||||
|
||||
configFile = with cfg; pkgs.writeText "monero.conf" ''
|
||||
log-file=/dev/stdout
|
||||
data-dir=${dataDir}
|
||||
|
||||
${optionalString mining.enable ''
|
||||
start-mining=${mining.address}
|
||||
mining-threads=${toString mining.threads}
|
||||
''}
|
||||
|
||||
rpc-bind-ip=${rpc.address}
|
||||
rpc-bind-port=${toString rpc.port}
|
||||
${optionalString login ''
|
||||
rpc-login=${rpc.user}:${rpc.password}
|
||||
''}
|
||||
${optionalString rpc.restricted ''
|
||||
restrict-rpc=1
|
||||
''}
|
||||
|
||||
limit-rate-up=${toString limits.upload}
|
||||
limit-rate-down=${toString limits.download}
|
||||
max-concurrency=${toString limits.threads}
|
||||
block-sync-size=${toString limits.syncSize}
|
||||
|
||||
${listToConf "add-peer" extraNodes}
|
||||
${listToConf "add-priority-node" priorityNodes}
|
||||
${listToConf "add-exclusive-node" exclusiveNodes}
|
||||
|
||||
${extraConfig}
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.monero = {
|
||||
|
||||
enable = mkEnableOption "Monero node daemon.";
|
||||
|
||||
mining.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to mine moneroj.
|
||||
'';
|
||||
};
|
||||
|
||||
mining.address = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
Monero address where to send mining rewards.
|
||||
'';
|
||||
};
|
||||
|
||||
mining.threads = mkOption {
|
||||
type = types.addCheck types.int (x: x>=0);
|
||||
default = 0;
|
||||
description = ''
|
||||
Number of threads used for mining.
|
||||
Set to <literal>0</literal> to use all available.
|
||||
'';
|
||||
};
|
||||
|
||||
rpc.user = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
User name for RPC connections.
|
||||
'';
|
||||
};
|
||||
|
||||
rpc.password = mkOption {
|
||||
type = types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
Password for RPC connections.
|
||||
'';
|
||||
};
|
||||
|
||||
rpc.address = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
description = ''
|
||||
IP address the RPC server will bind to.
|
||||
'';
|
||||
};
|
||||
|
||||
rpc.port = mkOption {
|
||||
type = types.int;
|
||||
default = 18081;
|
||||
description = ''
|
||||
Port the RPC server will bind to.
|
||||
'';
|
||||
};
|
||||
|
||||
rpc.restricted = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to restrict RPC to view only commands.
|
||||
'';
|
||||
};
|
||||
|
||||
limits.upload = mkOption {
|
||||
type = types.addCheck types.int (x: x>=-1);
|
||||
default = -1;
|
||||
description = ''
|
||||
Limit of the upload rate in kB/s.
|
||||
Set to <literal>-1</literal> to leave unlimited.
|
||||
'';
|
||||
};
|
||||
|
||||
limits.download = mkOption {
|
||||
type = types.addCheck types.int (x: x>=-1);
|
||||
default = -1;
|
||||
description = ''
|
||||
Limit of the download rate in kB/s.
|
||||
Set to <literal>-1</literal> to leave unlimited.
|
||||
'';
|
||||
};
|
||||
|
||||
limits.threads = mkOption {
|
||||
type = types.addCheck types.int (x: x>=0);
|
||||
default = 0;
|
||||
description = ''
|
||||
Maximum number of threads used for a parallel job.
|
||||
Set to <literal>0</literal> to leave unlimited.
|
||||
'';
|
||||
};
|
||||
|
||||
limits.syncSize = mkOption {
|
||||
type = types.addCheck types.int (x: x>=0);
|
||||
default = 0;
|
||||
description = ''
|
||||
Maximum number of blocks to sync at once.
|
||||
Set to <literal>0</literal> for adaptive.
|
||||
'';
|
||||
};
|
||||
|
||||
extraNodes = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
List of additional peer IP addresses to add to the local list.
|
||||
'';
|
||||
};
|
||||
|
||||
priorityNodes = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
List of peer IP addresses to connect to and
|
||||
attempt to keep the connection open.
|
||||
'';
|
||||
};
|
||||
|
||||
exclusiveNodes = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
List of peer IP addresses to connect to *only*.
|
||||
If given the other peer options will be ignored.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
Extra lines to be added verbatim to monerod configuration.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
users.extraUsers = singleton {
|
||||
name = "monero";
|
||||
uid = config.ids.uids.monero;
|
||||
description = "Monero daemon user";
|
||||
home = dataDir;
|
||||
createHome = true;
|
||||
};
|
||||
|
||||
users.extraGroups = singleton {
|
||||
name = "monero";
|
||||
gid = config.ids.gids.monero;
|
||||
};
|
||||
|
||||
systemd.services.monero = {
|
||||
description = "monero daemon";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
User = "monero";
|
||||
Group = "monero";
|
||||
ExecStart = "${pkgs.monero}/bin/monerod --config-file=${configFile} --non-interactive";
|
||||
Restart = "always";
|
||||
SuccessExitStatus = [ 0 1 ];
|
||||
};
|
||||
};
|
||||
|
||||
assertions = singleton {
|
||||
assertion = cfg.mining.enable -> cfg.mining.address != "";
|
||||
message = ''
|
||||
You need a Monero address to receive mining rewards:
|
||||
specify one using option monero.mining.address.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -24,7 +24,11 @@ let
|
||||
|
||||
kernel = config.boot.kernelPackages;
|
||||
|
||||
packages = if config.boot.zfs.enableUnstable then {
|
||||
packages = if config.boot.zfs.enableLegacyCrypto then {
|
||||
spl = kernel.splLegacyCrypto;
|
||||
zfs = kernel.zfsLegacyCrypto;
|
||||
zfsUser = pkgs.zfsLegacyCrypto;
|
||||
} else if config.boot.zfs.enableUnstable then {
|
||||
spl = kernel.splUnstable;
|
||||
zfs = kernel.zfsUnstable;
|
||||
zfsUser = pkgs.zfsUnstable;
|
||||
@ -75,6 +79,27 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
enableLegacyCrypto = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enabling this option will allow you to continue to use the old format for
|
||||
encrypted datasets. With the inclusion of stability patches the format of
|
||||
encrypted datasets has changed. They can still be accessed and mounted but
|
||||
in read-only mode mounted. It is highly recommended to convert them to
|
||||
the new format.
|
||||
|
||||
This option is only for convenience to people that cannot convert their
|
||||
datasets to the new format yet and it will be removed in due time.
|
||||
|
||||
For migration strategies from old format to this new one, check the Wiki:
|
||||
https://nixos.wiki/wiki/NixOS_on_ZFS#Encrypted_Dataset_Format_Change
|
||||
|
||||
See https://github.com/zfsonlinux/zfs/pull/6864 for more details about
|
||||
the stability patches.
|
||||
'';
|
||||
};
|
||||
|
||||
extraPools = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
|
||||
@ -52,7 +52,8 @@ in rec {
|
||||
(all nixos.dummy)
|
||||
(all nixos.manual)
|
||||
|
||||
(all nixos.iso_minimal)
|
||||
nixos.iso_minimal.x86_64-linux
|
||||
nixos.iso_minimal.i686-linux
|
||||
nixos.iso_graphical.x86_64-linux
|
||||
nixos.ova.x86_64-linux
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "mopidy-iris-${version}";
|
||||
version = "3.11.0";
|
||||
version = "3.12.4";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit version;
|
||||
pname = "Mopidy-Iris";
|
||||
sha256 = "1a9pn35vv1b9v0s30ajjg7gjjvcfjwgfyp7z61m567nv6cr37vhq";
|
||||
sha256 = "0k64rfnp5b4rybb396zzx12wnnca43a8l1s6s6dr6cflgk9aws87";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
|
||||
|
||||
let
|
||||
version = "1.19.3";
|
||||
version = "1.20.0";
|
||||
channel = "stable";
|
||||
|
||||
plat = {
|
||||
@ -12,9 +12,9 @@ let
|
||||
}.${stdenv.system};
|
||||
|
||||
sha256 = {
|
||||
"i686-linux" = "0qaijcsjy9sysim19gyqmagg8rmxgamf0l74qj3ap0wsv2v7xixr";
|
||||
"x86_64-linux" = "1kvkcrr1hgnssy2z45h8fdgr9j6w94myr2hvlknwcahzxrnrwr7k";
|
||||
"x86_64-darwin" = "19vkv97yq0alnq4dvs62a2vx3f1mvfz1ic63114s9sd6smikrg0g";
|
||||
"i686-linux" = "0lhfljcdb05v0p3kc6zimgd2z057397blfp56bhr7v7wnsi6i40k";
|
||||
"x86_64-linux" = "138kvqa5cixry62yry0lwzxlk9fs8hb4zqzmsd8ag1jjfma8y45k";
|
||||
"x86_64-darwin" = "1adnwlqf2kw8wfjf86a3xg83j1yqnlsdckksw82b06x3j11g91i8";
|
||||
}.${stdenv.system};
|
||||
|
||||
archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "electrum-${version}";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
||||
sha256 = "06z0a5p1jg93jialphslip8d72q9yg3651qqaf494gs3h9kw1sv1";
|
||||
sha256 = "01dnqiazjl2avrmdiq68absjvcfv24446y759z2s9dwk8ywzjkrg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -2,17 +2,17 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "afew";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "121w7bd53xyibllxxbfykjj76n81kn1vgjqd22izyh67y8qyyk5r";
|
||||
sha256 = "0105glmlkpkjqbz350dxxasvlfx9dk0him9vwbl86andzi106ygz";
|
||||
};
|
||||
|
||||
buildInputs = with pythonPackages; [ setuptools_scm ];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
pythonPackages.notmuch chardet
|
||||
pythonPackages.notmuch chardet dkimpy
|
||||
] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mblaze-${version}";
|
||||
version = "0.3";
|
||||
version = "0.3.1";
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "chneukirchen";
|
||||
repo = "mblaze";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jrn81rvw6qanlfppc12dkvpbmidzrq1lx3rfhvcsna55k3gjyw9";
|
||||
sha256 = "1a4rqadq3dm6r11v7akng1qy88zpiq5qbqdryb8df3pxkv62nm1a";
|
||||
};
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||
[[ -s "$lib" ]] || die "couldn't find libnotmuch"
|
||||
|
||||
badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')"
|
||||
goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')"
|
||||
goodname="$(find "${talloc}/lib" -name 'libtalloc.*.*.*.dylib')"
|
||||
|
||||
[[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary"
|
||||
[[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
|
||||
, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib
|
||||
, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas
|
||||
, curl, Cocoa, Foundation, cf-private, libobjc, tzdata, fetchpatch
|
||||
, curl, Cocoa, Foundation, cf-private, libobjc, libcxx, tzdata, fetchpatch
|
||||
, withRecommendedPackages ? true
|
||||
, enableStrictBarrier ? false
|
||||
}:
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
pango pcre perl readline texLive xz zlib less texinfo graphviz icu
|
||||
pkgconfig bison imake which jdk openblas curl
|
||||
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc ];
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
|
||||
|
||||
patches = [ ./no-usr-local-search-paths.patch ];
|
||||
|
||||
@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
|
||||
--without-aqua
|
||||
--disable-R-framework
|
||||
OBJC="clang"
|
||||
CPPFLAGS="-isystem ${libcxx}/include/c++/v1"
|
||||
LDFLAGS="-L${libcxx}/lib"
|
||||
'' + ''
|
||||
)
|
||||
echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
let
|
||||
version = "1.12.15";
|
||||
version = "1.13.0";
|
||||
jarName = "bfg-${version}.jar";
|
||||
mavenUrl = "http://central.maven.org/maven2/com/madgag/bfg/${version}/${jarName}";
|
||||
in
|
||||
@ -12,7 +12,7 @@ in
|
||||
|
||||
src = fetchurl {
|
||||
url = mavenUrl;
|
||||
sha256 = "17dh25jambkk55khknlhy8wa9s1i1xmh9hdgj72j1lzyl0ag42ik";
|
||||
sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz";
|
||||
};
|
||||
|
||||
buildInputs = [ jre makeWrapper ];
|
||||
|
||||
@ -117,7 +117,7 @@ rec {
|
||||
git = gitSVN;
|
||||
};
|
||||
|
||||
svn2git_kde = callPackage ./svn2git-kde { };
|
||||
svn_all_fast_export = libsForQt5.callPackage ./svn-all-fast-export { };
|
||||
|
||||
tig = callPackage ./tig { };
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }:
|
||||
let
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
in
|
||||
buildGoPackage {
|
||||
name = "grv-${version}";
|
||||
@ -10,15 +10,16 @@ buildGoPackage {
|
||||
|
||||
goPackagePath = "github.com/rgburke/grv";
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rgburke";
|
||||
repo = "grv";
|
||||
rev = "v${version}";
|
||||
sha256 = "0q9gvxfw48d4kjpb2jx7lg577vazjg0n961y6ija5saja5n16mk2";
|
||||
sha256 = "1i8cr5xxdacpby60nqfyj8ijyc0h62029kbds2lq26rb8nn9qih2";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = " GRV is a terminal interface for viewing git repositories";
|
||||
homepage = https://github.com/rgburke/grv;
|
||||
|
||||
@ -1,102 +0,0 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/Sirupsen/logrus";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/Sirupsen/logrus";
|
||||
rev = "768a92a02685ee7535069fc1581341b41bab9b72";
|
||||
sha256 = "1m67cxb6p0zgq0xba63qb4vvy6z5d78alya0vnx5djfixygiij53";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/bradfitz/slice";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/bradfitz/slice";
|
||||
rev = "d9036e2120b5ddfa53f3ebccd618c4af275f47da";
|
||||
sha256 = "189h48w3ppvx2kqyxq0s55kxv629lljjxbyqjnlrgg8fy6ya8wgy";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gobwas/glob";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gobwas/glob";
|
||||
rev = "51eb1ee00b6d931c66d229ceeb7c31b985563420";
|
||||
sha256 = "090wzpwsjana1qas8ipwh1pj959gvc4b7vwybzi01f3bmd79jwlp";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
|
||||
sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/rgburke/goncurses";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/rgburke/goncurses";
|
||||
rev = "9a788ac9d81e61c6a2ca6205ee8d72d738ed12b9";
|
||||
sha256 = "0xqwxscdszbybriyzqmsd2zkzda9anckx56q8gksfy3gwj286gpb";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/rjeczalik/notify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/rjeczalik/notify";
|
||||
rev = "27b537f07230b3f917421af6dcf044038dbe57e2";
|
||||
sha256 = "05alsqjz2x8jzz2yp8r20zwglcg7y1ywq60zy6icj18qs3abmlp0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/tchap/go-patricia";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/tchap/go-patricia";
|
||||
rev = "5ad6cdb7538b0097d5598c7e57f0a24072adf7dc";
|
||||
sha256 = "0351x63zqympgfsnjl78cgvqhvipl3kfs1i15hfaw91hqin6dykr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "go4.org";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/camlistore/go4";
|
||||
rev = "fba789b7e39ba524b9e60c45c37a50fae63a2a09";
|
||||
sha256 = "01irxqy8na646b4zbw7v3zwy3yx9m7flhim5c3z4lzq5hiy2h75i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "1875d0a70c90e57f11972aefd42276df65e895b9";
|
||||
sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "3dbebcf8efb6a5011a60c2b4591c1022a759af8a";
|
||||
sha256 = "02pwjyimpm13km3fk0rg2l9p37w7qycdwp74piawwgcgh80qnww9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/libgit2/git2go.v25";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/libgit2/git2go.v25";
|
||||
rev = "334260d743d713a55ff3c097ec6707f2bb39e9d5";
|
||||
sha256 = "0hfya9z2pg29zbc0s92hj241rnbk7d90jzj34q0dp8b7akz6r1rc";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -0,0 +1,43 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }:
|
||||
|
||||
let
|
||||
version = "1.0.11";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "svn-all-fast-export-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svn-all-fast-export";
|
||||
repo = "svn2git";
|
||||
rev = version;
|
||||
sha256 = "0lhnw8f15j4wkpswhrjd7bp9xkhbk32zmszaxayzfhbdl0g7pzwj";
|
||||
};
|
||||
|
||||
# https://github.com/svn-all-fast-export/svn2git/pull/40
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "pr40.patch";
|
||||
sha256 = "1qndhk5csf7kddk3giailx7r0cdipq46lj73nkcws43n4n93synk";
|
||||
url = https://github.com/svn-all-fast-export/svn2git/pull/40.diff;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
buildInputs = [ apr.dev subversion.dev qtbase ];
|
||||
|
||||
qmakeFlags = [
|
||||
"VERSION=${version}"
|
||||
"APR_INCLUDE=${apr.dev}/include/apr-1"
|
||||
"SVN_INCLUDE=${subversion.dev}/include/subversion-1"
|
||||
];
|
||||
|
||||
installPhase = "make install INSTALL_ROOT=$out";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/svn-all-fast-export/svn2git;
|
||||
description = "A fast-import based converter for an svn repo to git repos";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.flokli ];
|
||||
};
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
{ stdenv, fetchgit, qt4, qmake4Hook, subversion, apr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "svn2git-kde-1.0.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = http://git.gitorious.org/svn2git/svn2git.git;
|
||||
rev = "149d6c6e14a1724c96999328683a9264fc508264";
|
||||
sha256 = "0gjxhnraizlwyidn66rczwc01f6sfx4ndmsj86ssqml3p0d4sl6q";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-I${apr.dev}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's|/bin/cat|cat|' ./src/repository.cpp
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp svn-all-fast-export $out/bin
|
||||
'';
|
||||
|
||||
buildInputs = [ subversion apr qt4 ];
|
||||
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
|
||||
meta.broken = true;
|
||||
}
|
||||
@ -95,6 +95,11 @@ in stdenv.mkDerivation rec {
|
||||
url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch";
|
||||
sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2018-6360.patch";
|
||||
url = https://salsa.debian.org/multimedia-team/mpv/raw/ddface85a1adfdfe02ffb25b5ac7fac715213b97/debian/patches/09_ytdl-hook-whitelist-protocols.patch;
|
||||
sha256 = "1gb1lkjbr8rv4v9ji6w5z97kbxbi16dbwk2255ajbvngjrc7vivv";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
# platform). Static libs are always built.
|
||||
enableShared ? true
|
||||
|
||||
, version ? "8.4.20180122"
|
||||
, version ? "8.4.0.20180204"
|
||||
}:
|
||||
|
||||
assert !enableIntegerSimple -> gmp != null;
|
||||
@ -73,8 +73,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.haskell.org/ghc.git";
|
||||
rev = "61db0b8941cfb7ed8941ed29bdb04bd8ef3b71a5";
|
||||
sha256 = "15sbpgkal4854jc1xn3sprvpnxwdj0fyy43y5am0h9vja3pjhjyi";
|
||||
rev = "111737cd218751f06ea58d3cf2c7c144265b5dfc";
|
||||
sha256 = "0ksp0k3sp928aq2cv6whgbfmjnr7l2j10diha13nncksp4byf0s9";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -966,37 +966,37 @@ self: super: {
|
||||
hledger = overrideCabal super.hledger (drv: {
|
||||
postInstall = ''
|
||||
for i in $(seq 1 9); do
|
||||
for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do
|
||||
for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do
|
||||
mkdir -p $out/share/man/man$i
|
||||
cp $j $out/share/man/man$i/
|
||||
done
|
||||
done
|
||||
mkdir $out/share/info
|
||||
cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/
|
||||
mkdir -p $out/share/info
|
||||
cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/
|
||||
'';
|
||||
});
|
||||
hledger-ui = overrideCabal super.hledger-ui (drv: {
|
||||
postInstall = ''
|
||||
for i in $(seq 1 9); do
|
||||
for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do
|
||||
for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do
|
||||
mkdir -p $out/share/man/man$i
|
||||
cp $j $out/share/man/man$i/
|
||||
done
|
||||
done
|
||||
mkdir $out/share/info
|
||||
cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/
|
||||
mkdir -p $out/share/info
|
||||
cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/
|
||||
'';
|
||||
});
|
||||
hledger-web = overrideCabal super.hledger-web (drv: {
|
||||
postInstall = ''
|
||||
for i in $(seq 1 9); do
|
||||
for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do
|
||||
for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do
|
||||
mkdir -p $out/share/man/man$i
|
||||
cp $j $out/share/man/man$i/
|
||||
done
|
||||
done
|
||||
mkdir $out/share/info
|
||||
cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/
|
||||
mkdir -p $out/share/info
|
||||
cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/
|
||||
'';
|
||||
});
|
||||
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, fixDarwinDylibNames
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fixDarwinDylibNames
|
||||
, which, perl
|
||||
|
||||
# Optional Arguments
|
||||
, snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null
|
||||
@ -15,15 +18,16 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rocksdb-${version}";
|
||||
version = "5.1.2";
|
||||
version = "5.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "rocksdb";
|
||||
rev = "v${version}";
|
||||
sha256 = "1smahz67gcd86nkdqaml78lci89dza131mlj5472r4sxjdxsx277";
|
||||
sha256 = "00qnd56v4qyzxg0b3ya3flf2jhbbfaibj1y53bd5ciaw3af6zxnd";
|
||||
};
|
||||
|
||||
|
||||
nativeBuildInputs = [ which perl ];
|
||||
buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc fixDarwinDylibNames ];
|
||||
|
||||
postPatch = ''
|
||||
@ -39,16 +43,20 @@ stdenv.mkDerivation rec {
|
||||
|
||||
${if enableLite then "LIBNAME" else null} = "librocksdb_lite";
|
||||
${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1";
|
||||
|
||||
buildFlags = [
|
||||
|
||||
buildAndInstallFlags = [
|
||||
"USE_RTTI=1"
|
||||
"DEBUG_LEVEL=0"
|
||||
"DISABLE_WARNING_AS_ERROR=1"
|
||||
];
|
||||
|
||||
buildFlags = buildAndInstallFlags ++ [
|
||||
"shared_lib"
|
||||
"static_lib"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
installFlags = buildAndInstallFlags ++ [
|
||||
"INSTALL_PATH=\${out}"
|
||||
"DEBUG_LEVEL=0"
|
||||
"install-shared"
|
||||
"install-static"
|
||||
];
|
||||
@ -66,6 +74,6 @@ stdenv.mkDerivation rec {
|
||||
description = "A library that provides an embeddable, persistent key-value store for fast storage";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.allBut [ "i686-linux" ];
|
||||
maintainers = with maintainers; [ wkennington ];
|
||||
maintainers = with maintainers; [ adev wkennington ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "uriparser-${version}";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/uriparser/Sources/${version}/${name}.tar.bz2";
|
||||
sha256 = "08vvcmg4mcpi2gyrq043c9mfcy3mbrw6lhp86698hx392fjcsz6f";
|
||||
sha256 = "1p9c6lr39rjl4bbzi7wl2nsg72gcz8qhicxh9v043qyr0dfcvsjq";
|
||||
};
|
||||
|
||||
|
||||
|
||||
34
pkgs/development/python-modules/dendropy/default.nix
Normal file
34
pkgs/development/python-modules/dendropy/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "DendroPy";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bd5b35ce1a1c9253209b7b5f3939ac22beaa70e787f8129149b4f7ffe865d510";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
# Test removed/disabled and reported upstream: https://github.com/jeetsukumaran/DendroPy/issues/74
|
||||
rm -f dendropy/test/test_dataio_nexml_reader_tree_list.py
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# Needed for unicode python tests
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
'';
|
||||
|
||||
checkInputs = [ pkgs.glibcLocales ];
|
||||
|
||||
meta = {
|
||||
homepage = http://dendropy.org/;
|
||||
description = "A Python library for phylogenetic computing";
|
||||
maintainers = with lib.maintainers; [ unode ];
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
48
pkgs/development/python-modules/pysam/default.nix
Normal file
48
pkgs/development/python-modules/pysam/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, bzip2
|
||||
, bcftools
|
||||
, curl
|
||||
, cython
|
||||
, htslib
|
||||
, lzma
|
||||
, pytest
|
||||
, samtools
|
||||
, zlib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysam";
|
||||
version = "0.13.0";
|
||||
|
||||
# Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is
|
||||
# missing some files which cause test failures.
|
||||
# Tracked at: https://github.com/pysam-developers/pysam/issues/616
|
||||
src = fetchFromGitHub {
|
||||
owner = "pysam-developers";
|
||||
repo = "pysam";
|
||||
rev = "v${version}";
|
||||
sha256 = "1lwbcl38w1x0gciw5psjp87msmv9zzkgiqikg9b83dqaw2y5az1i";
|
||||
};
|
||||
|
||||
buildInputs = [ bzip2 curl cython lzma zlib ];
|
||||
|
||||
checkInputs = [ pytest bcftools htslib samtools ];
|
||||
|
||||
checkPhase = "py.test";
|
||||
|
||||
preInstall = ''
|
||||
export HOME=$(mktemp -d)
|
||||
make -C tests/pysam_data
|
||||
make -C tests/cbcf_data
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://pysam.readthedocs.io/;
|
||||
description = "A python module for reading, manipulating and writing genome data sets";
|
||||
maintainers = with lib.maintainers; [ unode ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -1,8 +1,7 @@
|
||||
{lib, buildPythonPackage, fetchPypi, pytest, cram, bash, writeText}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
pname = "pytest-cram";
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
@ -10,7 +9,8 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0ad05999iqzyjay9y5lc0cnd3jv8qxqlzsvxzp76shslmhrv0c4f";
|
||||
sha256 = "006p5dr3q794sbwwmxmdls3nwq0fvnyrxxmc03pgq8n74chl71qn";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.64.0";
|
||||
version = "0.65.0";
|
||||
name = "flow-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jvx2vx1d3n5z689zqm0gylmmjxim176avinwn3q8xla3gz3srp8";
|
||||
sha256 = "00m9wqfqpnv7p2kz0970254jfaqakb12lsnhk95hw47ghfyb2f7p";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -14,12 +14,12 @@ let
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bossa-2014-08-18";
|
||||
name = "bossa-1.8";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://github.com/shumatech/BOSSA;
|
||||
rev = "0f0a41cb1c3a65e909c5c744d8ae664e896a08ac"; /* arduino branch */
|
||||
sha256 = "0xg79kli1ypw9zyl90mm6vfk909jinmk3lnl8sim6v2yn8shs9cn";
|
||||
rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62";
|
||||
sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm";
|
||||
};
|
||||
|
||||
patches = [ ./bossa-no-applet-build.patch ];
|
||||
|
||||
@ -20,11 +20,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1avx4p71g9m3zvynhhhysxnpkqyhhlv42xiv9502bvp3nwfkgnqs";
|
||||
};
|
||||
|
||||
buildInputs = [ liburcu python ];
|
||||
buildInputs = [ python ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ liburcu ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "LTTng Userspace Tracer libraries";
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
{
|
||||
stdenv, fetchFromGitHub, cmake, extra-cmake-modules,
|
||||
zlib, boost162, libunwind, elfutils, sparsehash,
|
||||
qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons,
|
||||
zlib, boost, libunwind, elfutils, sparsehash,
|
||||
qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "heaptrack-${version}";
|
||||
version = "2017-10-30";
|
||||
version = "2018-01-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDE";
|
||||
repo = "heaptrack";
|
||||
rev = "2bf49bc4fed144e004a9cabd40580a0f0889758f";
|
||||
sha256 = "0sqxk5cc8r2vsj5k2dj9jkd1f2x2yj3mxgsp65g7ls01bgga0i4d";
|
||||
rev = "a4534d52788ab9814efca1232d402b2eb319342c";
|
||||
sha256 = "00xfv51kavvcmwgfmcixx0k5vhd06gkj5q0mm8rwxiw6215xp41a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
zlib boost162 libunwind elfutils sparsehash
|
||||
qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons
|
||||
zlib boost libunwind elfutils sparsehash
|
||||
qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
28
pkgs/os-specific/darwin/lsusb/default.nix
Normal file
28
pkgs/os-specific/darwin/lsusb/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0";
|
||||
name = "lsusb-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jlhonora";
|
||||
repo = "lsusb";
|
||||
rev = "8a6bd7084a55a58ade6584af5075c1db16afadd1";
|
||||
sha256 = "0p8pkcgvsx44dd56wgipa8pzi3298qk9h4rl9pwsw1939hjx6h0g";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/man/man8
|
||||
install -m 0755 lsusb $out/bin
|
||||
install -m 0444 man/lsusb.8 $out/share/man/man8
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/jlhonora/lsusb;
|
||||
description = "lsusb command for Mac OS X";
|
||||
platforms = stdenv.lib.platforms.darwin;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.varunpatro ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hdparm-9.53";
|
||||
name = "hdparm-9.54";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/hdparm/${name}.tar.gz";
|
||||
sha256 = "1rb5086gp4l1h1fn2nk10ziqxjxigsd0c1zczahwc5k9vy8zawr6";
|
||||
sha256 = "0ghnhdj7wfw6acfyhdawpfa5n9kvkvzgi1fw6i7sghgbjx5nhyjd";
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.17";
|
||||
version = "4.14.18";
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0jqa86bnnlzv0r0bvzvmbj1c89a5m64zrjfvfrjlwg3vy63r9ii7";
|
||||
sha256 = "0m73kz9jg6mylgql0zzypm76g6x7m3bq7dklivhkm4ldqg0r8sl6";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1pxgs5wqmidwa5lz6q1m9gz6jyvhvlgy8r5bs48cm08b0vcwsvlq";
|
||||
sha256 = "16h346abbdi6k3handw8nblscyf966gx1q9xig4gbij73b10nspb";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "4.15.1";
|
||||
version = "4.15.2";
|
||||
revision = "a";
|
||||
sha256 = "1k9ng0110vzl29rzbglk3vmnpfqk04rd2mja5aqql81z5pb1x528";
|
||||
sha256 = "1rmia5k07pfx47qkc8nx3xiap6mxbwlry3jxrx4kwf3hh5cnqnsv";
|
||||
|
||||
# modVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
|
||||
|
||||
@ -61,13 +61,19 @@ in
|
||||
assert kernel != null;
|
||||
{
|
||||
splStable = common {
|
||||
version = "0.7.5";
|
||||
sha256 = "0njb3274bc5pfr80pzj94sljq457pr71n50s0gsccbz8ghk28rlr";
|
||||
version = "0.7.6";
|
||||
sha256 = "1l641d89k48ngmarx9mxh8gw2zzrf7fw7n8zmslhz4h1152plddb";
|
||||
};
|
||||
|
||||
splUnstable = common {
|
||||
version = "2017-12-21";
|
||||
rev = "c9821f1ccc647dfbd506f381b736c664d862d126";
|
||||
sha256 = "08r6sa36jaj6n54ap18npm6w85v5yn3x8ljg792h37f49b8kir6c";
|
||||
version = "2018-01-24";
|
||||
rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771";
|
||||
sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h";
|
||||
};
|
||||
|
||||
splLegacyCrypto = common {
|
||||
version = "2018-01-24";
|
||||
rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771";
|
||||
sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h";
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, zlib, libuuid, python, attr, openssl
|
||||
|
||||
# Kernel dependencies
|
||||
, kernel ? null, spl ? null, splUnstable ? null
|
||||
, kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -19,6 +19,7 @@ let
|
||||
, spl
|
||||
, rev ? "zfs-${version}"
|
||||
, isUnstable ? false
|
||||
, isLegacyCrypto ? false
|
||||
, incompatibleKernelVersion ? null } @ args:
|
||||
if buildKernel &&
|
||||
(incompatibleKernelVersion != null) &&
|
||||
@ -43,7 +44,7 @@ let
|
||||
buildInputs =
|
||||
optionals buildKernel [ spl ]
|
||||
++ optionals buildUser [ zlib libuuid python attr ]
|
||||
++ optionals (buildUser && isUnstable) [ openssl ];
|
||||
++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ];
|
||||
|
||||
# for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
|
||||
NIX_CFLAGS_LINK = "-lgcc_s";
|
||||
@ -141,9 +142,9 @@ in {
|
||||
incompatibleKernelVersion = null;
|
||||
|
||||
# this package should point to the latest release.
|
||||
version = "0.7.5";
|
||||
version = "0.7.6";
|
||||
|
||||
sha256 = "086g4xjx05sy4fwn5709sm46m2yv35wb915xfmqjvpry46245nig";
|
||||
sha256 = "1k3a69zfdk4ia4z2l69lbz0mj26bwdanxd2wynkdpm2kl3zjj18h";
|
||||
|
||||
extraPatches = [
|
||||
(fetchpatch {
|
||||
@ -160,19 +161,41 @@ in {
|
||||
incompatibleKernelVersion = null;
|
||||
|
||||
# this package should point to a version / git revision compatible with the latest kernel release
|
||||
version = "2018-01-10";
|
||||
version = "2018-02-02";
|
||||
|
||||
rev = "1d53657bf561564162e2ad6449f80fa0140f1dd6";
|
||||
sha256 = "0ibkhfz06cypgl2c869dzdbdx2i3m8ywwdmnzscv0cin5gm31vhx";
|
||||
rev = "fbd42542686af053f0d162ec4630ffd4fff1cc30";
|
||||
sha256 = "0qzkwnnk7kz1hwvcaqlpzi5yspfhhmd2alklc07k056ddzbx52qb";
|
||||
isUnstable = true;
|
||||
|
||||
extraPatches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Mic92/zfs/compare/ded8f06a3cfee...nixos-zfs-2017-09-12.patch";
|
||||
sha256 = "033wf4jn0h0kp0h47ai98rywnkv5jwvf3xwym30phnaf8xxdx8aj";
|
||||
url = "https://github.com/Mic92/zfs/compare/fbd42542686af053f0d162ec4630ffd4fff1cc30...nixos-zfs-2018-02-02.patch";
|
||||
sha256 = "05wqwjm9648x60vkwxbp8l6z1q73r2a5l2ni28i2f4pla8s3ahln";
|
||||
})
|
||||
];
|
||||
|
||||
spl = splUnstable;
|
||||
};
|
||||
|
||||
zfsLegacyCrypto = common {
|
||||
# comment/uncomment if breaking kernel versions are known
|
||||
incompatibleKernelVersion = null;
|
||||
|
||||
# this package should point to a version / git revision compatible with the latest kernel release
|
||||
version = "2018-02-01";
|
||||
|
||||
rev = "4c46b99d24a6e71b3c72462c11cb051d0930ad60";
|
||||
sha256 = "011lcp2x44jgfzqqk2gjmyii1v7rxcprggv20prxa3c552drsx3c";
|
||||
isUnstable = true;
|
||||
|
||||
extraPatches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Mic92/zfs/compare/4c46b99d24a6e71b3c72462c11cb051d0930ad60...nixos-zfs-2018-02-01.patch";
|
||||
sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch";
|
||||
})
|
||||
];
|
||||
|
||||
spl = splLegacyCrypto;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -2,17 +2,21 @@
|
||||
, expat, libxml2, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "squid-4.0.21";
|
||||
name = "squid-4.0.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
|
||||
sha256 = "0cwfj3qpl72k5l1h2rvkv1xg0720rifk4wcvi49z216hznyqwk8m";
|
||||
sha256 = "0a8g0zs3xayfkxl8maq823b14lckvh9d5lf7ryh9rx303xh1mdqq";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
perl openldap db cyrus_sasl expat libxml2 openssl
|
||||
] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace configure --replace "/usr/local/include/libxml2" "${libxml2.dev}/include/libxml2"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--enable-ipv6"
|
||||
"--disable-strict-error-checking"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
|
||||
{ stdenv, fetchurl, fetchpatch, perl, openldap, pam, db, cyrus_sasl, libcap
|
||||
, expat, libxml2, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -13,6 +13,19 @@ stdenv.mkDerivation rec {
|
||||
perl openldap db cyrus_sasl expat libxml2 openssl
|
||||
] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2018-1000024.patch";
|
||||
url = http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_1.patch;
|
||||
sha256 = "0vzxr4rmybz0w4c1hi3szvqawbzl4r4b8wyvq9vgq1mzkk5invpg";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2018-1000027.patch";
|
||||
url = http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_2.patch;
|
||||
sha256 = "1a8hwk9z7h1j0c57anfzp3bwjd4pjbyh8aks4ca79nwz4d0y6wf3";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-ipv6"
|
||||
"--disable-strict-error-checking"
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
{ stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2017-12-14";
|
||||
version = "2018-01-22";
|
||||
name = "oh-my-zsh-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/robbyrussell/oh-my-zsh";
|
||||
rev = "c3b072eace1ce19a48e36c2ead5932ae2d2e06d9";
|
||||
sha256 = "14nmql4527l4qs4rxb5gczb8cklz8s682ly0l0nmqh36cmvaqx8y";
|
||||
rev = "37c2d0ddd751e15d0c87a51e2d9f9849093571dc";
|
||||
sha256 = "0x2r7205ps5v5bl1f9vdnry9gxflypaahz49cnhq5f5klb49bakn";
|
||||
};
|
||||
|
||||
pathsToLink = [ "/share/oh-my-zsh" ];
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
|
||||
, acl, librsync, ncurses, openssl, zlib, uthash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "burp-${version}";
|
||||
version = "2.0.54";
|
||||
version = "2.1.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grke";
|
||||
repo = "burp";
|
||||
rev = version;
|
||||
sha256 = "1z1w013hqxbfjgri0fan2570qwhgwvm4k4ghajbzqg8kly4fgk5x";
|
||||
sha256 = "1i8j15pmnn9cn6cd4dnp28qbisq8cl9l4y3chsmil4xqljr9fi5x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ librsync ncurses openssl zlib uthash ]
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin) acl;
|
||||
|
||||
|
||||
27
pkgs/tools/backup/diskrsync/default.nix
Normal file
27
pkgs/tools/backup/diskrsync/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ buildGoPackage, fetchFromGitHub, stdenv }:
|
||||
|
||||
buildGoPackage rec {
|
||||
|
||||
name = "${pname}-${version}";
|
||||
pname = "diskrsync";
|
||||
version = "unstable-2018-02-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dop251";
|
||||
repo = pname;
|
||||
rev = "2f36bd6e5084ce16c12a2ee216ebb2939a7d5730";
|
||||
sha256 = "1rpfk7ds4lpff30aq4d8rw7g9j4bl2hd1bvcwd1pfxalp222zkxn";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/dop251/diskrsync";
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Rsync for block devices and disk images";
|
||||
homepage = https://github.com/dop251/diskrsync;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
};
|
||||
|
||||
}
|
||||
21
pkgs/tools/backup/diskrsync/deps.nix
Normal file
21
pkgs/tools/backup/diskrsync/deps.nix
Normal file
@ -0,0 +1,21 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/dop251/spgz";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/dop251/spgz";
|
||||
rev = "d50e5e978e08044da0cf9babc6b42b55ec8fe0d5";
|
||||
sha256 = "11h8z6cwxw272rn5zc4y3w9d6py113iaimy681v6xxv26d30m8bx";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "1875d0a70c90e57f11972aefd42276df65e895b9";
|
||||
sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q";
|
||||
};
|
||||
}
|
||||
]
|
||||
53
pkgs/tools/security/nmap/qt.nix
Normal file
53
pkgs/tools/security/nmap/qt.nix
Normal file
@ -0,0 +1,53 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper
|
||||
, dnsutils, nmap
|
||||
, qtbase, qtscript, qtwebkit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nmapsi4-${version}";
|
||||
version = "0.5-alpha1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/nmapsi/${name}.tar.xz";
|
||||
sha256 = "18v9a3l2nmij3gb4flscigxr5c44nphkjfmk07qpyy73fy61mzrs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
|
||||
|
||||
buildInputs = [ qtbase qtscript qtwebkit ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
for f in \
|
||||
src/platform/digmanager.cpp \
|
||||
src/platform/discover.cpp \
|
||||
src/platform/monitor/monitor.cpp \
|
||||
src/platform/nsemanager.cpp ; do
|
||||
|
||||
substituteInPlace $f \
|
||||
--replace '"dig"' '"${dnsutils}/bin/dig"'\
|
||||
--replace '"nmap"' '"${nmap}/bin/nmap"' \
|
||||
--replace '"nping"' '"${nmap}/bin/nping"'
|
||||
done
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mv $out/share/applications/kde4/*.desktop $out/share/applications
|
||||
rmdir $out/share/applications/kde4
|
||||
|
||||
for f in $out/share/applications/* ; do
|
||||
substituteInPlace $f \
|
||||
--replace Qt4 Qt5 \
|
||||
--replace Exec=nmapsi4 Exec=$out/bin/nmapsi4 \
|
||||
--replace "Exec=kdesu nmapsi4" "Exec=kdesu $out/bin/nmapsi4"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Qt frontend for nmap";
|
||||
homepage = https://www.nmapsi4.org/;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
@ -34,16 +34,6 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.5.0";
|
||||
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
sha256 = "07yx1gxj9v1iyyiy5fhq2wsmh4qfbrx158wi7jb0nx6lah80ffma";
|
||||
};
|
||||
});
|
||||
|
||||
requests = super.requests.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.9.1";
|
||||
|
||||
@ -77,11 +67,11 @@ let
|
||||
in with localPython.pkgs; buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "awsebcli";
|
||||
version = "3.12.1";
|
||||
version = "3.12.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "12v3zz69iql4ggiz9x7h27vyq9y9jlm46yczxyg62j89m2iyr5bl";
|
||||
sha256 = "19sgx43fyq35rqp0q8zbqavgg0k0n46iy1fqsxvw9lf0g0v62pjh";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -1811,6 +1811,8 @@ with pkgs;
|
||||
|
||||
dev86 = callPackage ../development/compilers/dev86 { };
|
||||
|
||||
diskrsync = callPackage ../tools/backup/diskrsync { };
|
||||
|
||||
djbdns = callPackage ../tools/networking/djbdns { };
|
||||
|
||||
dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { };
|
||||
@ -3773,6 +3775,8 @@ with pkgs;
|
||||
graphicalSupport = true;
|
||||
};
|
||||
|
||||
nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };
|
||||
|
||||
nnn = callPackage ../applications/misc/nnn { };
|
||||
|
||||
notary = callPackage ../tools/security/notary { };
|
||||
@ -13116,7 +13120,7 @@ with pkgs;
|
||||
sch_cake = callPackage ../os-specific/linux/sch_cake { };
|
||||
|
||||
inherit (callPackage ../os-specific/linux/spl {})
|
||||
splStable splUnstable;
|
||||
splStable splUnstable splLegacyCrypto;
|
||||
|
||||
spl = splStable;
|
||||
|
||||
@ -13147,7 +13151,7 @@ with pkgs;
|
||||
inherit (callPackage ../os-specific/linux/zfs {
|
||||
configFile = "kernel";
|
||||
inherit kernel spl;
|
||||
}) zfsStable zfsUnstable;
|
||||
}) zfsStable zfsUnstable zfsLegacyCrypto;
|
||||
|
||||
zfs = zfsStable;
|
||||
});
|
||||
@ -13653,7 +13657,7 @@ with pkgs;
|
||||
|
||||
inherit (callPackage ../os-specific/linux/zfs {
|
||||
configFile = "user";
|
||||
}) zfsStable zfsUnstable;
|
||||
}) zfsStable zfsUnstable zfsLegacyCrypto;
|
||||
|
||||
zfs = zfsStable;
|
||||
|
||||
|
||||
@ -44,6 +44,8 @@ in
|
||||
};
|
||||
|
||||
libobjc = apple-source-releases.objc4;
|
||||
|
||||
lsusb = callPackage ../os-specific/darwin/lsusb { };
|
||||
|
||||
opencflite = callPackage ../os-specific/darwin/opencflite { };
|
||||
|
||||
|
||||
@ -203,6 +203,8 @@ in {
|
||||
|
||||
bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};
|
||||
|
||||
dendropy = callPackage ../development/python-modules/dendropy { };
|
||||
|
||||
dbf = callPackage ../development/python-modules/dbf { };
|
||||
|
||||
dbfread = callPackage ../development/python-modules/dbfread { };
|
||||
@ -13181,6 +13183,8 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
pysam = callPackage ../development/python-modules/pysam { };
|
||||
|
||||
pysaml2 = buildPythonPackage rec {
|
||||
name = "pysaml2-${version}";
|
||||
version = "3.0.2";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user