mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-30 11:50:06 +00:00
Merge release-19.09 into staging-19.09
This commit is contained in:
Frederik Rietdijk
@@ -45,12 +45,12 @@
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>git tag -a -s -m "Release 17.09-beta" 17.09-beta
|
||||
&& git push --tags</literal>
|
||||
&& git push origin 17.09-beta</literal>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
From the master branch run <literal>git checkout -B
|
||||
From the master branch run <literal>git checkout -b
|
||||
release-17.09</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
@@ -157,7 +157,7 @@
|
||||
<listitem>
|
||||
<para>
|
||||
Release Nix (currently only Eelco Dolstra can do that).
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/commit/53710c752a85f00658882531bc90a23a3d1287e4">
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/tools/nix-fallback-paths.nix">
|
||||
Make sure fallback is updated. </link>
|
||||
</para>
|
||||
</listitem>
|
||||
@@ -169,8 +169,8 @@
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Change <literal>stableBranch</literal> to true and wait for channel to
|
||||
update.
|
||||
Change <literal>stableBranch</literal> to <literal>true</literal> in Hydra and wait for
|
||||
the channel to update.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
@@ -193,9 +193,11 @@
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Update http://nixos.org/nixos/download.html and
|
||||
http://nixos.org/nixos/manual in
|
||||
https://github.com/NixOS/nixos-org-configurations
|
||||
Update the
|
||||
<link xlink:href="https://github.com/NixOS/nixos-homepage/commit/2a37975d5a617ecdfca94696242b6f32ffcba9f1"><code>NIXOS_SERIES</code></link>
|
||||
in the
|
||||
<link xlink:href="https://github.com/NixOS/nixos-homepage">nixos-homepage</link>
|
||||
repository.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
@@ -212,7 +214,8 @@
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Send an email to nix-dev to announce the release with above information.
|
||||
Create a new topic on <link xlink:href="https://discourse.nixos.org/">the
|
||||
Discourse instance</link> to announce the release with the above information.
|
||||
Best to check how previous email was formulated to see what needs to be
|
||||
included.
|
||||
</para>
|
||||
|
||||
@@ -392,11 +392,11 @@
|
||||
<filename>hardware-configuration.nix</filename> is included from
|
||||
<filename>configuration.nix</filename> and will be overwritten by future
|
||||
invocations of <command>nixos-generate-config</command>; thus, you
|
||||
generally should not modify it.) Additionally, you may want to look at
|
||||
generally should not modify it.) Additionally, you may want to look at
|
||||
<link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware
|
||||
configuration for known-hardware</link> at this point or after
|
||||
installation.
|
||||
|
||||
|
||||
</para>
|
||||
<note>
|
||||
<para>
|
||||
@@ -418,11 +418,11 @@
|
||||
Do the installation:
|
||||
<screen>
|
||||
<prompt># </prompt>nixos-install</screen>
|
||||
Cross fingers. If this fails due to a temporary problem (such as a network
|
||||
issue while downloading binaries from the NixOS binary cache), you can
|
||||
just re-run <command>nixos-install</command>. Otherwise, fix your
|
||||
<filename>configuration.nix</filename> and then re-run
|
||||
<command>nixos-install</command>.
|
||||
This will install your system based on the configuration you provided.
|
||||
If anything fails due to a configuration problem or any other issue
|
||||
(such as a network outage while downloading binaries from the NixOS
|
||||
binary cache), you can re-run <command>nixos-install</command> after
|
||||
fixing your <filename>configuration.nix</filename>.
|
||||
</para>
|
||||
<para>
|
||||
As the last step, <command>nixos-install</command> will ask you to set the
|
||||
|
||||
@@ -543,7 +543,7 @@
|
||||
<listitem>
|
||||
<para>
|
||||
The <option>networking.useDHCP</option> option is unsupported in combination with
|
||||
<option>networking.useNetworkd</option> in anticipation of defaulting to it by default.
|
||||
<option>networking.useNetworkd</option> in anticipation of defaulting to it.
|
||||
It has to be set to <literal>false</literal> and enabled per
|
||||
interface with <option>networking.interfaces.<name>.useDHCP = true;</option>
|
||||
</para>
|
||||
|
||||
@@ -316,6 +316,7 @@
|
||||
./services/development/bloop.nix
|
||||
./services/development/hoogle.nix
|
||||
./services/development/jupyter/default.nix
|
||||
./services/development/lorri.nix
|
||||
./services/editors/emacs.nix
|
||||
./services/editors/infinoted.nix
|
||||
./services/games/factorio.nix
|
||||
|
||||
@@ -133,7 +133,8 @@ with lib;
|
||||
# piwik was renamed to matomo
|
||||
(mkRenamedOptionModule [ "services" "piwik" "enable" ] [ "services" "matomo" "enable" ])
|
||||
(mkRenamedOptionModule [ "services" "piwik" "webServerUser" ] [ "services" "matomo" "webServerUser" ])
|
||||
(mkRenamedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] [ "services" "matomo" "phpfpmProcessManagerConfig" ])
|
||||
(mkRemovedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools.<name>.settings")
|
||||
(mkRemovedOptionModule [ "services" "matomo" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools.<name>.settings")
|
||||
(mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ])
|
||||
|
||||
# tarsnap
|
||||
|
||||
47
nixos/modules/services/development/lorri.nix
Normal file
47
nixos/modules/services/development/lorri.nix
Normal file
@@ -0,0 +1,47 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.lorri;
|
||||
socketPath = "lorri/daemon.socket";
|
||||
in {
|
||||
options = {
|
||||
services.lorri = {
|
||||
enable = lib.mkOption {
|
||||
default = false;
|
||||
type = lib.types.bool;
|
||||
description = ''
|
||||
Enables the daemon for `lorri`, a nix-shell replacement for project
|
||||
development. The socket-activated daemon starts on the first request
|
||||
issued by the `lorri` command.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.user.sockets.lorri = {
|
||||
description = "Socket for Lorri Daemon";
|
||||
wantedBy = [ "sockets.target" ];
|
||||
socketConfig = {
|
||||
ListenStream = "%t/${socketPath}";
|
||||
RuntimeDirectory = "lorri";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.services.lorri = {
|
||||
description = "Lorri Daemon";
|
||||
requires = [ "lorri.socket" ];
|
||||
after = [ "lorri.socket" ];
|
||||
path = with pkgs; [ config.nix.package gnutar gzip ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.lorri}/bin/lorri daemon";
|
||||
PrivateTmp = true;
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = "read-only";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.lorri ];
|
||||
};
|
||||
}
|
||||
@@ -43,7 +43,7 @@ let
|
||||
|
||||
ANALYTICS_REPORTING_ENABLED = boolToString cfg.analytics.reporting.enable;
|
||||
|
||||
SMTP_ENABLE = boolToString cfg.smtp.enable;
|
||||
SMTP_ENABLED = boolToString cfg.smtp.enable;
|
||||
SMTP_HOST = cfg.smtp.host;
|
||||
SMTP_USER = cfg.smtp.user;
|
||||
SMTP_PASSWORD = cfg.smtp.password;
|
||||
|
||||
@@ -119,9 +119,8 @@ in
|
||||
};
|
||||
users.groups.vault.gid = config.ids.gids.vault;
|
||||
|
||||
systemd.tmpfiles.rules = optional (cfg.storagePath != null) [
|
||||
"d '${cfg.storagePath}' 0700 vault vault - -"
|
||||
];
|
||||
systemd.tmpfiles.rules = optional (cfg.storagePath != null)
|
||||
"d '${cfg.storagePath}' 0700 vault vault - -";
|
||||
|
||||
systemd.services.vault = {
|
||||
description = "Vault server daemon";
|
||||
|
||||
@@ -35,6 +35,7 @@ let
|
||||
(if (cfg.web.credentialsFile != null || cfg.web.credentials != { })
|
||||
then "--credentials=${toString credFile}"
|
||||
else "--no-auth")
|
||||
"--addr=${address}:${toString port}"
|
||||
] ++ extraOptions);
|
||||
|
||||
in {
|
||||
@@ -176,7 +177,7 @@ in {
|
||||
systemd.services.magneticod = {
|
||||
description = "Magnetico DHT crawler";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
User = "magnetico";
|
||||
@@ -188,7 +189,7 @@ in {
|
||||
systemd.services.magneticow = {
|
||||
description = "Magnetico web interface";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network-online.target" "magneticod.service"];
|
||||
after = [ "network.target" "magneticod.service"];
|
||||
|
||||
serviceConfig = {
|
||||
User = "magnetico";
|
||||
@@ -201,7 +202,7 @@ in {
|
||||
assertions =
|
||||
[
|
||||
{
|
||||
assertion = cfg.web.credentialsFile != null || cfg.web.credentials != { };
|
||||
assertion = cfg.web.credentialsFile == null || cfg.web.credentials == { };
|
||||
message = ''
|
||||
The options services.magnetico.web.credentialsFile and
|
||||
services.magnetico.web.credentials are mutually exclusives.
|
||||
|
||||
@@ -105,7 +105,7 @@ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
|
||||
<para>
|
||||
You can use other web servers by forwarding calls for
|
||||
<filename>index.php</filename> and <filename>piwik.php</filename> to the
|
||||
<literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket. You can use
|
||||
<literal><link linkend="opt-services.phpfpm.pools._name_.socket">services.phpfpm.pools.<name>.socket</link></literal> fastcgi unix socket. You can use
|
||||
the nginx configuration in the module code as a reference to what else
|
||||
should be configured.
|
||||
</para>
|
||||
|
||||
@@ -2,15 +2,13 @@
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.matomo;
|
||||
fpm = config.services.phpfpm.pools.${pool};
|
||||
|
||||
user = "matomo";
|
||||
dataDir = "/var/lib/${user}";
|
||||
deprecatedDataDir = "/var/lib/piwik";
|
||||
|
||||
pool = user;
|
||||
# it's not possible to use /run/phpfpm/${pool}.sock because /run/phpfpm/ is root:root 0770,
|
||||
# and therefore is not accessible by the web server.
|
||||
phpSocket = "/run/phpfpm-${pool}.sock";
|
||||
phpExecutionUnit = "phpfpm-${pool}";
|
||||
databaseService = "mysql.service";
|
||||
|
||||
@@ -50,7 +48,7 @@ in {
|
||||
default = null;
|
||||
example = "lighttpd";
|
||||
description = ''
|
||||
Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for Matomo if the nginx
|
||||
Name of the web server user that forwards requests to <option>services.phpfpm.pools.<name>.socket</option> the fastcgi socket for Matomo if the nginx
|
||||
option is not used. Either this option or the nginx option is mandatory.
|
||||
If you want to use another webserver than nginx, you need to set this to that server's user
|
||||
and pass fastcgi requests to `index.php`, `matomo.php` and `piwik.php` (legacy name) to this socket.
|
||||
@@ -71,25 +69,6 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
phpfpmProcessManagerConfig = mkOption {
|
||||
type = types.str;
|
||||
default = ''
|
||||
; default phpfpm process manager settings
|
||||
pm = dynamic
|
||||
pm.max_children = 75
|
||||
pm.start_servers = 10
|
||||
pm.min_spare_servers = 5
|
||||
pm.max_spare_servers = 20
|
||||
pm.max_requests = 500
|
||||
|
||||
; log worker's stdout, but this has a performance hit
|
||||
catch_workers_output = yes
|
||||
'';
|
||||
description = ''
|
||||
Settings for phpfpm's process manager. You might need to change this depending on the load for Matomo.
|
||||
'';
|
||||
};
|
||||
|
||||
nginx = mkOption {
|
||||
type = types.nullOr (types.submodule (
|
||||
recursiveUpdate
|
||||
@@ -233,15 +212,24 @@ in {
|
||||
else if (cfg.webServerUser != null) then cfg.webServerUser else "";
|
||||
in {
|
||||
${pool} = {
|
||||
listen = phpSocket;
|
||||
extraConfig = ''
|
||||
listen.owner = ${socketOwner}
|
||||
listen.group = root
|
||||
listen.mode = 0600
|
||||
user = ${user}
|
||||
env[PIWIK_USER_PATH] = ${dataDir}
|
||||
${cfg.phpfpmProcessManagerConfig}
|
||||
inherit user;
|
||||
phpOptions = ''
|
||||
error_log = 'stderr'
|
||||
log_errors = on
|
||||
'';
|
||||
settings = mapAttrs (name: mkDefault) {
|
||||
"listen.owner" = socketOwner;
|
||||
"listen.group" = "root";
|
||||
"listen.mode" = "0660";
|
||||
"pm" = "dynamic";
|
||||
"pm.max_children" = 75;
|
||||
"pm.start_servers" = 10;
|
||||
"pm.min_spare_servers" = 5;
|
||||
"pm.max_spare_servers" = 20;
|
||||
"pm.max_requests" = 500;
|
||||
"catch_workers_output" = true;
|
||||
};
|
||||
phpEnv.PIWIK_USER_PATH = dataDir;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -264,15 +252,15 @@ in {
|
||||
};
|
||||
# allow index.php for webinterface
|
||||
locations."= /index.php".extraConfig = ''
|
||||
fastcgi_pass unix:${phpSocket};
|
||||
fastcgi_pass unix:${fpm.socket};
|
||||
'';
|
||||
# allow matomo.php for tracking
|
||||
locations."= /matomo.php".extraConfig = ''
|
||||
fastcgi_pass unix:${phpSocket};
|
||||
fastcgi_pass unix:${fpm.socket};
|
||||
'';
|
||||
# allow piwik.php for tracking (deprecated name)
|
||||
locations."= /piwik.php".extraConfig = ''
|
||||
fastcgi_pass unix:${phpSocket};
|
||||
fastcgi_pass unix:${fpm.socket};
|
||||
'';
|
||||
# Any other attempt to access any php files is forbidden
|
||||
locations."~* ^.+\\.php$".extraConfig = ''
|
||||
|
||||
@@ -120,6 +120,14 @@ let
|
||||
include ${recommendedProxyConfig};
|
||||
''}
|
||||
|
||||
${optionalString (cfg.mapHashBucketSize != null) ''
|
||||
map_hash_bucket_size ${toString cfg.mapHashBucketSize};
|
||||
''}
|
||||
|
||||
${optionalString (cfg.mapHashMaxSize != null) ''
|
||||
map_hash_max_size ${toString cfg.mapHashMaxSize};
|
||||
''}
|
||||
|
||||
# $connection_upgrade is used for websocket proxying
|
||||
map $http_upgrade $connection_upgrade {
|
||||
default upgrade;
|
||||
@@ -508,6 +516,23 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
mapHashBucketSize = mkOption {
|
||||
type = types.nullOr (types.enum [ 32 64 128 ]);
|
||||
default = null;
|
||||
description = ''
|
||||
Sets the bucket size for the map variables hash tables. Default
|
||||
value depends on the processor’s cache line size.
|
||||
'';
|
||||
};
|
||||
|
||||
mapHashMaxSize = mkOption {
|
||||
type = types.nullOr types.ints.positive;
|
||||
default = null;
|
||||
description = ''
|
||||
Sets the maximum size of the map variables hash tables.
|
||||
'';
|
||||
};
|
||||
|
||||
resolver = mkOption {
|
||||
type = types.submodule {
|
||||
options = {
|
||||
|
||||
@@ -153,8 +153,11 @@ in
|
||||
login = handleTest ./login.nix {};
|
||||
loki = handleTest ./loki.nix {};
|
||||
#logstash = handleTest ./logstash.nix {};
|
||||
lorri = handleTest ./lorri/default.nix {};
|
||||
magnetico = handleTest ./magnetico.nix {};
|
||||
mailcatcher = handleTest ./mailcatcher.nix {};
|
||||
mathics = handleTest ./mathics.nix {};
|
||||
matomo = handleTest ./matomo.nix {};
|
||||
matrix-synapse = handleTest ./matrix-synapse.nix {};
|
||||
mediawiki = handleTest ./mediawiki.nix {};
|
||||
memcached = handleTest ./memcached.nix {};
|
||||
|
||||
3
nixos/tests/lorri/builder.sh
Normal file
3
nixos/tests/lorri/builder.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
printf "%s" "${name:?}" > "${out:?}"
|
||||
24
nixos/tests/lorri/default.nix
Normal file
24
nixos/tests/lorri/default.nix
Normal file
@@ -0,0 +1,24 @@
|
||||
import ../make-test.nix {
|
||||
machine = { pkgs, ... }: {
|
||||
imports = [ ../../modules/profiles/minimal.nix ];
|
||||
environment.systemPackages = [ pkgs.lorri ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
# Copy files over
|
||||
$machine->succeed(
|
||||
"cp '${./fake-shell.nix}' shell.nix",
|
||||
"cp '${./builder.sh}' builder.sh"
|
||||
);
|
||||
|
||||
# Start the daemon and wait until it is ready
|
||||
$machine->execute("lorri daemon > lorri.stdout 2> lorri.stderr &");
|
||||
$machine->waitUntilSucceeds("grep --fixed-strings 'lorri: ready' lorri.stdout");
|
||||
|
||||
# Ping the daemon
|
||||
$machine->execute("lorri ping_ \$(readlink -f shell.nix)");
|
||||
|
||||
# Wait for the daemon to finish the build
|
||||
$machine->waitUntilSucceeds("grep --fixed-strings 'OutputPaths' lorri.stdout");
|
||||
'';
|
||||
}
|
||||
5
nixos/tests/lorri/fake-shell.nix
Normal file
5
nixos/tests/lorri/fake-shell.nix
Normal file
@@ -0,0 +1,5 @@
|
||||
derivation {
|
||||
system = builtins.currentSystem;
|
||||
name = "fake-shell";
|
||||
builder = ./builder.sh;
|
||||
}
|
||||
39
nixos/tests/matomo.nix
Normal file
39
nixos/tests/matomo.nix
Normal file
@@ -0,0 +1,39 @@
|
||||
{ system ? builtins.currentSystem, config ? { }
|
||||
, pkgs ? import ../.. { inherit system config; } }:
|
||||
|
||||
with import ../lib/testing.nix { inherit system pkgs; };
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
matomoTest = package:
|
||||
makeTest {
|
||||
machine = { config, pkgs, ... }: {
|
||||
services.matomo = {
|
||||
package = package;
|
||||
enable = true;
|
||||
nginx = {
|
||||
forceSSL = false;
|
||||
enableACME = false;
|
||||
};
|
||||
};
|
||||
services.mysql = {
|
||||
enable = true;
|
||||
package = pkgs.mysql;
|
||||
};
|
||||
services.nginx.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
startAll;
|
||||
$machine->waitForUnit("mysql.service");
|
||||
$machine->waitForUnit("phpfpm-matomo.service");
|
||||
$machine->waitForUnit("nginx.service");
|
||||
$machine->succeed("curl -sSfL http://localhost/ | grep '<title>Matomo[^<]*Installation'");
|
||||
'';
|
||||
};
|
||||
in {
|
||||
matomo = matomoTest pkgs.matomo // {
|
||||
name = "matomo";
|
||||
meta.maintainers = with maintainers; [ florianjacob kiwi ];
|
||||
};
|
||||
}
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ncmpc";
|
||||
version = "0.36";
|
||||
version = "0.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MusicPlayerDaemon";
|
||||
repo = "ncmpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ssmk1p43gjhcqi86sh6b7csqpwwpf3hs32cmnylv6pmbcwbs69h";
|
||||
sha256 = "0hhc5snxy5fbg47ynz4b7fkmzdy974zxqr0cqc6kh15yvbr25ikh";
|
||||
};
|
||||
|
||||
buildInputs = [ glib ncurses mpd_clientlib boost ];
|
||||
|
||||
@@ -1,27 +1,27 @@
|
||||
{ mkDerivation, lib, makeDesktopItem, fetchFromGitHub
|
||||
{ stdenv, wrapQtAppsHook, makeDesktopItem, fetchFromGitHub
|
||||
, qtbase, qmake, qtmultimedia, qttools
|
||||
, qtgraphicaleffects, qtdeclarative
|
||||
, qtlocation, qtquickcontrols, qtquickcontrols2
|
||||
, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns
|
||||
, monero, unbound, readline, boost, libunwind
|
||||
, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
|
||||
, hidapi
|
||||
, hidapi, randomx
|
||||
}:
|
||||
|
||||
with lib;
|
||||
with stdenv.lib;
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-gui";
|
||||
version = "0.14.1.2";
|
||||
version = "0.15.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero-gui";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k";
|
||||
sha256 = "1shpnly2dym5jhvk8zk10p69mz062dihx979djg74q6hgkhhhqsh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkgconfig ];
|
||||
nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtmultimedia qtgraphicaleffects
|
||||
@@ -30,7 +30,7 @@ mkDerivation rec {
|
||||
qtwebchannel qtwebengine qtx11extras
|
||||
qtxmlpatterns monero unbound readline
|
||||
boost libunwind libsodium pcsclite zeromq
|
||||
cppzmq hidapi
|
||||
cppzmq hidapi randomx
|
||||
];
|
||||
|
||||
patches = [ ./move-log-file.patch ];
|
||||
|
||||
@@ -1,43 +1,41 @@
|
||||
{ stdenv, fetchgit
|
||||
, cmake, pkgconfig, git
|
||||
{ stdenv, fetchFromGitHub
|
||||
, cmake, pkgconfig
|
||||
, boost, miniupnpc, openssl, unbound, cppzmq
|
||||
, zeromq, pcsclite, readline, libsodium, hidapi
|
||||
, python3Packages
|
||||
, python3Packages, randomx, rapidjson
|
||||
, CoreData, IOKit, PCSC
|
||||
}:
|
||||
|
||||
assert stdenv.isDarwin -> IOKit != null;
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero";
|
||||
version = "0.14.1.0";
|
||||
version = "0.15.0.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/monero-project/monero.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "1asa197fad81jfv12qgaa7y7pdr1r1pda96m9pvivkh4v30cx0nh";
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero";
|
||||
rev = "v${version}";
|
||||
sha256 = "19y4kcj4agws7swfa3draysb1y18c3xb13r8cg0faxx1dlm0zbnr";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig git ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
buildInputs = [
|
||||
boost miniupnpc openssl unbound
|
||||
cppzmq zeromq pcsclite readline
|
||||
libsodium hidapi
|
||||
libsodium hidapi randomx rapidjson
|
||||
python3Packages.protobuf
|
||||
] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DBUILD_GUI_DEPS=ON"
|
||||
"-DReadline_ROOT_DIR=${readline.dev}"
|
||||
] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
|
||||
] ++ stdenv.lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Private, secure, untraceable currency";
|
||||
homepage = https://getmonero.org/;
|
||||
license = licenses.bsd3;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, python3, fetchFromGitHub, makeWrapper, buildEnv, aspellDicts
|
||||
{ stdenv, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts
|
||||
# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
|
||||
# available.
|
||||
, enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ]
|
||||
@@ -9,7 +9,7 @@ let
|
||||
python = let
|
||||
packageOverrides = self: super: {
|
||||
markdown = super.markdown.overridePythonAttrs(old: {
|
||||
src = super.fetchPypi {
|
||||
src = super.fetchPypi {
|
||||
version = "3.0.1";
|
||||
pname = "Markdown";
|
||||
sha256 = "d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c";
|
||||
@@ -17,11 +17,12 @@ let
|
||||
});
|
||||
|
||||
chardet = super.chardet.overridePythonAttrs(old: {
|
||||
src = super.fetchPypi {
|
||||
src = super.fetchPypi {
|
||||
version = "2.3.0";
|
||||
pname = "chardet";
|
||||
sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa";
|
||||
};
|
||||
patches = [];
|
||||
});
|
||||
};
|
||||
in python3.override { inherit packageOverrides; };
|
||||
@@ -41,12 +42,11 @@ in python.pkgs.buildPythonApplication {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
propagatedBuildInputs = [ pythonEnv ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/retext $out/bin/.retext
|
||||
makeWrapper "$out/bin/.retext" "$out/bin/retext" \
|
||||
wrapQtApp "$out/bin/retext" \
|
||||
--set ASPELL_CONF "dict-dir ${buildEnv {
|
||||
name = "aspell-all-dicts";
|
||||
paths = map (path: "${path}/lib/aspell") enchantAspellDicts;
|
||||
|
||||
@@ -72,6 +72,7 @@ stdenv.mkDerivation {
|
||||
"--with-tclsh=${tcl}/bin/tclsh"
|
||||
"--with-tlib=ncurses"
|
||||
"--with-compiledby=Nix"
|
||||
"LDFLAGS=-headerpad_max_install_names"
|
||||
];
|
||||
|
||||
makeFlags = ''PREFIX=$(out) CPPFLAGS="-Wno-error"'';
|
||||
|
||||
@@ -13,8 +13,8 @@ let
|
||||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "6.9.10-69";
|
||||
sha256 = "0l4lllis16gbwjpvvsyfz91i9nq11zb3lg2zlmyay7v5697jshh6";
|
||||
version = "6.9.10-71";
|
||||
sha256 = "0c69xmr8k8c4dplgzxydm30s2dr8biq71x07hc15bw196nsx3srr";
|
||||
patches = [];
|
||||
}
|
||||
# Freeze version on mingw so we don't need to port the patch too often.
|
||||
|
||||
@@ -1,32 +1,34 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation
|
||||
, qtbase, qtx11extras, qtsvg, makeWrapper
|
||||
, vulkan-loader, xorg
|
||||
, python3, bison, pcre, automake, autoconf
|
||||
, vulkan-loader, xorg, python3, python3Packages
|
||||
, bison, pcre, automake, autoconf, addOpenGLRunpath
|
||||
}:
|
||||
let
|
||||
custom_swig = fetchFromGitHub {
|
||||
owner = "baldurk";
|
||||
repo = "swig";
|
||||
rev = "renderdoc-modified-6";
|
||||
sha256 = "00ykqlzx1k9iwqjlc54kfch7cnzsj53hxn7ql70dj3rxqzrnadc0";
|
||||
rev = "renderdoc-modified-7";
|
||||
sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6";
|
||||
};
|
||||
pythonPackages = python3Packages;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4";
|
||||
mkDerivation rec {
|
||||
version = "1.5";
|
||||
pname = "renderdoc";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baldurk";
|
||||
repo = "renderdoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "1iann73r4yzkwnm13h4zqipqrp5i5cnkv27yyap0axz6h3npw94r";
|
||||
sha256 = "0a05f6qfq90wrf4fixchp9knx4nhqhwjxl02n03a7k56xzxxnlci";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
|
||||
];
|
||||
]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]);
|
||||
# TODO: figure out how to make cmake recognise pyside2
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf ];
|
||||
nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf addOpenGLRunpath ];
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${custom_swig} swig
|
||||
@@ -40,19 +42,23 @@ stdenv.mkDerivation rec {
|
||||
"-DBUILD_VERSION_DIST_VER=${version}"
|
||||
"-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc"
|
||||
"-DBUILD_VERSION_STABLE=ON"
|
||||
# TODO: add once pyside2 is in nixpkgs
|
||||
#"-DPYSIDE2_PACKAGE_DIR=${python36Packages.pyside2}"
|
||||
];
|
||||
|
||||
# Future work: define these in the above array via placeholders
|
||||
# TODO: define these in the above array via placeholders, once those are widely supported
|
||||
preConfigure = ''
|
||||
cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/"
|
||||
cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig"
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib"
|
||||
wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib"
|
||||
'';
|
||||
|
||||
# The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh
|
||||
postFixup = ''
|
||||
addOpenGLRunpath $out/lib/librenderdoc.so
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -42,5 +42,6 @@ python2Packages.buildPythonApplication rec {
|
||||
homepage = https://github.com/dashpay/electrum-dash;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ np ];
|
||||
knownVulnerabilities = [ "CVE-2018-1000022" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -45,11 +45,11 @@ let
|
||||
|
||||
flash = stdenv.mkDerivation rec {
|
||||
pname = "flashplayer-ppapi";
|
||||
version = "32.0.0.270";
|
||||
version = "32.0.0.293";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
|
||||
sha256 = "1z8nfw7b3dsy79gb50bmmdjz66j5gx6m0hkw1abp35xdgh2sz2ak";
|
||||
sha256 = "0rgriqdbyrzpm1bcph35bhzd5dz21yim56z93hkmbpdqg7767dwm";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
beta = {
|
||||
sha256 = "1n45pfpjqrpzmy7k2ps498mm273bpzfda58dz78lbdm6r7z3s7av";
|
||||
sha256bin64 = "1rf31v1ipix8c6q4blqjrn2ap3pxnlrpfx7037qjpg84zhip0zpc";
|
||||
version = "79.0.3945.29";
|
||||
sha256 = "0sm6x4z6i6p292l98k0h0v69f29hgfd9l46jg8xbh2jzg9f5fp78";
|
||||
sha256bin64 = "1yvy0d2h09cf1w42c93kpw66a2v9yn079zs6qjiqzs07yzxvxjdm";
|
||||
version = "79.0.3945.36";
|
||||
};
|
||||
dev = {
|
||||
sha256 = "1zj0nmj1687xsyzlh1hy2wblxv1qgdy2kj9h8bmqhld16laxwqw5";
|
||||
sha256bin64 = "1x8wpdz18cflvj2ambqwyhzq206dil4szh1s8paqw1jwncaw7gjf";
|
||||
version = "80.0.3962.2";
|
||||
sha256 = "0zf434ijk6zw37fricnkb1968nhmb7zlfivf59nx9yh7irbwb4hm";
|
||||
sha256bin64 = "1fphf8pwbbirs9fiislg3vav8c4a393lz487sa7f90mzsx84ffiz";
|
||||
version = "80.0.3964.0";
|
||||
};
|
||||
stable = {
|
||||
sha256 = "01wx5bi397d80za0sdfwgfbjj6n2ad2i31zmcrhm6wzryjwrmx6i";
|
||||
sha256bin64 = "1nwhyasqxkxkx5pn2j9dx95mblj5w7fkh2zwvjz763b331w65ivp";
|
||||
version = "78.0.3904.97";
|
||||
sha256 = "03jvfz68nvmmrplygf96sh0l347p4h03c8vpw8yrglh6ycwkiigr";
|
||||
sha256bin64 = "1knsrdh4vj1zl3v1frzrvzg0pwb64zhq2il7pwskrfcbmsj3gkh6";
|
||||
version = "78.0.3904.108";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flashplayer";
|
||||
version = "32.0.0.270";
|
||||
version = "32.0.0.293";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 =
|
||||
if debug then
|
||||
if arch == "x86_64" then
|
||||
"1c3dn4gkl40i5sjkvpbkn9fl82vjhy1v7dhrayk3ncfsxcyvbcm0"
|
||||
"0lz1na68gdi9n23hfj5c731dbskm9684cwar7ji8yjfhfryfg5yn"
|
||||
else
|
||||
"1g7i9mihn5g9i71xyf805k19yk41vsr85gzk87gm426m0hcgg89i"
|
||||
"10gm2ynndlyk66fndfbh7ah5ssqpyw8415i10n3lpw940x201dk0"
|
||||
else
|
||||
if arch == "x86_64" then
|
||||
"16lxgkbr2hg49vhc7414zkh1kblhysf779854faay308ml3i5kdw"
|
||||
"0hmlv0v9lbgxrmz0n7czfnrbrwjwxhy99gsr5g1m0aqgw0y61clc"
|
||||
else
|
||||
"0jrdzm8pw7aq32w7m4rvkhj7mmqyddh5yxpj7q3d9hxrwshkikvj";
|
||||
"0qdw4f48xhnkzdly3jz63v14nmzd0gg49az5wxb08ghs8laaqlik";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "flashplayer-standalone";
|
||||
version = "32.0.0.270";
|
||||
version = "32.0.0.293";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
@@ -60,9 +60,9 @@ stdenv.mkDerivation {
|
||||
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
|
||||
sha256 =
|
||||
if debug then
|
||||
"0k5azrl92hkbn7adjz7s2lv8h59n7gsjrcprqdc485i4f7sjmkwj"
|
||||
"13mrknvl3yd8vrcs7mp6szz6f9ssfs72apzvc60f9qfwkhiwlg87"
|
||||
else
|
||||
"1la5s4wxchfpl8in576xj675yrg84pify22pwf063h0jg3rdgi68";
|
||||
"0isvmzyi4isxvxxc5ksplcqc5cafpvbrln3dddpms8zps2dxpyzi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@@ -15,13 +15,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.15.4";
|
||||
version = "1.15.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "18wpqrgb1ils4g8ggg217xq4jq30i4m7par2mdjk59pmz7ssm25p";
|
||||
sha256 = "1sk76ddhpiv0b2jhmlf3d38y6p64fgj4cpg9d3h92lmah3fqndgk";
|
||||
};
|
||||
|
||||
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "davmail";
|
||||
version = "5.2.0";
|
||||
version = "5.4.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-2961.zip";
|
||||
sha256 = "0jw6sjg7k7zg8ab0srz6cjjj5hnw5ppxx1w35sw055dlg54fh2m5";
|
||||
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-3135.zip";
|
||||
sha256 = "05n2j5canh046744arvni6yfdsandvjkld93w3p7rg116jrh19gq";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -58,7 +58,7 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "1.27.4"; # Please backport all updates to the stable channel.
|
||||
version = "1.28.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "1aza1s70xzx9qkv7b5mpfi4zgdn5dq3rl03lx3jixij3x3pxg5sj";
|
||||
sha256 = "14cd635fax99l5jk70jy0mjnvw01b0gbv666szc4ajamm36l2bkr";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
@@ -7,7 +7,7 @@ let
|
||||
|
||||
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
|
||||
# source of the latter disappears much faster.
|
||||
version = "8.51.0.86";
|
||||
version = "8.51.0.92";
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
alsaLib
|
||||
@@ -59,8 +59,11 @@ let
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
|
||||
sha256 = "0c00i2fg55vkycly9wqy8qss9wsils3n0apl8kqisk0ihghds814";
|
||||
urls = [
|
||||
"https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
||||
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
||||
];
|
||||
sha256 = "11x13c7z70iaq86pyy5nqc0mcfdr7vjpjkxw6kdyjhqyxs6q6ipf";
|
||||
}
|
||||
else
|
||||
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl
|
||||
, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, xkeyboard_config, alsaLib
|
||||
, libpulseaudio ? null, libredirect, quazip, less, which, unzip, llvmPackages
|
||||
, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -26,6 +26,8 @@ let
|
||||
categories = "Network";
|
||||
};
|
||||
|
||||
fakeLess = writeShellScriptBin "less" "cat";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -46,11 +48,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper less which unzip ];
|
||||
nativeBuildInputs = [ makeWrapper fakeLess which unzip ];
|
||||
|
||||
unpackPhase =
|
||||
''
|
||||
echo -e 'q\ny' | sh -xe $src
|
||||
echo -e '\ny' | sh -xe $src
|
||||
cd TeamSpeak*
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, fetchpatch, cmake
|
||||
{ mkDerivation, lib, fetchurl, fetchpatch, cmake
|
||||
, extra-cmake-modules, qtbase, qtscript
|
||||
, karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig
|
||||
, kdoctools, kross, kcmutils, kwindowsystem
|
||||
, libktorrent, taglib, libgcrypt, kplotting
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "ktorrent";
|
||||
version = "${libktorrent.mainVersion}";
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "KDE integrated BtTorrent client";
|
||||
homepage = https://www.kde.org/applications/internet/ktorrent/;
|
||||
license = licenses.gpl2;
|
||||
|
||||
@@ -8,13 +8,13 @@ with stdenv.lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-gitea";
|
||||
repo = "gitea";
|
||||
rev = "v${version}";
|
||||
sha256 = "07isawbasshkgij2mh7pmp6h3ns758ysflngr18z0k2m38ny9h31";
|
||||
sha256 = "0ql6hrrc339hrik4yk26bjn5x167c5q4s10kjld5fsgmn2k1nhdb";
|
||||
# Required to generate the same checksum on MacOS due to unicode encoding differences
|
||||
# More information: https://github.com/NixOS/nixpkgs/pull/48128
|
||||
extraPostFetch = ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, wrapQtAppsHook }:
|
||||
{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl_1_0_2, xkeyboard_config, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p4v";
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
qtscript
|
||||
qtsensors
|
||||
qtwebkit
|
||||
openssl
|
||||
openssl_1_0_2
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://www.perforce.com;
|
||||
license = stdenv.lib.licenses.unfreeRedistributable;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = [ stdenv.lib.maintainers.nioncode ];
|
||||
maintainers = with stdenv.lib.maintainers; [ nathyong nioncode ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,21 +9,32 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2017-7544.patch";
|
||||
url = https://sourceforge.net/p/libexif/bugs/_discuss/thread/fc394c4b/489a/attachment/xx.pat;
|
||||
sha256 = "1qgk8hgnxr8d63jsc4vljxz9yg33mbml280dq4a6050rmk9wq4la";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2017-7544.patch";
|
||||
url = "https://github.com/libexif/libexif/commit/c39acd1692023b26290778a02a9232c873f9d71a.patch";
|
||||
sha256 = "0xgx6ly2i4q05shb61mfx6njwf1yp347jkznm0ka4m85i41xm6sd";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2018-20030-1.patch";
|
||||
url = "https://github.com/libexif/libexif/commit/5d28011c40ec86cf52cffad541093d37c263898a.patch";
|
||||
sha256 = "1wv8s962wmbn2m2xypgirf12g6msrbplpsmd5bh86irfwhkcppj3";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2018-20030-2.patch";
|
||||
url = "https://github.com/libexif/libexif/commit/6aa11df549114ebda520dde4cdaea2f9357b2c89.patch";
|
||||
sha256 = "01aqvz63glwq6wg0wr7ykqqghb4abgq77ghvhizbzadg1k4h7drx";
|
||||
excludes = [ "NEWS" ];
|
||||
})
|
||||
];
|
||||
patchFlags = "-p0";
|
||||
|
||||
buildInputs = [ gettext ];
|
||||
|
||||
meta = {
|
||||
homepage = http://libexif.sourceforge.net/;
|
||||
homepage = https://libexif.github.io/;
|
||||
description = "A library to read and manipulate EXIF data in digital photographs";
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.erictapen ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
|
||||
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53";
|
||||
sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2019-15531.patch";
|
||||
url = "https://git.gnunet.org/libextractor.git/patch/?id=d2b032452241708bee68d02aa02092cfbfba951a";
|
||||
sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw";
|
||||
excludes = [ "ChangeLog" ];
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure =
|
||||
|
||||
15
pkgs/development/libraries/qca2/c++11.patch
Normal file
15
pkgs/development/libraries/qca2/c++11.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 453fd8a..be294cc 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -126,8 +126,8 @@ if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align")
|
||||
endif()
|
||||
|
||||
- set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
|
||||
- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
|
||||
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=c++11 -Wundef -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
|
||||
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -std=c++11 -Wundef -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
|
||||
endif (CMAKE_SYSTEM_NAME MATCHES Linux)
|
||||
endif (CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
||||
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = stdenv.lib.optional (builtins.compareVersions qt.version "5.0.0" >= 0) [ ./c++11.patch ];
|
||||
|
||||
# tells CMake to use this CA bundle file if it is accessible
|
||||
preConfigure = ''
|
||||
export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt
|
||||
|
||||
24
pkgs/development/libraries/randomx/default.nix
Normal file
24
pkgs/development/libraries/randomx/default.nix
Normal file
@@ -0,0 +1,24 @@
|
||||
{ stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "randomX";
|
||||
version = "1.1.6";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tevador";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1qd0rbzgxdy87wwy0n6ca29bcq25j5ndnfgmx8iyf225m4rcwngf";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Proof of work algorithm based on random code execution";
|
||||
homepage = https://github.com/tevador/RandomX;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -77,7 +77,14 @@ $out/lib/common-lisp/query-fs"
|
||||
};
|
||||
};
|
||||
cffi = addNativeLibs [pkgs.libffi];
|
||||
cl-mysql = addNativeLibs [pkgs.mysql];
|
||||
cl-mysql = x: {
|
||||
propagatedBuildInputs = [pkgs.mysql.connector-c];
|
||||
overrides = y: (x.overrides y) // {
|
||||
prePatch = ((x.overrides y).prePatch or "") + ''
|
||||
sed -i 's,libmysqlclient_r,${pkgs.mysql.connector-c}/lib/mysql/libmysqlclient_r,' system.lisp
|
||||
'';
|
||||
};
|
||||
};
|
||||
cl-ppcre-template = x: {
|
||||
overrides = y: (x.overrides y) // {
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ buildPythonPackage, lib, fetchPypi
|
||||
, pytest, filelock, mock, pep8
|
||||
, pytest_4, filelock, mock, pep8
|
||||
, cython, isPy27
|
||||
, six, pyshp, shapely, geos, numpy
|
||||
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
sha256 = "0q9ckfi37cxj7jwnqnzij62vwcf4krccx576vv5lhvpgvplxjjs2";
|
||||
};
|
||||
|
||||
checkInputs = [ filelock mock pytest pep8 ];
|
||||
checkInputs = [ filelock mock pytest_4 pep8 ];
|
||||
|
||||
# several tests require network connectivity: we disable them.
|
||||
# also py2.7's tk is over-eager in trying to open an x display,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
|
||||
, attrs, click, cligj, click-plugins, six, munch, enum34
|
||||
, pytest, boto3, mock
|
||||
, pytest, boto3, mock, giflib
|
||||
, gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
|
||||
}:
|
||||
|
||||
@@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||
sha256 = "0gpvdrayam4qvpqvz0911nlyvf7ib3slsyml52qx172vhpldycgs";
|
||||
};
|
||||
|
||||
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gdal_2 # for gdal-config
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
|
||||
buildInputs = [
|
||||
gdal_2
|
||||
];
|
||||
] ++ lib.optionals stdenv.cc.isClang [ giflib ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
@@ -30,12 +30,12 @@ buildPythonPackage rec {
|
||||
click-plugins
|
||||
six
|
||||
munch
|
||||
] ++ stdenv.lib.optional (!isPy3k) enum34;
|
||||
] ++ lib.optional (!isPy3k) enum34;
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
boto3
|
||||
] ++ stdenv.lib.optional (pythonOlder "3.4") mock;
|
||||
] ++ lib.optional (pythonOlder "3.4") mock;
|
||||
|
||||
checkPhase = ''
|
||||
rm -r fiona # prevent importing local fiona
|
||||
@@ -45,7 +45,7 @@ buildPythonPackage rec {
|
||||
and not test_*_wheel"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "OGR's neat, nimble, no-nonsense API for Python";
|
||||
homepage = http://toblerity.org/fiona/;
|
||||
license = licenses.bsd3;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut
|
||||
, lib, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
|
||||
, lib, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
|
||||
, zlib, libpng, libGL, libGLU, physfs
|
||||
, qtbase, qttools
|
||||
, withServer ? true
|
||||
@@ -14,14 +14,11 @@ let
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "hedgewars";
|
||||
version = "1.0.0-beta2";
|
||||
version = "1.0.0";
|
||||
|
||||
# it's crazy slow to fetch the whole repo but the beta versions are not
|
||||
# released as tarballs
|
||||
src = fetchhg {
|
||||
url = "https://hg.hedgewars.org/hedgewars/";
|
||||
rev = "dff37ac61dcf";
|
||||
sha256 = "1dsq6wfv3d7jfnr068b7ixpnqp0h6mj7zgby6h1viwblgbirri78";
|
||||
src = fetchurl {
|
||||
url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2";
|
||||
sha256 = "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig qttools ];
|
||||
|
||||
@@ -75,7 +75,7 @@ in buildFHSUserEnv rec {
|
||||
xorg.libX11
|
||||
xorg.libXfixes
|
||||
libGL
|
||||
libva
|
||||
pkgsi686Linux.libva
|
||||
|
||||
# Not formally in runtime but needed by some games
|
||||
at-spi2-atk
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.201";
|
||||
version = "4.4.202";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "120kci4kmc48zcw16lhxmh71kaxm9ac5qxik36q3a20czg28b2m7";
|
||||
sha256 = "0adrmps7izfqy0yn4440isxvigslwzk1a375r9kh86idwbmcxb7x";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.201";
|
||||
version = "4.9.202";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "125xmh5h1zmfniidpjljny53qkl4phpxaali69i66lajscxx8grq";
|
||||
sha256 = "1gsfbvsswpwj6r56ynb6mmx7dc8hp9yhi7sfr0hhii0gs4ffq241";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ledger-udev-rules";
|
||||
version = "unstable-2019-02-13";
|
||||
version = "unstable-2019-05-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LedgerHQ";
|
||||
repo = "udev-rules";
|
||||
rev = "20cc1651eb551c4855aaa56628c77eaeb3031c22";
|
||||
sha256 = "0riydkc4in10pv4qlrvbg3w78qsvxly5caa3zwyqcmsm5fmprqky";
|
||||
rev = "765b7fdf57b20fd9326cedf48ee52e905024ab4f";
|
||||
sha256 = "10a42al020zpkx918y6b1l9az45vk3921b2l1mx87w3m0ad9qvif";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "microcode-intel";
|
||||
version = "20190618";
|
||||
version = "20191113";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "Intel-Linux-Processor-Microcode-Data-Files";
|
||||
rev = "microcode-${version}";
|
||||
sha256 = "0fdhrpxvsq0rm5mzj82gvmfb3lm7mhc9hwvimv7dl1jaidbp6lvs";
|
||||
sha256 = "04138j9n14197ybkh2vxfjy21wcgvbd183ya4b6k262y9nzjmvsa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ iucode-tool libarchive ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nextcloud";
|
||||
version = "16.0.5";
|
||||
version = "16.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0lg5zaakfdngrh0ida0qbq76jbiab5fv46jziqf77zbnlx7wc2c7";
|
||||
sha256 = "1hnbrvl77772rcl4kfzzwd1mlyl2f1f557gfn4hcnpl4a62q1rr3";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -20,11 +20,11 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "samba";
|
||||
version = "4.10.8";
|
||||
version = "4.10.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
|
||||
sha256 = "1x0hlhb674fndfkmimjicnzs543n3i8465a5ifcmjwvzavxha7y4";
|
||||
sha256 = "19b653rr2i9snvapik58phbqj38cxjdlyx6nl3m2y3k1a55p633h";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
@@ -19,7 +19,6 @@ buildPythonApplication rec {
|
||||
propagatedBuildInputs = [ urlgrabber ];
|
||||
|
||||
checkPhase = ''
|
||||
export PYTHONPATH="$PYTHONPATH:."
|
||||
${python}/bin/${python.executable} tests/baseclass.py -vv
|
||||
'';
|
||||
|
||||
|
||||
@@ -16,6 +16,5 @@ buildPythonApplication rec {
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.aszlig ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
56
pkgs/tools/misc/lorri/default.nix
Normal file
56
pkgs/tools/misc/lorri/default.nix
Normal file
@@ -0,0 +1,56 @@
|
||||
{ stdenv
|
||||
, pkgs
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
# Updater script
|
||||
, runtimeShell
|
||||
, writeScript
|
||||
# Tests
|
||||
, nixosTests
|
||||
# Apple dependencies
|
||||
, CoreServices
|
||||
, Security
|
||||
, cf-private
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lorri";
|
||||
version = "unstable-2019-10-30";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Your project's nix-env";
|
||||
homepage = "https://github.com/target/lorri";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ grahamc Profpatsch ];
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "target";
|
||||
repo = pname;
|
||||
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
|
||||
rev = "03f10395943449b1fc5026d3386ab8c94c520ee3";
|
||||
sha256 = "0fcl79ndaziwd8d74mk1lsijz34p2inn64b4b4am3wsyk184brzq";
|
||||
};
|
||||
|
||||
cargoSha256 = "1daff4plh7hwclfp21hkx4fiflh9r80y2c7k2sd3zm4lmpy0jpfz";
|
||||
doCheck = false;
|
||||
|
||||
BUILD_REV_COUNT = src.revCount or 1;
|
||||
RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {};
|
||||
|
||||
nativeBuildInputs = with pkgs; [ nix direnv which ];
|
||||
buildInputs =
|
||||
stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security cf-private ];
|
||||
|
||||
passthru = {
|
||||
updater = with builtins; writeScript "copy-runtime-nix.sh" ''
|
||||
#!${runtimeShell}
|
||||
set -euo pipefail
|
||||
cp ${src}/nix/runtime.nix ${toString ./runtime.nix}
|
||||
cp ${src}/nix/runtime-closure.nix.template ${toString ./runtime-closure.nix.template}
|
||||
'';
|
||||
tests = {
|
||||
nixos = nixosTests.lorri;
|
||||
};
|
||||
};
|
||||
}
|
||||
37
pkgs/tools/misc/lorri/runtime-closure.nix.template
Normal file
37
pkgs/tools/misc/lorri/runtime-closure.nix.template
Normal file
@@ -0,0 +1,37 @@
|
||||
# Nix with sandboxing requires every path used at build time be
|
||||
# explicitly declared. If we simply passed in the paths, they
|
||||
# would be copied in as sources. Using builtins.storePath we're
|
||||
# able to tell Nix that, no, in fact, treat these not as sources
|
||||
# to copy, but instead of a regular store path.
|
||||
#
|
||||
# Include the explicit closure, too, otherwise we'll get mysterious
|
||||
# "file not found" errors due to the glibc interpreter being
|
||||
# missing.
|
||||
let
|
||||
# Magic inspired by Nix's config.nix:
|
||||
# https://github.com/NixOS/nix/blob/f9a2ea44867cd1dbb408bca4df0ced806137b7f7/corepkgs/config.nix.in#L23
|
||||
#
|
||||
# If the dependency is in the Nix store we're using, refer to
|
||||
# it as a literal store path. If it isn't, refer to it "normally".
|
||||
#
|
||||
# This makes sandboxing happy when in a nix-build, and the
|
||||
# evaluation happy when in a «cargo build».
|
||||
tools_build_host = @tools_build_host@;
|
||||
|
||||
# Compare the stringified version of the tools_build_host Nix store
|
||||
# path to the evaluator's stringified Nix store path. Otherwise,
|
||||
# Nix will read the sources in to the /nix/store, and, well,
|
||||
# you can only copy the /nix/store in to the /nix/store so many
|
||||
# times before you run out of disk space.
|
||||
dep = if ("${toString (dirOf tools_build_host)}" == "${toString builtins.storeDir}")
|
||||
then (builtins.trace "using storePath" builtins.storePath)
|
||||
else (builtins.trace "using toString" toString) # assume we have no sandboxing
|
||||
;
|
||||
|
||||
tools = dep tools_build_host;
|
||||
|
||||
in {
|
||||
path = "${tools}/bin";
|
||||
builder = "${tools}/bin/bash";
|
||||
closure = import @runtime_closure_list@ { inherit dep; };
|
||||
}
|
||||
33
pkgs/tools/misc/lorri/runtime.nix
Normal file
33
pkgs/tools/misc/lorri/runtime.nix
Normal file
@@ -0,0 +1,33 @@
|
||||
{
|
||||
# Plumbing tools:
|
||||
closureInfo, runCommand, writeText, buildEnv,
|
||||
|
||||
# Actual dependencies to propagate:
|
||||
bash, coreutils }:
|
||||
let
|
||||
tools = buildEnv {
|
||||
name = "lorri-runtime-tools";
|
||||
paths = [ coreutils bash ];
|
||||
};
|
||||
|
||||
runtimeClosureInfo = closureInfo {
|
||||
rootPaths = [ tools ];
|
||||
};
|
||||
|
||||
closureToNix = runCommand "closure.nix" {}
|
||||
''
|
||||
(
|
||||
echo '{ dep, ... }: ['
|
||||
sed -E 's/^(.*)$/ (dep \1)/' ${runtimeClosureInfo}/store-paths
|
||||
echo ']'
|
||||
) > $out
|
||||
'';
|
||||
|
||||
runtimeClosureInfoAsNix = runCommand "runtime-closure.nix" {
|
||||
runtime_closure_list = closureToNix;
|
||||
tools_build_host = tools;
|
||||
}
|
||||
''
|
||||
substituteAll ${./runtime-closure.nix.template} $out
|
||||
'';
|
||||
in runtimeClosureInfoAsNix
|
||||
@@ -18,11 +18,11 @@ buildPythonPackage rec {
|
||||
# The websites youtube-dl deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2019.10.22";
|
||||
version = "2019.11.05";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "06wg6wpyq0fawjxjrhd7zasfjr9b6w9wsk2amiqdl712zqlq2rwb";
|
||||
sha256 = "129461i4103slqj3nq69djnlmgjj3lfgmazn41avc5g967w29b85";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -3961,7 +3961,9 @@ in
|
||||
|
||||
intecture-auth = callPackage ../tools/admin/intecture/auth.nix { };
|
||||
|
||||
intecture-cli = callPackage ../tools/admin/intecture/cli.nix { };
|
||||
intecture-cli = callPackage ../tools/admin/intecture/cli.nix {
|
||||
openssl = openssl_1_0_2;
|
||||
};
|
||||
|
||||
intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { };
|
||||
|
||||
@@ -5761,7 +5763,7 @@ in
|
||||
|
||||
redsocks = callPackage ../tools/networking/redsocks { };
|
||||
|
||||
retext = callPackage ../applications/editors/retext { };
|
||||
retext = libsForQt5.callPackage ../applications/editors/retext { };
|
||||
|
||||
richgo = callPackage ../development/tools/richgo { };
|
||||
|
||||
@@ -8168,7 +8170,10 @@ in
|
||||
|
||||
llvmPackages_latest = llvmPackages_8;
|
||||
|
||||
lorri = throw "lorri is not stable yet. Please go to https://github.com/target/lorri and follow the installation instructions there, for the time being.";
|
||||
lorri = callPackage ../tools/misc/lorri {
|
||||
inherit (darwin) cf-private;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||
};
|
||||
|
||||
manticore = callPackage ../development/compilers/manticore { };
|
||||
|
||||
@@ -13417,6 +13422,8 @@ in
|
||||
|
||||
qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { };
|
||||
|
||||
randomx = callPackage ../development/libraries/randomx { };
|
||||
|
||||
resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
|
||||
|
||||
rhino = callPackage ../development/libraries/java/rhino {
|
||||
|
||||
Reference in New Issue
Block a user