diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 6f5a6d3bf28..da36ae68b3f 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -1,12 +1,39 @@ { config, lib, pkgs, ... }: - -with lib; - let 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 @@ -18,7 +45,7 @@ in { hsphfpd.enable = mkEnableOption "support for hsphfpd[-prototype] implementation"; powerOnBoot = mkOption { - type = types.bool; + type = types.bool; default = true; description = "Whether to power up the default Bluetooth controller on boot."; }; @@ -38,8 +65,15 @@ in { ''; }; - config = mkOption { - type = with types; attrsOf (attrsOf (oneOf [ bool int str ])); + disabledPlugins = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Built-in plugins to disable"; + }; + + settings = mkOption { + type = cfgFmt.type; + default = { }; example = { General = { ControllerMode = "bredr"; @@ -47,79 +81,65 @@ in { }; 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 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 = { - Policy = { - AutoEnable = mkDefault cfg.powerOnBoot; - }; - }; - - 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 ]; + environment.etc."bluetooth/main.conf".source = + cfgFmt.generate "main.conf" (recursiveUpdate defaults cfg.settings); + services.udev.packages = [ package ]; + services.dbus.packages = [ package ] + ++ optional cfg.hsphfpd.enable pkgs.hsphfpd; + systemd.packages = [ package ]; systemd.services = { - bluetooth = { - wantedBy = [ "bluetooth.target" ]; - aliases = [ "dbus-org.bluez.service" ]; - # restarting can leave people without a mouse/keyboard - unitConfig.X-RestartIfChanged = false; - }; - } - // (optionalAttrs cfg.hsphfpd.enable { - hsphfpd = { - after = [ "bluetooth.service" ]; - requires = [ "bluetooth.service" ]; - wantedBy = [ "multi-user.target" ]; - - description = "A prototype implementation used for connecting HSP/HFP Bluetooth devices"; - serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/hsphfpd.pl"; + bluetooth = + let + # `man bluetoothd` will refer to main.conf in the nix store but bluez + # will in fact load the configuration file at /etc/bluetooth/main.conf + # 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" ] + ++ optional hasDisabledPlugins + "--noplugin=${concatStringsSep "," cfg.disabledPlugins}"; + in + { + wantedBy = [ "bluetooth.target" ]; + aliases = [ "dbus-org.bluez.service" ]; + serviceConfig.ExecStart = [ + "" + "${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 = { obex.aliases = [ "dbus-org.bluez.obex.service" ]; } - // (optionalAttrs cfg.hsphfpd.enable { - telephony_client = { - wantedBy = [ "default.target"]; - - description = "telephony_client for hsphfpd"; - serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl"; - }; - }) - ; + // optionalAttrs cfg.hsphfpd.enable { + telephony_client = { + wantedBy = [ "default.target" ]; + description = "telephony_client for hsphfpd"; + serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl"; + }; + }; }; - } diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix new file mode 100644 index 00000000000..436afac7df2 --- /dev/null +++ b/pkgs/applications/audio/muso/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 3958a44cdaf..52914c1128a 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.0.5.9"; + version = "1.0.6.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "011pp94i49fx587ng16m6ml63vwiysjvpkijihrk6xamz78zddgx"; + sha256 = "1znmix9w7ahzyb933lxzqv6j8j5qycknq3gmnkakj749ksshql1b"; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 5ee5e261211..9065ff49cf8 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -1,8 +1,13 @@ { fetchNuGet }: [ + (fetchNuGet { + name = "AngleSharp.Css"; + version = "0.14.2"; + sha256 = "1d34a8ab5dri4wlw07jvk7b1z0d0zizwihwpdfva3sxhb4279ahd"; + }) (fetchNuGet { name = "AngleSharp"; - version = "0.9.11"; - sha256 = "17vf1bizskkxr8pf547lk2b48m12wv3si83gxk145i73bf9gi64a"; + version = "0.14.0"; + sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) (fetchNuGet { name = "AWSSDK.Core"; @@ -136,8 +141,18 @@ }) (fetchNuGet { name = "HtmlSanitizer"; - version = "4.0.217"; - sha256 = "0szay9mf5mmrp1hx0yc175aaalv76qg0j515lfs133j1d95lj26d"; + version = "5.0.372"; + 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 { name = "Microsoft.AspNet.SignalR.Client"; @@ -209,11 +224,6 @@ version = "3.1.1"; sha256 = "0arqmy04dd0r4wm2fin66gxxwj2kirbgxyf3w7kq6f73lrnazhq0"; }) - (fetchNuGet { - name = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.1.0"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; - }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; @@ -294,26 +304,21 @@ version = "2.0.4"; sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "3.1.0"; + sha256 = "1fg1zggza45pa8zlcf8llqh6v47fqi44azsia68kmsg2q9r1r4mq"; + }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.4"; sha256 = "1s5h96zdc3vh1v03gizmqfw5hmksajw10bdrj79pm8brbyzipxia"; }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "3.1.0"; - sha256 = "1bd6hilnwp47z3l14qspdxi5f5nhv6rivarc6w8wil425bq0h3pd"; - }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; version = "3.1.4"; sha256 = "07l7137pzwh0k4m53ji5j6a2zmbbzrl164p18wxcri77ds5is4g7"; }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "3.1.0"; - sha256 = "1pjn4wwhxgsiap7byld114kx6m0nm6696r8drspqic7lskm4y305"; - }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Analyzers"; version = "3.1.4"; @@ -344,31 +349,16 @@ version = "3.1.4"; sha256 = "009mcmakw0p7k8xrz920a8qc0rjv361awiz8jia5i5a8p5ihgkbx"; }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore"; - version = "3.1.0"; - sha256 = "1l12lsk1xfrv5pjnm0b9w9kncgdh0pcjcbxl4zrsg82s7bs7dhda"; - }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore"; version = "3.1.4"; sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Abstractions"; - version = "3.1.0"; - sha256 = "0j5m2a48rwyzzvbz0hpr2md35iv78b86zyqjnrjq0y4vb7sairc0"; - }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; version = "3.1.4"; sha256 = "09f96pvpyzylpdaiw3lsvr7p6rs4i21mmhsxl6pkivg5lpfb79sk"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Memory"; - version = "3.1.0"; - sha256 = "1hi61647apn25kqjcb37nqafp8fikymdrk43j3kxjbwwwx507jy1"; - }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; version = "3.1.4"; @@ -389,11 +379,6 @@ version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.0"; - sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.4"; @@ -404,11 +389,6 @@ version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.0"; - sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.4"; @@ -439,11 +419,6 @@ version = "2.1.0"; sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "3.1.0"; - sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "3.1.4"; @@ -459,11 +434,6 @@ version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.0"; - sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; - }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.4"; @@ -474,11 +444,6 @@ version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.0"; - sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; - }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "3.1.4"; @@ -489,6 +454,11 @@ version = "2.0.4"; sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "3.1.0"; + sha256 = "12nrdw3q9wl5zry8gb3sw003a0iyk2gvps2ij813l7lim38wy1mi"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "3.1.1"; @@ -559,11 +529,6 @@ version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.0"; - sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; - }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.4"; @@ -579,11 +544,6 @@ version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging"; - version = "3.1.0"; - sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; - }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "3.1.4"; @@ -599,11 +559,6 @@ version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "3.1.0"; - sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh"; - }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "3.1.4"; @@ -629,11 +584,6 @@ version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "3.1.0"; - sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; - }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "3.1.4"; @@ -669,6 +619,11 @@ version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.0.1"; @@ -699,6 +654,11 @@ version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { + name = "Microsoft.Win32.SystemEvents"; + version = "4.7.0"; + sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; + }) (fetchNuGet { name = "MySqlConnector"; version = "0.61.0"; @@ -729,6 +689,11 @@ version = "5.0.60"; sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.68"; + sha256 = "0k275mbp9wannm10pqj4nv8agjc1f6hsrfhl0m6ax1apv81sfxcd"; + }) (fetchNuGet { name = "NBitpayClient"; version = "1.0.0.39"; @@ -849,6 +814,11 @@ version = "1.8.1.3"; sha256 = "1lv1ljaz8df835jgmp3ny1xgqqjf1s9f25baw7bf8d24qlf25i2g"; }) + (fetchNuGet { + name = "QRCoder"; + version = "1.4.1"; + sha256 = "1xgwhpqrm4ycnj8nk4ibxfwkmkiwc5i15l1za3ci5alghlpcb6ch"; + }) (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; @@ -869,11 +839,6 @@ version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.0.1"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; - }) (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; @@ -949,10 +914,15 @@ version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { + name = "Selenium.Support"; + version = "3.141.0"; + sha256 = "1gqwzbfq7i9jz830b0jibsis0qfxs8sl10n1nja02c6s637cwzib"; + }) (fetchNuGet { name = "Selenium.WebDriver.ChromeDriver"; - version = "85.0.4183.8700"; - sha256 = "0klyqmwa6yc0ibbmci51mzb2vl6n13qlk06chc9w78i0a43fs382"; + version = "87.0.4280.8800"; + sha256 = "1zrizydlhjv81r1fa5g8wzxrx1cxly3ip7pargj48hdx419iblfr"; }) (fetchNuGet { name = "Selenium.WebDriver"; @@ -1064,11 +1034,6 @@ version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.7.0"; - sha256 = "1gik4sn9jsi1wcy1pyyp0r4sn2g17cwrsh24b2d52vif8p2h24zx"; - }) (fetchNuGet { name = "System.Collections.Immutable"; version = "1.7.1"; @@ -1134,21 +1099,11 @@ version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.0.0"; - sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; - }) (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.7.0"; - sha256 = "0cr0v5dz8l5ackxv6b772fjcyj2nimqmrmzanjs4cw2668v568n1"; - }) (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.7.1"; @@ -1179,6 +1134,11 @@ version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { + name = "System.Drawing.Common"; + version = "4.7.0"; + sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; + }) (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.0.11"; @@ -1189,21 +1149,11 @@ version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.0.1"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; - }) (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.0.1"; - sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; - }) (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; @@ -1299,11 +1249,6 @@ version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.1.0"; - sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; - }) (fetchNuGet { name = "System.Net.Http"; version = "4.3.0"; @@ -1329,11 +1274,6 @@ version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { - name = "System.Net.Requests"; - version = "4.0.11"; - sha256 = "13mka55sa6dg6nw4zdrih44gnp8hnj5azynz47ljsh2791lz3d9h"; - }) (fetchNuGet { name = "System.Net.Security"; version = "4.3.0"; @@ -1349,11 +1289,6 @@ version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { - name = "System.Net.WebHeaderCollection"; - version = "4.0.1"; - sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; - }) (fetchNuGet { name = "System.Net.WebHeaderCollection"; version = "4.3.0"; @@ -1594,21 +1529,11 @@ version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }) (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }) (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; @@ -1624,11 +1549,6 @@ version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }) (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; @@ -1649,11 +1569,6 @@ version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }) (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; @@ -1689,6 +1604,11 @@ version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "4.5.0"; + sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; + }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.5.1"; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 45143a797e5..ffa061edc72 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.46"; + version = "2.1.49"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "1aph7yiwmch7s7x1qkzqv1shs3v6kg8i2s7266la0yp9ksf3w35p"; + sha256 = "0xg5gbq6rbzgsbgwf94qcy2b0m5kdspi6hc5a64smaj9i7i0136l"; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index 85d395089de..b0bf85f623f 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -181,23 +181,18 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.21"; - sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1"; + version = "2.0.28"; + sha256 = "1zfirfmhgigp733km9rqkgz560h5wg88bpba499x49h5j650cnn4"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "2.0.12"; - sha256 = "1d6lmymc9x3p74c8hc2x3m61ncnkqqgrddw9cw2m0zkvilkncsns"; + version = "2.0.21"; + sha256 = "1k26fkss6d7x2yqlid31z5i04b5dmlbbbwijg9c8i3d996i1z7sq"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.58"; - sha256 = "0qim9xbbj380254iyi1jsh2gnr90ddwd2593jw9a8bjwnlk7qr2c"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.60"; - sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; + version = "5.0.73"; + sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -221,8 +216,8 @@ }) (fetchNuGet { name = "Newtonsoft.Json"; - version = "11.0.1"; - sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; + version = "11.0.2"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) (fetchNuGet { name = "Newtonsoft.Json"; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 2cc20b424b1..aaaab255c76 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which -, IOKit ? null }: +, IOKit, copyDesktopItems, makeDesktopItem, wrapGAppsHook +}: with lib; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; }; - nativeBuildInputs = [ pkg-config which ]; + nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ]; buildInputs = [gettext glib gtk2 libX11 libSM libICE] ++ optionals stdenv.isDarwin [ IOKit ]; @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { # Makefiles are patched to fix references to `/usr/X11R6' and to add # `-lX11' to make sure libX11's store path is in the RPATH. - patchPhase = '' + postPatch = '' echo "patching makefiles..." for i in Makefile src/Makefile server/Makefile do @@ -30,6 +31,23 @@ stdenv.mkDerivation rec { makeFlags = [ "STRIP=-s" ]; 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 = { description = "Themeable process stack of system monitors"; longDescription = '' @@ -40,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "http://gkrellm.srcbox.net"; license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with maintainers; [ khumba ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 9e2b9709afc..21777252f3b 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.4"; + version = "0.28.5"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LilIwg3Zu7Zi7AhJeW0j2qUmSOGy1HHjvvB07FUcEeI="; + sha256 = "sha256-LSUWEgCajIBgRPiuvGJ9I3tJLXk1JrVDDsgS7lpbVYk="; }; vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 3e89fe0a4dc..7fb26476d8a 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , buildGoModule , srht, redis, celery, pyyaml, markdown }: diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index ea3f58e3890..5ce140273eb 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, pyyaml, PyGithub }: buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 8966cbe0800..a25a14f610c 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , buildGoModule , srht, minio, pygit2, scmsrht }: diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index fae311831f2..c8fa64c8b4d 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,5 +1,4 @@ { lib, fetchhg, buildPythonPackage -, python , srht, hglib, scmsrht, unidiff }: buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 99b5663a9b8..8b6d9201997 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht }: buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 25d22dede35..98191f564e9 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, asyncpg, aiosmtpd, pygit2, emailthreads }: buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 24a31a3ef17..e3751a6d5c8 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, pygit2 }: buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index d07bd29357a..b5b15520d25 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , buildGoModule , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache , sshpubkeys, weasyprint }: diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index 12747f98103..dab518e70ae 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, pyyaml }: buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 85ae3b2cf14..5e75efb0886 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -1,7 +1,6 @@ { lib, fetchgit, buildPythonPackage -, python , srht, redis, alembic, pystache -, pytest, factory_boy, writeText }: +, pytest, factory_boy }: buildPythonPackage rec { pname = "todosrht"; diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index c8213482d79..23e225bd744 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -5,7 +5,7 @@ kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage, kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, - solid + solid, systemsettings }: mkDerivation { @@ -15,6 +15,11 @@ mkDerivation { buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons 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 + ''; } diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix index f3a03b36474..96ba9afc237 100644 --- a/pkgs/development/compilers/graalvm/community-edition.nix +++ b/pkgs/development/compilers/graalvm/community-edition.nix @@ -7,45 +7,45 @@ let javaVersionPlatform = "${javaVersion}-${platform}"; graalvmXXX-ce = stdenv.mkDerivation rec { pname = "graalvm${javaVersion}-ce"; - version = "20.3.0"; + version = "21.0.0"; srcs = [ (fetchurl { - sha256 = { "8-linux-amd64" = "195b20ivvv8ipjn3qq2313j8qf96ji93pqm99nvn20bq23wasp25"; - "11-linux-amd64" = "1mdk1zhazvvh1fa01bzi5v5fxhvx592xmbakx0y1137vykbayyjm"; - "8-darwin-amd64" = "1rrs471204p71knyxpjxymdi8ws98ph2kf5j0knk529g0d24rs01"; - "11-darwin-amd64" = "008dl8dbf37mv4wahb9hbd6jp8svvmpy1rgsiqkn3i4hypxnkf12"; + sha256 = { "8-linux-amd64" = "18q1plrpclp02rlwn3vvv2fcyspvqv2gkzn14f0b59pnladmlv1j"; + "11-linux-amd64" = "1g1xjbr693rimdy2cy6jvz4vgnbnw76wa87xcmaszka206fmpnsc"; + "8-darwin-amd64" = "0giv8f7ybdykadzmxjy91i6njbdx6dclyx7g6vyhwk2l1cvxi4li"; + "11-darwin-amd64" = "1a8gjp6fp11ms05pd62h1x1ifkkr3wv0hrxic670v90bbps9lsqf"; }.${javaVersionPlatform}; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersionPlatform}-${version}.tar.gz"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "1rzbhllz28x5ps8n304v998hykr4m8z1gfg53ybi6laxhkbx3i13"; - "11-linux-amd64" = "09ipdl1489xnbckwl6sl9y7zy7kp5qf5fgf3kgz5d69jrk2z6rvf"; - "8-darwin-amd64" = "1iy2943jbrarh8bm9wy15xk7prnskqwik2ham07a6ybp4j4b81xi"; - "11-darwin-amd64" = "0vk2grlirghzc78kvwg66w0xriy5p8qkcp7qx83i62d7sj0kvwnf"; + sha256 = { "8-linux-amd64" = "0hpq2g9hc8b7j4d8a08kq1mnl6pl7a4kwaj0a3gka3d4m6r7cscg"; + "11-linux-amd64" = "0z3hb2bf0lqzw760civ3h1wvx22a75n7baxc0l2i9h5wxas002y7"; + "8-darwin-amd64" = "1izbgl4hjg5jyi422xnkx006qnw163r1i1djf76q1plms40y01ph"; + "11-darwin-amd64" = "1d9z75gil0if74ndla9yw3xx9i2bfbcs32qa0z6wi5if66cmknb8"; }.${javaVersionPlatform}; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "0v98v44vblhyi3jhrngmvrkb3a6d607x4fpmrb4mrrsg75vbvc6d"; - "11-linux-amd64" = "0kb9472ilwqg40gyw1c4lmzkd9s763raw560sw80ljm3p75k4sc7"; - "8-darwin-amd64" = "192n9ckr4p8qirpxr67ji3wzxpng33yfr7kxynlrcp7b3ghfic6p"; - "11-darwin-amd64" = "1wqdk8wphywa00kl3xikiskclb84rx3nw5a4vi5y2n060kclcp22"; + sha256 = { "8-linux-amd64" = "122p8psgmzhqnjb2fy1lwghg0kw5qa8xkzgyjp682lwg4j8brz43"; + "11-linux-amd64" = "1vdc90m6s013cbhmj58nb4vyxllbxirw0idlgv0iv9cyhx90hzgz"; + "8-darwin-amd64" = "04q0s9xsaskqn9kbhz0mgdk28j2qnxrzqfmw6jn2znr8s8jsc6yp"; + "11-darwin-amd64" = "1pw4xd8g5cc9bm52awmm1zxs96ijws43vws7y10wxa6a0nhv7z5f"; }.${javaVersionPlatform}; url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "1iskmkhrrwlhcq92g1ljvsfi9q403xxkwgzn9m282z5llh2fxv74"; - "11-linux-amd64" = "13bg2gs22rzbngnbw8j68jqgcknbiw30kpxac5jjcn55rf2ymvkz"; - "8-darwin-amd64" = "08pib13q7s5wymnbykkyif66ll146vznxw4yz12qwhb419882jc7"; - "11-darwin-amd64" = "0cb9lhc21yr2dnrm4kwa68laaczvsdnzpcbl2qix50d0v84xl602"; + sha256 = { "8-linux-amd64" = "19m7n4f5jrmsfvgv903sarkcjh55l0nlnw99lvjlcafw5hqzyb91"; + "11-linux-amd64" = "18ibb7l7b4hmbnvyr8j7mrs11mvlsf2j0c8rdd2s93x2114f26ba"; + "8-darwin-amd64" = "1zlzi00339kvg4ym2j75ypfkzn8zbwdpriqmkaz4fh28qjmc1dwq"; + "11-darwin-amd64" = "0x301i1fimakhi2x29ldr0fsqkb3qs0g9jsmjv27d62dpqx8kgc8"; }.${javaVersionPlatform}; url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "12lvcl1vmc35wh3xw5dqca7yiijsd432x4lim3knzppipy7fmflq"; - "11-linux-amd64" = "1s8zfgjyyw6w53974h9a2ig8a1bvc97aplyrdziywfrijgp6zkqk"; - "8-darwin-amd64" = "06i1n42hkhcf1pfb2bly22ws4a09xgydsgh8b0kvjmb1fapd4paq"; - "11-darwin-amd64" = "1r2bqhfxnw09izxlsc562znlp3m9c1isqzhlki083h3vp548vv9s"; + sha256 = { "8-linux-amd64" = "0dlgbg6kri89r9zbk6n0ch3g8356j1g35bwjng87c2y5y0vcw0b5"; + "11-linux-amd64" = "1yby65hww6zmd2g5pjwbq5pv3iv4gfv060b8fq75fjhwrisyj5gd"; + "8-darwin-amd64" = "1smdj491g23i3z7p5rybid18nnz8bphrqjkv0lg2ffyrpn8k6g93"; + "11-darwin-amd64" = "056zyn0lpd7741k1szzjwwacka0g7rn0j4ypfmav4h1245mjg8lx"; }.${javaVersionPlatform}; 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 = '' - rpath="${ { "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64"; - "11" = "$out/lib/jli:$out/lib/server:$out/lib"; + 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:$out/languages/ruby/lib/cext"; }.${javaVersion} }:${ lib.makeLibraryPath [ @@ -204,11 +204,13 @@ let echo '1 + 1' | $out/bin/graalpython - # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL - # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even - # though `openssl` is in `propagatedBuildInputs`. For more details see: - # https://github.com/NixOS/nixpkgs/pull/105815 - # echo '1 + 1' | $out/bin/irb + ${lib.optionalString stdenv.isLinux '' + # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL + # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even + # though `openssl` is in `propagatedBuildInputs`. For more details see: + # https://github.com/NixOS/nixpkgs/pull/105815 + echo '1 + 1' | $out/bin/irb + ''} echo '1 + 1' | $out/bin/node -i ${lib.optionalString (javaVersion == "11") '' diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 55ccb32191a..774e83311b1 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, graalvm11-ce, glibcLocales }: -with lib; stdenv.mkDerivation rec { pname = "babashka"; version = "0.2.10"; @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { native-image \ -jar ${src} \ -H:Name=bb \ - ${optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \ + ${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \ -H:+ReportExceptionStackTraces \ -J-Dclojure.spec.skip-macros=true \ -J-Dclojure.compiler.direct-linking=true \ diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index ab64505e091..8875a9cf55e 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { # Causes build failure due to warning 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 = '' export SOURCE_DIR=$(pwd) export HOME=$TMPDIR diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix index ef6b254b8a3..4d3036d4cfb 100644 --- a/pkgs/development/libraries/muparserx/default.nix +++ b/pkgs/development/libraries/muparserx/default.nix @@ -38,5 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://beltoforion.de/en/muparserx/"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; + # selftest fails + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index ebc0eb51df4..16c61f2e895 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , freezegun , google-api-core , matplotlib diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 85ed160413e..3226e3854c7 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -46,11 +46,6 @@ buildPythonPackage rec { ipython ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'numba==0.43'" "'numba'" - ''; - # avoid collecting local files preCheck = '' cd clifford/test diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 92af67fa183..5baa28e4bd7 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , fetchpatch , rPackages -, rWrapper , buildPythonPackage , biopython , numpy @@ -55,11 +54,6 @@ buildPythonPackage rec { rPackages.DNAcopy ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pandas >= 0.20.1, < 0.25.0" "pandas" - ''; - checkInputs = [ R ]; checkPhase = '' diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/development/python-modules/csvs-to-sqlite/default.nix index 4105d981386..ea32471f09c 100644 --- a/pkgs/development/python-modules/csvs-to-sqlite/default.nix +++ b/pkgs/development/python-modules/csvs-to-sqlite/default.nix @@ -2,13 +2,12 @@ , buildPythonPackage , fetchFromGitHub , isPy3k -, pytestrunner , click , dateparser , pandas , py-lru-cache , six -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -23,11 +22,6 @@ buildPythonPackage rec { sha256 = "0p99cg76d3s7jxvigh5ad04dzhmr6g62qzzh4i6h7x9aiyvdhvk4"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace pandas~=0.25.0 pandas - ''; - propagatedBuildInputs = [ click dateparser @@ -37,13 +31,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - pytest - ''; - meta = with lib; { description = "Convert CSV files into a SQLite database"; homepage = "https://github.com/simonw/csvs-to-sqlite"; diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 4c2db1f5214..42f1d77b12b 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi , chart-studio , colorlover , ipython diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index a3cc7b6afda..a68c86538ee 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , dask , numpy, toolz # dask[array] , scipy @@ -38,6 +37,7 @@ buildPythonPackage rec { checkPhase = '' pytest --ignore=tests/test_dask_image/ ''; + pythonImportsCheck = [ "dask_image" ]; meta = with lib; { homepage = "https://github.com/dask/dask-image"; diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 737def7b9ac..4f4b7b705c4 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -12,10 +12,6 @@ , six , multipledispatch , packaging -, pytest -, xgboost -, tensorflow -, joblib , distributed }: diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index 1bec4c82872..d656b055d11 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -4,8 +4,6 @@ , dask , distributed , mpi4py -, pytest -, requests }: buildPythonPackage rec { @@ -17,15 +15,11 @@ buildPythonPackage rec { sha256 = "76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7"; }; - checkInputs = [ pytest requests ]; propagatedBuildInputs = [ dask distributed mpi4py ]; - checkPhase = '' - py.test dask_mpi - ''; - # hardcoded mpirun path in tests doCheck = false; + pythonImportsCheck = [ "dask_mpi" ]; meta = with lib; { homepage = "https://github.com/dask/dask-mpi"; diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index 4e64b8c9f0c..eb18ac31fd0 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -4,8 +4,6 @@ , xgboost , dask , distributed -, pytest -, scikitlearn }: buildPythonPackage rec { @@ -17,19 +15,17 @@ buildPythonPackage rec { sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c"; }; - checkInputs = [ pytest scikitlearn ]; propagatedBuildInputs = [ xgboost dask distributed ]; - checkPhase = '' - py.test dask_xgboost/tests/test_core.py - ''; - doCheck = false; + pythonImportsCheck = [ "dask_xdgboost" ]; meta = with lib; { homepage = "https://github.com/dask/dask-xgboost"; description = "Interactions between Dask and XGBoost"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; + # TypeError: __init__() got an unexpected keyword argument 'iid' + broken = true; }; } diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 534cc816def..2b11b1ea273 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { # dask doesn't do well with large core counts 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; { diff --git a/pkgs/development/python-modules/dftfit/default.nix b/pkgs/development/python-modules/dftfit/default.nix index 0f0563e3baf..73791bdaa9a 100644 --- a/pkgs/development/python-modules/dftfit/default.nix +++ b/pkgs/development/python-modules/dftfit/default.nix @@ -12,11 +12,7 @@ , lammps-cython , pymatgen-lammps , pytestrunner -, pytest -, pytestcov -, pytest-benchmark , isPy3k -, openssh }: buildPythonPackage rec { @@ -25,18 +21,27 @@ buildPythonPackage rec { disabled = (!isPy3k); src = fetchPypi { - inherit pname version; - sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df"; + inherit pname version; + sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df"; }; buildInputs = [ pytestrunner ]; - checkInputs = [ pytest pytestcov pytest-benchmark openssh ]; - propagatedBuildInputs = [ pymatgen marshmallow pyyaml pygmo - pandas scipy numpy scikitlearn - lammps-cython pymatgen-lammps ]; + propagatedBuildInputs = [ + pymatgen + marshmallow + pyyaml + pygmo + pandas + scipy + numpy + scikitlearn + lammps-cython + pymatgen-lammps + ]; # tests require git lfs download. and is quite large so skip tests doCheck = false; + pythonImportsCheck = [ "dftfit" ]; meta = { description = "Ab-Initio Molecular Dynamics Potential Development"; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index f4be407fade..372b931bca2 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -1,11 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pytest -, pytest-repeat -, pytest-timeout -, mock -, joblib , click , cloudpickle , dask @@ -18,9 +13,6 @@ , tornado , zict , pyyaml -, isPy3k -, futures -, singledispatch , mpi4py , bokeh , pythonOlder @@ -29,6 +21,7 @@ buildPythonPackage rec { pname = "distributed"; version = "2.30.1"; + disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { @@ -36,23 +29,14 @@ buildPythonPackage rec { sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e"; }; - disabled = pythonOlder "3.6"; - - checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six 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 doCheck = false; + pythonImportsCheck = [ "distributed" ]; meta = { description = "Distributed computation in Python."; diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 0fa202addb9..54af81d5d8b 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.19.202"; + version = "2.20.204"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "2b606dc645f99feae67dfc528620dddc773ecef5d59bcaeae68bba601f25162b"; + sha256 = "sha256-JNjD9UtLHsMGwTuXydZ+L5+pPQ2eobkr26Yt9pgs1qA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index ea6dfe32fda..56fb450b3e5 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -6,7 +6,7 @@ , pybind11 , setuptools_scm , pytestrunner -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -31,18 +31,10 @@ buildPythonPackage rec { pytestrunner ]; - checkInputs = [ - pytest - ]; + propagatedBuildInputs = [ numpy pandas ]; - propagatedBuildInputs = [ - numpy - pandas - ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "duckdb" ]; meta = with lib; { description = "DuckDB is an embeddable SQL OLAP Database Management System"; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 07922ee19ef..dc25759afe3 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner, -thrift, pytest, python-snappy, lz4, zstd }: +{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner +, thrift, pytestCheckHook, python-snappy, lz4, zstandard, zstd }: buildPythonPackage rec { pname = "fastparquet"; @@ -12,15 +12,13 @@ buildPythonPackage rec { sha256 = "17i091kky34m2xivk29fqsyxxxa7v4352n79w01n7ni93za6wana"; }; - postPatch = '' - # FIXME: package zstandard - # removing the test dependency for now - substituteInPlace setup.py --replace "'zstandard'," "" - ''; - nativeBuildInputs = [ pytestrunner ]; 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; { description = "A python implementation of the parquet format"; diff --git a/pkgs/development/python-modules/flammkuchen/default.nix b/pkgs/development/python-modules/flammkuchen/default.nix index a5525d97f60..1349e10c539 100644 --- a/pkgs/development/python-modules/flammkuchen/default.nix +++ b/pkgs/development/python-modules/flammkuchen/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , numpy , scipy , tables diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index 50ed257f57e..9a0b1b09db6 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , numpy -, setuptools , python , scikitimage , openjpeg diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 4fd6ccf19c5..b4e8803784b 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; checkInputs = [ pytestCheckHook pytestcov ]; - pytestFlagsArray = [ "tests" "--ignore=docs" ]; + pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ]; disabledTests = [ "gridplot_outputs" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index 7464f3c8997..ed5179d6db5 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -24,6 +24,7 @@ buildPythonPackage { # tests cannot work without elasticsearch doCheck = false; + pythonImportsCheck = [ "image_match" ]; meta = with lib; { homepage = "https://github.com/ascribe/image-match"; diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index 8d2b7fd8da8..ee1df820a40 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -26,6 +26,9 @@ buildPythonPackage rec { opencv3 ]; + doCheck = false; + pythonImportsCheck = [ "imagecorruptions" ]; + meta = with lib; { homepage = "https://github.com/bethgelab/imagecorruptions"; description = "This package provides a set of image corruptions"; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index e0c2adb8e8b..d40774b86b6 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -3,7 +3,6 @@ , pandas , pytestCheckHook , scikitlearn -, tensorflow }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix index 0634e919024..e5b0cc6fbc7 100644 --- a/pkgs/development/python-modules/intelhex/default.nix +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -1,25 +1,23 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch +, pytestCheckHook }: buildPythonPackage rec { pname = "intelhex"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0ckqjbxd8gwcg98gfzpn4vq1qxzfvq3rdbrr1hikj1nmw08qb780"; + sha256 = "sha256-iStzYacZ9JRSN9qMz3VOlRPbMvViiFJ4WuoQjc0lAJM="; }; - patches = [ - # patch the tests to check for the correct version string (2.2.1) - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/bialix/intelhex/pull/26.patch"; - sha256 = "1f3f2cyf9ipb9zdifmjs8rqhg028dhy91vabxxn3l7br657s8r2l"; - }) - ]; + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "intelhex/test.py" ]; + + pythonImportsCheck = [ "intelhex" ]; meta = { homepage = "https://github.com/bialix/intelhex"; diff --git a/pkgs/development/python-modules/lammps-cython/default.nix b/pkgs/development/python-modules/lammps-cython/default.nix index 4c16010f4af..609d7a410c1 100644 --- a/pkgs/development/python-modules/lammps-cython/default.nix +++ b/pkgs/development/python-modules/lammps-cython/default.nix @@ -9,10 +9,7 @@ , pymatgen , ase , pytestrunner -, pytest_4 -, pytestcov , isPy3k -, openssh }: buildPythonPackage rec { @@ -26,7 +23,6 @@ buildPythonPackage rec { }; buildInputs = [ cython pytestrunner ]; - checkInputs = [ pytest_4 pytestcov openssh ]; propagatedBuildInputs = [ mpi4py pymatgen ase numpy ]; preBuild = '' @@ -44,6 +40,8 @@ buildPythonPackage rec { EOF ''; + pythonImportsCheck = [ "lammps" ]; + meta = { description = "Pythonic Wrapper to LAMMPS using cython"; homepage = "https://gitlab.com/costrouc/lammps-cython"; diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 2406738cf1b..f8cb85ab418 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -1,33 +1,41 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, libsodium +, pytestCheckHook +}: buildPythonPackage rec { pname = "libnacl"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "saltstack"; repo = pname; rev = "v${version}"; - sha256 = "10rpim9lf0qd861a3miq8iqg8w87slqwqni7nq66h72jdk130axg"; + sha256 = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc="; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ libsodium ]; + buildInputs = [ libsodium ]; postPatch = - let soext = stdenv.hostPlatform.extensions.sharedLibrary; in '' - substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium${soext}')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')" - ''; + let soext = stdenv.hostPlatform.extensions.sharedLibrary; in + '' + substituteInPlace "./libnacl/__init__.py" --replace \ + "ctypes.cdll.LoadLibrary('libsodium${soext}')" \ + "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')" + ''; - checkPhase = '' - py.test - ''; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "libnacl" ]; meta = with lib; { - maintainers = with maintainers; [ xvapx ]; description = "Python bindings for libsodium based on ctypes"; - homepage = "https://pypi.python.org/pypi/libnacl"; + homepage = "https://libnacl.readthedocs.io/"; license = licenses.asl20; platforms = platforms.unix; + maintainers = with maintainers; [ xvapx ]; }; } diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index b7ddf35caec..86c5afd8c4a 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { # tests not included with pypi release doCheck = false; + pythonImportsCheck = [ "nbsmoke" ]; meta = with lib; { description = "Basic notebook checks and linting"; diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index e1c22ddbfa3..3cd420c7491 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -1,5 +1,5 @@ { 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 { pname = "osmnx"; @@ -14,14 +14,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ]; - checkInputs = [ coverage pytest coveralls ]; - #Fails when using sandboxing as it requires internet connection, works fine without it + # requires network doCheck = false; - - #Check phase for the record - #checkPhase = '' - # coverage run --source osmnx -m pytest --verbose - #''; + pythonImportsCheck = [ "osmnx" ]; meta = with lib; { description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix index ea0ba44e99d..d4aa1551bed 100644 --- a/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/pkgs/development/python-modules/pandas-datareader/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , isPy27 , pandas , lxml diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index bfe4e2b9ea0..2f9fbdccd55 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { # not everything packaged with pypi release doCheck = false; + pythonImportsCheck = [ "pims" ]; meta = with lib; { homepage = "https://github.com/soft-matter/pims"; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index b9c84c484df..a38d5df50dd 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -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 _arrow-cpp = arrow-cpp.override { python3 = python; }; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 9cca6cf57ef..034bdb6363a 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , lib , fetchPypi -, isPy27 , click , num2words , numpy @@ -11,8 +10,7 @@ , patsy , bids-validator , sqlalchemy -, pytest -, pathlib +, pytestCheckHook }: buildPythonPackage rec { @@ -36,11 +34,8 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ pytest ] ++ lib.optionals isPy27 [ pathlib ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "bids" ]; meta = with lib; { description = "Python tools for querying and manipulating BIDS datasets"; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 64ec58487c4..8fac00e871e 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,13 +1,19 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - version = "4.3.2"; + version = "4.3.3"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "dfeed4715e2056e3e56b9c5f51a679ce2934897eef926f3d14e5364e43f19070"; + sha256 = "sha256-/7KrJkoLg69Uii2wxQl5jiCDYd85YBuomK5lzs+1nLs="; }; postPatch = '' @@ -25,20 +31,16 @@ buildPythonPackage rec { --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" ''); - checkInputs = [ pytest glibcLocales ]; - - checkPhase = '' - export LC_ALL=en_US.UTF-8 - ${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 - ''; + checkInputs = [ pytestCheckHook ]; + # https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor) + disabledTests = [ "test_open_existing_pipe" ]; + pythonImportsCheck = [ "pyfakefs" ]; meta = with lib; { description = "Fake file system that mocks the Python file system modules"; - license = licenses.asl20; - homepage = "http://pyfakefs.org/"; - changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md"; + homepage = "http://pyfakefs.org/"; + changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md"; + license = licenses.asl20; maintainers = with maintainers; [ gebner ]; }; } diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index 155254a6af3..96e807f8eba 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -10,20 +10,18 @@ buildPythonPackage rec { 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]; propagatedBuildInputs = [ numpy scipy cython dask ]; # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; - - 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" - #''; + pythonImportsCheck = [ "pyfftw" ]; meta = with lib; { description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/pkgs/development/python-modules/pymatgen-lammps/default.nix index c80472a6730..72f362f85c4 100644 --- a/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -3,14 +3,14 @@ , buildPythonPackage , pymatgen , pytestrunner -, pytest +, pytestCheckHook , isPy3k }: buildPythonPackage rec { pname = "pymatgen-lammps"; version = "0.4.5"; - disabled = (!isPy3k); + disabled = !isPy3k; src = fetchurl { url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; @@ -18,13 +18,17 @@ buildPythonPackage rec { }; buildInputs = [ pytestrunner ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ pymatgen ]; + pythonImportsCheck = [ "pmg_lammps" ]; + meta = { description = "A LAMMPS wrapper using pymatgen"; homepage = "https://gitlab.com/costrouc/pymatgen-lammps"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; + # not compatible with recent versions of pymatgen + broken = true; }; } diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index bae7a561323..448b4c3c338 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { # No tests in pypi tarball. doCheck = false; + pythonImportsCheck = [ "pymatgen" ]; meta = with lib; { description = "A robust materials analysis code that defines core object representations for structures and molecules"; diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index 3ce1e70e823..20dbe0ba31c 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -17,10 +17,11 @@ buildPythonPackage rec { sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa"; }; - doCheck = false; - propagatedBuildInputs = [ requests lxml pandas ]; + doCheck = false; + pythonImportsCheck = [ "pytrends" ]; + meta = with lib; { description = "Pseudo API for Google Trends"; homepage = "https://github.com/GeneralMills/pytrends"; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index e5eb877b6b2..062aeeb97ff 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -2,11 +2,11 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub -, fetchpatch # C Inputs , blas , catch2 , cmake +, conan , cython , fmt , muparserx @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.7.1"; + version = "0.7.4"; disabled = pythonOlder "3.6"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - sha256 = "07l0wavdknx0y4vy0hwgw24365sg4nb6ygl3lpa098np85qgyn4y"; + sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo="; }; nativeBuildInputs = [ @@ -61,10 +61,13 @@ buildPythonPackage rec { pybind11 ]; - patches = [ - # TODO: remove in favor of qiskit-aer PR #877 patch once accepted/stable - ./remove-conan-install.patch - ]; + postPatch = '' + substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," "" + ''; + + preBuild = '' + export DISABLE_CONAN=1 + ''; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch b/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch deleted file mode 100644 index 1c5ae87b082..00000000000 --- a/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch +++ /dev/null @@ -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'] diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index 11274c525f0..0e6e8e25b53 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.8.1"; + version = "0.8.2"; disabled = pythonOlder "3.6"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "11qyya3vyq50wpzrzzl8v46yx5p72rhpqhybwn47qgazxgg82r1b"; + sha256 = "sha256-ybf8bXqsVk6quYi0vrfo/Mplk7Nr7tQS7cevXxI9khw="; }; # 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. # 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 = '' - substituteInPlace setup.py \ - --replace "pyscf; sys_platform != 'win32'" "" \ - --replace "cplex; python_version >= '3.6' and python_version < '3.8'" "" + substituteInPlace setup.py --replace "docplex==2.15.194" "docplex" # 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 " \ diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index b5295dbd041..f73b46a520a 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -2,7 +2,6 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub -, fetchpatch , python , numpy , qiskit-terra @@ -24,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.6"; @@ -33,11 +32,11 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - sha256 = "17kplmi17axcbbgw35dzfr3d5bzfymxfni9sf6v14223c5674p4y"; + sha256 = "sha256-Kl3tnoamZrCxwoDdu8betG6Lf3CC3D8R2TYiq8Zl3Aw="; }; # 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 = '' substituteInPlace qiskit/ignis/mitigation/expval/base_meas_mitigator.py --replace "plt.axes" "'plt.axes'" ''; diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 89d39b718cd..ff51e82e351 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -56,7 +56,7 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.16.1"; + version = "0.16.4"; disabled = pythonOlder "3.6"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0007glsbrvq9swamvz8r76z9nzh46b388y0ds1dypczxpwlp9xcq"; + sha256 = "sha256-/rWlPfpAHoMedKG42jfUYt0Ezq7i+9dkyPllavkg4cc="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 7c79d517ce5..3c7a0044202 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # 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"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - sha256 = "0x4cqx1wqqj7h5g3vdag694qjzsmvhpw25yrlcs70mh5ywdp28x1"; + sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index 56b80a4676b..0247d20ec7d 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -46,6 +46,8 @@ buildPythonPackage rec { importlib-metadata ]; + pythonImportsCheck = [ "quandl" ]; + meta = with lib; { description = "Quandl Python client library"; homepage = "https://github.com/quandl/quandl-python"; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 0b042288fb7..cae84f8cbe9 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -1,8 +1,6 @@ { stdenv , lib -, python , buildPythonPackage -, fetchpatch , fetchPypi , isPyPy , R diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index f14c4d82f42..f13fecc0855 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -32,12 +32,6 @@ buildPythonPackage rec { checkInputs = [ coverage ]; 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 doCheck = false; @@ -45,6 +39,8 @@ buildPythonPackage rec { ${python.interpreter} -m skbio.test ''; + pythonImportsCheck = [ "skbio" ]; + meta = with lib; { homepage = "http://scikit-bio.org/"; description = "Data structures, algorithms and educational resources for bioinformatics"; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index b3bf8fce0fc..8c771ea286c 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { # Computationally very demanding tests doCheck = false; + pythonImportsCheck= [ "seaborn" ]; meta = { description = "Statisitical data visualization"; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index bb41f61517f..7ea4604ff37 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -26,10 +26,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; - # on CPU, these expect artifacts from previous GPU run disabledTests = [ + # on CPU, these expect artifacts from previous GPU run "test_load_cuda_params_to_cpu" + # failing tests "test_pickle_load" + "test_grid_search_with_slds_" + "test_grid_search_with_dict_works" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 0ce6e338e61..72546642009 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -1,9 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, click, ecdsa, fido2, intelhex, pyserial, pyusb, requests}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, click +, cryptography +, ecdsa +, fido2 +, intelhex +, pyserial +, pyusb +, requests +}: buildPythonPackage rec { pname = "solo-python"; - version = "0.0.26"; + version = "0.0.27"; format = "flit"; disabled = pythonOlder "3.6"; # only python>=3.6 is supported @@ -11,7 +22,7 @@ owner = "solokeys"; repo = pname; rev = version; - sha256 = "05rwqrhr1as6zqhg63d6wga7l42jm2azbav5w6ih8mx5zbxf61yz"; + sha256 = "sha256-OCiKa6mnqJGoNCC4KqI+hMw22tzhdN63x9/KujNJqcE="; }; # replaced pinned fido, with unrestricted fido version @@ -21,6 +32,7 @@ propagatedBuildInputs = [ click + cryptography ecdsa fido2 intelhex diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index d17aed6ae43..3a62dd4ecf1 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi , confluent-kafka , distributed , flaky diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 88adbe4f7d9..80eefc0a639 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, buildPythonPackage, fetchPypi, isPy3k, callPackage +{ lib, buildPythonPackage, fetchPypi, isPy3k , opencv3 , pyqt5 , pyqtgraph @@ -19,7 +19,7 @@ , imageio-ffmpeg , av , nose -, pytest +, pytestCheckHook , pyserial , arrayqueues , colorspacious @@ -37,14 +37,18 @@ buildPythonPackage rec { inherit pname version; sha256 = "aab9d07575ef599a9c0ae505656e3c03ec753462df3c15742f1f768f2b578f0a"; }; - doCheck = false; + + # crashes python + preCheck = '' + rm stytra/tests/test_z_experiments.py + ''; + checkInputs = [ nose - pytest + pytestCheckHook pyserial ]; - propagatedBuildInputs = [ opencv3 pyqt5 diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix index 6e621ee8b68..dbfad336d0f 100644 --- a/pkgs/development/python-modules/torchgpipe/default.nix +++ b/pkgs/development/python-modules/torchgpipe/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytest , pytestrunner , pytestCheckHook , pytorch @@ -23,12 +22,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytorch ]; - checkInputs = [ pytest pytestrunner pytestCheckHook ]; - disabledTests = [ "test_inplace_on_requires_grad" ]; - # seems like a harmless failure: - ## AssertionError: - ## 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.' + checkInputs = [ pytestrunner pytestCheckHook ]; + disabledTests = [ + "test_inplace_on_requires_grad" + "test_input_requiring_grad" + ]; meta = with lib; { description = "GPipe implemented in Pytorch and optimized for CUDA rather than TPU"; diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix index 2c8f6dd8031..290892672e5 100644 --- a/pkgs/development/python-modules/traittypes/default.nix +++ b/pkgs/development/python-modules/traittypes/default.nix @@ -3,10 +3,9 @@ , fetchFromGitHub , fetchpatch , isPy27 -, pytest +, pytestCheckHook , nose , numpy -, scipy , pandas , xarray , traitlets @@ -35,7 +34,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ traitlets ]; - checkInputs = [ numpy pandas xarray nose pytest ]; + checkInputs = [ numpy pandas xarray nose pytestCheckHook ]; + pythonImportsCheck = [ "traittypes" ]; meta = with lib; { description = "Trait types for NumPy, SciPy, XArray, and Pandas"; diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix new file mode 100644 index 00000000000..235540209e3 --- /dev/null +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix deleted file mode 100644 index a9f3042fb39..00000000000 --- a/pkgs/development/python-modules/transmissionrpc/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix index 21fe31630de..aca6095d333 100644 --- a/pkgs/development/python-modules/uproot3-methods/default.nix +++ b/pkgs/development/python-modules/uproot3-methods/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { # No tests on PyPi doCheck = false; + pythonImportsCheck = [ "uproot3_methods" ]; meta = with lib; { homepage = "https://github.com/scikit-hep/uproot3-methods"; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 083aa630209..04c38838a43 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage , fetchPypi, pythonOlder -, pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }: +, jupyter_core, pandas, ipywidgets, jupyter }: buildPythonPackage rec { pname = "vega"; @@ -11,12 +11,11 @@ buildPythonPackage rec { sha256 = "f343ceb11add58d24cd320d69e410b111a56c98c9069ebb4ef89c608c4c1950d"; }; - buildInputs = [ pytest ]; propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; # currently, recommonmark is broken on python3 doCheck = false; - checkInputs = [ altair ]; + pythonImportsCheck = [ "vega" ]; meta = with lib; { description = "An IPython/Jupyter widget for Vega and Vega-Lite"; diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index 4119b26259d..7137205b350 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -6,7 +6,6 @@ , imutils , progress , matplotlib -, pytest }: buildPythonPackage rec { @@ -18,11 +17,11 @@ buildPythonPackage rec { sha256 = "649a77a0c1b670d13a1bf411451945d7da439364dc0c33ee3636a23f1d82b456"; }; - checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ]; # tests not packaged with pypi doCheck = false; + pythonImportsCheck = [ "vidstab" ]; meta = with lib; { homepage = "https://github.com/AdamSpannbauer/python_video_stab"; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 0cc386b657c..5539489afb0 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "clj-kondo"; - version = "2020.12.12"; + version = "2021.02.13"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "27b8a82fb613803ab9c712866b7cc89c40fcafc4ac3af178c11b4ed7549934dc"; + sha256 = "sha256-Rq7W5sP9nRB0TGRUSQIyC3U568uExmcM/gd+1HjAqac="; }; dontUnpack = true; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 369ba13a0f5..af772645824 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; postPatch = '' - substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" - substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" - substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" + substituteInPlace ./Documentation/Makefile \ + --replace "2>/dev/null" "" \ + --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" ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index f9d26da6297..9fce836326e 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.26.0"; + version = "1.27.0"; src = fetchPypi { inherit pname version; - sha256 = "1jppwqxamj3a65fw2a87brz4iqgijaa4lja51wlxh2xdkqj0sn6l"; + sha256 = "1kpkxgyzz35ga4ld7cbjr0pfbhrcbrfmp9msnwjqllmsmy0g5bas"; }; patches = [ diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix new file mode 100644 index 00000000000..56f6cddb61e --- /dev/null +++ b/pkgs/tools/audio/yabridge/default.nix @@ -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" ]; + }; +} diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix new file mode 100644 index 00000000000..6fa85cd89e8 --- /dev/null +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch b/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch new file mode 100644 index 00000000000..e17cda6ada3 --- /dev/null +++ b/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch @@ -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='.", ++ "Could not find '{}' through 'NIX_PROFILES' or '{}'. You can override the \ ++ default search path using 'yabridgectl set --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) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index cd91d51d960..63808d48512 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -24,12 +24,6 @@ stdenv.mkDerivation rec { # Tainted Mode disables PERL5LIB 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 sed -i '/^export PATH/d' ssh_filter_btrbk.sh substituteInPlace ssh_filter_btrbk.sh --replace logger ${util-linux}/bin/logger diff --git a/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch b/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch deleted file mode 100644 index 90b60235aad..00000000000 --- a/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e34a16301f425f273a67ed3abbc45840bc82d892 Mon Sep 17 00:00:00 2001 -From: srs5694 -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 - diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 9c36e55b8f2..eac55d6beae 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -14,17 +14,16 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.12.0"; - srcName = "refind-src-${version}"; + version = "0.13.0"; src = fetchurl { - url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz"; - sha256 = "1i5p3sir3mx4i2q5w78360xn2kbgsj8rmgrqvsvag1zzr5dm1f3v"; + url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; + sha256 = "0zivlcw1f3zwnrwvbhwq6gg781hh72g2bhc2cxcsb2zmg7q8in65"; }; patches = [ + # Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds. ./0001-toolchain.patch - ./0001-Fix-GCC-10-compile-problem.patch ]; buildInputs = [ gnu-efi ]; @@ -44,6 +43,8 @@ stdenv.mkDerivation rec { buildFlags = [ "gnuefi" "fs_gnuefi" ]; installPhase = '' + runHook preInstall + install -d $out/bin/ install -d $out/share/refind/drivers_${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-mvrefind sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 1c2d7ab6717..343f2d0527e 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, darwin, fetchFromGitHub, rustPlatform }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "kak-lsp"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c"; - buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optional stdenv.isDarwin [ Security ]; meta = with lib; { description = "Kakoune Language Server Protocol Client"; diff --git a/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch b/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch index e92f5a46ae7..6bead60dc56 100755 --- a/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch +++ b/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch @@ -1,5 +1,5 @@ From e295844e8ef5c13487996ab700e5f12a7fadb1a6 Mon Sep 17 00:00:00 2001 -From: Nima Vasseghi +From: Private Date: Wed, 30 Dec 2020 16:06:46 -0800 Subject: [PATCH] malloc.h to stdlib.h in rfc2440.c diff --git a/pkgs/tools/security/shhgit/default.nix b/pkgs/tools/security/shhgit/default.nix new file mode 100644 index 00000000000..a05eba1282c --- /dev/null +++ b/pkgs/tools/security/shhgit/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index af9ef68dc24..8c017c42d7a 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, zlib, kmod, which , hwdata , static ? stdenv.hostPlatform.isStatic -, darwin ? null +, IOKit }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; 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 '' substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf905a4bd40..e20e3de4751 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -748,6 +748,12 @@ in metapixel = callPackage ../tools/graphics/metapixel { }; + yabridge = callPackage ../tools/audio/yabridge { + wine = wineWowPackages.minimal; + }; + + yabridgectl = callPackage ../tools/audio/yabridgectl { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -5505,7 +5511,9 @@ in 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 { }; @@ -7009,7 +7017,9 @@ in 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 { inherit (darwin.apple_sdk.frameworks) IOKit; @@ -16676,6 +16686,8 @@ in sfsexp = callPackage ../development/libraries/sfsexp {}; + shhgit = callPackage ../tools/security/shhgit { }; + shhmsg = callPackage ../development/libraries/shhmsg { }; shhopt = callPackage ../development/libraries/shhopt { }; @@ -22555,7 +22567,7 @@ in gitit = callPackage ../applications/misc/gitit {}; gkrellm = callPackage ../applications/misc/gkrellm { - inherit (darwin) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit; }; glow = callPackage ../applications/editors/glow { }; @@ -24040,6 +24052,8 @@ in mupdf = callPackage ../applications/misc/mupdf { }; mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { }; + muso = callPackage ../applications/audio/muso { }; + mystem = callPackage ../applications/misc/mystem { }; diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c3d36efba5..9b5bdfbfb7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7932,7 +7932,9 @@ in { 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 { };