Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c2867828bbc5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8eaff5b06ad1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 19, 2018

  1. 2
    Copy the full SHA
    96a2217 View commit details
  2. libressl_2_6: 2.6.4 -> 2.6.5

    fpletz committed Jun 19, 2018
    Copy the full SHA
    26501a9 View commit details
  3. Copy the full SHA
    8eaff5b View commit details
Showing with 42 additions and 27 deletions.
  1. +40 −20 nixos/modules/services/misc/xmr-stak.nix
  2. +2 −7 pkgs/development/libraries/libressl/default.nix
60 changes: 40 additions & 20 deletions nixos/modules/services/misc/xmr-stak.nix
Original file line number Diff line number Diff line change
@@ -10,9 +10,6 @@ let
inherit (cfg) openclSupport cudaSupport;
};

xmrConfArg = optionalString (cfg.configText != "") ("-c " +
pkgs.writeText "xmr-stak-config.txt" cfg.configText);

in

{
@@ -29,22 +26,34 @@ in
description = "List of parameters to pass to xmr-stak.";
};

configText = mkOption {
type = types.lines;
default = "";
example = ''
"currency" : "monero",
"pool_list" :
[ { "pool_address" : "pool.supportxmr.com:5555",
"wallet_address" : "<long-hash>",
"pool_password" : "minername",
"pool_weight" : 1,
},
],
configFiles = mkOption {
type = types.attrsOf types.str;
default = {};
example = literalExample ''
{
"config.txt" = '''
"verbose_level" : 4,
"h_print_time" : 60,
"tls_secure_algo" : true,
''';
"pools.txt" = '''
"currency" : "monero7",
"pool_list" :
[ { "pool_address" : "pool.supportxmr.com:443",
"wallet_address" : "my-wallet-address",
"rig_id" : "",
"pool_password" : "nixos",
"use_nicehash" : false,
"use_tls" : true,
"tls_fingerprint" : "",
"pool_weight" : 23
},
],
''';
}
'';
description = ''
Verbatim xmr-stak config.txt. If empty, the <literal>-c</literal>
parameter will not be added to the xmr-stak command.
Content of config files like config.txt, pools.txt or cpu.txt.
'';
};
};
@@ -58,10 +67,13 @@ in
environment = mkIf cfg.cudaSupport {
LD_LIBRARY_PATH = "${pkgs.linuxPackages_latest.nvidia_x11}/lib";
};
script = ''
exec ${pkg}/bin/xmr-stak ${xmrConfArg} ${concatStringsSep " " cfg.extraArgs}
'';

preStart = concatStrings (flip mapAttrsToList cfg.configFiles (fn: content: ''
ln -sf '${pkgs.writeText "xmr-stak-${fn}" content}' '${fn}'
''));

serviceConfig = let rootRequired = cfg.openclSupport || cfg.cudaSupport; in {
ExecStart = "${pkg}/bin/xmr-stak ${concatStringsSep " " cfg.extraArgs}";
# xmr-stak generates cpu and/or gpu configuration files
WorkingDirectory = "/tmp";
PrivateTmp = true;
@@ -70,4 +82,12 @@ in
};
};
};

imports = [
(mkRemovedOptionModule ["services" "xmr-stak" "configText"] ''
This option was removed in favour of `services.xmr-stak.configFiles`
because the new config file `pools.txt` was introduced. You are
now able to define all other config files like cpu.txt or amd.txt.
'')
];
}
9 changes: 2 additions & 7 deletions pkgs/development/libraries/libressl/default.nix
Original file line number Diff line number Diff line change
@@ -34,14 +34,9 @@ let

in {

libressl_2_5 = generic {
version = "2.5.5";
sha256 = "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5";
};

libressl_2_6 = generic {
version = "2.6.4";
sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3";
version = "2.6.5";
sha256 = "0anx9nlgixdjn811zclim85jm5yxmxwycj71ix27rlhr233xz7l5";
};

libressl_2_7 = generic {