mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
f5e013347f
@ -336,9 +336,9 @@ with import <nixpkgs> {};
|
||||
let src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "nixpkgs-mozilla";
|
||||
# commit from: 2018-03-27
|
||||
rev = "2945b0b6b2fd19e7d23bac695afd65e320efcebe";
|
||||
sha256 = "034m1dryrzh2lmjvk3c0krgip652dql46w5yfwpvh7gavd3iypyw";
|
||||
# commit from: 2019-05-15
|
||||
rev = "9f35c4b09fd44a77227e79ff0c1b4b6a69dff533";
|
||||
sha256 = "18h0nvh55b5an4gmlgfbvwbyqj91bklf1zymis6lbdh75571qaz0";
|
||||
};
|
||||
in
|
||||
with import "${src.out}/rust-overlay.nix" pkgs pkgs;
|
||||
|
||||
@ -434,12 +434,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
|
||||
|
||||
lgpl21 = spdx {
|
||||
spdxId = "LGPL-2.1-only";
|
||||
fullName = "GNU Library General Public License v2.1 only";
|
||||
fullName = "GNU Lesser General Public License v2.1 only";
|
||||
};
|
||||
|
||||
lgpl21Plus = spdx {
|
||||
spdxId = "LGPL-2.1-or-later";
|
||||
fullName = "GNU Library General Public License v2.1 or later";
|
||||
fullName = "GNU Lesser General Public License v2.1 or later";
|
||||
};
|
||||
|
||||
lgpl3 = spdx {
|
||||
|
||||
@ -820,10 +820,6 @@
|
||||
github = "c0deaddict";
|
||||
name = "Jos van Bakel";
|
||||
};
|
||||
c0dehero = {
|
||||
email = "codehero@nerdpol.ch";
|
||||
name = "CodeHero";
|
||||
};
|
||||
calbrecht = {
|
||||
email = "christian.albrecht@mayflower.de";
|
||||
github = "calbrecht";
|
||||
@ -3668,6 +3664,11 @@
|
||||
github = "nphilou";
|
||||
name = "Philippe Nguyen";
|
||||
};
|
||||
nshalman = {
|
||||
email = "nahamu@gmail.com";
|
||||
github = "nshalman";
|
||||
name = "Nahum Shalman";
|
||||
};
|
||||
nslqqq = {
|
||||
email = "nslqqq@gmail.com";
|
||||
name = "Nikita Mikhailov";
|
||||
@ -4090,6 +4091,11 @@
|
||||
email = "patrick.callahan@latitudeengineering.com";
|
||||
name = "Patrick Callahan";
|
||||
};
|
||||
pyrolagus = {
|
||||
email = "pyrolagus@gmail.com";
|
||||
github = "PyroLagus";
|
||||
name = "Danny Bautista";
|
||||
};
|
||||
q3k = {
|
||||
email = "q3k@q3k.org";
|
||||
github = "q3k";
|
||||
|
||||
@ -1,44 +1,49 @@
|
||||
# nix name, luarocks name, server, version,luaversion
|
||||
ansicolors,,,,
|
||||
argparse,,,,
|
||||
basexx,,,,
|
||||
binaryheap,,,,
|
||||
digestif,,http://luarocks.org/dev,,lua5_3
|
||||
dkjson,,,,
|
||||
fifo,,,,
|
||||
http,,,,
|
||||
inspect,,,,
|
||||
ldoc,,,,
|
||||
lgi,,,,
|
||||
lpeg_patterns,,,,
|
||||
lpeglabel,,,,
|
||||
lpty,,,,
|
||||
lrexlib-gnu,,,,
|
||||
lrexlib-posix,,,,
|
||||
ltermbox,,,,
|
||||
lua-cmsgpack,,,,
|
||||
lua_cliargs,,,,
|
||||
lua-iconv,,,,
|
||||
lua-lsp,,http://luarocks.org/dev,,
|
||||
lua-messagepack,,,,
|
||||
lua-term,,,,
|
||||
lua-toml,,,,
|
||||
luabitop,,,,
|
||||
luaevent,,,,
|
||||
luacheck,,,,
|
||||
luaffi,,http://luarocks.org/dev,,
|
||||
luuid,,,,
|
||||
markdown,,,,
|
||||
penlight,,,,
|
||||
rapidjson,,,,
|
||||
say,,,,
|
||||
std__debug,std._debug,,,
|
||||
std_normalize,std.normalize,,,
|
||||
luv,,,,
|
||||
luasystem,,,,
|
||||
mediator_lua,,http://luarocks.org/manifests/teto,,
|
||||
mpack,,http://luarocks.org/manifests/teto,,
|
||||
nvim-client,,,,
|
||||
busted,,http://luarocks.org/manifests/teto,,
|
||||
luassert,,,,
|
||||
coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1,
|
||||
# nix name, luarocks name, server, version,luaversion,maintainers
|
||||
ansicolors,,,,,
|
||||
argparse,,,,,
|
||||
basexx,,,,,
|
||||
binaryheap,,,,,vcunat
|
||||
digestif,,http://luarocks.org/dev,,lua5_3,
|
||||
dkjson,,,,,
|
||||
fifo,,,,,
|
||||
http,,,,,
|
||||
inspect,,,,,
|
||||
ldoc,,,,,
|
||||
lgi,,,,,
|
||||
lpeg,,,,,vyp
|
||||
lpeg_patterns,,,,,
|
||||
lpeglabel,,,,,
|
||||
lpty,,,,,
|
||||
lrexlib-gnu,,,,,
|
||||
lrexlib-posix,,,,,
|
||||
ltermbox,,,,,
|
||||
cjson,lua-cjson,,,,
|
||||
lua-cmsgpack,,,,,
|
||||
lua_cliargs,,,,,
|
||||
lua-iconv,,,,,
|
||||
lua-lsp,,http://luarocks.org/dev,,,
|
||||
lua-messagepack,,,,,
|
||||
lua-term,,,,,
|
||||
lua-toml,,,,,
|
||||
lua-zlib,,,,,koral
|
||||
luabitop,,,,,
|
||||
luaevent,,,,,
|
||||
luacheck,,,,,
|
||||
luaffi,,http://luarocks.org/dev,,,
|
||||
luaposix,,,,,vyp lblasc
|
||||
luazip,,,,,
|
||||
luuid,,,,,
|
||||
markdown,,,,,
|
||||
penlight,,,,,
|
||||
rapidjson,,,,,
|
||||
say,,,,,
|
||||
std__debug,std._debug,,,,
|
||||
std_normalize,std.normalize,,,,
|
||||
luv,,,,,
|
||||
luasystem,,,,,
|
||||
mediator_lua,,http://luarocks.org/manifests/teto,,,
|
||||
mpack,,,,,
|
||||
nvim-client,,,,,
|
||||
busted,,http://luarocks.org/manifests/teto,,,
|
||||
luassert,,,,,
|
||||
coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1,,
|
||||
|
||||
|
@ -29,6 +29,13 @@
|
||||
<xref linkend="opt-services.openssh.enable"/> = true;
|
||||
<link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];
|
||||
'
|
||||
</screen>
|
||||
By default the next free address in the <literal>10.233.0.0/16</literal> subnet will be chosen
|
||||
as container IP. This behavior can be altered by setting <literal>--host-address</literal> and
|
||||
<literal>--local-address</literal>:
|
||||
<screen>
|
||||
# nixos-container create test --config-file test-container.nix \
|
||||
--local-address 10.235.1.2 --host-address 10.235.1.1
|
||||
</screen>
|
||||
</para>
|
||||
|
||||
|
||||
@ -165,6 +165,12 @@
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/62211">issue #62211</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The setopt declarations will be evaluated at the end of <literal>/etc/zshrc</literal>, so any code in <xref linkend="opt-programs.zsh.interactiveShellInit" />,
|
||||
<xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
|
||||
@ -611,6 +611,7 @@
|
||||
./services/networking/morty.nix
|
||||
./services/networking/miredo.nix
|
||||
./services/networking/mstpd.nix
|
||||
./services/networking/mtprotoproxy.nix
|
||||
./services/networking/murmur.nix
|
||||
./services/networking/mxisd.nix
|
||||
./services/networking/namecoind.nix
|
||||
@ -759,6 +760,7 @@
|
||||
./services/web-apps/atlassian/crowd.nix
|
||||
./services/web-apps/atlassian/jira.nix
|
||||
./services/web-apps/codimd.nix
|
||||
./services/web-apps/cryptpad.nix
|
||||
./services/web-apps/documize.nix
|
||||
./services/web-apps/frab.nix
|
||||
./services/web-apps/icingaweb2/icingaweb2.nix
|
||||
|
||||
@ -194,8 +194,6 @@ in
|
||||
HISTSIZE=${toString cfg.histSize}
|
||||
HISTFILE=${cfg.histFile}
|
||||
|
||||
${optionalString (cfg.setOptions != []) "setopt ${concatStringsSep " " cfg.setOptions}"}
|
||||
|
||||
HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
|
||||
|
||||
# Tell zsh how to find installed completions
|
||||
@ -209,6 +207,8 @@ in
|
||||
|
||||
${cfg.interactiveShellInit}
|
||||
|
||||
${optionalString (cfg.setOptions != []) "setopt ${concatStringsSep " " cfg.setOptions}"}
|
||||
|
||||
${zshAliases}
|
||||
|
||||
${cfg.promptInit}
|
||||
|
||||
@ -98,6 +98,20 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
dmixConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
example = ''
|
||||
period_size 2048
|
||||
periods 2
|
||||
'';
|
||||
description = ''
|
||||
For music production software that still doesn't support JACK natively you
|
||||
would like to put buffer/period adjustments here
|
||||
to decrease dmix device latency.
|
||||
'';
|
||||
};
|
||||
|
||||
session = mkOption {
|
||||
type = types.lines;
|
||||
description = ''
|
||||
@ -150,6 +164,7 @@ in {
|
||||
ipc_key 219345
|
||||
slave {
|
||||
pcm loophw00
|
||||
${cfg.loopback.dmixConfig}
|
||||
}
|
||||
}
|
||||
pcm.asoftvol {
|
||||
|
||||
@ -229,6 +229,8 @@ in {
|
||||
location / {
|
||||
try_files $uri $uri/ /index.php?$args =404;
|
||||
|
||||
rewrite ^/skins/.*/css/fonts/(.*)$ /fonts/$1 permanent;
|
||||
|
||||
location ~ /api/(css|img|ico) {
|
||||
rewrite ^/api(.+)$ /api/app/webroot/$1 break;
|
||||
try_files $uri $uri/ =404;
|
||||
|
||||
@ -34,6 +34,7 @@ let
|
||||
unifi = import ./exporters/unifi.nix { inherit config lib pkgs; };
|
||||
varnish = import ./exporters/varnish.nix { inherit config lib pkgs; };
|
||||
bind = import ./exporters/bind.nix { inherit config lib pkgs; };
|
||||
wireguard = import ./exporters/wireguard.nix { inherit config lib pkgs; };
|
||||
};
|
||||
|
||||
mkExporterOpts = ({ name, port }: {
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
{ config, lib, pkgs }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.wireguard;
|
||||
in {
|
||||
port = 9586;
|
||||
extraOpts = {
|
||||
verbose = mkEnableOption "Verbose logging mode for prometheus-wireguard-exporter";
|
||||
|
||||
wireguardConfig = mkOption {
|
||||
type = with types; nullOr (either path str);
|
||||
default = null;
|
||||
|
||||
description = ''
|
||||
Path to the Wireguard Config to
|
||||
<link xlink:href="https://github.com/MindFlavor/prometheus_wireguard_exporter/tree/2.0.0#usage">add the peer's name to the stats of a peer</link>.
|
||||
|
||||
Please note that <literal>networking.wg-quick</literal> is required for this feature
|
||||
as <literal>networking.wireguard</literal> uses
|
||||
<citerefentry><refentrytitle>wg</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||
to set the peers up.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
script = ''
|
||||
${pkgs.prometheus-wireguard-exporter}/bin/prometheus_wireguard_exporter \
|
||||
-p ${toString cfg.port} \
|
||||
${optionalString cfg.verbose "-v"} \
|
||||
${optionalString (cfg.wireguardConfig != null) "-n ${cfg.wireguardConfig}"}
|
||||
'';
|
||||
|
||||
path = [ pkgs.wireguard-tools ];
|
||||
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
AmbientCapabilities = [ "CAP_NET_ADMIN" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
110
nixos/modules/services/networking/mtprotoproxy.nix
Normal file
110
nixos/modules/services/networking/mtprotoproxy.nix
Normal file
@ -0,0 +1,110 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.mtprotoproxy;
|
||||
|
||||
configOpts = {
|
||||
PORT = cfg.port;
|
||||
USERS = cfg.users;
|
||||
SECURE_ONLY = cfg.secureOnly;
|
||||
} // lib.optionalAttrs (cfg.adTag != null) { AD_TAG = cfg.adTag; }
|
||||
// cfg.extraConfig;
|
||||
|
||||
convertOption = opt:
|
||||
if isString opt || isInt opt then
|
||||
builtins.toJSON opt
|
||||
else if isBool opt then
|
||||
if opt then "True" else "False"
|
||||
else if isList opt then
|
||||
"[" + concatMapStringsSep "," convertOption opt + "]"
|
||||
else if isAttrs opt then
|
||||
"{" + concatStringsSep "," (mapAttrsToList (name: opt: "${builtins.toJSON name}: ${convertOption opt}") opt) + "}"
|
||||
else
|
||||
throw "Invalid option type";
|
||||
|
||||
configFile = pkgs.writeText "config.py" (concatStringsSep "\n" (mapAttrsToList (name: opt: "${name} = ${convertOption opt}") configOpts));
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.mtprotoproxy = {
|
||||
|
||||
enable = mkEnableOption "mtprotoproxy";
|
||||
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
default = 3256;
|
||||
description = ''
|
||||
TCP port to accept mtproto connections on.
|
||||
'';
|
||||
};
|
||||
|
||||
users = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
example = {
|
||||
"tg" = "00000000000000000000000000000000";
|
||||
"tg2" = "0123456789abcdef0123456789abcdef";
|
||||
};
|
||||
description = ''
|
||||
Allowed users and their secrets. A secret is a 32 characters long hex string.
|
||||
'';
|
||||
};
|
||||
|
||||
secureOnly = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Don't allow users to connect in non-secure mode (without random padding).
|
||||
'';
|
||||
};
|
||||
|
||||
adTag = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
# Taken from mtproxyproto's repo.
|
||||
example = "3c09c680b76ee91a4c25ad51f742267d";
|
||||
description = ''
|
||||
Tag for advertising that can be obtained from @MTProxybot.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.attrs;
|
||||
default = {};
|
||||
example = {
|
||||
"STATS_PRINT_PERIOD" = 600;
|
||||
};
|
||||
description = ''
|
||||
Extra configuration options for mtprotoproxy.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd.services.mtprotoproxy = {
|
||||
description = "MTProto Proxy Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.mtprotoproxy}/bin/mtprotoproxy ${configFile}";
|
||||
DynamicUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@ -244,7 +244,7 @@ let
|
||||
description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}";
|
||||
requires = [ "wireguard-${interfaceName}.service" ];
|
||||
after = [ "wireguard-${interfaceName}.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ];
|
||||
environment.DEVICE = interfaceName;
|
||||
environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity";
|
||||
path = with pkgs; [ iproute wireguard-tools ];
|
||||
@ -303,7 +303,7 @@ let
|
||||
};
|
||||
|
||||
script = ''
|
||||
${optionalString (!config.boot.isContainer) "modprobe wireguard"}
|
||||
${optionalString (!config.boot.isContainer) "modprobe wireguard || true"}
|
||||
|
||||
${values.preSetup}
|
||||
|
||||
|
||||
54
nixos/modules/services/web-apps/cryptpad.nix
Normal file
54
nixos/modules/services/web-apps/cryptpad.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.cryptpad;
|
||||
in
|
||||
{
|
||||
options.services.cryptpad = {
|
||||
enable = mkEnableOption "the Cryptpad service";
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.cryptpad;
|
||||
defaultText = "pkgs.cryptpad";
|
||||
type = types.package;
|
||||
description = "
|
||||
Cryptpad package to use.
|
||||
";
|
||||
};
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.path;
|
||||
default = "${cfg.package}/lib/node_modules/cryptpad/config/config.example.js";
|
||||
defaultText = "\${cfg.package}/lib/node_modules/cryptpad/config/config.example.js";
|
||||
description = ''
|
||||
Path to the JavaScript configuration file.
|
||||
|
||||
See <link
|
||||
xlink:href="https://github.com/xwiki-labs/cryptpad/blob/master/config/config.example.js"/>
|
||||
for a configuration example.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.cryptpad = {
|
||||
description = "Cryptpad Service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "networking.target" ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
Environment = [
|
||||
"CRYPTPAD_CONFIG=${cfg.configFile}"
|
||||
"HOME=%S/cryptpad"
|
||||
];
|
||||
ExecStart = "${cfg.package}/bin/cryptpad";
|
||||
PrivateTmp = true;
|
||||
Restart = "always";
|
||||
StateDirectory = "cryptpad";
|
||||
WorkingDirectory = "%S/cryptpad";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -8,8 +8,6 @@ let
|
||||
|
||||
httpd = mainCfg.package.out;
|
||||
|
||||
version24 = !versionOlder httpd.version "2.4";
|
||||
|
||||
httpdConf = mainCfg.configFile;
|
||||
|
||||
php = mainCfg.phpPackage.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ };
|
||||
@ -107,11 +105,10 @@ let
|
||||
"auth_basic" "auth_digest"
|
||||
|
||||
# Authentication: is the user who he claims to be?
|
||||
"authn_file" "authn_dbm" "authn_anon"
|
||||
(if version24 then "authn_core" else "authn_alias")
|
||||
"authn_file" "authn_dbm" "authn_anon" "authn_core"
|
||||
|
||||
# Authorization: is the user allowed access?
|
||||
"authz_user" "authz_groupfile" "authz_host"
|
||||
"authz_user" "authz_groupfile" "authz_host" "authz_core"
|
||||
|
||||
# Other modules.
|
||||
"ext_filter" "include" "log_config" "env" "mime_magic"
|
||||
@ -119,14 +116,9 @@ let
|
||||
"mime" "dav" "status" "autoindex" "asis" "info" "dav_fs"
|
||||
"vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
|
||||
"userdir" "alias" "rewrite" "proxy" "proxy_http"
|
||||
]
|
||||
++ optionals version24 [
|
||||
"unixd" "cache" "cache_disk" "slotmem_shm" "socache_shmcb"
|
||||
"mpm_${mainCfg.multiProcessingModule}"
|
||||
"authz_core"
|
||||
"unixd"
|
||||
"cache" "cache_disk"
|
||||
"slotmem_shm"
|
||||
"socache_shmcb"
|
||||
|
||||
# For compatibility with old configurations, the new module mod_access_compat is provided.
|
||||
"access_compat"
|
||||
]
|
||||
@ -135,19 +127,8 @@ let
|
||||
++ extraApacheModules;
|
||||
|
||||
|
||||
allDenied = if version24 then ''
|
||||
Require all denied
|
||||
'' else ''
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
'';
|
||||
|
||||
allGranted = if version24 then ''
|
||||
Require all granted
|
||||
'' else ''
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
'';
|
||||
allDenied = "Require all denied";
|
||||
allGranted = "Require all granted";
|
||||
|
||||
|
||||
loggingConf = (if mainCfg.logFormat != "none" then ''
|
||||
@ -180,9 +161,9 @@ let
|
||||
|
||||
|
||||
sslConf = ''
|
||||
SSLSessionCache ${if version24 then "shmcb" else "shm"}:${mainCfg.stateDir}/ssl_scache(512000)
|
||||
SSLSessionCache shmcb:${mainCfg.stateDir}/ssl_scache(512000)
|
||||
|
||||
${if version24 then "Mutex" else "SSLMutex"} posixsem
|
||||
Mutex posixsem
|
||||
|
||||
SSLRandomSeed startup builtin
|
||||
SSLRandomSeed connect builtin
|
||||
@ -322,9 +303,7 @@ let
|
||||
|
||||
ServerRoot ${httpd}
|
||||
|
||||
${optionalString version24 ''
|
||||
DefaultRuntimeDir ${mainCfg.stateDir}/runtime
|
||||
''}
|
||||
DefaultRuntimeDir ${mainCfg.stateDir}/runtime
|
||||
|
||||
PidFile ${mainCfg.stateDir}/httpd.pid
|
||||
|
||||
@ -397,14 +376,6 @@ let
|
||||
# Generate directives for the main server.
|
||||
${perServerConf true mainCfg}
|
||||
|
||||
# Always enable virtual hosts; it doesn't seem to hurt.
|
||||
${let
|
||||
listen = concatMap getListen allHosts;
|
||||
uniqueListen = uniqList {inputList = listen;};
|
||||
directives = concatMapStrings (listen: "NameVirtualHost ${listenToString listen}\n") uniqueListen;
|
||||
in optionalString (!version24) directives
|
||||
}
|
||||
|
||||
${let
|
||||
makeVirtualHost = vhost: ''
|
||||
<VirtualHost ${concatStringsSep " " (map listenToString (getListen vhost))}>
|
||||
@ -717,10 +688,10 @@ in
|
||||
''
|
||||
mkdir -m 0750 -p ${mainCfg.stateDir}
|
||||
[ $(id -u) != 0 ] || chown root.${mainCfg.group} ${mainCfg.stateDir}
|
||||
${optionalString version24 ''
|
||||
mkdir -m 0750 -p "${mainCfg.stateDir}/runtime"
|
||||
[ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime"
|
||||
''}
|
||||
|
||||
mkdir -m 0750 -p "${mainCfg.stateDir}/runtime"
|
||||
[ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime"
|
||||
|
||||
mkdir -m 0700 -p ${mainCfg.logDir}
|
||||
|
||||
# Get rid of old semaphores. These tend to accumulate across
|
||||
|
||||
@ -7,8 +7,8 @@ let
|
||||
generationsDirBuilder = pkgs.substituteAll {
|
||||
src = ./generations-dir-builder.sh;
|
||||
isExecutable = true;
|
||||
inherit (pkgs.buildPackages) bash;
|
||||
path = with pkgs.buildPackages; [coreutils gnused gnugrep];
|
||||
inherit (pkgs) bash;
|
||||
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
|
||||
inherit (config.boot.loader.generationsDir) copyKernels;
|
||||
};
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ let
|
||||
|
||||
timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
|
||||
|
||||
builder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; };
|
||||
builder = import ./extlinux-conf-builder.nix { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
options = {
|
||||
|
||||
@ -3,6 +3,6 @@
|
||||
pkgs.substituteAll {
|
||||
src = ./extlinux-conf-builder.sh;
|
||||
isExecutable = true;
|
||||
path = [pkgs.buildPackages.coreutils pkgs.buildPackages.gnused pkgs.buildPackages.gnugrep];
|
||||
inherit (pkgs.buildPackages) bash;
|
||||
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
|
||||
inherit (pkgs) bash;
|
||||
}
|
||||
|
||||
@ -7,8 +7,8 @@ let
|
||||
initScriptBuilder = pkgs.substituteAll {
|
||||
src = ./init-script-builder.sh;
|
||||
isExecutable = true;
|
||||
inherit (pkgs.buildPackages) bash;
|
||||
path = with pkgs.buildPackages; [coreutils gnused gnugrep];
|
||||
inherit (pkgs) bash;
|
||||
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@ -18,17 +18,18 @@ let
|
||||
|
||||
extlinuxConfBuilder =
|
||||
import ../generic-extlinux-compatible/extlinux-conf-builder.nix {
|
||||
pkgs = pkgs.buildPackages;
|
||||
inherit pkgs;
|
||||
};
|
||||
in
|
||||
pkgs.substituteAll {
|
||||
src = ./uboot-builder.sh;
|
||||
isExecutable = true;
|
||||
inherit (pkgs.buildPackages) bash;
|
||||
path = with pkgs.buildPackages; [coreutils gnused gnugrep];
|
||||
inherit (pkgs) bash;
|
||||
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
|
||||
firmware = pkgs.raspberrypifw;
|
||||
inherit uboot;
|
||||
inherit configTxt;
|
||||
inherit extlinuxConfBuilder;
|
||||
inherit version;
|
||||
}
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
|
||||
isExecutable = true;
|
||||
|
||||
inherit (pkgs.buildPackages) python3;
|
||||
inherit (pkgs) python3;
|
||||
|
||||
systemd = config.systemd.package;
|
||||
|
||||
|
||||
@ -24,11 +24,9 @@ let
|
||||
kernel = config.boot.kernelPackages;
|
||||
|
||||
packages = if config.boot.zfs.enableUnstable then {
|
||||
spl = null;
|
||||
zfs = kernel.zfsUnstable;
|
||||
zfsUser = pkgs.zfsUnstable;
|
||||
} else {
|
||||
spl = kernel.spl;
|
||||
zfs = kernel.zfs;
|
||||
zfsUser = pkgs.zfs;
|
||||
};
|
||||
@ -325,8 +323,8 @@ in
|
||||
virtualisation.lxd.zfsSupport = true;
|
||||
|
||||
boot = {
|
||||
kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl";
|
||||
extraModulePackages = with packages; [ zfs ] ++ optional (!cfgZfs.enableUnstable) spl;
|
||||
kernelModules = [ "zfs" ];
|
||||
extraModulePackages = with packages; [ zfs ];
|
||||
};
|
||||
|
||||
boot.initrd = mkIf inInitrd {
|
||||
|
||||
@ -689,7 +689,7 @@ in
|
||||
[{ name = "container@"; value = unit; }]
|
||||
# declarative containers
|
||||
++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" (let
|
||||
config = cfg // (
|
||||
containerConfig = cfg // (
|
||||
if cfg.enableTun then
|
||||
{
|
||||
allowedDevices = cfg.allowedDevices
|
||||
@ -700,18 +700,21 @@ in
|
||||
else {});
|
||||
in
|
||||
unit // {
|
||||
preStart = preStartScript config;
|
||||
script = startScript config;
|
||||
postStart = postStartScript config;
|
||||
serviceConfig = serviceDirectives config;
|
||||
preStart = preStartScript containerConfig;
|
||||
script = startScript containerConfig;
|
||||
postStart = postStartScript containerConfig;
|
||||
serviceConfig = serviceDirectives containerConfig;
|
||||
} // (
|
||||
if config.autoStart then
|
||||
if containerConfig.autoStart then
|
||||
{
|
||||
wantedBy = [ "machines.target" ];
|
||||
wants = [ "network.target" ];
|
||||
after = [ "network.target" ];
|
||||
restartTriggers = [ config.path ];
|
||||
reloadIfChanged = true;
|
||||
restartTriggers = [
|
||||
containerConfig.path
|
||||
config.environment.etc."containers/${name}.conf".source
|
||||
];
|
||||
restartIfChanged = true;
|
||||
}
|
||||
else {})
|
||||
)) config.containers)
|
||||
|
||||
@ -249,6 +249,7 @@ in
|
||||
transmission = handleTest ./transmission.nix {};
|
||||
udisks2 = handleTest ./udisks2.nix {};
|
||||
upnp = handleTest ./upnp.nix {};
|
||||
uwsgi = handleTest ./uwsgi.nix {};
|
||||
vault = handleTest ./vault.nix {};
|
||||
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
|
||||
wireguard = handleTest ./wireguard {};
|
||||
|
||||
@ -68,6 +68,12 @@ import ./make-test.nix ({ pkgs, ... }: {
|
||||
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-on-top}'");
|
||||
$docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-on-top.imageName}");
|
||||
|
||||
# Ensure layers are shared between images
|
||||
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.another-layered-image}'");
|
||||
$docker->succeed("docker inspect ${pkgs.dockerTools.examples.layered-image.imageName} | ${pkgs.jq}/bin/jq -r '.[] | .RootFS.Layers | .[]' | sort > layers1.sha256");
|
||||
$docker->succeed("docker inspect ${pkgs.dockerTools.examples.another-layered-image.imageName} | ${pkgs.jq}/bin/jq -r '.[] | .RootFS.Layers | .[]' | sort > layers2.sha256");
|
||||
$docker->succeed('[ $(comm -1 -2 layers1.sha256 layers2.sha256 | wc -l) -ne 0 ]');
|
||||
|
||||
# Ensure order of layers is correct
|
||||
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.layersOrder}'");
|
||||
$docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer1 | grep -q layer1");
|
||||
|
||||
@ -315,6 +315,29 @@ let
|
||||
succeed("curl -sSf http://localhost:9131/metrics | grep -q 'varnish_up 1'");
|
||||
'';
|
||||
};
|
||||
|
||||
wireguard = let snakeoil = import ./wireguard/snakeoil-keys.nix; in {
|
||||
exporterConfig.enable = true;
|
||||
metricProvider = {
|
||||
networking.wireguard.interfaces.wg0 = {
|
||||
ips = [ "10.23.42.1/32" "fc00::1/128" ];
|
||||
listenPort = 23542;
|
||||
|
||||
inherit (snakeoil.peer0) privateKey;
|
||||
|
||||
peers = singleton {
|
||||
allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];
|
||||
|
||||
inherit (snakeoil.peer1) publicKey;
|
||||
};
|
||||
};
|
||||
};
|
||||
exporterTest = ''
|
||||
waitForUnit("prometheus-wireguard-exporter.service");
|
||||
waitForOpenPort(9586);
|
||||
succeed("curl -sSf http://localhost:9586/metrics | grep '${snakeoil.peer1.publicKey}'");
|
||||
'';
|
||||
};
|
||||
};
|
||||
in
|
||||
mapAttrs (exporter: testConfig: (makeTest {
|
||||
|
||||
@ -135,8 +135,8 @@ in {
|
||||
|
||||
subtest "check_slurm_dbd", sub {
|
||||
# find the srun job from above in the database
|
||||
sleep 2;
|
||||
$submit->succeed("sacct | grep hostname");
|
||||
sleep 5;
|
||||
$control->succeed("sacct | grep hostname");
|
||||
};
|
||||
'';
|
||||
})
|
||||
|
||||
38
nixos/tests/uwsgi.nix
Normal file
38
nixos/tests/uwsgi.nix
Normal file
@ -0,0 +1,38 @@
|
||||
import ./make-test.nix ({ pkgs, ... }:
|
||||
{
|
||||
name = "uwsgi";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ lnl7 ];
|
||||
};
|
||||
machine = { pkgs, ... }: {
|
||||
services.uwsgi.enable = true;
|
||||
services.uwsgi.plugins = [ "python3" ];
|
||||
services.uwsgi.instance = {
|
||||
type = "emperor";
|
||||
vassals.hello = {
|
||||
type = "normal";
|
||||
master = true;
|
||||
workers = 2;
|
||||
http = ":8000";
|
||||
module = "wsgi:application";
|
||||
chdir = pkgs.writeTextDir "wsgi.py" ''
|
||||
from flask import Flask
|
||||
application = Flask(__name__)
|
||||
|
||||
@application.route("/")
|
||||
def hello():
|
||||
return "Hello World!"
|
||||
'';
|
||||
pythonPackages = self: with self; [ flask ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript =
|
||||
''
|
||||
$machine->waitForUnit('multi-user.target');
|
||||
$machine->waitForUnit('uwsgi.service');
|
||||
$machine->waitForOpenPort(8000);
|
||||
$machine->succeed('curl -v 127.0.0.1:8000 | grep "Hello World!"');
|
||||
'';
|
||||
})
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "Mopidy-Iris";
|
||||
version = "3.37.1";
|
||||
version = "3.38.0";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0qcg456k7av0anymmmnlcn0v4642gbgk0nhic6w9bg9v5m0nj9ll";
|
||||
sha256 = "0w86g037jdihh6a16x7y82qk8yk30frkj23k9axcj9fjyp30r0x5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@ let
|
||||
sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "3.5.0.15"; # "Android Studio 3.5 Beta 3"
|
||||
build = "191.5585527";
|
||||
sha256Hash = "0b9yj3rf3nk8y9qfmf5kjh8rwn73v7ghym1bhz864r079h7lwr53";
|
||||
version = "3.5.0.16"; # "Android Studio 3.5 Beta 4"
|
||||
build = "191.5619324";
|
||||
sha256Hash = "1rg6v9b8fdnmslpv80khhpx59lvwhj1vwbkyabz2fryfj67wz01z";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "3.6.0.2"; # "Android Studio 3.6 Canary 2"
|
||||
build = "191.5599242";
|
||||
sha256Hash = "0aivw3lz09v7sq28ply9nczaxkwdlkb5byr8yym5qydkcv35x9gl";
|
||||
version = "3.6.0.3"; # "Android Studio 3.6 Canary 3"
|
||||
build = "191.5618338";
|
||||
sha256Hash = "0ryf61svn6ra8gh1rvfjqj3j282zmgcvkjvgfvql1wgkjlz21519";
|
||||
};
|
||||
in rec {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "kdevelop-pg-qt";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
|
||||
sha256 = "20d84d25bd40610bd6c0964e4fe0642e56c41b76a65575122dc5196649621e5d";
|
||||
sha256 = "01a4y98hf8zlrdf5l8f4izqh4n3j3xs93j8ny5a3f4z50nb6hxq7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
|
||||
|
||||
@ -12,14 +12,14 @@ let
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
"i686-linux" = "1xl8bk1m7d930dp7nw4770vk14cppci0ag079y8d39xqnvs24mr0";
|
||||
"x86_64-linux" = "0mq6gzz7338h4ragiar55xxby0x7whcd9nvnfk46bri162bacjbg";
|
||||
"x86_64-darwin" = "0pgj515k2bkpz953shmnalfw6yz8sg07jsxqk1rni9s3khrrd25h";
|
||||
"i686-linux" = "1485maq7rrvi742w0zs5nnaqy2s7w4hhm0fi4n69vafncia8zyic";
|
||||
"x86_64-linux" = "082725c7yzih13d4khvwz34ijwdg6yxmsxhjmpn2pqlfsg43hxsh";
|
||||
"x86_64-darwin" = "1mvj63sbdcw227bi4idqcwqxds60g64spvdi2bxh5sk6g5q5df90";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
|
||||
version = "1.34.0";
|
||||
version = "1.35.0";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "goxel-${version}";
|
||||
version = "0.8.3";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guillaumechereau";
|
||||
repo = "goxel";
|
||||
rev = "v${version}";
|
||||
sha256 = "03hyy0i65zdplggaxlndgyvffvnb9g5kvxq2qbicirvz5zcsghk2";
|
||||
sha256 = "1vd1vw5pplm4ig9f5gwnbvndnag1h7j0jj0cnj78gpiv96qak2vw";
|
||||
};
|
||||
|
||||
patches = [ ./disable-imgui_ini.patch ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
let
|
||||
|
||||
major = "4.2";
|
||||
minor = "0";
|
||||
minor = "1";
|
||||
patch = null;
|
||||
|
||||
in
|
||||
@ -22,7 +22,7 @@ mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz";
|
||||
sha256 = "1l5bhk4b2f3qdzg9jk2sxz2bq8cqs10nm3wgkrkbqs6vig75rsym";
|
||||
sha256 = "1jm9kj9cq2nhaqg3kvyb193hhkd6al1gh23fkl54dj88x3fpldim";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
|
||||
|
||||
@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.unix;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,24 +2,24 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6-003";
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then
|
||||
fetchzip {
|
||||
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
|
||||
sha256 = "1jwkvj6xxfgn08j6wzwcra3p1dp04vblzr2g5s1y3bj4r7gs4gax";
|
||||
sha256 = "11smnx8fh32qm3b82x2ps4y46q29h77x1j1dj3d5vs0vha9b8frj";
|
||||
stripRoot = false;
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchzip {
|
||||
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
|
||||
sha256 = "1svic2b2msbwzfx3qxfglxp0jjzy3p3v78273wab942zh822ld8b";
|
||||
sha256 = "1qwxga6qmb3n76h2fl1lxhnz676cqbx8gic1b5c9hw88gnqwykb9";
|
||||
stripRoot = false;
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "x86_64-darwin" then
|
||||
fetchzip {
|
||||
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip";
|
||||
sha256 = "03bnwn06066hvp0n30260mhvkjr60dl93nj9l7p6a0ndcv7w77r8";
|
||||
sha256 = "0gzmwc20liqx2cqply06yarwp228ydfgfb26bmpxbvlp0cq7d07g";
|
||||
stripRoot = false;
|
||||
}
|
||||
else throw "Architecture not supported";
|
||||
|
||||
@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = https://github.com/mcuelenaere/fsv;
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.mesaPlatforms;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, qmake, qttools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gpxsee-${version}";
|
||||
version = "7.1";
|
||||
pname = "gpxsee";
|
||||
version = "7.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "1dgag8j3566qwiz1pschfq2wqdp7y1pr4cm9na4zwrdjhn3ci6v5";
|
||||
sha256 = "1ymqz4wrl9ghkyyqi2vrnlyvz3fc84s3p8a1dkiqlvyvj360ck9j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
@ -19,23 +19,14 @@ stdenv.mkDerivation rec {
|
||||
lrelease lang/*.ts
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 GPXSee $out/bin/GPXSee
|
||||
mkdir -p $out/share/gpxsee
|
||||
cp -r pkg/csv $out/share/gpxsee/
|
||||
cp -r pkg/maps $out/share/gpxsee/
|
||||
mkdir -p $out/share/gpxsee/translations
|
||||
cp -r lang/*.qm $out/share/gpxsee/translations
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.gpxsee.org/;
|
||||
description = "GPX viewer and analyzer";
|
||||
description = "GPS log file viewer and analyzer";
|
||||
longDescription = ''
|
||||
GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX,
|
||||
TCX, KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files.
|
||||
GPXSee is a Qt-based GPS log file viewer and analyzer that supports
|
||||
all common GPS log file formats.
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.womfoo ];
|
||||
|
||||
@ -21,14 +21,14 @@
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.14.1";
|
||||
version = "0.14.2";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nm8l8ki0csdapf5mj3vg605ki5hjsx7h7i3m01x1a4vjzjmk8bv";
|
||||
sha256 = "15iv3k7iryf10n8n67d37x24pzcarq97a3dr42lbld00k1lx19az";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "moonlight-embedded-${version}";
|
||||
version = "2.4.9";
|
||||
version = "2.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irtimmer";
|
||||
repo = "moonlight-embedded";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mzs0dr6bg57kjyxjh48hfmlsil7fvgqf9lhjzxxj3llvpxwws86";
|
||||
sha256 = "0m5i3q3hbjl51cndjpz5hxi3br6fvpn1fzdv0f6lxjxgw9z32413";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
26
pkgs/applications/misc/mystem/default.nix
Normal file
26
pkgs/applications/misc/mystem/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mystem-${version}";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.cdn.yandex.net/mystem/${name}-linux-64bit.tar.gz";
|
||||
sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
tar -xaf "$src"
|
||||
mkdir -p $out/bin
|
||||
install -Dm755 mystem $out/bin/mystem
|
||||
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/mystem
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Morphological analysis of Russian text";
|
||||
homepage = https://yandex.ru/dev/mystem/;
|
||||
license = licenses.unfreeRedistributable;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
version = "1.26.0";
|
||||
version = "1.27.0";
|
||||
pname = "rtv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michael-lazar";
|
||||
repo = "rtv";
|
||||
rev = "v${version}";
|
||||
sha256 = "0smwlhc4sj92365pl7yy6a821xddmh9px43nbd0kdd2z9xrndyx1";
|
||||
sha256 = "1hw7xy2kjxq7y3wcibcz4l7zj8icvigialqr17l362xry0y17y5j";
|
||||
};
|
||||
|
||||
# Tests try to access network
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "waybar-${version}";
|
||||
version = "0.6.6";
|
||||
version = "0.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexays";
|
||||
repo = "Waybar";
|
||||
rev = version;
|
||||
sha256 = "0wxd03lkgssz0vsib9qc040vfg1i6nrg7ac2c6qwficx62j2zlm1";
|
||||
sha256 = "1rkqxszay2fns8c2q0b668mjacr4wb7drlbfi55z9w5f9cfxgifw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -31,12 +31,16 @@
|
||||
++ optional swaySupport sway
|
||||
++ optional mpdSupport mpd_clientlib;
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddbusmenu-gtk=${ if traySupport then "enabled" else "disabled" }"
|
||||
"-Dpulseaudio=${ if pulseSupport then "enabled" else "disabled" }"
|
||||
"-Dlibnl=${ if nlSupport then "enabled" else "disabled" }"
|
||||
"-Dlibudev=${ if udevSupport then "enabled" else "disabled" }"
|
||||
"-Dmpd=${ if mpdSupport then "enabled" else "disabled" }"
|
||||
mesonFlags = (stdenv.lib.mapAttrsToList
|
||||
(option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")
|
||||
{
|
||||
dbusmenu-gtk = traySupport;
|
||||
pulseaudio = pulseSupport;
|
||||
libnl = nlSupport;
|
||||
libudev = udevSupport;
|
||||
mpd = mpdSupport;
|
||||
}
|
||||
) ++ [
|
||||
"-Dout=${placeholder "out"}"
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig
|
||||
{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig
|
||||
, appstream-glib, desktop-file-utils, python3
|
||||
, gtk, girara, gettext, libxml2
|
||||
, sqlite, glib, texlive, libintl, libseccomp
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx
|
||||
gettext makeWrapper libxml2
|
||||
gettext wrapGAppsHook libxml2
|
||||
] ++ optional stdenv.isLinux appstream-glib;
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -250,7 +250,7 @@ let
|
||||
treat_warnings_as_errors = false;
|
||||
is_clang = stdenv.cc.isClang;
|
||||
clang_use_chrome_plugins = false;
|
||||
remove_webcore_debug_symbols = true;
|
||||
blink_symbol_level = 0;
|
||||
enable_swiftshader = false;
|
||||
fieldtrial_testing_like_official_build = true;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_7
|
||||
{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_8
|
||||
, makeWrapper, makeDesktopItem, ed
|
||||
, glib, gtk3, gnome3, gsettings-desktop-schemas
|
||||
, libva ? null
|
||||
@ -18,8 +18,8 @@
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_7.stdenv;
|
||||
llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_7;
|
||||
stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_8.stdenv;
|
||||
llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_8;
|
||||
in let
|
||||
stdenv = stdenv_;
|
||||
llvmPackages = llvmPackages_;
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
+ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here
|
||||
+ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None)
|
||||
+ if SOURCE_DATE_EPOCH is not None:
|
||||
+ print SOURCE_DATE_EPOCH
|
||||
+ print(SOURCE_DATE_EPOCH)
|
||||
+ return 0
|
||||
+ else:
|
||||
+ raise RuntimeError("SOURCE_DATE_EPOCH not set")
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
beta = {
|
||||
sha256 = "01sw6ql4fr1zwbw4l4c3xgmd3jqil9lgmpmlhfyj9ga4kp2qlnim";
|
||||
sha256bin64 = "0xwxb54l1ylrckxd36pkzcla34d5hbnhxz3gkrv4id530l6ms6jh";
|
||||
version = "75.0.3770.27";
|
||||
sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns";
|
||||
sha256bin64 = "02zq7gy51nclfh8806yqv4713cpb4yamy0h7x1zgcd2rxvqm4v53";
|
||||
version = "75.0.3770.80";
|
||||
};
|
||||
dev = {
|
||||
sha256 = "0fq8sjyscz998ha4wnn4npr3bb4jslcjc1i7xgwz6bh4yhi1az4f";
|
||||
sha256bin64 = "1yb6ff6bg662klki7dcrdaysmsnqrnlp8syxcvwl2rysswll3wyl";
|
||||
version = "76.0.3788.1";
|
||||
sha256 = "0h0dbmk8l45c61g8iiylfnw45rqyqwc40brphwksi6gsvwn2yw8h";
|
||||
sha256bin64 = "0vrwsllnrcgdvsflncqhwyfbjiqcj0n3mxyyyalr8arvkpz5r5ai";
|
||||
version = "76.0.3806.1";
|
||||
};
|
||||
stable = {
|
||||
sha256 = "01ifjsss3nqr15xx2iqsiqgjq1xc07j7ljnapsb484m7dcfk3gnw";
|
||||
sha256bin64 = "0zkv4x4vbra476c6wy4igp6k80r9ssb9632wsyrzjni9w3zk9qvy";
|
||||
version = "74.0.3729.157";
|
||||
sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns";
|
||||
sha256bin64 = "03agz2bl22cmwgdcni8lbzjrwpikg5caimh8ynmhnpy7q9r3zy2w";
|
||||
version = "75.0.3770.80";
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -17,10 +17,10 @@ rec {
|
||||
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
ffversion = "67.0";
|
||||
ffversion = "67.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "0lwljfcbb1avnlafyrw5z08l3wxixfk6nv91blp6sc45mvsk89l77ckfyay7jy4v6c84q4a9h0wbh2mnx0r1xm3fhy9lshlm1n0s051";
|
||||
sha512 = "1cbhlbgni08phqqiqlh1c29kl8b1w2sify4756bm4a01hmhfnhgwfa6v88vhzqy9h4c0045g8g4w14l2521k8w6rcijl1nvh14xdczf";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -246,7 +246,7 @@ in rec {
|
||||
|
||||
tor-browser-8-5 = tbcommon rec {
|
||||
ffversion = "60.7.0esr";
|
||||
tbversion = "8.5.0";
|
||||
tbversion = "8.5.0"; # TODO: update to match binary bundle (8.5.1 currently)
|
||||
|
||||
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
## various stuff that can be plugged in
|
||||
, flashplayer, hal-flash
|
||||
, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2
|
||||
, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
|
||||
, jrePlugin, icedtea_web
|
||||
, bluejeans, djview4, adobe-reader
|
||||
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
|
||||
@ -77,6 +77,7 @@ let
|
||||
libs = lib.optional stdenv.isLinux udev
|
||||
++ lib.optional ffmpegSupport ffmpeg
|
||||
++ lib.optional gssSupport kerberos
|
||||
++ lib.optional gdkWayland libglvnd
|
||||
++ lib.optionals (cfg.enableQuakeLive or false)
|
||||
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
|
||||
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
|
||||
|
||||
@ -89,7 +89,7 @@ let
|
||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "8.5";
|
||||
version = "8.5.1";
|
||||
|
||||
lang = "en-US";
|
||||
|
||||
@ -99,7 +99,7 @@ let
|
||||
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "09ixdq4n41cf5f3agmam3n669fflz6vwpalxpai07p2alal80g2x";
|
||||
sha256 = "1mi587rh63ylhww0l8rr58qwbh9h7sk0c666mf84xk5b10s77hjb";
|
||||
};
|
||||
|
||||
"i686-linux" = fetchurl {
|
||||
@ -107,7 +107,7 @@ let
|
||||
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "0lgxwb8hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7";
|
||||
sha256 = "0lgxwb9hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -1,28 +1,17 @@
|
||||
{ stdenv, fetchFromGitHub, buildGoPackage }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "cni-${version}";
|
||||
version = "0.6.0";
|
||||
pname = "cni";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containernetworking";
|
||||
repo = "cni";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
|
||||
sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/containernetworking/cni";
|
||||
|
||||
buildPhase = ''
|
||||
cd "go/src/${goPackagePath}"
|
||||
patchShebangs build.sh
|
||||
./build.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm555 bin/cnitool $bin/bin/cnitool
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Container Network Interface - networking for Linux containers";
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cni-plugins-${version}";
|
||||
version = "0.7.5";
|
||||
pname = "cni-plugins";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containernetworking";
|
||||
repo = "plugins";
|
||||
rev = "v${version}";
|
||||
sha256 = "1kfi0iz2hs4rq3cdkw12j8d47ac4f5vrpzcwcrs2yzmh2j4n5sz5";
|
||||
sha256 = "1jmdjfwjgh6368wwdpfpjm708b0kl38cyc87wqp2f0y9mvvws8ni";
|
||||
};
|
||||
|
||||
buildInputs = [ removeReferencesTo go ];
|
||||
|
||||
buildPhase = ''
|
||||
patchShebangs build.sh
|
||||
patchShebangs build_linux.sh
|
||||
export "GOCACHE=$TMPDIR/go-cache"
|
||||
./build.sh
|
||||
./build_linux.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
|
||||
|
||||
let version = "0.64.1"; in
|
||||
let version = "0.73.0"; in
|
||||
|
||||
buildGoPackage {
|
||||
name = "helmfile-${version}";
|
||||
buildGoModule {
|
||||
pname = "helmfile";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roboll";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
sha256 = "1258c545fv4mcrzaw3z5gxl264fcahigaijgkjd4igh4pl0z0wxk";
|
||||
sha256 = "0mg88mqdmfvg10iips6xz4pw82w88pyf3b73g9kwzlv9v9vhgdzd";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
goPackagePath = "github.com/roboll/helmfile";
|
||||
|
||||
modSha256 = "1ksz1c4j7mhsbq6ifqab04588d48c9glyhr4d3d4jyvi19qhwx1d";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildFlagsArray = ''
|
||||
@ -24,7 +25,7 @@ buildGoPackage {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $bin/bin/helmfile \
|
||||
wrapProgram $out/bin/helmfile \
|
||||
--prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]}
|
||||
'';
|
||||
|
||||
|
||||
165
pkgs/applications/networking/cluster/helmfile/deps.nix
generated
165
pkgs/applications/networking/cluster/helmfile/deps.nix
generated
@ -1,165 +0,0 @@
|
||||
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/Masterminds/semver";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/Masterminds/semver";
|
||||
rev = "v1.4.1";
|
||||
sha256 = "1sr9nxvasy2mw00al3i7yp3wdz2q21wp3l1n1nydvmyf27ibg3bj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/Masterminds/sprig";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/Masterminds/sprig";
|
||||
rev = "v2.15.0";
|
||||
sha256 = "10vzhx710vaxqzh45vrkw4vc3fgcbycpn04shcylzcmlxmfnpjv1";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/aokoli/goutils";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/aokoli/goutils";
|
||||
rev = "v1.0.1";
|
||||
sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/google/go-cmp";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/google/go-cmp";
|
||||
rev = "v0.3.0";
|
||||
sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/google/uuid";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/google/uuid";
|
||||
rev = "064e2069ce9c";
|
||||
sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/huandu/xstrings";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/huandu/xstrings";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "0bnyh4awmr9aagqhhi19xdadzksrkl01d987ycqx86dwlvqqxnxf";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/imdario/mergo";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/imdario/mergo";
|
||||
rev = "v0.3.6";
|
||||
sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "v0.0.4";
|
||||
sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pkg/errors";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pkg/errors";
|
||||
rev = "v0.8.1";
|
||||
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/tatsushid/go-prettytable";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/tatsushid/go-prettytable";
|
||||
rev = "ed2d14c29939";
|
||||
sha256 = "01l2v8vfv9ng0g9p0ys5szkqpc0f9baglkavn7yxkif05kdqi0ik";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/urfave/cli";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/urfave/cli";
|
||||
rev = "6011f165dc28";
|
||||
sha256 = "159q8lwf40jaxbm7cybzsws176k0wsdcaaj2rx0wdw4m6xha8034";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "go.uber.org/atomic";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/uber-go/atomic";
|
||||
rev = "v1.3.2";
|
||||
sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "go.uber.org/multierr";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/uber-go/multierr";
|
||||
rev = "v1.1.0";
|
||||
sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "go.uber.org/zap";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/uber-go/zap";
|
||||
rev = "v1.8.0";
|
||||
sha256 = "0i9pfm5br4qq94ys1y5sr8h31bbq1xwcaxibx7g2n5n1bcbqviam";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "b2aa35443fbc";
|
||||
sha256 = "05qaicps075s77020q1vjihi5k7jbgr85ry0br9lj3jynwnrgyyg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/check.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/check.v1";
|
||||
rev = "20d25e280405";
|
||||
sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/yaml.v2";
|
||||
rev = "v2.2.1";
|
||||
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gotest.tools";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gotestyourself/gotest.tools";
|
||||
rev = "v2.2.0";
|
||||
sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -15,13 +15,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kubernetes-${version}";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "17jb05c5i9y725jf5ad2ki99wyi2dv2jdhfgcxrki9fzjsx967g2";
|
||||
sha256 = "1r31ssf8bdbz8fdsprhkc34jqhz5rcs3ixlf0mbjcbq0xr7y651z";
|
||||
};
|
||||
|
||||
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
|
||||
|
||||
@ -97,8 +97,8 @@ in rec {
|
||||
terraform_0_11-full = terraform_0_11.full;
|
||||
|
||||
terraform_0_12 = pluggable (generic {
|
||||
version = "0.12.0";
|
||||
sha256 = "1lycy789wzh1fcg7qcl540546bgw4b9kjlbh2j4hnm0bs9696b2a";
|
||||
version = "0.12.1";
|
||||
sha256 = "009cv1cpgrl1ysgqjiam9035as2q5aiyfwwa6xxh47r0zadph8z5";
|
||||
patches = [ ./provider-path.patch ];
|
||||
passthru = { inherit plugins; };
|
||||
});
|
||||
|
||||
@ -6,20 +6,20 @@ buildGoPackage rec {
|
||||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.8.1";
|
||||
rev = "9ce987dd0eeb66df993f8d232b57ff3e4d380dda";
|
||||
version = "0.8.8";
|
||||
rev = "344dc1dc61ffe2c29606b105cea0df79fb5897f5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "windmilleng";
|
||||
repo = "tilt";
|
||||
rev = "${rev}";
|
||||
sha256 = "0ybzj2csmjc7zlkprcyy5cnh9dxgngcx3wd6n43kawi5db0lvjn4";
|
||||
sha256 = "13yda6m2d92mmc9w4k8ngdxmpqcqf86bkrvcpmpaby848ls1yx8g";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/windmilleng/tilt";
|
||||
subPackages = [ "cmd/tilt" ];
|
||||
|
||||
buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-04-29");
|
||||
buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-06-03");
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }:
|
||||
{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "esniper-2.35.0";
|
||||
name = "esniper-2.35.0-15-g91d2665";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz";
|
||||
sha256 = "04iwjb42lw90c03125bjdpnm0fp78dmwf2j35r7mah0nwcrlagd9";
|
||||
};
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/esniper/git";
|
||||
rev = "91d2665539beaeac21fb4c0cc2fd39c44e771ed7";
|
||||
sha256 = "0dixcsvbcj9jbfjfv50nwvw7w90c4s6gnkrpilaan984i6y45rw0";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl curl ];
|
||||
|
||||
|
||||
@ -28,22 +28,14 @@ let
|
||||
in
|
||||
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4";
|
||||
version = "2.5";
|
||||
name = "weechat-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
|
||||
sha256 = "1z80y5fbrb56wdcx9njrf203r8282wnn3piw3yffk5lvhklsz9k1";
|
||||
sha256 = "14giv8j1phmpg3i9whx45nmskan501lwcq352ps9z52rkja2qxsc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = https://github.com/weechat/weechat/commit/6a9937f08ad2c14aeb0a847ffb99e652d47d8251.patch;
|
||||
sha256 = "1blhgxwqs65dvpw3ppxszxrsg02rx7qck1w71h61ljinyjzri3bp";
|
||||
excludes = [ "ChangeLog.adoc" ];
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "wee-slack-${version}";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "wee-slack";
|
||||
owner = "wee-slack";
|
||||
rev = "v${version}";
|
||||
sha256 = "1iy70q630cgs7fvk2151fq9519dwxrlqq862sbrwypzr6na6yqpg";
|
||||
sha256 = "0544j6vqbvb2xshq7ma2a3apx2vvpgfg3jh5prg265wnh4991nsw";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
diff --git a/wee_slack.py b/wee_slack.py
|
||||
index c5c7bc6..23fef2f 100644
|
||||
index dbe6446..d1b7546 100644
|
||||
--- a/wee_slack.py
|
||||
+++ b/wee_slack.py
|
||||
@@ -25,6 +25,8 @@ try:
|
||||
except:
|
||||
from StringIO import StringIO
|
||||
@@ -25,6 +25,8 @@ import random
|
||||
import socket
|
||||
import string
|
||||
|
||||
+sys.path.append('@env@')
|
||||
+
|
||||
from websocket import create_connection, WebSocketConnectionClosedException
|
||||
from websocket import ABNF, create_connection, WebSocketConnectionClosedException
|
||||
|
||||
# hack to make tests possible.. better way?
|
||||
try:
|
||||
|
||||
55
pkgs/applications/networking/mailreaders/aerc/default.nix
Normal file
55
pkgs/applications/networking/mailreaders/aerc/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ stdenv, buildGoModule, fetchurl
|
||||
, go, scdoc
|
||||
, python3, perl, w3m, dante
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aerc";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz";
|
||||
sha256 = "0wx9l097s51ih4khk231f9fs3vw55an8l2jx3q13v7y20522wgnk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
go
|
||||
scdoc
|
||||
python3.pkgs.wrapPython
|
||||
];
|
||||
|
||||
pythonPath = [
|
||||
python3.pkgs.colorama
|
||||
];
|
||||
|
||||
buildInputs = [ python3 perl ];
|
||||
|
||||
buildPhase = "
|
||||
runHook preBuild
|
||||
# we use make instead of go build
|
||||
runHook postBuild
|
||||
";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
make PREFIX=$out install
|
||||
wrapPythonProgramsIn $out/share/aerc/filters "$out $pythonPath"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/aerc --prefix PATH ":" "$out/share/aerc/filters"
|
||||
wrapProgram $out/share/aerc/filters/html --prefix PATH ":" \
|
||||
${stdenv.lib.makeBinPath [ w3m dante ]}
|
||||
'';
|
||||
|
||||
modSha256 = "1h0vr01s2y0k3jjigz0h8ngjv1mhk6kw8mdisp5pr017jbhijfsi";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "aerc is an email client for your terminal";
|
||||
homepage = https://aerc-mail.org/;
|
||||
maintainers = with maintainers; [ tadeokondrak ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -9,6 +9,7 @@
|
||||
, pcsclite ? null
|
||||
, systemd ? null
|
||||
, buildServer ? true
|
||||
, nocaps ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -31,6 +32,9 @@ stdenv.mkDerivation rec {
|
||||
'' + lib.optionalString (pcsclite != null) ''
|
||||
substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
|
||||
--replace "libpcsclite.so" "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so"
|
||||
'' + lib.optionalString nocaps ''
|
||||
substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \
|
||||
--replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
|
||||
'';
|
||||
|
||||
buildInputs = with lib; [
|
||||
|
||||
@ -13,11 +13,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "trilium-${version}";
|
||||
version = "0.30.8";
|
||||
version = "0.32.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
||||
sha256 = "1mw8m9qm5jqfbwzj721gyfa656bp3hs8mrqx5d354rbx5f12pgjr";
|
||||
sha256 = "05h5k5n63pmf6mmyfpw41xf6lzfd8dwdhy7r5fmhdxy2gpl3a817";
|
||||
};
|
||||
|
||||
# Fetch from source repo, no longer included in release.
|
||||
|
||||
@ -20,6 +20,7 @@ stdenv.mkDerivation rec
|
||||
break
|
||||
fi
|
||||
done
|
||||
'' + stdenv.lib.optionalString stdenv.isLinux ''
|
||||
patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so
|
||||
'';
|
||||
meta = with stdenv.lib;
|
||||
|
||||
@ -33,6 +33,12 @@ stdenv.mkDerivation rec {
|
||||
--replace 'float abs(float arg);' "" \
|
||||
--replace 'short abs(short arg);' "" \
|
||||
--replace 'long abs(long arg);' ""
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
# we are darwin, but we don't have all the quirks the source wants to compensate for
|
||||
substituteInPlace src/nrnpython/setup.py.in --replace 'readline="edit"' 'readline="readline"'
|
||||
for f in src/nrnpython/*.[ch] ; do
|
||||
substituteInPlace $f --replace "<Python/Python.h>" "<Python.h>"
|
||||
done
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -74,7 +80,8 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.bsd3;
|
||||
homepage = http://www.neuron.yale.edu/neuron;
|
||||
maintainers = [ maintainers.adev ];
|
||||
platforms = platforms.all;
|
||||
# source claims it's only tested for x86 and powerpc
|
||||
platforms = platforms.x86_64 ++ platforms.i686;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,32 +1,37 @@
|
||||
{ stdenv, fetchFromGitHub, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "star-${version}";
|
||||
version = "2.7.0f";
|
||||
pname = "star";
|
||||
version = "2.7.1a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "STAR";
|
||||
owner = "alexdobin";
|
||||
rev = version;
|
||||
sha256 = "0ndqlyimf7xf00nghn8awg12pw985ixghiypg98r2gdm7pscgd0i";
|
||||
sha256 = "0n6g4s4hgw7qygs1z97j7a2dgz8gfaa4cv5pjvvvmarvk0x07hyg";
|
||||
};
|
||||
|
||||
sourceRoot = "source/source";
|
||||
|
||||
postPatch = "sed 's:/bin/rm:rm:g' -i Makefile";
|
||||
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace "/bin/rm" "rm"
|
||||
'';
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
buildPhase = "make STAR STARlong";
|
||||
|
||||
buildFlags = [ "STAR" "STARlong" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp STAR STARlong $out/bin
|
||||
runHook preInstall
|
||||
install -D STAR STARlong -t $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Spliced Transcripts Alignment to a Reference";
|
||||
homepage = https://github.com/alexdobin/STAR;
|
||||
homepage = "https://github.com/alexdobin/STAR";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.arcadio ];
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
|
||||
, zlib, libGLU_combined, libGLU, xorg }:
|
||||
|
||||
let version = "4.2.3"; in
|
||||
let version = "4.3.0"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gmsh-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
|
||||
sha256 = "0n18wmj8i4m1pzri3r0676lx1427zf8qmsrgnn07drv6if1cia2q";
|
||||
sha256 = "0ab4p2dilk4rfw1qc817rmy56qkhxaajpnqdnvahbhcbf3skd8jl";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined
|
||||
buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined
|
||||
libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
|
||||
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ gfortran ];
|
||||
nativeBuildInputs = [ cmake gfortran ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, makeWrapper, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:
|
||||
|
||||
let
|
||||
strippedName = "betaflight-configurator";
|
||||
desktopItem = makeDesktopItem {
|
||||
name = strippedName;
|
||||
exec = strippedName;
|
||||
icon = "${strippedName}-icon.png";
|
||||
comment = "Betaflight configuration tool";
|
||||
desktopName = "Betaflight Configurator";
|
||||
genericName = "Flight controller configuration tool";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${strippedName}-${version}";
|
||||
version = "10.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/betaflight/betaflight-configurator/releases/download/${version}/${strippedName}_${version}_linux64.zip";
|
||||
sha256 = "1l4blqgaqfrnydk05q6pwdqdhcly2f8nwzrv0749cqmfiinh8ygc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ unzip gsettings-desktop-schemas gtk3 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin \
|
||||
$out/opt/${strippedName} \
|
||||
$out/share/icons
|
||||
|
||||
cp -r . $out/opt/${strippedName}/
|
||||
cp icon/*_icon_128.png $out/share/icons/${strippedName}-icon.png
|
||||
cp -r ${desktopItem}/share/applications $out/share/
|
||||
|
||||
makeWrapper ${nwjs}/bin/nw $out/bin/${strippedName} --add-flags $out/opt/${strippedName}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The Betaflight flight control system configuration tool";
|
||||
longDescription = ''
|
||||
A crossplatform configuration tool for the Betaflight flight control system.
|
||||
Various types of aircraft are supported by the tool and by Betaflight, e.g.
|
||||
quadcopters, hexacopters, octocopters and fixed-wing aircraft.
|
||||
'';
|
||||
homepage = https://github.com/betaflight/betaflight/wiki;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ wucke13 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -48,6 +48,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
|
||||
# compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
|
||||
CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
|
||||
|
||||
# this is fixed upstream though not yet in an officially released version,
|
||||
# should be fine remove on next release (if one ever happens)
|
||||
NIX_LDFLAGS = [
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
project = "cri-o";
|
||||
version = "1.14.1";
|
||||
version = "1.14.2";
|
||||
name = "${project}-${version}${flavor}";
|
||||
|
||||
goPackagePath = "github.com/${project}/${project}";
|
||||
@ -26,7 +26,7 @@ buildGoPackage rec {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cclxarwabk5zlqysm2dzgsm6qkxyzbnlylr0gs57ppn4ibky3nk";
|
||||
sha256 = "1p3yzcjljbpwhnsa512rc3zgbrnibh2bflfg4bdjhnfpqzg18376";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" ];
|
||||
|
||||
@ -3,15 +3,15 @@
|
||||
, pyyaml, backports_ssl_match_hostname, colorama, docopt
|
||||
, dockerpty, docker, ipaddress, jsonschema, requests
|
||||
, six, texttable, websocket_client, cached-property
|
||||
, enum34, functools32,
|
||||
, enum34, functools32, paramiko
|
||||
}:
|
||||
buildPythonApplication rec {
|
||||
version = "1.23.2";
|
||||
version = "1.24.0";
|
||||
pname = "docker-compose";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1x2jlh7z2znvyz2pqcpn0gigfiqnx8s59pc7xlvy9ryd76g9w1zz";
|
||||
sha256 = "0sd3bwmz80a2rffviq9vvyxic41ya08yj41k8x1m4vv74wcab0jm";
|
||||
};
|
||||
|
||||
# lots of networking and other fails
|
||||
@ -20,7 +20,7 @@ buildPythonApplication rec {
|
||||
propagatedBuildInputs = [
|
||||
pyyaml backports_ssl_match_hostname colorama dockerpty docker
|
||||
ipaddress jsonschema requests six texttable websocket_client
|
||||
docopt cached-property
|
||||
docopt cached-property paramiko
|
||||
] ++
|
||||
stdenv.lib.optional (pythonOlder "3.4") enum34 ++
|
||||
stdenv.lib.optional (pythonOlder "3.2") functools32;
|
||||
|
||||
@ -4,14 +4,14 @@ with lib;
|
||||
with builtins;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "conmon-${version}";
|
||||
version = "0.0.1pre52_${substring 0 7 src.rev}";
|
||||
pname = "conmon";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "conmon";
|
||||
rev = "6905a4dc47830fbd1110e937228057c0b073ebe1";
|
||||
sha256 = "1igny1hr2q1zrhsaxcx7l8xkdr5ragl8pj18qbr1lpa2v5v2f6hs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "08fgkbv7hq62lcq39za9pm2s2j92ismgrkvfm7acwbvajqh9syjb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "podman-${version}";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "libpod";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x1md2w43mdfzp9dsz8vbgs72dlkwsvh16hkgq90596gwipcg36x";
|
||||
sha256 = "1j5n08273igj6wm9rrwks9nnklv91060bn1yv3ak78csxc05whs3";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/containers/libpod";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2
|
||||
, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
|
||||
, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap, libGL
|
||||
, libpng, glib, lvm2, libXrandr, libXinerama, libopus
|
||||
, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
|
||||
, alsaLib, curl, libvpx, nettools, dbus
|
||||
@ -42,7 +42,7 @@ in stdenv.mkDerivation {
|
||||
++ optional javaBindings jdk
|
||||
++ optional pythonBindings python # Python is needed even when not building bindings
|
||||
++ optional pulseSupport libpulseaudio
|
||||
++ optionals (headless) [ libXrandr ]
|
||||
++ optionals (headless) [ libXrandr libGL ]
|
||||
++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
|
||||
|
||||
hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];
|
||||
|
||||
@ -226,4 +226,12 @@ rec {
|
||||
'';
|
||||
};
|
||||
|
||||
# 14. Create another layered image, for comparing layers with image 10.
|
||||
another-layered-image = pkgs.dockerTools.buildLayeredImage {
|
||||
name = "another-layered-image";
|
||||
tag = "latest";
|
||||
config.Cmd = [ "${pkgs.hello}/bin/hello" ];
|
||||
contents = [ pkgs.hello ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -9,7 +9,9 @@ layerPath="./layers/$layerNumber"
|
||||
echo "Creating layer #$layerNumber for $@"
|
||||
|
||||
mkdir -p "$layerPath"
|
||||
tar --no-recursion -rf "$layerPath/layer.tar" /nix /nix/store
|
||||
tar --no-recursion -rf "$layerPath/layer.tar" \
|
||||
--mtime="@$SOURCE_DATE_EPOCH" \
|
||||
--owner=0 --group=0 /nix /nix/store
|
||||
tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \
|
||||
--mtime="@$SOURCE_DATE_EPOCH" \
|
||||
--owner=0 --group=0 "$@"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "5.8.2";
|
||||
version = "5.9.0";
|
||||
in fetchFromGitHub rec {
|
||||
name = "font-awesome-${version}";
|
||||
|
||||
@ -14,7 +14,7 @@ in fetchFromGitHub rec {
|
||||
install -m444 -Dt $out/share/fonts/opentype otfs/*.otf
|
||||
'';
|
||||
|
||||
sha256 = "1h0qhvkfyfs4579jvrk3gwc7dp4i9s46bkj406b493dvmxxhv986";
|
||||
sha256 = "0sz7mn7g968vp5hszs05grpphd7zr3073az8lyy1lj0096zvjjii";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Font Awesome - OTF font";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "1.4.1";
|
||||
version = "2.0.0";
|
||||
in fetchzip rec {
|
||||
name = "ibm-plex-${version}";
|
||||
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
|
||||
@ -9,7 +9,7 @@ in fetchzip rec {
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype
|
||||
'';
|
||||
sha256 = "1y2p0gf8znryfcidg26dn9xi81wl9vq5m56ylvg5jp0sn971r4xq";
|
||||
sha256 = "0m4paww4349d37s7j20a00hp514p1jq54xrnz45wyrafb8pkah4g";
|
||||
|
||||
meta = with lib; {
|
||||
description = "IBM Plex Typeface";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "1.004";
|
||||
version = "1.005";
|
||||
in fetchzip rec {
|
||||
name = "public-sans-${version}";
|
||||
|
||||
@ -12,7 +12,7 @@ in fetchzip rec {
|
||||
unzip $downloadedFile fonts/{otf,variable}/\*.\[ot\]tf -d $out/share/
|
||||
'';
|
||||
|
||||
sha256 = "1d9ll6gvvlmlykv868lq7xmwldlfjp94k0rjqifipg3q1qv051lg";
|
||||
sha256 = "0s0zgszpi12wanl031gi3j24ci9pkbkhvsxc30skx8s1mj99cd7i";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A strong, neutral, principles-driven, open source typeface for text or display";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wireless-regdb";
|
||||
version = "2019.03.01";
|
||||
version = "2019.06.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0pwipig8bik1gca440hfv0xa23bi49jfiqc69xvcb6sr0rq6ykis";
|
||||
sha256 = "1gslvh0aqdkv48jyr2ddq153mw28i7qz2ybrjj9qvkk3dgc7x4fd";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mate-user-share-${version}";
|
||||
@ -13,14 +13,15 @@ stdenv.mkDerivation rec {
|
||||
pkgconfig
|
||||
intltool
|
||||
itstool
|
||||
libxml2
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
dbus-glib
|
||||
libnotify
|
||||
libcanberra-gtk3
|
||||
libxml2
|
||||
mate.caja
|
||||
hicolor-icon-theme
|
||||
# Should mod_dnssd and apacheHttpd be runtime dependencies?
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "terminal";
|
||||
version = "5.3.4";
|
||||
version = "5.3.5";
|
||||
|
||||
name = "elementary-${pname}-${version}";
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "08vwgd385j7cbi7c8442sjygzw9qy2phsi5lva4jaxwm8l15hk86";
|
||||
sha256 = "1gd5m24digmx3sgs21ggfiqiwhgym6s1dlg1sv9mdqh5wgsa6b8f";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel";
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "17xl4l0znr91aj6kb9p0rswyii4gy8k16r9fvj7d96dd5szdp4mc";
|
||||
sha256 = "15pl3km8jfmlgrrb2fcabdd0rkc849arz6sc3vz6azzpln7gxbq7";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
33
pkgs/development/compilers/go-jsonnet/default.nix
Normal file
33
pkgs/development/compilers/go-jsonnet/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "go-jsonnet-${version}";
|
||||
version = "0.13.0";
|
||||
|
||||
goPackagePath = "github.com/google/go-jsonnet";
|
||||
|
||||
# regenerate deps.nix using following steps:
|
||||
#
|
||||
# go get -u github.com/google/go-jsonnet
|
||||
# cd $GOPATH/src/github.com/google/go-jsonnet
|
||||
# git checkout <version>
|
||||
# dep init
|
||||
# dep2nix
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "google";
|
||||
repo = "go-jsonnet";
|
||||
sha256 = "0x95sqhrw4pscxq0q8781wix0w881k9my5kn5nf6k0fg1d6qlgiy";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "An implementation of Jsonnet in pure Go";
|
||||
maintainers = with lib.maintainers; [ nshalman ];
|
||||
license = lib.licenses.asl20;
|
||||
homepage = https://github.com/google/go-jsonnet;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
48
pkgs/development/compilers/go-jsonnet/deps.nix
generated
Normal file
48
pkgs/development/compilers/go-jsonnet/deps.nix
generated
Normal file
@ -0,0 +1,48 @@
|
||||
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/fatih/color";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fatih/color";
|
||||
rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
|
||||
sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-colorable";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-colorable";
|
||||
rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
|
||||
sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-isatty";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-isatty";
|
||||
rev = "1311e847b0cb909da63b5fecfb5370aa66236465";
|
||||
sha256 = "0rqfh1rj6f5wm8p2ky7inm8g10152p7w6n2cli17kf9gad797i8h";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/sergi/go-diff";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sergi/go-diff";
|
||||
rev = "1744e2970ca51c86172c8190fadad617561ed6e7";
|
||||
sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "4c4f7f33c9ed00de01c4c741d2177abfcfe19307";
|
||||
sha256 = "191001bxqyc3xfs46nnqmm7jdk0r73vk7a4zqngfl7zwjv9smwsq";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jsonnet-${version}";
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "google";
|
||||
repo = "jsonnet";
|
||||
sha256 = "13a0sf1k8ivxhc28w0d0axzr0sj3jccl9sjq6l0dkyzrnmbxzmkb";
|
||||
sha256 = "1fibr1kysbxcf8jp2a4xvs3n7i8d9k2430agxzc9mdyqrh79zlxk";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -38,26 +38,17 @@ self: super: {
|
||||
# The test suite depends on old versions of tasty and QuickCheck.
|
||||
hackage-security = dontCheck super.hackage-security;
|
||||
|
||||
# Link statically to avoid runtime dependency on GHC.
|
||||
jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal;
|
||||
|
||||
# enable using a local hoogle with extra packagages in the database
|
||||
# nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
|
||||
# $ hoogle server
|
||||
hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; };
|
||||
|
||||
# Break infinite recursions.
|
||||
attoparsec-varword = super.attoparsec-varword.override { bytestring-builder-varword = dontCheck self.bytestring-builder-varword; };
|
||||
Dust-crypto = dontCheck super.Dust-crypto;
|
||||
hasql-postgres = dontCheck super.hasql-postgres;
|
||||
hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; };
|
||||
hspec-expectations = dontCheck super.hspec-expectations;
|
||||
HTTP = dontCheck super.HTTP;
|
||||
http-streams = dontCheck super.http-streams;
|
||||
nanospec = dontCheck super.nanospec;
|
||||
options = dontCheck super.options;
|
||||
# Needs older QuickCheck version
|
||||
attoparsec-varword = dontCheck super.attoparsec-varword;
|
||||
|
||||
# Tests are failing
|
||||
# https://github.com/bos/statistics/issues/123
|
||||
statistics = dontCheck super.statistics;
|
||||
vector-builder = dontCheck super.vector-builder;
|
||||
|
||||
# These packages (and their reverse deps) cannot be built with profiling enabled.
|
||||
ghc-heap-view = disableLibraryProfiling super.ghc-heap-view;
|
||||
@ -66,16 +57,13 @@ self: super: {
|
||||
# This test keeps being aborted because it runs too quietly for too long
|
||||
Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
|
||||
|
||||
# Use the default version of mysql to build this package (which is actually mariadb).
|
||||
# test phase requires networking
|
||||
mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
|
||||
|
||||
# check requires mysql server
|
||||
mysql-simple = dontCheck super.mysql-simple;
|
||||
mysql-haskell = dontCheck super.mysql-haskell;
|
||||
|
||||
# Link the proper version.
|
||||
zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
|
||||
# Tests failing, fixed once 0.8.0 is in stackage
|
||||
# https://gitlab.com/twittner/zeromq-haskell/issues/63
|
||||
zeromq4-haskell = dontCheck super.zeromq4-haskell;
|
||||
|
||||
# The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
|
||||
# https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
|
||||
@ -104,7 +92,7 @@ self: super: {
|
||||
# https://github.com/froozen/kademlia/issues/2
|
||||
kademlia = dontCheck super.kademlia;
|
||||
|
||||
# Test suite doesn't terminate
|
||||
# Tests require older tasty
|
||||
hzk = dontCheck super.hzk;
|
||||
|
||||
# Tests require a Kafka broker running locally
|
||||
@ -1186,7 +1174,7 @@ self: super: {
|
||||
# https://github.com/mgajda/json-autotype/issues/25
|
||||
json-autotype = dontCheck super.json-autotype;
|
||||
|
||||
# The LTS-12.x version doesn't suffice to build hlint, hoogle, etc.
|
||||
# The LTS-13.x version doesn't suffice to build hlint, hoogle, etc.
|
||||
hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
|
||||
hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
|
||||
|
||||
@ -1275,12 +1263,9 @@ self: super: {
|
||||
# Has tasty < 1.2 requirement, but works just fine with 1.2
|
||||
temporary-resourcet = doJailbreak super.temporary-resourcet;
|
||||
|
||||
# Tests require internet
|
||||
dhall_1_23_0 = dontCheck super.dhall_1_23_0;
|
||||
|
||||
# Requires dhall >= 1.23.0
|
||||
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_23_0; };
|
||||
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_23_0; };
|
||||
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_24_0; };
|
||||
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_24_0; };
|
||||
|
||||
# Test suite doesn't work with current QuickCheck
|
||||
# https://github.com/pruvisto/heap/issues/11
|
||||
|
||||
@ -43,10 +43,8 @@ core-packages:
|
||||
- ghcjs-base-0
|
||||
|
||||
default-package-overrides:
|
||||
# Newer versions don't work in LTS-12.x
|
||||
- alsa-mixer < 0.3
|
||||
- cassava-megaparsec < 2
|
||||
# LTS Haskell 13.23
|
||||
- ghc-lib-parser ==0.20190523 # newer versions break hlint
|
||||
# LTS Haskell 13.24
|
||||
- abstract-deque ==0.3
|
||||
- abstract-deque-tests ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
@ -342,7 +340,7 @@ default-package-overrides:
|
||||
- bytestring-builder ==0.10.8.2.0
|
||||
- bytestring-conversion ==0.3.1
|
||||
- bytestring-lexing ==0.5.0.2
|
||||
- bytestring-strict-builder ==0.4.5.2
|
||||
- bytestring-strict-builder ==0.4.5.3
|
||||
- bytestring-tree-builder ==0.2.7.3
|
||||
- bzlib ==0.5.0.5
|
||||
- bzlib-conduit ==0.3.0.1
|
||||
@ -371,7 +369,7 @@ default-package-overrides:
|
||||
- cayley-client ==0.4.9
|
||||
- cborg ==0.2.1.0
|
||||
- cborg-json ==0.2.1.0
|
||||
- cereal ==0.5.8.0
|
||||
- cereal ==0.5.8.1
|
||||
- cereal-conduit ==0.8.0
|
||||
- cereal-text ==0.1.0.2
|
||||
- cereal-time ==0.1.0.0
|
||||
@ -699,7 +697,7 @@ default-package-overrides:
|
||||
- explicit-exception ==0.1.10
|
||||
- exp-pairs ==0.2.0.0
|
||||
- extensible-exceptions ==0.1.1.4
|
||||
- extra ==1.6.15
|
||||
- extra ==1.6.17
|
||||
- extractable-singleton ==0.0.1
|
||||
- extrapolate ==0.3.3
|
||||
- fail ==4.9.0.0
|
||||
@ -860,7 +858,7 @@ default-package-overrides:
|
||||
- gloss-algorithms ==1.13.0.1
|
||||
- gloss-examples ==1.13.0.2
|
||||
- gloss-raster ==1.13.0.2
|
||||
- gloss-rendering ==1.13.0.2
|
||||
- gloss-rendering ==1.13.1.1
|
||||
- GLURaw ==2.0.0.4
|
||||
- GLUT ==2.7.0.14
|
||||
- gnuplot ==0.5.6
|
||||
@ -920,8 +918,8 @@ default-package-overrides:
|
||||
- haskey-btree ==0.3.0.1
|
||||
- haskoin-core ==0.8.4
|
||||
- hasql ==1.3.0.6
|
||||
- hasql-optparse-applicative ==0.3.0.3
|
||||
- hasql-pool ==0.5.0.2
|
||||
- hasql-optparse-applicative ==0.3.0.4
|
||||
- hasql-pool ==0.5.1
|
||||
- hasql-transaction ==0.7.1
|
||||
- hasty-hamiltonian ==1.3.2
|
||||
- haxl ==2.0.1.1
|
||||
@ -1060,14 +1058,14 @@ default-package-overrides:
|
||||
- hunit-dejafu ==1.2.1.0
|
||||
- hvect ==0.4.0.0
|
||||
- hvega ==0.1.0.3
|
||||
- hw-balancedparens ==0.2.0.3
|
||||
- hw-balancedparens ==0.2.0.4
|
||||
- hw-bits ==0.7.0.6
|
||||
- hw-conduit ==0.2.0.5
|
||||
- hw-conduit-merges ==0.2.0.0
|
||||
- hw-diagnostics ==0.0.0.7
|
||||
- hweblib ==0.6.3
|
||||
- hw-eliasfano ==0.1.0.1
|
||||
- hw-excess ==0.2.0.3
|
||||
- hw-excess ==0.2.1.0
|
||||
- hw-fingertree-strict ==0.1.1.1
|
||||
- hw-hspec-hedgehog ==0.1.0.4
|
||||
- hw-int ==0.0.0.3
|
||||
@ -1118,7 +1116,7 @@ default-package-overrides:
|
||||
- inline-c ==0.7.0.1
|
||||
- inline-c-cpp ==0.3.0.2
|
||||
- inliterate ==0.1.0
|
||||
- insert-ordered-containers ==0.2.1.0
|
||||
- insert-ordered-containers ==0.2.2
|
||||
- inspection-testing ==0.4.1.2
|
||||
- instance-control ==0.1.2.0
|
||||
- integer-logarithms ==1.0.3
|
||||
@ -1126,7 +1124,7 @@ default-package-overrides:
|
||||
- intern ==0.9.2
|
||||
- interpolate ==0.2.0
|
||||
- interpolatedstring-perl6 ==1.0.1
|
||||
- interpolation ==0.1.1
|
||||
- interpolation ==0.1.1.1
|
||||
- interpolator ==0.1.2
|
||||
- IntervalMap ==0.6.1.1
|
||||
- intervals ==0.8.1
|
||||
@ -1673,7 +1671,7 @@ default-package-overrides:
|
||||
- range-set-list ==0.1.3
|
||||
- rank1dynamic ==0.4.0
|
||||
- rank2classes ==1.2.1
|
||||
- Rasterific ==0.7.4.2
|
||||
- Rasterific ==0.7.4.4
|
||||
- rasterific-svg ==0.3.3.2
|
||||
- ratel ==1.0.8
|
||||
- ratel-wai ==1.0.5
|
||||
@ -1788,7 +1786,7 @@ default-package-overrides:
|
||||
- semirings ==0.2.1.1
|
||||
- semiring-simple ==1.0.0.1
|
||||
- semver ==0.3.4
|
||||
- sendfile ==0.7.10
|
||||
- sendfile ==0.7.11.1
|
||||
- seqalign ==0.2.0.4
|
||||
- serf ==0.1.1.0
|
||||
- serialise ==0.2.1.0
|
||||
@ -1820,14 +1818,14 @@ default-package-overrides:
|
||||
- servant-server ==0.15
|
||||
- servant-static-th ==0.2.2.0
|
||||
- servant-streaming ==0.3.0.0
|
||||
- servant-swagger ==1.1.7
|
||||
- servant-swagger-ui ==0.3.2.3.19.3
|
||||
- servant-swagger-ui-core ==0.3.2
|
||||
- servant-swagger-ui-redoc ==0.3.2.1.22.2
|
||||
- servant-swagger ==1.1.7.1
|
||||
- servant-swagger-ui ==0.3.3.3.22.2
|
||||
- servant-swagger-ui-core ==0.3.3
|
||||
- servant-swagger-ui-redoc ==0.3.3.1.22.2
|
||||
- servant-tracing ==0.1.0.2
|
||||
- servant-websockets ==1.1.0
|
||||
- servant-yaml ==0.1.0.1
|
||||
- serverless-haskell ==0.8.7
|
||||
- serverless-haskell ==0.8.8
|
||||
- serversession ==1.0.1
|
||||
- serversession-frontend-wai ==1.0
|
||||
- servius ==1.2.3.0
|
||||
@ -2250,7 +2248,7 @@ default-package-overrides:
|
||||
- windns ==0.1.0.1
|
||||
- winery ==0.3.1
|
||||
- wire-streams ==0.1.1.0
|
||||
- witherable ==0.3
|
||||
- witherable ==0.3.1
|
||||
- with-location ==0.1.0
|
||||
- witness ==0.4
|
||||
- wizards ==1.0.3
|
||||
@ -2437,8 +2435,6 @@ package-maintainers:
|
||||
- hsyslog
|
||||
- jailbreak-cabal
|
||||
- json-autotype
|
||||
- lambdabot-core
|
||||
- lambdabot-irc-plugins
|
||||
- language-nix
|
||||
- liquid-fixpoint
|
||||
- liquidhaskell
|
||||
@ -2794,6 +2790,7 @@ broken-packages:
|
||||
- anydbm
|
||||
- aosd
|
||||
- apart
|
||||
- apecs-stm
|
||||
- apelsin
|
||||
- api-builder
|
||||
- api-tools
|
||||
@ -2860,6 +2857,7 @@ broken-packages:
|
||||
- artery
|
||||
- artifact
|
||||
- ascii-flatten
|
||||
- ascii-string
|
||||
- ascii-vector-avc
|
||||
- ascii85-conduit
|
||||
- asic
|
||||
@ -2908,7 +2906,6 @@ broken-packages:
|
||||
- attoparsec-time
|
||||
- attoparsec-trans
|
||||
- attoparsec-uri
|
||||
- attoparsec-varword
|
||||
- attosplit
|
||||
- Attrac
|
||||
- atuin
|
||||
@ -4775,6 +4772,7 @@ broken-packages:
|
||||
- getflag
|
||||
- GGg
|
||||
- ggtsTC
|
||||
- gh-labeler
|
||||
- ghc-core-smallstep
|
||||
- ghc-datasize
|
||||
- ghc-dump-core
|
||||
@ -4846,6 +4844,7 @@ broken-packages:
|
||||
- git-sanity
|
||||
- git-vogue
|
||||
- gitdo
|
||||
- github
|
||||
- github-backup
|
||||
- github-data
|
||||
- github-tools
|
||||
@ -5341,6 +5340,10 @@ broken-packages:
|
||||
- hasktorch-signatures-partial
|
||||
- hasktorch-signatures-support
|
||||
- hasktorch-zoo
|
||||
- haskus-binary
|
||||
- haskus-system-build
|
||||
- haskus-utils
|
||||
- haskus-utils-compat
|
||||
- haskus-web
|
||||
- haslo
|
||||
- hasloGUI
|
||||
@ -5348,7 +5351,9 @@ broken-packages:
|
||||
- hasql-backend
|
||||
- hasql-class
|
||||
- hasql-cursor-query
|
||||
- hasql-dynamic-statements
|
||||
- hasql-generic
|
||||
- hasql-implicits
|
||||
- hasql-migration
|
||||
- hasql-optparse-applicative
|
||||
- hasql-pool
|
||||
@ -7279,6 +7284,7 @@ broken-packages:
|
||||
- nitro
|
||||
- nix-eval
|
||||
- nixfromnpm
|
||||
- nixpkgs-update
|
||||
- nkjp
|
||||
- nlp-scores
|
||||
- nlp-scores-scripts
|
||||
@ -7303,6 +7309,7 @@ broken-packages:
|
||||
- NoSlow
|
||||
- not-gloss-examples
|
||||
- notcpp
|
||||
- notifications-tray-icon
|
||||
- notmuch-haskell
|
||||
- notmuch-web
|
||||
- NoTrace
|
||||
@ -7808,6 +7815,7 @@ broken-packages:
|
||||
- primitive-addr
|
||||
- primitive-atomic
|
||||
- primitive-containers
|
||||
- primitive-extras
|
||||
- primitive-indexed
|
||||
- primitive-maybe
|
||||
- primitive-simd
|
||||
@ -8362,6 +8370,7 @@ broken-packages:
|
||||
- scalendar
|
||||
- SCalendar
|
||||
- scalp-webhooks
|
||||
- scan-metadata
|
||||
- scan-vector-machine
|
||||
- scc
|
||||
- scenegraph
|
||||
@ -8376,6 +8385,8 @@ broken-packages:
|
||||
- scholdoc-types
|
||||
- SciBaseTypes
|
||||
- science-constants-dimensional
|
||||
- SciFlow
|
||||
- SciFlow-drmaa
|
||||
- scion
|
||||
- scion-browser
|
||||
- scons2dot
|
||||
@ -8474,6 +8485,7 @@ broken-packages:
|
||||
- servant-generate
|
||||
- servant-generic
|
||||
- servant-github
|
||||
- servant-github-webhook
|
||||
- servant-haxl-client
|
||||
- servant-hmac-auth
|
||||
- servant-http-streams
|
||||
@ -8650,6 +8662,7 @@ broken-packages:
|
||||
- skylark-client
|
||||
- skype4hs
|
||||
- slack
|
||||
- slave-thread
|
||||
- slidemews
|
||||
- Slides
|
||||
- slim
|
||||
@ -8913,7 +8926,9 @@ broken-packages:
|
||||
- stgi
|
||||
- STL
|
||||
- stm-chunked-queues
|
||||
- stm-containers
|
||||
- stm-firehose
|
||||
- stm-hamt
|
||||
- stm-io-hooks
|
||||
- stm-lifted
|
||||
- stm-promise
|
||||
@ -9071,6 +9086,7 @@ broken-packages:
|
||||
- Tablify
|
||||
- tabloid
|
||||
- tabs
|
||||
- taffybar
|
||||
- tag-bits
|
||||
- tag-stream
|
||||
- tagged-exception-core
|
||||
@ -9218,6 +9234,7 @@ broken-packages:
|
||||
- th-traced
|
||||
- th-typegraph
|
||||
- thank-you-stars
|
||||
- theatre
|
||||
- themoviedb
|
||||
- thentos-cookie-session
|
||||
- Theora
|
||||
@ -10109,7 +10126,6 @@ broken-packages:
|
||||
- zoom-refs
|
||||
- zre
|
||||
- zsh-battery
|
||||
- zstd
|
||||
- zsyntax
|
||||
- ztar
|
||||
- zuramaru
|
||||
|
||||
@ -569,4 +569,16 @@ self: super: builtins.intersectAttrs super {
|
||||
# Avoid infitite recursion with tonatona.
|
||||
tonaparser = dontCheck super.tonaparser;
|
||||
|
||||
# Needs internet to run tests
|
||||
HTTP = dontCheck super.HTTP;
|
||||
|
||||
# Break infinite recursions.
|
||||
Dust-crypto = dontCheck super.Dust-crypto;
|
||||
nanospec = dontCheck super.nanospec;
|
||||
options = dontCheck super.options;
|
||||
snap-server = dontCheck super.snap-server;
|
||||
|
||||
# Tests require internet
|
||||
dhall_1_24_0 = dontCheck super.dhall_1_24_0;
|
||||
|
||||
}
|
||||
|
||||
2638
pkgs/development/haskell-modules/hackage-packages.nix
generated
2638
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,8 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "21.2.3";
|
||||
sha256 = "1v47c7bddbp31y6f8yzdjyvgcx9sskxql33k7cs0p5fmr05hhxws";
|
||||
version = "21.3.7.1";
|
||||
sha256 = "03vbp22vwra3zz76q3sjv23lmic60gi96a7dncry8whbfp4i4j8a";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
{ pkgs, stdenv, fetchurl, lua5_1, zziplib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.3";
|
||||
name = "lua-zip-${version}";
|
||||
isLibrary = true;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip";
|
||||
sha256 = "beb9260d606fdd5304aa958d95f0d3c20be7ca0a2cff44e7b75281c138a76a50";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.unzip lua5_1 zziplib ];
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray=(
|
||||
PREFIX=$out
|
||||
LUA_LIBDIR="$out/lib/lua/${lua5_1.luaversion}"
|
||||
LUA_INC="-I${lua5_1}/include");
|
||||
'';
|
||||
|
||||
patches = [ ./zip.patch ];
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/luaforge/luazip;
|
||||
hydraPlatforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -3,7 +3,9 @@
|
||||
, gtk3Support ? false, gtk3 ? null
|
||||
, qt4 ? null
|
||||
, qt4Support ? false
|
||||
, withLibdnssdCompat ? false }:
|
||||
, withLibdnssdCompat ? false
|
||||
, python ? null
|
||||
, withPython ? false }:
|
||||
|
||||
assert qt4Support -> qt4 != null;
|
||||
|
||||
@ -30,6 +32,9 @@ stdenv.mkDerivation rec {
|
||||
++ (stdenv.lib.optional gtk3Support gtk3)
|
||||
++ (stdenv.lib.optional qt4Support qt4);
|
||||
|
||||
propagatedBuildInputs =
|
||||
stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]);
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gettext intltool glib ];
|
||||
|
||||
configureFlags =
|
||||
@ -37,7 +42,8 @@ stdenv.mkDerivation rec {
|
||||
"--disable-gtk"
|
||||
(stdenv.lib.enableFeature gtk3Support "gtk3")
|
||||
"--${if qt4Support then "enable" else "disable"}-qt4"
|
||||
"--disable-python" "--localstatedir=/var" "--with-distro=none"
|
||||
(stdenv.lib.enableFeature withPython "python")
|
||||
"--localstatedir=/var" "--with-distro=none"
|
||||
# A systemd unit is provided by the avahi-daemon NixOS module
|
||||
"--with-systemdsystemunitdir=no" ]
|
||||
++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd"
|
||||
|
||||
@ -2,29 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "editline-${version}";
|
||||
version = "1.16.0";
|
||||
version = "1.16.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "troglobit";
|
||||
repo = "editline";
|
||||
rev = version;
|
||||
sha256 = "0a751dp34mk9hwv59ss447csknpm5i5cgd607m3fqf24rszyhbf2";
|
||||
sha256 = "192valxbvkxh47dszrnahv7xiccarjw9y84g4zaw5y0lxfc54dir";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# will be in 1.17.0
|
||||
(fetchpatch {
|
||||
name = "redisplay-clear-screen.patch";
|
||||
url = "https://github.com/troglobit/editline/commit/a4b67d226829a55bc8501f36708d5e104a52fbe4.patch";
|
||||
sha256 = "0dbgdqxa4x9wgr9kx89ql74np4qq6fzdbph9j9c65ns3gnaanjkw";
|
||||
})
|
||||
# PR24
|
||||
(fetchpatch {
|
||||
name = "fix-narrow-term-crash.patch";
|
||||
url = https://github.com/troglobit/editline/pull/24/commits/8660aef4b795fbd46a86dca804f067a81757c5df.patch;
|
||||
sha256 = "0pcz1f141qv78xbq09yh0zfcjiqyavr66snz1hvxzvi8x0vixc4i";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
outputs = [ "out" "dev" "man" "doc" ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user