Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-02-17 06:14:55 +00:00 committed by GitHub
commit cd9df16806
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
94 changed files with 777 additions and 649 deletions

View file

@ -1,12 +1,39 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib;
let let
cfg = config.hardware.bluetooth; cfg = config.hardware.bluetooth;
bluez-bluetooth = cfg.package; package = cfg.package;
in { inherit (lib)
mkDefault mkEnableOption mkIf mkOption
mkRenamedOptionModule mkRemovedOptionModule
concatStringsSep escapeShellArgs
optional optionals optionalAttrs recursiveUpdate types;
cfgFmt = pkgs.formats.ini { };
# bluez will complain if some of the sections are not found, so just make them
# empty (but present in the file) for now
defaults = {
General.ControllerMode = "dual";
Controller = { };
GATT = { };
Policy.AutoEnable = cfg.powerOnBoot;
};
hasDisabledPlugins = builtins.length cfg.disabledPlugins > 0;
in
{
imports = [
(mkRenamedOptionModule [ "hardware" "bluetooth" "config" ] [ "hardware" "bluetooth" "settings" ])
(mkRemovedOptionModule [ "hardware" "bluetooth" "extraConfig" ] ''
Use hardware.bluetooth.settings instead.
This is part of the general move to use structured settings instead of raw
text for config as introduced by RFC0042:
https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md
'')
];
###### interface ###### interface
@ -18,7 +45,7 @@ in {
hsphfpd.enable = mkEnableOption "support for hsphfpd[-prototype] implementation"; hsphfpd.enable = mkEnableOption "support for hsphfpd[-prototype] implementation";
powerOnBoot = mkOption { powerOnBoot = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
description = "Whether to power up the default Bluetooth controller on boot."; description = "Whether to power up the default Bluetooth controller on boot.";
}; };
@ -38,8 +65,15 @@ in {
''; '';
}; };
config = mkOption { disabledPlugins = mkOption {
type = with types; attrsOf (attrsOf (oneOf [ bool int str ])); type = types.listOf types.str;
default = [ ];
description = "Built-in plugins to disable";
};
settings = mkOption {
type = cfgFmt.type;
default = { };
example = { example = {
General = { General = {
ControllerMode = "bredr"; ControllerMode = "bredr";
@ -47,79 +81,65 @@ in {
}; };
description = "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; description = "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf).";
}; };
extraConfig = mkOption {
type = with types; nullOr lines;
default = null;
example = ''
[General]
ControllerMode = bredr
'';
description = ''
Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf).
'';
};
}; };
}; };
###### implementation ###### implementation
config = mkIf cfg.enable { config = mkIf cfg.enable {
warnings = optional (cfg.extraConfig != null) "hardware.bluetooth.`extraConfig` is deprecated, please use hardware.bluetooth.`config`."; environment.systemPackages = [ package ]
++ optional cfg.hsphfpd.enable pkgs.hsphfpd;
hardware.bluetooth.config = { environment.etc."bluetooth/main.conf".source =
Policy = { cfgFmt.generate "main.conf" (recursiveUpdate defaults cfg.settings);
AutoEnable = mkDefault cfg.powerOnBoot; services.udev.packages = [ package ];
}; services.dbus.packages = [ package ]
}; ++ optional cfg.hsphfpd.enable pkgs.hsphfpd;
systemd.packages = [ package ];
environment.systemPackages = [ bluez-bluetooth ]
++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ];
environment.etc."bluetooth/main.conf"= {
source = pkgs.writeText "main.conf"
(generators.toINI { } cfg.config + optionalString (cfg.extraConfig != null) cfg.extraConfig);
};
services.udev.packages = [ bluez-bluetooth ];
services.dbus.packages = [ bluez-bluetooth ]
++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ];
systemd.packages = [ bluez-bluetooth ];
systemd.services = { systemd.services = {
bluetooth = { bluetooth =
wantedBy = [ "bluetooth.target" ]; let
aliases = [ "dbus-org.bluez.service" ]; # `man bluetoothd` will refer to main.conf in the nix store but bluez
# restarting can leave people without a mouse/keyboard # will in fact load the configuration file at /etc/bluetooth/main.conf
unitConfig.X-RestartIfChanged = false; # so force it here to avoid any ambiguity and things suddenly breaking
}; # if/when the bluez derivation is changed.
} args = [ "-f /etc/bluetooth/main.conf" ]
// (optionalAttrs cfg.hsphfpd.enable { ++ optional hasDisabledPlugins
hsphfpd = { "--noplugin=${concatStringsSep "," cfg.disabledPlugins}";
after = [ "bluetooth.service" ]; in
requires = [ "bluetooth.service" ]; {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "bluetooth.target" ];
aliases = [ "dbus-org.bluez.service" ];
description = "A prototype implementation used for connecting HSP/HFP Bluetooth devices"; serviceConfig.ExecStart = [
serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/hsphfpd.pl"; ""
"${package}/libexec/bluetooth/bluetoothd ${escapeShellArgs args}"
];
# restarting can leave people without a mouse/keyboard
unitConfig.X-RestartIfChanged = false;
}; };
}) }
; // (optionalAttrs cfg.hsphfpd.enable {
hsphfpd = {
after = [ "bluetooth.service" ];
requires = [ "bluetooth.service" ];
wantedBy = [ "bluetooth.target" ];
description = "A prototype implementation used for connecting HSP/HFP Bluetooth devices";
serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/hsphfpd.pl";
};
});
systemd.user.services = { systemd.user.services = {
obex.aliases = [ "dbus-org.bluez.obex.service" ]; obex.aliases = [ "dbus-org.bluez.obex.service" ];
} }
// (optionalAttrs cfg.hsphfpd.enable { // optionalAttrs cfg.hsphfpd.enable {
telephony_client = { telephony_client = {
wantedBy = [ "default.target"]; wantedBy = [ "default.target" ];
description = "telephony_client for hsphfpd";
serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl";
};
})
;
description = "telephony_client for hsphfpd";
serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl";
};
};
}; };
} }

View file

@ -0,0 +1,36 @@
{ lib, fetchFromGitHub, rustPlatform
, pkg-config, wrapGAppsHook
}:
rustPlatform.buildRustPackage rec {
pname = "muso";
version = "2.0.0";
src = fetchFromGitHub {
owner = "quebin31";
repo = pname;
rev = "68cc90869bcc0f202830a318fbfd6bb9bdb75a39";
sha256 = "1dnfslliss173igympl7h1zc0qz0g10kf96dwrcj6aglmvvw426p";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
preConfigure = ''
substituteInPlace lib/utils.rs \
--replace "/usr/share/muso" "$out/share/muso"
'';
postInstall = ''
mkdir -p $out/share/muso
cp share/* $out/share/muso/
'';
cargoSha256 = "06jgk54r3f8gq6iylv5rgsawss3hc5kmvk02y4gl8iwfnw4xrvmg";
meta = with lib; {
description = "An automatic music sorter (based on ID3 tags)";
homepage = "https://github.com/quebin31/muso";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ bloomvdomino ];
};
}

View file

@ -15,13 +15,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "btcpayserver"; pname = "btcpayserver";
version = "1.0.5.9"; version = "1.0.6.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "011pp94i49fx587ng16m6ml63vwiysjvpkijihrk6xamz78zddgx"; sha256 = "1znmix9w7ahzyb933lxzqv6j8j5qycknq3gmnkakj749ksshql1b";
}; };
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];

View file

@ -1,8 +1,13 @@
{ fetchNuGet }: [ { fetchNuGet }: [
(fetchNuGet {
name = "AngleSharp.Css";
version = "0.14.2";
sha256 = "1d34a8ab5dri4wlw07jvk7b1z0d0zizwihwpdfva3sxhb4279ahd";
})
(fetchNuGet { (fetchNuGet {
name = "AngleSharp"; name = "AngleSharp";
version = "0.9.11"; version = "0.14.0";
sha256 = "17vf1bizskkxr8pf547lk2b48m12wv3si83gxk145i73bf9gi64a"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6";
}) })
(fetchNuGet { (fetchNuGet {
name = "AWSSDK.Core"; name = "AWSSDK.Core";
@ -136,8 +141,18 @@
}) })
(fetchNuGet { (fetchNuGet {
name = "HtmlSanitizer"; name = "HtmlSanitizer";
version = "4.0.217"; version = "5.0.372";
sha256 = "0szay9mf5mmrp1hx0yc175aaalv76qg0j515lfs133j1d95lj26d"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r";
})
(fetchNuGet {
name = "McMaster.NETCore.Plugins.Mvc";
version = "1.3.1";
sha256 = "1dh58ijwn6q6id0jpzr4hpfl0y4ak43zq4m8rsi5j2qv8vasq1mi";
})
(fetchNuGet {
name = "McMaster.NETCore.Plugins";
version = "1.3.1";
sha256 = "0jrp7sshnvg7jcb52gfhwmg1jy31k9dxdf4061yggwcgpfskyg7n";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.AspNet.SignalR.Client"; name = "Microsoft.AspNet.SignalR.Client";
@ -209,11 +224,6 @@
version = "3.1.1"; version = "3.1.1";
sha256 = "0arqmy04dd0r4wm2fin66gxxwj2kirbgxyf3w7kq6f73lrnazhq0"; sha256 = "0arqmy04dd0r4wm2fin66gxxwj2kirbgxyf3w7kq6f73lrnazhq0";
}) })
(fetchNuGet {
name = "Microsoft.Bcl.AsyncInterfaces";
version = "1.1.0";
sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Bcl.AsyncInterfaces"; name = "Microsoft.Bcl.AsyncInterfaces";
version = "1.1.1"; version = "1.1.1";
@ -294,26 +304,21 @@
version = "2.0.4"; version = "2.0.4";
sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j";
}) })
(fetchNuGet {
name = "Microsoft.DotNet.PlatformAbstractions";
version = "3.1.0";
sha256 = "1fg1zggza45pa8zlcf8llqh6v47fqi44azsia68kmsg2q9r1r4mq";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.DotNet.PlatformAbstractions"; name = "Microsoft.DotNet.PlatformAbstractions";
version = "3.1.4"; version = "3.1.4";
sha256 = "1s5h96zdc3vh1v03gizmqfw5hmksajw10bdrj79pm8brbyzipxia"; sha256 = "1s5h96zdc3vh1v03gizmqfw5hmksajw10bdrj79pm8brbyzipxia";
}) })
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Abstractions";
version = "3.1.0";
sha256 = "1bd6hilnwp47z3l14qspdxi5f5nhv6rivarc6w8wil425bq0h3pd";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Abstractions"; name = "Microsoft.EntityFrameworkCore.Abstractions";
version = "3.1.4"; version = "3.1.4";
sha256 = "07l7137pzwh0k4m53ji5j6a2zmbbzrl164p18wxcri77ds5is4g7"; sha256 = "07l7137pzwh0k4m53ji5j6a2zmbbzrl164p18wxcri77ds5is4g7";
}) })
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Analyzers";
version = "3.1.0";
sha256 = "1pjn4wwhxgsiap7byld114kx6m0nm6696r8drspqic7lskm4y305";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Analyzers"; name = "Microsoft.EntityFrameworkCore.Analyzers";
version = "3.1.4"; version = "3.1.4";
@ -344,31 +349,16 @@
version = "3.1.4"; version = "3.1.4";
sha256 = "009mcmakw0p7k8xrz920a8qc0rjv361awiz8jia5i5a8p5ihgkbx"; sha256 = "009mcmakw0p7k8xrz920a8qc0rjv361awiz8jia5i5a8p5ihgkbx";
}) })
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore";
version = "3.1.0";
sha256 = "1l12lsk1xfrv5pjnm0b9w9kncgdh0pcjcbxl4zrsg82s7bs7dhda";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.EntityFrameworkCore"; name = "Microsoft.EntityFrameworkCore";
version = "3.1.4"; version = "3.1.4";
sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742"; sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.Caching.Abstractions";
version = "3.1.0";
sha256 = "0j5m2a48rwyzzvbz0hpr2md35iv78b86zyqjnrjq0y4vb7sairc0";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.Caching.Abstractions"; name = "Microsoft.Extensions.Caching.Abstractions";
version = "3.1.4"; version = "3.1.4";
sha256 = "09f96pvpyzylpdaiw3lsvr7p6rs4i21mmhsxl6pkivg5lpfb79sk"; sha256 = "09f96pvpyzylpdaiw3lsvr7p6rs4i21mmhsxl6pkivg5lpfb79sk";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.Caching.Memory";
version = "3.1.0";
sha256 = "1hi61647apn25kqjcb37nqafp8fikymdrk43j3kxjbwwwx507jy1";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.Caching.Memory"; name = "Microsoft.Extensions.Caching.Memory";
version = "3.1.4"; version = "3.1.4";
@ -389,11 +379,6 @@
version = "2.1.0"; version = "2.1.0";
sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.Configuration.Abstractions";
version = "3.1.0";
sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.Configuration.Abstractions"; name = "Microsoft.Extensions.Configuration.Abstractions";
version = "3.1.4"; version = "3.1.4";
@ -404,11 +389,6 @@
version = "2.0.0"; version = "2.0.0";
sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.Configuration.Binder";
version = "3.1.0";
sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.Configuration.Binder"; name = "Microsoft.Extensions.Configuration.Binder";
version = "3.1.4"; version = "3.1.4";
@ -439,11 +419,6 @@
version = "2.1.0"; version = "2.1.0";
sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.Configuration";
version = "3.1.0";
sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.Configuration"; name = "Microsoft.Extensions.Configuration";
version = "3.1.4"; version = "3.1.4";
@ -459,11 +434,6 @@
version = "2.1.0"; version = "2.1.0";
sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection.Abstractions";
version = "3.1.0";
sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection.Abstractions"; name = "Microsoft.Extensions.DependencyInjection.Abstractions";
version = "3.1.4"; version = "3.1.4";
@ -474,11 +444,6 @@
version = "2.0.0"; version = "2.0.0";
sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection";
version = "3.1.0";
sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection"; name = "Microsoft.Extensions.DependencyInjection";
version = "3.1.4"; version = "3.1.4";
@ -489,6 +454,11 @@
version = "2.0.4"; version = "2.0.4";
sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.DependencyModel";
version = "3.1.0";
sha256 = "12nrdw3q9wl5zry8gb3sw003a0iyk2gvps2ij813l7lim38wy1mi";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.DependencyModel"; name = "Microsoft.Extensions.DependencyModel";
version = "3.1.1"; version = "3.1.1";
@ -559,11 +529,6 @@
version = "2.1.0"; version = "2.1.0";
sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.Logging.Abstractions";
version = "3.1.0";
sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.Logging.Abstractions"; name = "Microsoft.Extensions.Logging.Abstractions";
version = "3.1.4"; version = "3.1.4";
@ -579,11 +544,6 @@
version = "2.0.0"; version = "2.0.0";
sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.Logging";
version = "3.1.0";
sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.Logging"; name = "Microsoft.Extensions.Logging";
version = "3.1.4"; version = "3.1.4";
@ -599,11 +559,6 @@
version = "2.0.0"; version = "2.0.0";
sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.Options";
version = "3.1.0";
sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.Options"; name = "Microsoft.Extensions.Options";
version = "3.1.4"; version = "3.1.4";
@ -629,11 +584,6 @@
version = "2.1.0"; version = "2.1.0";
sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb";
}) })
(fetchNuGet {
name = "Microsoft.Extensions.Primitives";
version = "3.1.0";
sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.Primitives"; name = "Microsoft.Extensions.Primitives";
version = "3.1.4"; version = "3.1.4";
@ -669,6 +619,11 @@
version = "2.1.2"; version = "2.1.2";
sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141";
}) })
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
version = "3.1.0";
sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.NETCore.Targets"; name = "Microsoft.NETCore.Targets";
version = "1.0.1"; version = "1.0.1";
@ -699,6 +654,11 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq";
}) })
(fetchNuGet {
name = "Microsoft.Win32.SystemEvents";
version = "4.7.0";
sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q";
})
(fetchNuGet { (fetchNuGet {
name = "MySqlConnector"; name = "MySqlConnector";
version = "0.61.0"; version = "0.61.0";
@ -729,6 +689,11 @@
version = "5.0.60"; version = "5.0.60";
sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v";
}) })
(fetchNuGet {
name = "NBitcoin";
version = "5.0.68";
sha256 = "0k275mbp9wannm10pqj4nv8agjc1f6hsrfhl0m6ax1apv81sfxcd";
})
(fetchNuGet { (fetchNuGet {
name = "NBitpayClient"; name = "NBitpayClient";
version = "1.0.0.39"; version = "1.0.0.39";
@ -849,6 +814,11 @@
version = "1.8.1.3"; version = "1.8.1.3";
sha256 = "1lv1ljaz8df835jgmp3ny1xgqqjf1s9f25baw7bf8d24qlf25i2g"; sha256 = "1lv1ljaz8df835jgmp3ny1xgqqjf1s9f25baw7bf8d24qlf25i2g";
}) })
(fetchNuGet {
name = "QRCoder";
version = "1.4.1";
sha256 = "1xgwhpqrm4ycnj8nk4ibxfwkmkiwc5i15l1za3ci5alghlpcb6ch";
})
(fetchNuGet { (fetchNuGet {
name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0"; version = "4.3.0";
@ -869,11 +839,6 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d";
}) })
(fetchNuGet {
name = "runtime.native.System.Net.Http";
version = "4.0.1";
sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6";
})
(fetchNuGet { (fetchNuGet {
name = "runtime.native.System.Net.Http"; name = "runtime.native.System.Net.Http";
version = "4.3.0"; version = "4.3.0";
@ -949,10 +914,15 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5";
}) })
(fetchNuGet {
name = "Selenium.Support";
version = "3.141.0";
sha256 = "1gqwzbfq7i9jz830b0jibsis0qfxs8sl10n1nja02c6s637cwzib";
})
(fetchNuGet { (fetchNuGet {
name = "Selenium.WebDriver.ChromeDriver"; name = "Selenium.WebDriver.ChromeDriver";
version = "85.0.4183.8700"; version = "87.0.4280.8800";
sha256 = "0klyqmwa6yc0ibbmci51mzb2vl6n13qlk06chc9w78i0a43fs382"; sha256 = "1zrizydlhjv81r1fa5g8wzxrx1cxly3ip7pargj48hdx419iblfr";
}) })
(fetchNuGet { (fetchNuGet {
name = "Selenium.WebDriver"; name = "Selenium.WebDriver";
@ -1064,11 +1034,6 @@
version = "1.5.0"; version = "1.5.0";
sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06";
}) })
(fetchNuGet {
name = "System.Collections.Immutable";
version = "1.7.0";
sha256 = "1gik4sn9jsi1wcy1pyyp0r4sn2g17cwrsh24b2d52vif8p2h24zx";
})
(fetchNuGet { (fetchNuGet {
name = "System.Collections.Immutable"; name = "System.Collections.Immutable";
version = "1.7.1"; version = "1.7.1";
@ -1134,21 +1099,11 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y";
}) })
(fetchNuGet {
name = "System.Diagnostics.DiagnosticSource";
version = "4.0.0";
sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m";
})
(fetchNuGet { (fetchNuGet {
name = "System.Diagnostics.DiagnosticSource"; name = "System.Diagnostics.DiagnosticSource";
version = "4.3.0"; version = "4.3.0";
sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq";
}) })
(fetchNuGet {
name = "System.Diagnostics.DiagnosticSource";
version = "4.7.0";
sha256 = "0cr0v5dz8l5ackxv6b772fjcyj2nimqmrmzanjs4cw2668v568n1";
})
(fetchNuGet { (fetchNuGet {
name = "System.Diagnostics.DiagnosticSource"; name = "System.Diagnostics.DiagnosticSource";
version = "4.7.1"; version = "4.7.1";
@ -1179,6 +1134,11 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4";
}) })
(fetchNuGet {
name = "System.Drawing.Common";
version = "4.7.0";
sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg";
})
(fetchNuGet { (fetchNuGet {
name = "System.Dynamic.Runtime"; name = "System.Dynamic.Runtime";
version = "4.0.11"; version = "4.0.11";
@ -1189,21 +1149,11 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
}) })
(fetchNuGet {
name = "System.Globalization.Calendars";
version = "4.0.1";
sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh";
})
(fetchNuGet { (fetchNuGet {
name = "System.Globalization.Calendars"; name = "System.Globalization.Calendars";
version = "4.3.0"; version = "4.3.0";
sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq";
}) })
(fetchNuGet {
name = "System.Globalization.Extensions";
version = "4.0.1";
sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc";
})
(fetchNuGet { (fetchNuGet {
name = "System.Globalization.Extensions"; name = "System.Globalization.Extensions";
version = "4.3.0"; version = "4.3.0";
@ -1299,11 +1249,6 @@
version = "4.5.3"; version = "4.5.3";
sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a";
}) })
(fetchNuGet {
name = "System.Net.Http";
version = "4.1.0";
sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb";
})
(fetchNuGet { (fetchNuGet {
name = "System.Net.Http"; name = "System.Net.Http";
version = "4.3.0"; version = "4.3.0";
@ -1329,11 +1274,6 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii";
}) })
(fetchNuGet {
name = "System.Net.Requests";
version = "4.0.11";
sha256 = "13mka55sa6dg6nw4zdrih44gnp8hnj5azynz47ljsh2791lz3d9h";
})
(fetchNuGet { (fetchNuGet {
name = "System.Net.Security"; name = "System.Net.Security";
version = "4.3.0"; version = "4.3.0";
@ -1349,11 +1289,6 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla";
}) })
(fetchNuGet {
name = "System.Net.WebHeaderCollection";
version = "4.0.1";
sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q";
})
(fetchNuGet { (fetchNuGet {
name = "System.Net.WebHeaderCollection"; name = "System.Net.WebHeaderCollection";
version = "4.3.0"; version = "4.3.0";
@ -1594,21 +1529,11 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml";
}) })
(fetchNuGet {
name = "System.Security.Cryptography.Cng";
version = "4.2.0";
sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc";
})
(fetchNuGet { (fetchNuGet {
name = "System.Security.Cryptography.Cng"; name = "System.Security.Cryptography.Cng";
version = "4.3.0"; version = "4.3.0";
sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv";
}) })
(fetchNuGet {
name = "System.Security.Cryptography.Csp";
version = "4.0.0";
sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q";
})
(fetchNuGet { (fetchNuGet {
name = "System.Security.Cryptography.Csp"; name = "System.Security.Cryptography.Csp";
version = "4.3.0"; version = "4.3.0";
@ -1624,11 +1549,6 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32";
}) })
(fetchNuGet {
name = "System.Security.Cryptography.OpenSsl";
version = "4.0.0";
sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q";
})
(fetchNuGet { (fetchNuGet {
name = "System.Security.Cryptography.OpenSsl"; name = "System.Security.Cryptography.OpenSsl";
version = "4.3.0"; version = "4.3.0";
@ -1649,11 +1569,6 @@
version = "4.5.0"; version = "4.5.0";
sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7";
}) })
(fetchNuGet {
name = "System.Security.Cryptography.X509Certificates";
version = "4.1.0";
sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh";
})
(fetchNuGet { (fetchNuGet {
name = "System.Security.Cryptography.X509Certificates"; name = "System.Security.Cryptography.X509Certificates";
version = "4.3.0"; version = "4.3.0";
@ -1689,6 +1604,11 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf";
}) })
(fetchNuGet {
name = "System.Text.Encoding.CodePages";
version = "4.5.0";
sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3";
})
(fetchNuGet { (fetchNuGet {
name = "System.Text.Encoding.CodePages"; name = "System.Text.Encoding.CodePages";
version = "4.5.1"; version = "4.5.1";

View file

@ -15,13 +15,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nbxplorer"; pname = "nbxplorer";
version = "2.1.46"; version = "2.1.49";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dgarage"; owner = "dgarage";
repo = "NBXplorer"; repo = "NBXplorer";
rev = "v${version}"; rev = "v${version}";
sha256 = "1aph7yiwmch7s7x1qkzqv1shs3v6kg8i2s7266la0yp9ksf3w35p"; sha256 = "0xg5gbq6rbzgsbgwf94qcy2b0m5kdspi6hc5a64smaj9i7i0136l";
}; };
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];

View file

@ -181,23 +181,18 @@
}) })
(fetchNuGet { (fetchNuGet {
name = "NBitcoin.Altcoins"; name = "NBitcoin.Altcoins";
version = "2.0.21"; version = "2.0.28";
sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1"; sha256 = "1zfirfmhgigp733km9rqkgz560h5wg88bpba499x49h5j650cnn4";
}) })
(fetchNuGet { (fetchNuGet {
name = "NBitcoin.TestFramework"; name = "NBitcoin.TestFramework";
version = "2.0.12"; version = "2.0.21";
sha256 = "1d6lmymc9x3p74c8hc2x3m61ncnkqqgrddw9cw2m0zkvilkncsns"; sha256 = "1k26fkss6d7x2yqlid31z5i04b5dmlbbbwijg9c8i3d996i1z7sq";
}) })
(fetchNuGet { (fetchNuGet {
name = "NBitcoin"; name = "NBitcoin";
version = "5.0.58"; version = "5.0.73";
sha256 = "0qim9xbbj380254iyi1jsh2gnr90ddwd2593jw9a8bjwnlk7qr2c"; sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1";
})
(fetchNuGet {
name = "NBitcoin";
version = "5.0.60";
sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v";
}) })
(fetchNuGet { (fetchNuGet {
name = "NETStandard.Library"; name = "NETStandard.Library";
@ -221,8 +216,8 @@
}) })
(fetchNuGet { (fetchNuGet {
name = "Newtonsoft.Json"; name = "Newtonsoft.Json";
version = "11.0.1"; version = "11.0.2";
sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2";
}) })
(fetchNuGet { (fetchNuGet {
name = "Newtonsoft.Json"; name = "Newtonsoft.Json";

View file

@ -1,5 +1,6 @@
{ lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which { lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which
, IOKit ? null }: , IOKit, copyDesktopItems, makeDesktopItem, wrapGAppsHook
}:
with lib; with lib;
@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y";
}; };
nativeBuildInputs = [ pkg-config which ]; nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ];
buildInputs = [gettext glib gtk2 libX11 libSM libICE] buildInputs = [gettext glib gtk2 libX11 libSM libICE]
++ optionals stdenv.isDarwin [ IOKit ]; ++ optionals stdenv.isDarwin [ IOKit ];
@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
# Makefiles are patched to fix references to `/usr/X11R6' and to add # Makefiles are patched to fix references to `/usr/X11R6' and to add
# `-lX11' to make sure libX11's store path is in the RPATH. # `-lX11' to make sure libX11's store path is in the RPATH.
patchPhase = '' postPatch = ''
echo "patching makefiles..." echo "patching makefiles..."
for i in Makefile src/Makefile server/Makefile for i in Makefile src/Makefile server/Makefile
do do
@ -30,6 +31,23 @@ stdenv.mkDerivation rec {
makeFlags = [ "STRIP=-s" ]; makeFlags = [ "STRIP=-s" ];
installFlags = [ "DESTDIR=$(out)" ]; installFlags = [ "DESTDIR=$(out)" ];
# This icon is used by the desktop file.
postInstall = ''
install -Dm444 -T src/icon.xpm $out/share/pixmaps/gkrellm.xpm
'';
desktopItems = [
(makeDesktopItem {
name = "gkrellm";
exec = "gkrellm";
icon = "gkrellm";
desktopName = "GKrellM";
genericName = "System monitor";
comment = "The GNU Krell Monitors";
categories = "System;Monitor;";
})
];
meta = { meta = {
description = "Themeable process stack of system monitors"; description = "Themeable process stack of system monitors";
longDescription = '' longDescription = ''
@ -40,7 +58,7 @@ stdenv.mkDerivation rec {
homepage = "http://gkrellm.srcbox.net"; homepage = "http://gkrellm.srcbox.net";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [ ]; maintainers = with maintainers; [ khumba ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "terragrunt"; pname = "terragrunt";
version = "0.28.4"; version = "0.28.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-LilIwg3Zu7Zi7AhJeW0j2qUmSOGy1HHjvvB07FUcEeI="; sha256 = "sha256-LSUWEgCajIBgRPiuvGJ9I3tJLXk1JrVDDsgS7lpbVYk=";
}; };
vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4=";

View file

@ -1,5 +1,4 @@
{ lib, fetchgit, buildPythonPackage { lib, fetchgit, buildPythonPackage
, python
, buildGoModule , buildGoModule
, srht, redis, celery, pyyaml, markdown }: , srht, redis, celery, pyyaml, markdown }:

View file

@ -1,5 +1,4 @@
{ lib, fetchgit, buildPythonPackage { lib, fetchgit, buildPythonPackage
, python
, srht, pyyaml, PyGithub }: , srht, pyyaml, PyGithub }:
buildPythonPackage rec { buildPythonPackage rec {

View file

@ -1,5 +1,4 @@
{ lib, fetchgit, buildPythonPackage { lib, fetchgit, buildPythonPackage
, python
, buildGoModule , buildGoModule
, srht, minio, pygit2, scmsrht }: , srht, minio, pygit2, scmsrht }:

View file

@ -1,5 +1,4 @@
{ lib, fetchhg, buildPythonPackage { lib, fetchhg, buildPythonPackage
, python
, srht, hglib, scmsrht, unidiff }: , srht, hglib, scmsrht, unidiff }:
buildPythonPackage rec { buildPythonPackage rec {

View file

@ -1,5 +1,4 @@
{ lib, fetchgit, buildPythonPackage { lib, fetchgit, buildPythonPackage
, python
, srht }: , srht }:
buildPythonPackage rec { buildPythonPackage rec {

View file

@ -1,5 +1,4 @@
{ lib, fetchgit, buildPythonPackage { lib, fetchgit, buildPythonPackage
, python
, srht, asyncpg, aiosmtpd, pygit2, emailthreads }: , srht, asyncpg, aiosmtpd, pygit2, emailthreads }:
buildPythonPackage rec { buildPythonPackage rec {

View file

@ -1,5 +1,4 @@
{ lib, fetchgit, buildPythonPackage { lib, fetchgit, buildPythonPackage
, python
, srht, pygit2 }: , srht, pygit2 }:
buildPythonPackage rec { buildPythonPackage rec {

View file

@ -1,5 +1,4 @@
{ lib, fetchgit, buildPythonPackage { lib, fetchgit, buildPythonPackage
, python
, buildGoModule , buildGoModule
, pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache
, sshpubkeys, weasyprint }: , sshpubkeys, weasyprint }:

View file

@ -1,5 +1,4 @@
{ lib, fetchgit, buildPythonPackage { lib, fetchgit, buildPythonPackage
, python
, srht, pyyaml }: , srht, pyyaml }:
buildPythonPackage rec { buildPythonPackage rec {

View file

@ -1,7 +1,6 @@
{ lib, fetchgit, buildPythonPackage { lib, fetchgit, buildPythonPackage
, python
, srht, redis, alembic, pystache , srht, redis, alembic, pystache
, pytest, factory_boy, writeText }: , pytest, factory_boy }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "todosrht"; pname = "todosrht";

View file

@ -5,7 +5,7 @@
kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage,
kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils,
solid solid, systemsettings
}: }:
mkDerivation { mkDerivation {
@ -15,6 +15,11 @@ mkDerivation {
buildInputs = [ buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
kdeclarative kdelibs4support ki18n kiconthemes kio kirigami2 kpackage kdeclarative kdelibs4support ki18n kiconthemes kio kirigami2 kpackage
kservice kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid kservice kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid systemsettings
]; ];
preFixup = ''
# fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in the same directory,
# while it is actually located in a completely different store path
ln -sf ${lib.getBin systemsettings}/bin/systemsettings5 $out/bin/kinfocenter
'';
} }

View file

@ -7,45 +7,45 @@ let
javaVersionPlatform = "${javaVersion}-${platform}"; javaVersionPlatform = "${javaVersion}-${platform}";
graalvmXXX-ce = stdenv.mkDerivation rec { graalvmXXX-ce = stdenv.mkDerivation rec {
pname = "graalvm${javaVersion}-ce"; pname = "graalvm${javaVersion}-ce";
version = "20.3.0"; version = "21.0.0";
srcs = [ srcs = [
(fetchurl { (fetchurl {
sha256 = { "8-linux-amd64" = "195b20ivvv8ipjn3qq2313j8qf96ji93pqm99nvn20bq23wasp25"; sha256 = { "8-linux-amd64" = "18q1plrpclp02rlwn3vvv2fcyspvqv2gkzn14f0b59pnladmlv1j";
"11-linux-amd64" = "1mdk1zhazvvh1fa01bzi5v5fxhvx592xmbakx0y1137vykbayyjm"; "11-linux-amd64" = "1g1xjbr693rimdy2cy6jvz4vgnbnw76wa87xcmaszka206fmpnsc";
"8-darwin-amd64" = "1rrs471204p71knyxpjxymdi8ws98ph2kf5j0knk529g0d24rs01"; "8-darwin-amd64" = "0giv8f7ybdykadzmxjy91i6njbdx6dclyx7g6vyhwk2l1cvxi4li";
"11-darwin-amd64" = "008dl8dbf37mv4wahb9hbd6jp8svvmpy1rgsiqkn3i4hypxnkf12"; "11-darwin-amd64" = "1a8gjp6fp11ms05pd62h1x1ifkkr3wv0hrxic670v90bbps9lsqf";
}.${javaVersionPlatform}; }.${javaVersionPlatform};
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersionPlatform}-${version}.tar.gz"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersionPlatform}-${version}.tar.gz";
}) })
(fetchurl { (fetchurl {
sha256 = { "8-linux-amd64" = "1rzbhllz28x5ps8n304v998hykr4m8z1gfg53ybi6laxhkbx3i13"; sha256 = { "8-linux-amd64" = "0hpq2g9hc8b7j4d8a08kq1mnl6pl7a4kwaj0a3gka3d4m6r7cscg";
"11-linux-amd64" = "09ipdl1489xnbckwl6sl9y7zy7kp5qf5fgf3kgz5d69jrk2z6rvf"; "11-linux-amd64" = "0z3hb2bf0lqzw760civ3h1wvx22a75n7baxc0l2i9h5wxas002y7";
"8-darwin-amd64" = "1iy2943jbrarh8bm9wy15xk7prnskqwik2ham07a6ybp4j4b81xi"; "8-darwin-amd64" = "1izbgl4hjg5jyi422xnkx006qnw163r1i1djf76q1plms40y01ph";
"11-darwin-amd64" = "0vk2grlirghzc78kvwg66w0xriy5p8qkcp7qx83i62d7sj0kvwnf"; "11-darwin-amd64" = "1d9z75gil0if74ndla9yw3xx9i2bfbcs32qa0z6wi5if66cmknb8";
}.${javaVersionPlatform}; }.${javaVersionPlatform};
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersionPlatform}-${version}.jar"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersionPlatform}-${version}.jar";
}) })
(fetchurl { (fetchurl {
sha256 = { "8-linux-amd64" = "0v98v44vblhyi3jhrngmvrkb3a6d607x4fpmrb4mrrsg75vbvc6d"; sha256 = { "8-linux-amd64" = "122p8psgmzhqnjb2fy1lwghg0kw5qa8xkzgyjp682lwg4j8brz43";
"11-linux-amd64" = "0kb9472ilwqg40gyw1c4lmzkd9s763raw560sw80ljm3p75k4sc7"; "11-linux-amd64" = "1vdc90m6s013cbhmj58nb4vyxllbxirw0idlgv0iv9cyhx90hzgz";
"8-darwin-amd64" = "192n9ckr4p8qirpxr67ji3wzxpng33yfr7kxynlrcp7b3ghfic6p"; "8-darwin-amd64" = "04q0s9xsaskqn9kbhz0mgdk28j2qnxrzqfmw6jn2znr8s8jsc6yp";
"11-darwin-amd64" = "1wqdk8wphywa00kl3xikiskclb84rx3nw5a4vi5y2n060kclcp22"; "11-darwin-amd64" = "1pw4xd8g5cc9bm52awmm1zxs96ijws43vws7y10wxa6a0nhv7z5f";
}.${javaVersionPlatform}; }.${javaVersionPlatform};
url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersionPlatform}-${version}.jar"; url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersionPlatform}-${version}.jar";
}) })
(fetchurl { (fetchurl {
sha256 = { "8-linux-amd64" = "1iskmkhrrwlhcq92g1ljvsfi9q403xxkwgzn9m282z5llh2fxv74"; sha256 = { "8-linux-amd64" = "19m7n4f5jrmsfvgv903sarkcjh55l0nlnw99lvjlcafw5hqzyb91";
"11-linux-amd64" = "13bg2gs22rzbngnbw8j68jqgcknbiw30kpxac5jjcn55rf2ymvkz"; "11-linux-amd64" = "18ibb7l7b4hmbnvyr8j7mrs11mvlsf2j0c8rdd2s93x2114f26ba";
"8-darwin-amd64" = "08pib13q7s5wymnbykkyif66ll146vznxw4yz12qwhb419882jc7"; "8-darwin-amd64" = "1zlzi00339kvg4ym2j75ypfkzn8zbwdpriqmkaz4fh28qjmc1dwq";
"11-darwin-amd64" = "0cb9lhc21yr2dnrm4kwa68laaczvsdnzpcbl2qix50d0v84xl602"; "11-darwin-amd64" = "0x301i1fimakhi2x29ldr0fsqkb3qs0g9jsmjv27d62dpqx8kgc8";
}.${javaVersionPlatform}; }.${javaVersionPlatform};
url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersionPlatform}-${version}.jar"; url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersionPlatform}-${version}.jar";
}) })
(fetchurl { (fetchurl {
sha256 = { "8-linux-amd64" = "12lvcl1vmc35wh3xw5dqca7yiijsd432x4lim3knzppipy7fmflq"; sha256 = { "8-linux-amd64" = "0dlgbg6kri89r9zbk6n0ch3g8356j1g35bwjng87c2y5y0vcw0b5";
"11-linux-amd64" = "1s8zfgjyyw6w53974h9a2ig8a1bvc97aplyrdziywfrijgp6zkqk"; "11-linux-amd64" = "1yby65hww6zmd2g5pjwbq5pv3iv4gfv060b8fq75fjhwrisyj5gd";
"8-darwin-amd64" = "06i1n42hkhcf1pfb2bly22ws4a09xgydsgh8b0kvjmb1fapd4paq"; "8-darwin-amd64" = "1smdj491g23i3z7p5rybid18nnz8bphrqjkv0lg2ffyrpn8k6g93";
"11-darwin-amd64" = "1r2bqhfxnw09izxlsc562znlp3m9c1isqzhlki083h3vp548vv9s"; "11-darwin-amd64" = "056zyn0lpd7741k1szzjwwacka0g7rn0j4ypfmav4h1245mjg8lx";
}.${javaVersionPlatform}; }.${javaVersionPlatform};
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar";
}) })
@ -146,8 +146,8 @@ let
''; '';
postFixup = '' postFixup = ''
rpath="${ { "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64"; rpath="${ { "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64:$out/jre/languages/ruby/lib/cext";
"11" = "$out/lib/jli:$out/lib/server:$out/lib"; "11" = "$out/lib/jli:$out/lib/server:$out/lib:$out/languages/ruby/lib/cext";
}.${javaVersion} }.${javaVersion}
}:${ }:${
lib.makeLibraryPath [ lib.makeLibraryPath [
@ -204,11 +204,13 @@ let
echo '1 + 1' | $out/bin/graalpython echo '1 + 1' | $out/bin/graalpython
# TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL ${lib.optionalString stdenv.isLinux ''
# headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL
# though `openssl` is in `propagatedBuildInputs`. For more details see: # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even
# https://github.com/NixOS/nixpkgs/pull/105815 # though `openssl` is in `propagatedBuildInputs`. For more details see:
# echo '1 + 1' | $out/bin/irb # https://github.com/NixOS/nixpkgs/pull/105815
echo '1 + 1' | $out/bin/irb
''}
echo '1 + 1' | $out/bin/node -i echo '1 + 1' | $out/bin/node -i
${lib.optionalString (javaVersion == "11") '' ${lib.optionalString (javaVersion == "11") ''

View file

@ -1,6 +1,5 @@
{ lib, stdenv, fetchurl, graalvm11-ce, glibcLocales }: { lib, stdenv, fetchurl, graalvm11-ce, glibcLocales }:
with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "babashka"; pname = "babashka";
version = "0.2.10"; version = "0.2.10";
@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
native-image \ native-image \
-jar ${src} \ -jar ${src} \
-H:Name=bb \ -H:Name=bb \
${optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \ ${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \
-H:+ReportExceptionStackTraces \ -H:+ReportExceptionStackTraces \
-J-Dclojure.spec.skip-macros=true \ -J-Dclojure.spec.skip-macros=true \
-J-Dclojure.compiler.direct-linking=true \ -J-Dclojure.compiler.direct-linking=true \

View file

@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
# Causes build failure due to warning # Causes build failure due to warning
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
# Causes build failure due to warning
# https://github.com/jsoftware/jsource/issues/16
NIX_CFLAGS_COMPILE = "-Wno-error=return-local-addr";
buildPhase = '' buildPhase = ''
export SOURCE_DIR=$(pwd) export SOURCE_DIR=$(pwd)
export HOME=$TMPDIR export HOME=$TMPDIR

View file

@ -38,5 +38,7 @@ stdenv.mkDerivation rec {
homepage = "https://beltoforion.de/en/muparserx/"; homepage = "https://beltoforion.de/en/muparserx/";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ drewrisinger ]; maintainers = with maintainers; [ drewrisinger ];
# selftest fails
broken = stdenv.isDarwin;
}; };
} }

View file

@ -3,7 +3,6 @@
, buildPythonPackage , buildPythonPackage
, pythonOlder , pythonOlder
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, freezegun , freezegun
, google-api-core , google-api-core
, matplotlib , matplotlib

View file

@ -46,11 +46,6 @@ buildPythonPackage rec {
ipython ipython
]; ];
postPatch = ''
substituteInPlace setup.py \
--replace "'numba==0.43'" "'numba'"
'';
# avoid collecting local files # avoid collecting local files
preCheck = '' preCheck = ''
cd clifford/test cd clifford/test

View file

@ -2,7 +2,6 @@
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, rPackages , rPackages
, rWrapper
, buildPythonPackage , buildPythonPackage
, biopython , biopython
, numpy , numpy
@ -55,11 +54,6 @@ buildPythonPackage rec {
rPackages.DNAcopy rPackages.DNAcopy
]; ];
postPatch = ''
substituteInPlace setup.py \
--replace "pandas >= 0.20.1, < 0.25.0" "pandas"
'';
checkInputs = [ R ]; checkInputs = [ R ];
checkPhase = '' checkPhase = ''

View file

@ -2,13 +2,12 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, isPy3k , isPy3k
, pytestrunner
, click , click
, dateparser , dateparser
, pandas , pandas
, py-lru-cache , py-lru-cache
, six , six
, pytest , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -23,11 +22,6 @@ buildPythonPackage rec {
sha256 = "0p99cg76d3s7jxvigh5ad04dzhmr6g62qzzh4i6h7x9aiyvdhvk4"; sha256 = "0p99cg76d3s7jxvigh5ad04dzhmr6g62qzzh4i6h7x9aiyvdhvk4";
}; };
postPatch = ''
substituteInPlace setup.py \
--replace pandas~=0.25.0 pandas
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
click click
dateparser dateparser
@ -37,13 +31,9 @@ buildPythonPackage rec {
]; ];
checkInputs = [ checkInputs = [
pytest pytestCheckHook
]; ];
checkPhase = ''
pytest
'';
meta = with lib; { meta = with lib; {
description = "Convert CSV files into a SQLite database"; description = "Convert CSV files into a SQLite database";
homepage = "https://github.com/simonw/csvs-to-sqlite"; homepage = "https://github.com/simonw/csvs-to-sqlite";

View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch { lib, buildPythonPackage, fetchPypi
, chart-studio , chart-studio
, colorlover , colorlover
, ipython , ipython

View file

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, fetchpatch
, dask , dask
, numpy, toolz # dask[array] , numpy, toolz # dask[array]
, scipy , scipy
@ -38,6 +37,7 @@ buildPythonPackage rec {
checkPhase = '' checkPhase = ''
pytest --ignore=tests/test_dask_image/ pytest --ignore=tests/test_dask_image/
''; '';
pythonImportsCheck = [ "dask_image" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/dask/dask-image"; homepage = "https://github.com/dask/dask-image";

View file

@ -12,10 +12,6 @@
, six , six
, multipledispatch , multipledispatch
, packaging , packaging
, pytest
, xgboost
, tensorflow
, joblib
, distributed , distributed
}: }:

View file

@ -4,8 +4,6 @@
, dask , dask
, distributed , distributed
, mpi4py , mpi4py
, pytest
, requests
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -17,15 +15,11 @@ buildPythonPackage rec {
sha256 = "76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7"; sha256 = "76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7";
}; };
checkInputs = [ pytest requests ];
propagatedBuildInputs = [ dask distributed mpi4py ]; propagatedBuildInputs = [ dask distributed mpi4py ];
checkPhase = ''
py.test dask_mpi
'';
# hardcoded mpirun path in tests # hardcoded mpirun path in tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "dask_mpi" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/dask/dask-mpi"; homepage = "https://github.com/dask/dask-mpi";

View file

@ -4,8 +4,6 @@
, xgboost , xgboost
, dask , dask
, distributed , distributed
, pytest
, scikitlearn
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -17,19 +15,17 @@ buildPythonPackage rec {
sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c"; sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c";
}; };
checkInputs = [ pytest scikitlearn ];
propagatedBuildInputs = [ xgboost dask distributed ]; propagatedBuildInputs = [ xgboost dask distributed ];
checkPhase = ''
py.test dask_xgboost/tests/test_core.py
'';
doCheck = false; doCheck = false;
pythonImportsCheck = [ "dask_xdgboost" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/dask/dask-xgboost"; homepage = "https://github.com/dask/dask-xgboost";
description = "Interactions between Dask and XGBoost"; description = "Interactions between Dask and XGBoost";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = [ maintainers.costrouc ];
# TypeError: __init__() got an unexpected keyword argument 'iid'
broken = true;
}; };
} }

View file

@ -78,7 +78,7 @@ buildPythonPackage rec {
# dask doesn't do well with large core counts # dask doesn't do well with large core counts
checkPhase = '' checkPhase = ''
pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array' pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array and not test_simple_nested'
''; '';
meta = with lib; { meta = with lib; {

View file

@ -12,11 +12,7 @@
, lammps-cython , lammps-cython
, pymatgen-lammps , pymatgen-lammps
, pytestrunner , pytestrunner
, pytest
, pytestcov
, pytest-benchmark
, isPy3k , isPy3k
, openssh
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -25,18 +21,27 @@ buildPythonPackage rec {
disabled = (!isPy3k); disabled = (!isPy3k);
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df"; sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df";
}; };
buildInputs = [ pytestrunner ]; buildInputs = [ pytestrunner ];
checkInputs = [ pytest pytestcov pytest-benchmark openssh ]; propagatedBuildInputs = [
propagatedBuildInputs = [ pymatgen marshmallow pyyaml pygmo pymatgen
pandas scipy numpy scikitlearn marshmallow
lammps-cython pymatgen-lammps ]; pyyaml
pygmo
pandas
scipy
numpy
scikitlearn
lammps-cython
pymatgen-lammps
];
# tests require git lfs download. and is quite large so skip tests # tests require git lfs download. and is quite large so skip tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "dftfit" ];
meta = { meta = {
description = "Ab-Initio Molecular Dynamics Potential Development"; description = "Ab-Initio Molecular Dynamics Potential Development";

View file

@ -1,11 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pytest
, pytest-repeat
, pytest-timeout
, mock
, joblib
, click , click
, cloudpickle , cloudpickle
, dask , dask
@ -18,9 +13,6 @@
, tornado , tornado
, zict , zict
, pyyaml , pyyaml
, isPy3k
, futures
, singledispatch
, mpi4py , mpi4py
, bokeh , bokeh
, pythonOlder , pythonOlder
@ -29,6 +21,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "distributed"; pname = "distributed";
version = "2.30.1"; version = "2.30.1";
disabled = pythonOlder "3.6";
# get full repository need conftest.py to run tests # get full repository need conftest.py to run tests
src = fetchPypi { src = fetchPypi {
@ -36,23 +29,14 @@ buildPythonPackage rec {
sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e"; sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e";
}; };
disabled = pythonOlder "3.6";
checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ];
propagatedBuildInputs = [ propagatedBuildInputs = [
click cloudpickle dask msgpack psutil six click cloudpickle dask msgpack psutil six
sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh
]; ];
# tests take about 10-15 minutes
# ignore 5 cli tests out of 1000 total tests that fail due to subprocesses
# these tests are not critical to the library (only the cli)
checkPhase = ''
py.test distributed -m "not avoid-travis" -r s --timeout-method=thread --timeout=0 --durations=20 --ignore="distributed/cli/tests"
'';
# when tested random tests would fail and not repeatably # when tested random tests would fail and not repeatably
doCheck = false; doCheck = false;
pythonImportsCheck = [ "distributed" ];
meta = { meta = {
description = "Distributed computation in Python."; description = "Distributed computation in Python.";

View file

@ -9,12 +9,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "docplex"; pname = "docplex";
version = "2.19.202"; version = "2.20.204";
# No source available from official repo # No source available from official repo
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "2b606dc645f99feae67dfc528620dddc773ecef5d59bcaeae68bba601f25162b"; sha256 = "sha256-JNjD9UtLHsMGwTuXydZ+L5+pPQ2eobkr26Yt9pgs1qA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -6,7 +6,7 @@
, pybind11 , pybind11
, setuptools_scm , setuptools_scm
, pytestrunner , pytestrunner
, pytest , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -31,18 +31,10 @@ buildPythonPackage rec {
pytestrunner pytestrunner
]; ];
checkInputs = [ propagatedBuildInputs = [ numpy pandas ];
pytest
];
propagatedBuildInputs = [ checkInputs = [ pytestCheckHook ];
numpy pythonImportsCheck = [ "duckdb" ];
pandas
];
checkPhase = ''
pytest
'';
meta = with lib; { meta = with lib; {
description = "DuckDB is an embeddable SQL OLAP Database Management System"; description = "DuckDB is an embeddable SQL OLAP Database Management System";

View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner, { lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner
thrift, pytest, python-snappy, lz4, zstd }: , thrift, pytestCheckHook, python-snappy, lz4, zstandard, zstd }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "fastparquet"; pname = "fastparquet";
@ -12,15 +12,13 @@ buildPythonPackage rec {
sha256 = "17i091kky34m2xivk29fqsyxxxa7v4352n79w01n7ni93za6wana"; sha256 = "17i091kky34m2xivk29fqsyxxxa7v4352n79w01n7ni93za6wana";
}; };
postPatch = ''
# FIXME: package zstandard
# removing the test dependency for now
substituteInPlace setup.py --replace "'zstandard'," ""
'';
nativeBuildInputs = [ pytestrunner ]; nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ numba numpy pandas thrift ]; propagatedBuildInputs = [ numba numpy pandas thrift ];
checkInputs = [ pytest python-snappy lz4 zstd ]; checkInputs = [ pytestCheckHook python-snappy lz4 zstandard zstd ];
# E ModuleNotFoundError: No module named 'fastparquet.speedups'
doCheck = false;
pythonImportsCheck = [ "fastparquet" ];
meta = with lib; { meta = with lib; {
description = "A python implementation of the parquet format"; description = "A python implementation of the parquet format";

View file

@ -1,4 +1,4 @@
{ lib, pkgs, buildPythonPackage, fetchPypi, isPy27 { lib, buildPythonPackage, fetchPypi, isPy27
, numpy , numpy
, scipy , scipy
, tables , tables

View file

@ -2,7 +2,6 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, numpy , numpy
, setuptools
, python , python
, scikitimage , scikitimage
, openjpeg , openjpeg

View file

@ -37,7 +37,7 @@ buildPythonPackage rec {
]; ];
checkInputs = [ pytestCheckHook pytestcov ]; checkInputs = [ pytestCheckHook pytestcov ];
pytestFlagsArray = [ "tests" "--ignore=docs" ]; pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ];
disabledTests = [ "gridplot_outputs" ]; disabledTests = [ "gridplot_outputs" ];
meta = with lib; { meta = with lib; {

View file

@ -24,6 +24,7 @@ buildPythonPackage {
# tests cannot work without elasticsearch # tests cannot work without elasticsearch
doCheck = false; doCheck = false;
pythonImportsCheck = [ "image_match" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/ascribe/image-match"; homepage = "https://github.com/ascribe/image-match";

View file

@ -26,6 +26,9 @@ buildPythonPackage rec {
opencv3 opencv3
]; ];
doCheck = false;
pythonImportsCheck = [ "imagecorruptions" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/bethgelab/imagecorruptions"; homepage = "https://github.com/bethgelab/imagecorruptions";
description = "This package provides a set of image corruptions"; description = "This package provides a set of image corruptions";

View file

@ -3,7 +3,6 @@
, pandas , pandas
, pytestCheckHook , pytestCheckHook
, scikitlearn , scikitlearn
, tensorflow
}: }:
buildPythonPackage rec { buildPythonPackage rec {

View file

@ -1,25 +1,23 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, fetchpatch , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "intelhex"; pname = "intelhex";
version = "2.2.1"; version = "2.3.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0ckqjbxd8gwcg98gfzpn4vq1qxzfvq3rdbrr1hikj1nmw08qb780"; sha256 = "sha256-iStzYacZ9JRSN9qMz3VOlRPbMvViiFJ4WuoQjc0lAJM=";
}; };
patches = [ checkInputs = [ pytestCheckHook ];
# patch the tests to check for the correct version string (2.2.1)
(fetchpatch { pytestFlagsArray = [ "intelhex/test.py" ];
url = "https://patch-diff.githubusercontent.com/raw/bialix/intelhex/pull/26.patch";
sha256 = "1f3f2cyf9ipb9zdifmjs8rqhg028dhy91vabxxn3l7br657s8r2l"; pythonImportsCheck = [ "intelhex" ];
})
];
meta = { meta = {
homepage = "https://github.com/bialix/intelhex"; homepage = "https://github.com/bialix/intelhex";

View file

@ -9,10 +9,7 @@
, pymatgen , pymatgen
, ase , ase
, pytestrunner , pytestrunner
, pytest_4
, pytestcov
, isPy3k , isPy3k
, openssh
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -26,7 +23,6 @@ buildPythonPackage rec {
}; };
buildInputs = [ cython pytestrunner ]; buildInputs = [ cython pytestrunner ];
checkInputs = [ pytest_4 pytestcov openssh ];
propagatedBuildInputs = [ mpi4py pymatgen ase numpy ]; propagatedBuildInputs = [ mpi4py pymatgen ase numpy ];
preBuild = '' preBuild = ''
@ -44,6 +40,8 @@ buildPythonPackage rec {
EOF EOF
''; '';
pythonImportsCheck = [ "lammps" ];
meta = { meta = {
description = "Pythonic Wrapper to LAMMPS using cython"; description = "Pythonic Wrapper to LAMMPS using cython";
homepage = "https://gitlab.com/costrouc/lammps-cython"; homepage = "https://gitlab.com/costrouc/lammps-cython";

View file

@ -1,33 +1,41 @@
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }: { lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, libsodium
, pytestCheckHook
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "libnacl"; pname = "libnacl";
version = "1.7.1"; version = "1.7.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "saltstack"; owner = "saltstack";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "10rpim9lf0qd861a3miq8iqg8w87slqwqni7nq66h72jdk130axg"; sha256 = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc=";
}; };
checkInputs = [ pytest ]; buildInputs = [ libsodium ];
propagatedBuildInputs = [ libsodium ];
postPatch = postPatch =
let soext = stdenv.hostPlatform.extensions.sharedLibrary; in '' let soext = stdenv.hostPlatform.extensions.sharedLibrary; in
substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium${soext}')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')" ''
''; substituteInPlace "./libnacl/__init__.py" --replace \
"ctypes.cdll.LoadLibrary('libsodium${soext}')" \
"ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')"
'';
checkPhase = '' checkInputs = [ pytestCheckHook ];
py.test
''; pythonImportsCheck = [ "libnacl" ];
meta = with lib; { meta = with lib; {
maintainers = with maintainers; [ xvapx ];
description = "Python bindings for libsodium based on ctypes"; description = "Python bindings for libsodium based on ctypes";
homepage = "https://pypi.python.org/pypi/libnacl"; homepage = "https://libnacl.readthedocs.io/";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ xvapx ];
}; };
} }

View file

@ -35,6 +35,7 @@ buildPythonPackage rec {
# tests not included with pypi release # tests not included with pypi release
doCheck = false; doCheck = false;
pythonImportsCheck = [ "nbsmoke" ];
meta = with lib; { meta = with lib; {
description = "Basic notebook checks and linting"; description = "Basic notebook checks and linting";

View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy { lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy
, pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}: , pandas, requests, Rtree, shapely, folium, scikitlearn, scipy}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "osmnx"; pname = "osmnx";
@ -14,14 +14,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ]; propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ];
checkInputs = [ coverage pytest coveralls ]; # requires network
#Fails when using sandboxing as it requires internet connection, works fine without it
doCheck = false; doCheck = false;
pythonImportsCheck = [ "osmnx" ];
#Check phase for the record
#checkPhase = ''
# coverage run --source osmnx -m pytest --verbose
#'';
meta = with lib; { meta = with lib; {
description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX.";

View file

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pytestCheckHook
, isPy27 , isPy27
, pandas , pandas
, lxml , lxml

View file

@ -23,6 +23,7 @@ buildPythonPackage rec {
# not everything packaged with pypi release # not everything packaged with pypi release
doCheck = false; doCheck = false;
pythonImportsCheck = [ "pims" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/soft-matter/pims"; homepage = "https://github.com/soft-matter/pims";

View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }: { lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }:
let let
_arrow-cpp = arrow-cpp.override { python3 = python; }; _arrow-cpp = arrow-cpp.override { python3 = python; };

View file

@ -1,7 +1,6 @@
{ buildPythonPackage { buildPythonPackage
, lib , lib
, fetchPypi , fetchPypi
, isPy27
, click , click
, num2words , num2words
, numpy , numpy
@ -11,8 +10,7 @@
, patsy , patsy
, bids-validator , bids-validator
, sqlalchemy , sqlalchemy
, pytest , pytestCheckHook
, pathlib
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -36,11 +34,8 @@ buildPythonPackage rec {
sqlalchemy sqlalchemy
]; ];
checkInputs = [ pytest ] ++ lib.optionals isPy27 [ pathlib ]; checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "bids" ];
checkPhase = ''
pytest
'';
meta = with lib; { meta = with lib; {
description = "Python tools for querying and manipulating BIDS datasets"; description = "Python tools for querying and manipulating BIDS datasets";

View file

@ -1,13 +1,19 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }: { lib
, stdenv
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec { buildPythonPackage rec {
version = "4.3.2"; version = "4.3.3";
pname = "pyfakefs"; pname = "pyfakefs";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "dfeed4715e2056e3e56b9c5f51a679ce2934897eef926f3d14e5364e43f19070"; sha256 = "sha256-/7KrJkoLg69Uii2wxQl5jiCDYd85YBuomK5lzs+1nLs=";
}; };
postPatch = '' postPatch = ''
@ -25,20 +31,16 @@ buildPythonPackage rec {
--replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir"
''); '');
checkInputs = [ pytest glibcLocales ]; checkInputs = [ pytestCheckHook ];
# https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor)
checkPhase = '' disabledTests = [ "test_open_existing_pipe" ];
export LC_ALL=en_US.UTF-8 pythonImportsCheck = [ "pyfakefs" ];
${python.interpreter} -m pyfakefs.tests.all_tests
${python.interpreter} -m pyfakefs.tests.all_tests_without_extra_packages
${python.interpreter} -m pytest pyfakefs/pytest_tests/pytest_plugin_test.py
'';
meta = with lib; { meta = with lib; {
description = "Fake file system that mocks the Python file system modules"; description = "Fake file system that mocks the Python file system modules";
license = licenses.asl20; homepage = "http://pyfakefs.org/";
homepage = "http://pyfakefs.org/"; changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md";
changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md"; license = licenses.asl20;
maintainers = with maintainers; [ gebner ]; maintainers = with maintainers; [ gebner ];
}; };
} }

View file

@ -10,20 +10,18 @@ buildPythonPackage rec {
sha256 = "60988e823ca75808a26fd79d88dbae1de3699e72a293f812aa4534f8a0a58cb0"; sha256 = "60988e823ca75808a26fd79d88dbae1de3699e72a293f812aa4534f8a0a58cb0";
}; };
preConfigure = ''
export LDFLAGS="-L${fftw.out}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib"
export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include"
'';
buildInputs = [ fftw fftwFloat fftwLongDouble]; buildInputs = [ fftw fftwFloat fftwLongDouble];
propagatedBuildInputs = [ numpy scipy cython dask ]; propagatedBuildInputs = [ numpy scipy cython dask ];
# Tests cannot import pyfftw. pyfftw works fine though. # Tests cannot import pyfftw. pyfftw works fine though.
doCheck = false; doCheck = false;
pythonImportsCheck = [ "pyfftw" ];
preConfigure = ''
export LDFLAGS="-L${fftw.out}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib"
export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include"
'';
#+ optionalString isDarwin ''
# export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib"
#'';
meta = with lib; { meta = with lib; {
description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";

View file

@ -3,14 +3,14 @@
, buildPythonPackage , buildPythonPackage
, pymatgen , pymatgen
, pytestrunner , pytestrunner
, pytest , pytestCheckHook
, isPy3k , isPy3k
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pymatgen-lammps"; pname = "pymatgen-lammps";
version = "0.4.5"; version = "0.4.5";
disabled = (!isPy3k); disabled = !isPy3k;
src = fetchurl { src = fetchurl {
url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz";
@ -18,13 +18,17 @@ buildPythonPackage rec {
}; };
buildInputs = [ pytestrunner ]; buildInputs = [ pytestrunner ];
checkInputs = [ pytest ]; checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ pymatgen ]; propagatedBuildInputs = [ pymatgen ];
pythonImportsCheck = [ "pmg_lammps" ];
meta = { meta = {
description = "A LAMMPS wrapper using pymatgen"; description = "A LAMMPS wrapper using pymatgen";
homepage = "https://gitlab.com/costrouc/pymatgen-lammps"; homepage = "https://gitlab.com/costrouc/pymatgen-lammps";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ costrouc ]; maintainers = with lib.maintainers; [ costrouc ];
# not compatible with recent versions of pymatgen
broken = true;
}; };
} }

View file

@ -52,6 +52,7 @@ buildPythonPackage rec {
# No tests in pypi tarball. # No tests in pypi tarball.
doCheck = false; doCheck = false;
pythonImportsCheck = [ "pymatgen" ];
meta = with lib; { meta = with lib; {
description = "A robust materials analysis code that defines core object representations for structures and molecules"; description = "A robust materials analysis code that defines core object representations for structures and molecules";

View file

@ -17,10 +17,11 @@ buildPythonPackage rec {
sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa"; sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa";
}; };
doCheck = false;
propagatedBuildInputs = [ requests lxml pandas ]; propagatedBuildInputs = [ requests lxml pandas ];
doCheck = false;
pythonImportsCheck = [ "pytrends" ];
meta = with lib; { meta = with lib; {
description = "Pseudo API for Google Trends"; description = "Pseudo API for Google Trends";
homepage = "https://github.com/GeneralMills/pytrends"; homepage = "https://github.com/GeneralMills/pytrends";

View file

@ -2,11 +2,11 @@
, pythonOlder , pythonOlder
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
# C Inputs # C Inputs
, blas , blas
, catch2 , catch2
, cmake , cmake
, conan
, cython , cython
, fmt , fmt
, muparserx , muparserx
@ -28,7 +28,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "qiskit-aer"; pname = "qiskit-aer";
version = "0.7.1"; version = "0.7.4";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "Qiskit"; owner = "Qiskit";
repo = "qiskit-aer"; repo = "qiskit-aer";
rev = version; rev = version;
sha256 = "07l0wavdknx0y4vy0hwgw24365sg4nb6ygl3lpa098np85qgyn4y"; sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -61,10 +61,13 @@ buildPythonPackage rec {
pybind11 pybind11
]; ];
patches = [ postPatch = ''
# TODO: remove in favor of qiskit-aer PR #877 patch once accepted/stable substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," ""
./remove-conan-install.patch '';
];
preBuild = ''
export DISABLE_CONAN=1
'';
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;

View file

@ -1,63 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index efeacfc..77bd6bd 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,7 +121,11 @@ endif()
# Looking for external libraries
#
-setup_conan()
+find_package(muparserx REQUIRED)
+find_package(nlohmann_json REQUIRED)
+find_package(spdlog REQUIRED)
+# for tests only
+find_package(catch2)
# If we do not set them with a space CMake fails afterwards if nothing is set for this vars!
set(AER_LINKER_FLAGS " ")
@@ -269,16 +273,16 @@ endif()
set(AER_LIBRARIES
${AER_LIBRARIES}
${BLAS_LIBRARIES}
- CONAN_PKG::nlohmann_json
+ nlohmann_json
Threads::Threads
- CONAN_PKG::spdlog
+ spdlog
${DL_LIB}
${THRUST_DEPENDANT_LIBS})
set(AER_COMPILER_DEFINITIONS ${AER_COMPILER_DEFINITIONS} ${CONAN_DEFINES})
# Cython build is only enabled if building through scikit-build.
if(SKBUILD) # Terra Addon build
- set(AER_LIBRARIES ${AER_LIBRARIES} CONAN_PKG::muparserx)
+ set(AER_LIBRARIES ${AER_LIBRARIES} muparserx)
add_subdirectory(qiskit/providers/aer/pulse/qutip_extra_lite/cy)
add_subdirectory(qiskit/providers/aer/backends/wrappers)
add_subdirectory(src/open_pulse)
diff --git a/setup.py b/setup.py
index fd71e9f..1561cc4 100644
--- a/setup.py
+++ b/setup.py
@@ -11,12 +11,6 @@ import inspect
PACKAGE_NAME = os.getenv('QISKIT_AER_PACKAGE_NAME', 'qiskit-aer')
-try:
- from conans import client
-except ImportError:
- subprocess.call([sys.executable, '-m', 'pip', 'install', 'conan'])
- from conans import client
-
try:
from skbuild import setup
except ImportError:
@@ -46,8 +40,6 @@ common_requirements = [
setup_requirements = common_requirements + [
'scikit-build',
- 'cmake!=3.17,!=3.17.0',
- 'conan>=1.22.2'
]
requirements = common_requirements + ['qiskit-terra>=0.12.0']

View file

@ -34,7 +34,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "qiskit-aqua"; pname = "qiskit-aqua";
version = "0.8.1"; version = "0.8.2";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -43,7 +43,7 @@ buildPythonPackage rec {
owner = "Qiskit"; owner = "Qiskit";
repo = "qiskit-aqua"; repo = "qiskit-aqua";
rev = version; rev = version;
sha256 = "11qyya3vyq50wpzrzzl8v46yx5p72rhpqhybwn47qgazxgg82r1b"; sha256 = "sha256-ybf8bXqsVk6quYi0vrfo/Mplk7Nr7tQS7cevXxI9khw=";
}; };
# Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed.
@ -73,13 +73,8 @@ buildPythonPackage rec {
# It can also be installed at runtime from the pip wheel. # It can also be installed at runtime from the pip wheel.
# We disable appropriate tests below to allow building without pyscf installed # We disable appropriate tests below to allow building without pyscf installed
# NOTE: we remove cplex b/c we can't build pythonPackages.cplex.
# cplex is only distributed in manylinux1 wheel (no source), and Nix python is not manylinux1 compatible
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py --replace "docplex==2.15.194" "docplex"
--replace "pyscf; sys_platform != 'win32'" "" \
--replace "cplex; python_version >= '3.6' and python_version < '3.8'" ""
# Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included # Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included
echo -e "\nimport warnings\ntry: import pyscf;\nexcept ImportError:\n " \ echo -e "\nimport warnings\ntry: import pyscf;\nexcept ImportError:\n " \

View file

@ -2,7 +2,6 @@
, pythonOlder , pythonOlder
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, python , python
, numpy , numpy
, qiskit-terra , qiskit-terra
@ -24,7 +23,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "qiskit-ignis"; pname = "qiskit-ignis";
version = "0.5.1"; version = "0.5.2";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -33,11 +32,11 @@ buildPythonPackage rec {
owner = "Qiskit"; owner = "Qiskit";
repo = "qiskit-ignis"; repo = "qiskit-ignis";
rev = version; rev = version;
sha256 = "17kplmi17axcbbgw35dzfr3d5bzfymxfni9sf6v14223c5674p4y"; sha256 = "sha256-Kl3tnoamZrCxwoDdu8betG6Lf3CC3D8R2TYiq8Zl3Aw=";
}; };
# hacky, fix https://github.com/Qiskit/qiskit-ignis/issues/532. # hacky, fix https://github.com/Qiskit/qiskit-ignis/issues/532.
# TODO: remove on qiskit-ignis v0.5.1 # TODO: remove on qiskit-ignis v0.5.2
postPatch = '' postPatch = ''
substituteInPlace qiskit/ignis/mitigation/expval/base_meas_mitigator.py --replace "plt.axes" "'plt.axes'" substituteInPlace qiskit/ignis/mitigation/expval/base_meas_mitigator.py --replace "plt.axes" "'plt.axes'"
''; '';

View file

@ -56,7 +56,7 @@ in
buildPythonPackage rec { buildPythonPackage rec {
pname = "qiskit-terra"; pname = "qiskit-terra";
version = "0.16.1"; version = "0.16.4";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -64,7 +64,7 @@ buildPythonPackage rec {
owner = "Qiskit"; owner = "Qiskit";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0007glsbrvq9swamvz8r76z9nzh46b388y0ds1dypczxpwlp9xcq"; sha256 = "sha256-/rWlPfpAHoMedKG42jfUYt0Ezq7i+9dkyPllavkg4cc=";
}; };
nativeBuildInputs = [ cython ]; nativeBuildInputs = [ cython ];

View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "qiskit"; pname = "qiskit";
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
version = "0.23.1"; version = "0.23.5";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "qiskit"; owner = "qiskit";
repo = "qiskit"; repo = "qiskit";
rev = version; rev = version;
sha256 = "0x4cqx1wqqj7h5g3vdag694qjzsmvhpw25yrlcs70mh5ywdp28x1"; sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -46,6 +46,8 @@ buildPythonPackage rec {
importlib-metadata importlib-metadata
]; ];
pythonImportsCheck = [ "quandl" ];
meta = with lib; { meta = with lib; {
description = "Quandl Python client library"; description = "Quandl Python client library";
homepage = "https://github.com/quandl/quandl-python"; homepage = "https://github.com/quandl/quandl-python";

View file

@ -1,8 +1,6 @@
{ stdenv { stdenv
, lib , lib
, python
, buildPythonPackage , buildPythonPackage
, fetchpatch
, fetchPypi , fetchPypi
, isPyPy , isPyPy
, R , R

View file

@ -32,12 +32,6 @@ buildPythonPackage rec {
checkInputs = [ coverage ]; checkInputs = [ coverage ];
propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ]; propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ];
# remove on when version > 0.5.4
postPatch = ''
sed -i "s/numpy >= 1.9.2, < 1.14.0/numpy/" setup.py
sed -i "s/pandas >= 0.19.2, < 0.23.0/pandas/" setup.py
'';
# cython package not included for tests # cython package not included for tests
doCheck = false; doCheck = false;
@ -45,6 +39,8 @@ buildPythonPackage rec {
${python.interpreter} -m skbio.test ${python.interpreter} -m skbio.test
''; '';
pythonImportsCheck = [ "skbio" ];
meta = with lib; { meta = with lib; {
homepage = "http://scikit-bio.org/"; homepage = "http://scikit-bio.org/";
description = "Data structures, algorithms and educational resources for bioinformatics"; description = "Data structures, algorithms and educational resources for bioinformatics";

View file

@ -26,6 +26,7 @@ buildPythonPackage rec {
# Computationally very demanding tests # Computationally very demanding tests
doCheck = false; doCheck = false;
pythonImportsCheck= [ "seaborn" ];
meta = { meta = {
description = "Statisitical data visualization"; description = "Statisitical data visualization";

View file

@ -26,10 +26,13 @@ buildPythonPackage rec {
propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ];
checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ];
# on CPU, these expect artifacts from previous GPU run
disabledTests = [ disabledTests = [
# on CPU, these expect artifacts from previous GPU run
"test_load_cuda_params_to_cpu" "test_load_cuda_params_to_cpu"
# failing tests
"test_pickle_load" "test_pickle_load"
"test_grid_search_with_slds_"
"test_grid_search_with_dict_works"
]; ];
meta = with lib; { meta = with lib; {

View file

@ -1,9 +1,20 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder { lib
, click, ecdsa, fido2, intelhex, pyserial, pyusb, requests}: , buildPythonPackage
, fetchFromGitHub
, pythonOlder
, click
, cryptography
, ecdsa
, fido2
, intelhex
, pyserial
, pyusb
, requests
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "solo-python"; pname = "solo-python";
version = "0.0.26"; version = "0.0.27";
format = "flit"; format = "flit";
disabled = pythonOlder "3.6"; # only python>=3.6 is supported disabled = pythonOlder "3.6"; # only python>=3.6 is supported
@ -11,7 +22,7 @@
owner = "solokeys"; owner = "solokeys";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "05rwqrhr1as6zqhg63d6wga7l42jm2azbav5w6ih8mx5zbxf61yz"; sha256 = "sha256-OCiKa6mnqJGoNCC4KqI+hMw22tzhdN63x9/KujNJqcE=";
}; };
# replaced pinned fido, with unrestricted fido version # replaced pinned fido, with unrestricted fido version
@ -21,6 +32,7 @@
propagatedBuildInputs = [ propagatedBuildInputs = [
click click
cryptography
ecdsa ecdsa
fido2 fido2
intelhex intelhex

View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch { lib, buildPythonPackage, fetchPypi
, confluent-kafka , confluent-kafka
, distributed , distributed
, flaky , flaky

View file

@ -1,4 +1,4 @@
{ lib, pkgs, buildPythonPackage, fetchPypi, isPy3k, callPackage { lib, buildPythonPackage, fetchPypi, isPy3k
, opencv3 , opencv3
, pyqt5 , pyqt5
, pyqtgraph , pyqtgraph
@ -19,7 +19,7 @@
, imageio-ffmpeg , imageio-ffmpeg
, av , av
, nose , nose
, pytest , pytestCheckHook
, pyserial , pyserial
, arrayqueues , arrayqueues
, colorspacious , colorspacious
@ -37,14 +37,18 @@ buildPythonPackage rec {
inherit pname version; inherit pname version;
sha256 = "aab9d07575ef599a9c0ae505656e3c03ec753462df3c15742f1f768f2b578f0a"; sha256 = "aab9d07575ef599a9c0ae505656e3c03ec753462df3c15742f1f768f2b578f0a";
}; };
doCheck = false;
# crashes python
preCheck = ''
rm stytra/tests/test_z_experiments.py
'';
checkInputs = [ checkInputs = [
nose nose
pytest pytestCheckHook
pyserial pyserial
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
opencv3 opencv3
pyqt5 pyqt5

View file

@ -2,7 +2,6 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, isPy27 , isPy27
, pytest
, pytestrunner , pytestrunner
, pytestCheckHook , pytestCheckHook
, pytorch , pytorch
@ -23,12 +22,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pytorch ]; propagatedBuildInputs = [ pytorch ];
checkInputs = [ pytest pytestrunner pytestCheckHook ]; checkInputs = [ pytestrunner pytestCheckHook ];
disabledTests = [ "test_inplace_on_requires_grad" ]; disabledTests = [
# seems like a harmless failure: "test_inplace_on_requires_grad"
## AssertionError: "test_input_requiring_grad"
## Pattern 'a leaf Variable that requires grad has been used in an in-place operation.' ];
## does not match 'a leaf Variable that requires grad is being used in an in-place operation.'
meta = with lib; { meta = with lib; {
description = "GPipe implemented in Pytorch and optimized for CUDA rather than TPU"; description = "GPipe implemented in Pytorch and optimized for CUDA rather than TPU";

View file

@ -3,10 +3,9 @@
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, isPy27 , isPy27
, pytest , pytestCheckHook
, nose , nose
, numpy , numpy
, scipy
, pandas , pandas
, xarray , xarray
, traitlets , traitlets
@ -35,7 +34,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ traitlets ]; propagatedBuildInputs = [ traitlets ];
checkInputs = [ numpy pandas xarray nose pytest ]; checkInputs = [ numpy pandas xarray nose pytestCheckHook ];
pythonImportsCheck = [ "traittypes" ];
meta = with lib; { meta = with lib; {
description = "Trait types for NumPy, SciPy, XArray, and Pandas"; description = "Trait types for NumPy, SciPy, XArray, and Pandas";

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, six
, typing-extensions
, requests
, yarl
}:
buildPythonPackage rec {
pname = "transmission-rpc";
version = "3.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "1y5048109j6z4smzwysvdjfn6cj9698dsxfim9i4nqam4nmw2wi7";
};
propagatedBuildInputs = [
six
typing-extensions
requests
yarl
];
# no tests
doCheck = false;
pythonImportsCheck = [ "transmission_rpc" ];
meta = with lib; {
description = "Python module that implements the Transmission bittorent client RPC protocol";
homepage = "https://pypi.python.org/project/transmission-rpc/";
license = licenses.mit;
maintainers = with maintainers; [ eyjhb ];
};
}

View file

@ -1,26 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, six
}:
buildPythonPackage rec {
pname = "transmissionrpc";
version = "0.11";
src = fetchPypi {
inherit pname version;
sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60";
};
propagatedBuildInputs = [ six ];
# no tests
doCheck = false;
meta = with lib; {
description = "Python implementation of the Transmission bittorent client RPC protocol";
homepage = "https://pypi.python.org/pypi/transmissionrpc/";
license = licenses.mit;
};
}

View file

@ -20,6 +20,7 @@ buildPythonPackage rec {
# No tests on PyPi # No tests on PyPi
doCheck = false; doCheck = false;
pythonImportsCheck = [ "uproot3_methods" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/scikit-hep/uproot3-methods"; homepage = "https://github.com/scikit-hep/uproot3-methods";

View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage , fetchPypi, pythonOlder { lib, buildPythonPackage , fetchPypi, pythonOlder
, pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }: , jupyter_core, pandas, ipywidgets, jupyter }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "vega"; pname = "vega";
@ -11,12 +11,11 @@ buildPythonPackage rec {
sha256 = "f343ceb11add58d24cd320d69e410b111a56c98c9069ebb4ef89c608c4c1950d"; sha256 = "f343ceb11add58d24cd320d69e410b111a56c98c9069ebb4ef89c608c4c1950d";
}; };
buildInputs = [ pytest ];
propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ];
# currently, recommonmark is broken on python3 # currently, recommonmark is broken on python3
doCheck = false; doCheck = false;
checkInputs = [ altair ]; pythonImportsCheck = [ "vega" ];
meta = with lib; { meta = with lib; {
description = "An IPython/Jupyter widget for Vega and Vega-Lite"; description = "An IPython/Jupyter widget for Vega and Vega-Lite";

View file

@ -6,7 +6,6 @@
, imutils , imutils
, progress , progress
, matplotlib , matplotlib
, pytest
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -18,11 +17,11 @@ buildPythonPackage rec {
sha256 = "649a77a0c1b670d13a1bf411451945d7da439364dc0c33ee3636a23f1d82b456"; sha256 = "649a77a0c1b670d13a1bf411451945d7da439364dc0c33ee3636a23f1d82b456";
}; };
checkInputs = [ pytest ];
propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ]; propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ];
# tests not packaged with pypi # tests not packaged with pypi
doCheck = false; doCheck = false;
pythonImportsCheck = [ "vidstab" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/AdamSpannbauer/python_video_stab"; homepage = "https://github.com/AdamSpannbauer/python_video_stab";

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clj-kondo"; pname = "clj-kondo";
version = "2020.12.12"; version = "2021.02.13";
reflectionJson = fetchurl { reflectionJson = fetchurl {
name = "reflection.json"; name = "reflection.json";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "27b8a82fb613803ab9c712866b7cc89c40fcafc4ac3af178c11b4ed7549934dc"; sha256 = "sha256-Rq7W5sP9nRB0TGRUSQIyC3U568uExmcM/gd+1HjAqac=";
}; };
dontUnpack = true; dontUnpack = true;

View file

@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ];
postPatch = '' postPatch = ''
substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" substituteInPlace ./Documentation/Makefile \
substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" --replace "2>/dev/null" "" \
substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0" substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0"
ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
''; '';

View file

@ -12,11 +12,11 @@ let
in in
buildPythonApplication rec { buildPythonApplication rec {
pname = "matrix-synapse"; pname = "matrix-synapse";
version = "1.26.0"; version = "1.27.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1jppwqxamj3a65fw2a87brz4iqgijaa4lja51wlxh2xdkqj0sn6l"; sha256 = "1kpkxgyzz35ga4ld7cbjr0pfbhrcbrfmp9msnwjqllmsmy0g5bas";
}; };
patches = [ patches = [

View file

@ -0,0 +1,127 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, wine
, boost
, libxcb
}:
let
# Derived from subprojects/bitsery.wrap
bitsery = rec {
version = "5.2.0";
src = fetchFromGitHub {
owner = "fraillt";
repo = "bitsery";
rev = "v${version}";
sha256 = "132b0n0xlpcv97l6bhk9n57hg95pkhwqzvr9jkv57nmggn76s5q7";
};
};
# Derived from subprojects/function2.wrap
function2 = rec {
version = "4.1.0";
src = fetchFromGitHub {
owner = "Naios";
repo = "function2";
rev = version;
sha256 = "0abrz2as62725g212qswi35nsdlf5wrhcz78hm2qidbgqr9rkir5";
};
};
# Derived from subprojects/tomlplusplus.wrap
tomlplusplus = rec {
version = "2.1.0";
src = fetchFromGitHub {
owner = "marzer";
repo = "tomlplusplus";
rev = "v${version}";
sha256 = "0fspinnpyk1c9ay0h3wl8d4bbm6aswlypnrw2c7pk2i4mh981b4b";
};
};
# Derived from vst3.wrap
vst3 = rec {
version = "e2fbb41f28a4b311f2fc7d28e9b4330eec1802b6";
src = fetchFromGitHub {
owner = "robbert-vdh";
repo = "vst3sdk";
rev = version;
fetchSubmodules = true;
sha256 = "1fqpylkbljifwdw2z75agc0yxnhmv4b09fxs3rvlw1qmm5mwx0p2";
};
};
in stdenv.mkDerivation rec {
pname = "yabridge";
version = "3.0.0";
# NOTE: Also update yabridgectl's cargoSha256 when this is updated
src = fetchFromGitHub {
owner = "robbert-vdh";
repo = pname;
rev = version;
sha256 = "0ha7jhnkd2i49q5rz2hp7sq6hv19bir99x51hs6nvvcf16hlf2bp";
};
# Unpack subproject sources
postUnpack = ''(
cd "$sourceRoot/subprojects"
cp -R --no-preserve=mode,ownership ${bitsery.src} bitsery-${bitsery.version}
tar -xf bitsery-patch-${bitsery.version}.tar.xz
cp -R --no-preserve=mode,ownership ${function2.src} function2-${function2.version}
tar -xf function2-patch-${function2.version}.tar.xz
cp -R --no-preserve=mode,ownership ${tomlplusplus.src} tomlplusplus
cp -R --no-preserve=mode,ownership ${vst3.src} vst3
)'';
postPatch = ''
patchShebangs .
'';
nativeBuildInputs = [
meson
ninja
pkg-config
wine
];
buildInputs = [
boost
libxcb
];
# Meson is no longer able to pick up Boost automatically.
# https://github.com/NixOS/nixpkgs/issues/86131
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
mesonFlags = [
"--cross-file" "cross-wine.conf"
# Requires CMake and is unnecessary
"-Dtomlplusplus:GENERATE_CMAKE_CONFIG=disabled"
# tomlplusplus examples and tests don't build with winegcc
"-Dtomlplusplus:BUILD_EXAMPLES=disabled"
"-Dtomlplusplus:BUILD_TESTS=disabled"
];
installPhase = ''
mkdir -p "$out/bin" "$out/lib"
cp yabridge-group.exe{,.so} "$out/bin"
cp yabridge-host.exe{,.so} "$out/bin"
cp libyabridge-vst2.so "$out/lib"
cp libyabridge-vst3.so "$out/lib"
'';
meta = with lib; {
description = "Yet Another VST bridge, run Windows VST2 plugins under Linux";
homepage = "https://github.com/robbert-vdh/yabridge";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ metadark ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -0,0 +1,23 @@
{ lib, rustPlatform, yabridge }:
rustPlatform.buildRustPackage rec {
pname = "yabridgectl";
version = yabridge.version;
src = yabridge.src;
sourceRoot = "source/tools/yabridgectl";
cargoSha256 = "1sjhani8h7ap42yqlnj05sx59jyz2h12qlm1ibv8ldxcpwps0bwy";
patches = [
./libyabridge-from-nix-profiles.patch
];
patchFlags = [ "-p3" ];
meta = with lib; {
description = "A small, optional utility to help set up and update yabridge for several directories at once";
homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ metadark ];
};
}

View file

@ -0,0 +1,70 @@
diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs
index c1c89cf..d7bd822 100644
--- a/tools/yabridgectl/src/config.rs
+++ b/tools/yabridgectl/src/config.rs
@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet};
use std::env;
use std::fmt::Display;
use std::fs;
+use std::iter;
use std::path::{Path, PathBuf};
use which::which;
use xdg::BaseDirectories;
@@ -216,34 +217,24 @@ impl Config {
}
}
None => {
- // Search in the system library locations and in `~/.local/share/yabridge` if no
- // path was set explicitely. We'll also search through `/usr/local/lib` just in case
- // but since we advocate against installing yabridge there we won't list this path
- // in the error message when `libyabridge-vst2.so` can't be found.
- let system_path = Path::new("/usr/lib");
+ // Search through NIX_PROFILES & data home directory if no path was set explicitly.
+ let nix_profiles = env::var("NIX_PROFILES");
let user_path = xdg_dirs.get_data_home();
- let lib_directories = [
- system_path,
- // Used on Debian based distros
- Path::new("/usr/lib/x86_64-linux-gnu"),
- // Used on Fedora
- Path::new("/usr/lib64"),
- Path::new("/usr/local/lib"),
- Path::new("/usr/local/lib/x86_64-linux-gnu"),
- Path::new("/usr/local/lib64"),
- &user_path,
- ];
+ let lib_directories = nix_profiles.iter()
+ .flat_map(|profiles| profiles.split(' ')
+ .map(|profile| Path::new(profile).join("lib")))
+ .chain(iter::once(user_path.clone()));
+
let mut candidates = lib_directories
- .iter()
.map(|directory| directory.join(LIBYABRIDGE_VST2_NAME));
+
match candidates.find(|directory| directory.exists()) {
Some(candidate) => candidate,
_ => {
return Err(anyhow!(
- "Could not find '{}' in either '{}' or '{}'. You can override the \
- default search path using 'yabridgectl set --path=<path>'.",
+ "Could not find '{}' through 'NIX_PROFILES' or '{}'. You can override the \
+ default search path using 'yabridgectl set --path=<path>'.",
LIBYABRIDGE_VST2_NAME,
- system_path.display(),
user_path.display()
));
}
diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs
index 0db1bd4..221cdd0 100644
--- a/tools/yabridgectl/src/main.rs
+++ b/tools/yabridgectl/src/main.rs
@@ -102,7 +102,7 @@ fn main() -> Result<()> {
.about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")
.long_about(
"Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \
- is not set, then yabridgectl will look in both '/usr/lib' and \
+ is not set, then yabridgectl will look through 'NIX_PROFILES' and \
'~/.local/share/yabridge' by default.",
)
.validator(validate_path)

View file

@ -24,12 +24,6 @@ stdenv.mkDerivation rec {
# Tainted Mode disables PERL5LIB # Tainted Mode disables PERL5LIB
substituteInPlace btrbk --replace "perl -T" "perl" substituteInPlace btrbk --replace "perl -T" "perl"
# Fix btrbk-mail
substituteInPlace contrib/cron/btrbk-mail \
--replace "/bin/date" "${coreutils}/bin/date" \
--replace "/bin/echo" "${coreutils}/bin/echo" \
--replace '$btrbk' 'btrbk'
# Fix SSH filter script # Fix SSH filter script
sed -i '/^export PATH/d' ssh_filter_btrbk.sh sed -i '/^export PATH/d' ssh_filter_btrbk.sh
substituteInPlace ssh_filter_btrbk.sh --replace logger ${util-linux}/bin/logger substituteInPlace ssh_filter_btrbk.sh --replace logger ${util-linux}/bin/logger

View file

@ -1,25 +0,0 @@
From e34a16301f425f273a67ed3abbc45840bc82d892 Mon Sep 17 00:00:00 2001
From: srs5694 <srs5694@users.sourceforge.net>
Date: Fri, 15 May 2020 12:34:14 -0400
Subject: [PATCH] Fix GCC 10 compile problem
---
Make.common | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Make.common b/Make.common
index 3f0b919..95a3a97 100644
--- a/Make.common
+++ b/Make.common
@@ -60,7 +60,7 @@ endif
#
# ...for both GNU-EFI and TianoCore....
-OPTIMFLAGS = -Os -fno-strict-aliasing
+OPTIMFLAGS = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
CFLAGS = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
# ...for GNU-EFI....
--
2.29.2

View file

@ -14,17 +14,16 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "refind"; pname = "refind";
version = "0.12.0"; version = "0.13.0";
srcName = "refind-src-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz"; url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz";
sha256 = "1i5p3sir3mx4i2q5w78360xn2kbgsj8rmgrqvsvag1zzr5dm1f3v"; sha256 = "0zivlcw1f3zwnrwvbhwq6gg781hh72g2bhc2cxcsb2zmg7q8in65";
}; };
patches = [ patches = [
# Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds.
./0001-toolchain.patch ./0001-toolchain.patch
./0001-Fix-GCC-10-compile-problem.patch
]; ];
buildInputs = [ gnu-efi ]; buildInputs = [ gnu-efi ];
@ -44,6 +43,8 @@ stdenv.mkDerivation rec {
buildFlags = [ "gnuefi" "fs_gnuefi" ]; buildFlags = [ "gnuefi" "fs_gnuefi" ];
installPhase = '' installPhase = ''
runHook preInstall
install -d $out/bin/ install -d $out/bin/
install -d $out/share/refind/drivers_${efiPlatform}/ install -d $out/share/refind/drivers_${efiPlatform}/
install -d $out/share/refind/tools_${efiPlatform}/ install -d $out/share/refind/tools_${efiPlatform}/
@ -102,6 +103,8 @@ stdenv.mkDerivation rec {
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {

View file

@ -1,4 +1,4 @@
{ stdenv, lib, darwin, fetchFromGitHub, rustPlatform }: { stdenv, lib, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "kak-lsp"; pname = "kak-lsp";
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c"; cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c";
buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; buildInputs = lib.optional stdenv.isDarwin [ Security ];
meta = with lib; { meta = with lib; {
description = "Kakoune Language Server Protocol Client"; description = "Kakoune Language Server Protocol Client";

View file

@ -1,5 +1,5 @@
From e295844e8ef5c13487996ab700e5f12a7fadb1a6 Mon Sep 17 00:00:00 2001 From e295844e8ef5c13487996ab700e5f12a7fadb1a6 Mon Sep 17 00:00:00 2001
From: Nima Vasseghi <nmv@fb.com> From: Private <private@private.priv>
Date: Wed, 30 Dec 2020 16:06:46 -0800 Date: Wed, 30 Dec 2020 16:06:46 -0800
Subject: [PATCH] malloc.h to stdlib.h in rfc2440.c Subject: [PATCH] malloc.h to stdlib.h in rfc2440.c

View file

@ -0,0 +1,26 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "shhgit";
version = "0.4-${lib.strings.substring 0 7 rev}";
rev = "7e55062d10d024f374882817692aa2afea02ff84";
src = fetchFromGitHub {
owner = "eth0izzle";
repo = pname;
inherit rev;
sha256 = "1b7r4ivfplm4crlvx571nyz2rc6djy0xvl14nz7m0ngh6206df9k";
};
vendorSha256 = "0isa9faaknm8c9mbyj5dvf1dfnyv44d1pjd2nbkyfi6b22hcci3d";
meta = with lib; {
description = "Tool to detect secrets in repositories";
homepage = "https://github.com/eth0izzle/shhgit";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config, zlib, kmod, which { lib, stdenv, fetchurl, pkg-config, zlib, kmod, which
, hwdata , hwdata
, static ? stdenv.hostPlatform.isStatic , static ? stdenv.hostPlatform.isStatic
, darwin ? null , IOKit
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib kmod which ] ++ buildInputs = [ zlib kmod which ] ++
lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; lib.optional stdenv.hostPlatform.isDarwin IOKit;
preConfigure = if stdenv.cc.isGNU then null else '' preConfigure = if stdenv.cc.isGNU then null else ''
substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' ""

View file

@ -748,6 +748,12 @@ in
metapixel = callPackage ../tools/graphics/metapixel { }; metapixel = callPackage ../tools/graphics/metapixel { };
yabridge = callPackage ../tools/audio/yabridge {
wine = wineWowPackages.minimal;
};
yabridgectl = callPackage ../tools/audio/yabridgectl { };
### APPLICATIONS/TERMINAL-EMULATORS ### APPLICATIONS/TERMINAL-EMULATORS
alacritty = callPackage ../applications/terminal-emulators/alacritty { alacritty = callPackage ../applications/terminal-emulators/alacritty {
@ -5505,7 +5511,9 @@ in
plugins = [ ]; # override with the list of desired plugins plugins = [ ]; # override with the list of desired plugins
}; };
kak-lsp = callPackage ../tools/misc/kak-lsp { }; kak-lsp = callPackage ../tools/misc/kak-lsp {
inherit (darwin.apple_sdk.frameworks) Security;
};
kbdd = callPackage ../applications/window-managers/kbdd { }; kbdd = callPackage ../applications/window-managers/kbdd { };
@ -7009,7 +7017,9 @@ in
pcimem = callPackage ../os-specific/linux/pcimem { }; pcimem = callPackage ../os-specific/linux/pcimem { };
pciutils = callPackage ../tools/system/pciutils { }; pciutils = callPackage ../tools/system/pciutils {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
pcsclite = callPackage ../tools/security/pcsclite { pcsclite = callPackage ../tools/security/pcsclite {
inherit (darwin.apple_sdk.frameworks) IOKit; inherit (darwin.apple_sdk.frameworks) IOKit;
@ -16676,6 +16686,8 @@ in
sfsexp = callPackage ../development/libraries/sfsexp {}; sfsexp = callPackage ../development/libraries/sfsexp {};
shhgit = callPackage ../tools/security/shhgit { };
shhmsg = callPackage ../development/libraries/shhmsg { }; shhmsg = callPackage ../development/libraries/shhmsg { };
shhopt = callPackage ../development/libraries/shhopt { }; shhopt = callPackage ../development/libraries/shhopt { };
@ -22555,7 +22567,7 @@ in
gitit = callPackage ../applications/misc/gitit {}; gitit = callPackage ../applications/misc/gitit {};
gkrellm = callPackage ../applications/misc/gkrellm { gkrellm = callPackage ../applications/misc/gkrellm {
inherit (darwin) IOKit; inherit (darwin.apple_sdk.frameworks) IOKit;
}; };
glow = callPackage ../applications/editors/glow { }; glow = callPackage ../applications/editors/glow { };
@ -24040,6 +24052,8 @@ in
mupdf = callPackage ../applications/misc/mupdf { }; mupdf = callPackage ../applications/misc/mupdf { };
mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { }; mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { };
muso = callPackage ../applications/audio/muso { };
mystem = callPackage ../applications/misc/mystem { }; mystem = callPackage ../applications/misc/mystem { };
diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { };

View file

@ -7932,7 +7932,9 @@ in {
translationstring = callPackage ../development/python-modules/translationstring { }; translationstring = callPackage ../development/python-modules/translationstring { };
transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; transmission-rpc = callPackage ../development/python-modules/transmission-rpc { };
transmissionrpc = self.transmission-rpc; # alias for compatibility 2020-02-07
treq = callPackage ../development/python-modules/treq { }; treq = callPackage ../development/python-modules/treq { };