public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging

Browse Source
This commit is contained in:
Matthew Bauer 2019-04-20 19:31:35 -04:00
commit 799fa4d404
63 changed files with 338 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/systems/default.nix
View File

@ -72,16 +72,22 @@ rec {
release = null; release = null;
}; };
kernelArch =
if final.isAarch32 then "arm"
else if final.isAarch64 then "arm64"
else if final.isx86_32 then "x86"
else if final.isx86_64 then "ia64"
else final.parsed.cpu.name;
qemuArch = qemuArch =
if final.isArm then "arm" if final.isArm then "arm"
else if final.isx86_64 then "x86_64" else if final.isx86_64 then "x86_64"
else if final.isx86 then "i386" else if final.isx86 then "i386"
else { else {
"powerpc" = "ppc"; "powerpc" = "ppc";
"powerpcle" = "ppc";
"powerpc64" = "ppc64"; "powerpc64" = "ppc64";
"powerpc64le" = "ppc64"; "powerpc64le" = "ppc64le";
"mips64" = "mips";
"mipsel64" = "mipsel";
}.${final.parsed.cpu.name} or final.parsed.cpu.name; }.${final.parsed.cpu.name} or final.parsed.cpu.name;
emulator = pkgs: let emulator = pkgs: let
@ -103,7 +109,7 @@ rec {
in in
if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name && if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
pkgs.stdenv.hostPlatform.isCompatible final pkgs.stdenv.hostPlatform.isCompatible final
then "${pkgs.runtimeShell} -c" then "${pkgs.runtimeShell} -c '\"$@\"' --"
else if final.isWindows else if final.isWindows
then "${wine}/bin/${wine-name}" then "${wine}/bin/${wine-name}"
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux

5
lib/systems/examples.nix
View File

@ -132,11 +132,6 @@ rec {
libc = "newlib"; libc = "newlib";
}; };
alpha-embedded = {
config = "alpha-elf";
libc = "newlib";
};
i686-embedded = { i686-embedded = {
config = "i686-elf"; config = "i686-elf";
libc = "newlib"; libc = "newlib";

46
lib/systems/parse.nix
View File

@ -127,22 +127,42 @@ rec {
(b == i386 && isCompatible a i486) (b == i386 && isCompatible a i486)
(b == i486 && isCompatible a i586) (b == i486 && isCompatible a i586)
(b == i586 && isCompatible a i686) (b == i586 && isCompatible a i686)
# NOTE: Not true in some cases. Like in WSL mode.
# XXX: Not true in some cases. Like in WSL mode.
(b == i686 && isCompatible a x86_64) (b == i686 && isCompatible a x86_64)
# ARM # ARMv4
(b == arm && isCompatible a armv5tel) (b == arm && isCompatible a armv5tel)
(b == armv5tel && isCompatible a armv6m)
(b == armv6m && isCompatible a armv6l) # ARMv5
(b == armv6l && isCompatible a armv7a) (b == armv5tel && isCompatible a armv6l)
(b == armv7a && isCompatible a armv7r)
(b == armv7r && isCompatible a armv7m) # ARMv6
(b == armv7m && isCompatible a armv7l) (b == armv6l && isCompatible a armv6m)
(b == armv7l && isCompatible a armv8a) (b == armv6m && isCompatible a armv7l)
(b == armv8a && isCompatible a armv8r)
(b == armv8r && isCompatible a armv8m) # ARMv7
# NOTE: not always true! Some arm64 cpus don’t support arm32 mode. (b == armv7l && isCompatible a armv7a)
(b == armv8m && isCompatible a aarch64) (b == armv7l && isCompatible a armv7r)
(b == armv7l && isCompatible a armv7m)
(b == armv7a && isCompatible a armv8a)
(b == armv7r && isCompatible a armv8a)
(b == armv7m && isCompatible a armv8a)
(b == armv7a && isCompatible a armv8r)
(b == armv7r && isCompatible a armv8r)
(b == armv7m && isCompatible a armv8r)
(b == armv7a && isCompatible a armv8m)
(b == armv7r && isCompatible a armv8m)
(b == armv7m && isCompatible a armv8m)
# ARMv8
(b == armv8r && isCompatible a armv8a)
(b == armv8m && isCompatible a armv8a)
# XXX: not always true! Some arm64 cpus don’t support arm32 mode.
(b == aarch64 && a == armv8a)
(b == armv8a && isCompatible a aarch64)
(b == aarch64 && a == aarch64_be) (b == aarch64 && a == aarch64_be)
(b == aarch64_be && isCompatible a aarch64) (b == aarch64_be && isCompatible a aarch64)

5
maintainers/maintainer-list.nix
View File

@ -365,6 +365,11 @@
github = "ankhers"; github = "ankhers";
name = "Justin Wood"; name = "Justin Wood";
}; };
anton-dessiatov = {
email = "anton.dessiatov@gmail.com";
github = "anton-dessiatov";
name = "Anton Desyatov";
};
Anton-Latukha = { Anton-Latukha = {
email = "anton.latuka+nixpkgs@gmail.com"; email = "anton.latuka+nixpkgs@gmail.com";
github = "Anton-Latukha"; github = "Anton-Latukha";

2
nixos/modules/services/admin/oxidized.nix
View File

@ -7,7 +7,7 @@ let
in in
{ {
options.services.oxidized = { options.services.oxidized = {
enable = mkEnableOption "the oxidized configuation backup service."; enable = mkEnableOption "the oxidized configuration backup service";
user = mkOption { user = mkOption {
type = types.str; type = types.str;

2
nixos/modules/services/cluster/kubernetes/addon-manager.nix
View File

@ -62,7 +62,7 @@ in
''; '';
}; };
enable = mkEnableOption "Whether to enable Kubernetes addon manager."; enable = mkEnableOption "Kubernetes addon manager";
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager"; kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager";
bootstrapAddonsKubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager bootstrap"; bootstrapAddonsKubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager bootstrap";

2
nixos/modules/services/cluster/kubernetes/controller-manager.nix
View File

@ -28,7 +28,7 @@ in
type = str; type = str;
}; };
enable = mkEnableOption "Kubernetes controller manager."; enable = mkEnableOption "Kubernetes controller manager";
extraOpts = mkOption { extraOpts = mkOption {
description = "Kubernetes controller manager extra command line options."; description = "Kubernetes controller manager extra command line options.";

2
nixos/modules/services/cluster/kubernetes/flannel.nix
View File

@ -23,7 +23,7 @@ in
{ {
###### interface ###### interface
options.services.kubernetes.flannel = { options.services.kubernetes.flannel = {
enable = mkEnableOption "enable flannel networking"; enable = mkEnableOption "flannel networking";
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes flannel"; kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes flannel";
}; };

2
nixos/modules/services/cluster/kubernetes/pki.nix
View File

@ -39,7 +39,7 @@ in
###### interface ###### interface
options.services.kubernetes.pki = with lib.types; { options.services.kubernetes.pki = with lib.types; {
enable = mkEnableOption "Whether to enable easyCert issuer service."; enable = mkEnableOption "easyCert issuer service";
certs = mkOption { certs = mkOption {
description = "List of certificate specs to feed to cert generator."; description = "List of certificate specs to feed to cert generator.";

2
nixos/modules/services/cluster/kubernetes/proxy.nix
View File

@ -17,7 +17,7 @@ in
type = str; type = str;
}; };
enable = mkEnableOption "Whether to enable Kubernetes proxy."; enable = mkEnableOption "Kubernetes proxy";
extraOpts = mkOption { extraOpts = mkOption {
description = "Kubernetes proxy extra command line options."; description = "Kubernetes proxy extra command line options.";

2
nixos/modules/services/cluster/kubernetes/scheduler.nix
View File

@ -16,7 +16,7 @@ in
type = str; type = str;
}; };
enable = mkEnableOption "Whether to enable Kubernetes scheduler."; enable = mkEnableOption "Kubernetes scheduler";
extraOpts = mkOption { extraOpts = mkOption {
description = "Kubernetes scheduler extra command line options."; description = "Kubernetes scheduler extra command line options.";

2
nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
View File

@ -18,7 +18,7 @@ in
services.gnome3.gnome-settings-daemon = { services.gnome3.gnome-settings-daemon = {
enable = mkEnableOption "GNOME Settings Daemon."; enable = mkEnableOption "GNOME Settings Daemon";
# There are many forks of gnome-settings-daemon # There are many forks of gnome-settings-daemon
package = mkOption { package = mkOption {

2
nixos/modules/services/hardware/bluetooth.nix
View File

@ -13,7 +13,7 @@ in {
options = { options = {
hardware.bluetooth = { hardware.bluetooth = {
enable = mkEnableOption "support for Bluetooth."; enable = mkEnableOption "support for Bluetooth";
powerOnBoot = mkOption { powerOnBoot = mkOption {
type = types.bool; type = types.bool;

4
nixos/modules/services/hardware/vdr.nix
View File

@ -12,7 +12,7 @@ in {
options = { options = {
services.vdr = { services.vdr = {
enable = mkEnableOption "enable VDR. Please put config into ${libDir}."; enable = mkEnableOption "VDR. Please put config into ${libDir}";
package = mkOption { package = mkOption {
type = types.package; type = types.package;
@ -34,7 +34,7 @@ in {
description = "Additional command line arguments to pass to VDR."; description = "Additional command line arguments to pass to VDR.";
}; };
enableLirc = mkEnableOption "enable LIRC"; enableLirc = mkEnableOption "LIRC";
}; };
}; };

2
nixos/modules/services/mail/mailcatcher.nix
View File

@ -11,7 +11,7 @@ in
options = { options = {
services.mailcatcher = { services.mailcatcher = {
enable = mkEnableOption "Enable MailCatcher."; enable = mkEnableOption "MailCatcher";
http.ip = mkOption { http.ip = mkOption {
type = types.str; type = types.str;

2
nixos/modules/services/mail/offlineimap.nix
View File

@ -7,7 +7,7 @@ let
in { in {
options.services.offlineimap = { options.services.offlineimap = {
enable = mkEnableOption "Offlineimap, a software to dispose your mailbox(es) as a local Maildir(s)."; enable = mkEnableOption "OfflineIMAP, a software to dispose your mailbox(es) as a local Maildir(s)";
install = mkOption { install = mkOption {
type = types.bool; type = types.bool;

2
nixos/modules/services/misc/beanstalkd.nix
View File

@ -12,7 +12,7 @@ in
options = { options = {
services.beanstalkd = { services.beanstalkd = {
enable = mkEnableOption "Enable the Beanstalk work queue."; enable = mkEnableOption "the Beanstalk work queue";
listen = { listen = {
port = mkOption { port = mkOption {

2
nixos/modules/services/misc/sssd.nix
View File

@ -6,7 +6,7 @@ let
in { in {
options = { options = {
services.sssd = { services.sssd = {
enable = mkEnableOption "the System Security Services Daemon."; enable = mkEnableOption "the System Security Services Daemon";
config = mkOption { config = mkOption {
type = types.lines; type = types.lines;

4
nixos/modules/services/networking/i2pd.nix
View File

@ -470,7 +470,7 @@ in
''; '';
}; };
trust.hidden = mkEnableOption "Router concealment."; trust.hidden = mkEnableOption "Router concealment";
websocket = mkEndpointOpt "websockets" "127.0.0.1" 7666; websocket = mkEndpointOpt "websockets" "127.0.0.1" 7666;
@ -478,7 +478,7 @@ in
exploratory.outbound = i2cpOpts "exploratory"; exploratory.outbound = i2cpOpts "exploratory";
ntcp2.enable = mkEnableTrueOption "NTCP2."; ntcp2.enable = mkEnableTrueOption "NTCP2.";
ntcp2.published = mkEnableOption "NTCP2 publication."; ntcp2.published = mkEnableOption "NTCP2 publication";
ntcp2.port = mkOption { ntcp2.port = mkOption {
type = types.int; type = types.int;
default = 0; default = 0;

2
nixos/modules/services/networking/miredo.nix
View File

@ -20,7 +20,7 @@ in
services.miredo = { services.miredo = {
enable = mkEnableOption "the Miredo IPv6 tunneling service."; enable = mkEnableOption "the Miredo IPv6 tunneling service";
package = mkOption { package = mkOption {
type = types.package; type = types.package;

2
nixos/modules/services/networking/monero.nix
View File

@ -51,7 +51,7 @@ in
services.monero = { services.monero = {
enable = mkEnableOption "Monero node daemon."; enable = mkEnableOption "Monero node daemon";
mining.enable = mkOption { mining.enable = mkOption {
type = types.bool; type = types.bool;

4
nixos/modules/services/networking/mosquitto.nix
View File

@ -44,7 +44,7 @@ in
options = { options = {
services.mosquitto = { services.mosquitto = {
enable = mkEnableOption "Enable the MQTT Mosquitto broker."; enable = mkEnableOption "the MQTT Mosquitto broker";
host = mkOption { host = mkOption {
default = "127.0.0.1"; default = "127.0.0.1";
@ -65,7 +65,7 @@ in
}; };
ssl = { ssl = {
enable = mkEnableOption "Enable SSL listener."; enable = mkEnableOption "SSL listener";
cafile = mkOption { cafile = mkOption {
type = types.nullOr types.path; type = types.nullOr types.path;

3
nixos/modules/services/networking/namecoind.nix
View File

@ -1,3 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
@ -43,7 +44,7 @@ in
services.namecoind = { services.namecoind = {
enable = mkEnableOption "namecoind, Namecoin client."; enable = mkEnableOption "namecoind, Namecoin client";
wallet = mkOption { wallet = mkOption {
type = types.path; type = types.path;

2
nixos/modules/services/networking/nullidentdmod.nix
View File

@ -3,7 +3,7 @@
in { in {
options.services.nullidentdmod = with types; { options.services.nullidentdmod = with types; {
enable = mkEnableOption "Enable the nullidentdmod identd daemon"; enable = mkEnableOption "the nullidentdmod identd daemon";
userid = mkOption { userid = mkOption {
type = nullOr str; type = nullOr str;

2
nixos/modules/services/networking/toxvpn.nix
View File

@ -5,7 +5,7 @@ with lib;
{ {
options = { options = {
services.toxvpn = { services.toxvpn = {
enable = mkEnableOption "enable toxvpn running on startup"; enable = mkEnableOption "toxvpn running on startup";
localip = mkOption { localip = mkOption {
type = types.string; type = types.string;

2
nixos/modules/services/search/kibana.nix
View File

@ -31,7 +31,7 @@ let
in { in {
options.services.kibana = { options.services.kibana = {
enable = mkEnableOption "enable kibana service"; enable = mkEnableOption "kibana service";
listenAddress = mkOption { listenAddress = mkOption {
description = "Kibana listening host"; description = "Kibana listening host";

2
nixos/modules/services/search/solr.nix
View File

@ -11,7 +11,7 @@ in
{ {
options = { options = {
services.solr = { services.solr = {
enable = mkEnableOption "Enables the solr service."; enable = mkEnableOption "Solr";
# default to the 8.x series not forcing major version upgrade of those on the 7.x series # default to the 8.x series not forcing major version upgrade of those on the 7.x series
package = mkOption { package = mkOption {

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -75,7 +75,7 @@ in {
debug = mkEnableOption "gnome-session debug messages"; debug = mkEnableOption "gnome-session debug messages";
flashback = { flashback = {
enableMetacity = mkEnableOption "Enable the standard GNOME Flashback session with Metacity."; enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity";
customSessions = mkOption { customSessions = mkOption {
type = types.listOf (types.submodule { type = types.listOf (types.submodule {

2
nixos/modules/services/x11/display-managers/xpra.nix
View File

@ -33,7 +33,7 @@ in
description = "Authentication to use when connecting to xpra"; description = "Authentication to use when connecting to xpra";
}; };
pulseaudio = mkEnableOption "pulseaudio audio streaming."; pulseaudio = mkEnableOption "pulseaudio audio streaming";
extraOptions = mkOption { extraOptions = mkOption {
description = "Extra xpra options"; description = "Extra xpra options";

2
nixos/modules/tasks/filesystems/btrfs.nix
View File

@ -19,7 +19,7 @@ in
# One could also do regular btrfs balances, but that shouldn't be necessary # One could also do regular btrfs balances, but that shouldn't be necessary
# during normal usage and as long as the filesystems aren't filled near capacity # during normal usage and as long as the filesystems aren't filled near capacity
services.btrfs.autoScrub = { services.btrfs.autoScrub = {
enable = mkEnableOption "Enable regular btrfs scrub"; enable = mkEnableOption "regular btrfs scrub";
fileSystems = mkOption { fileSystems = mkOption {
type = types.listOf types.path; type = types.listOf types.path;

136
pkgs/applications/networking/cluster/terraform-providers/data.nix
View File

@ -11,22 +11,22 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-alicloud"; repo = "terraform-provider-alicloud";
version = "1.36.0"; version = "1.39.0";
sha256 = "13rmlsnplcmcxjksm1wizgzlx47h5in5gmqhbm2n6k5ayx4x9ha2"; sha256 = "0m5fvqrvnb7v5iii67l743j3hq32rljrvnkgc7fcd46zrf38yl2h";
}; };
archive = archive =
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-archive"; repo = "terraform-provider-archive";
version = "1.2.0"; version = "1.2.1";
sha256 = "1qargj90nl7r8a1fcsj10fnjirskvbn3gz0dsijqnr432jxs2cvh"; sha256 = "1avx3m0dkld0kmsi8ifqcla8254p1izh5wrziffr7r05s152r8qf";
}; };
arukas = arukas =
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-arukas"; repo = "terraform-provider-arukas";
version = "1.0.0"; version = "1.1.0";
sha256 = "1v8jzns8czy8navdrabsvc9zk1s9vs1718ngjlx9vs13r3bkm2fc"; sha256 = "1akl9fzgm5qv01vz18xjzyqjnlxw699qq4x8vr96j16l1zf10h99";
}; };
atlas = atlas =
{ {
@ -39,8 +39,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-aws"; repo = "terraform-provider-aws";
version = "2.3.0"; version = "2.6.0";
sha256 = "0cim14q56xr7hm06d4sy205p4xp1x3kbddb4pw65ck671i55h7ln"; sha256 = "0hpnyid5w33n8ypwcz3a43gazbvk6m60b57qll2qgx6bm1q75b19";
}; };
azuread = azuread =
{ {
@ -53,15 +53,15 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-azurerm"; repo = "terraform-provider-azurerm";
version = "1.23.0"; version = "1.25.0";
sha256 = "11v1832sxnigyiyy4i34mxwn7j18i6iwsff8sqabpa7v9a405ngp"; sha256 = "1fhcljxz6cb5q1kd7aprxv1bga53x6fg65q5wkp985aaqnl42b8k";
}; };
azurestack = azurestack =
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-azurestack"; repo = "terraform-provider-azurestack";
version = "0.4.0"; version = "0.5.0";
sha256 = "1c9am0v4aq95k1jblc767vykk76dp0d6z2fvy148ag77cy2jgryc"; sha256 = "0pi8hjl6350ibkiz5pi86p58gkj8jf0a27ar04npsrn2wcz90k8z";
}; };
bigip = bigip =
{ {
@ -81,8 +81,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-brightbox"; repo = "terraform-provider-brightbox";
version = "1.0.6"; version = "1.1.1";
sha256 = "02wbx36kdbxxjwsbbwry3drdx5injllglpsb56dw1fvqymmal7wl"; sha256 = "03fh287fmbg9jxsiniwj3sn6nsjdm46qv82b5aaqny3qmhjddjvq";
}; };
chef = chef =
{ {
@ -109,15 +109,15 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-cloudflare"; repo = "terraform-provider-cloudflare";
version = "1.12.0"; version = "1.13.0";
sha256 = "1kq9mbs3if7w9jnsdkj104lvy532lwkd9wr4m0ilh7zql0vm9mpk"; sha256 = "01fgcycn5g53cx32xcgrpcpvjxwb8w11hs0f7s2bhg6cq0v9higj";
}; };
cloudscale = cloudscale =
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-cloudscale"; repo = "terraform-provider-cloudscale";
version = "1.0.1"; version = "1.1.0";
sha256 = "0lhzwbm1a2s11s0ahb3vxfvshh385fgy1ficvip4rl31dahhwrav"; sha256 = "09b1cq0vyyag8aaiwmhnwrgigmxvxk3qsk31h4hshm7ddk7db9qn";
}; };
cloudstack = cloudstack =
{ {
@ -137,15 +137,15 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-consul"; repo = "terraform-provider-consul";
version = "2.2.0"; version = "2.3.0";
sha256 = "13jwvf7n7238pzvdq9m6vnl9vqa9hkr1mrcf9sa1q9lxkim9ijfk"; sha256 = "06b6yjmaq7sq26kfsqxlxmz5mnr1xsn1vywndh14grqwg6zmsrl6";
}; };
datadog = datadog =
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-datadog"; repo = "terraform-provider-datadog";
version = "1.7.0"; version = "1.8.0";
sha256 = "0a7nvq2nhfv2jg6jc83jjg11yzzkiwyifdj5ni76nri82mbhb14q"; sha256 = "1pmz4gxhfynj7mjcl07n2ggz00vccw4bv6cmp7na3ssbpnjiy1wx";
}; };
digitalocean = digitalocean =
{ {
@ -193,8 +193,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-external"; repo = "terraform-provider-external";
version = "1.1.0"; version = "1.1.1";
sha256 = "18gwwcspj31rid0r603z0688nzdwl2nl8wy6hrzw62bx5gy4bdrp"; sha256 = "110kqp4gsag3l8h9hwjdq98s9rz9f5w31mrs50rygdc0yd43hq8z";
}; };
fastly = fastly =
{ {
@ -228,15 +228,15 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-google"; repo = "terraform-provider-google";
version = "2.3.0"; version = "2.4.0";
sha256 = "063z08qamy0yx376qh0pxd446kbnp6z1828x6nr7yzh4dw0rzc3s"; sha256 = "153pr01m7clvdq9c09xhvlivagn12nlxhykh1x9yya9ixkg0zrrv";
}; };
google-beta = google-beta =
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-google-beta"; repo = "terraform-provider-google-beta";
version = "2.3.0"; version = "2.4.0";
sha256 = "120vq5bd092ykv6cc53w9208wfmf2hd8hflas282l4yg0b47gx83"; sha256 = "08vbj9m6x0byf7x77a5b5isg0kmlxvc9gswgilzi6djgwg0j6wwd";
}; };
grafana = grafana =
{ {
@ -270,8 +270,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-heroku"; repo = "terraform-provider-heroku";
version = "1.8.0"; version = "1.9.0";
sha256 = "0gansylgmc8fx9lskpc4dkjjc3v3jxbmcgscbgc4qfiiybxf5j8n"; sha256 = "1qabhf2qm7ba5jw6hclkcp2pw8c39ggrqkhhqg0bh03h220rl22x";
}; };
http = http =
{ {
@ -326,15 +326,15 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-linode"; repo = "terraform-provider-linode";
version = "1.5.0"; version = "1.6.0";
sha256 = "1vp20jxxrzm57z6ldni2rbw9plwws17gpzv3z0ffqa9rijqxh3fr"; sha256 = "0i2x0jd26qanziihlc38s7rxiab66ld2s5gz18rrmrbwhcl95fwj";
}; };
local = local =
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-local"; repo = "terraform-provider-local";
version = "1.2.0"; version = "1.2.1";
sha256 = "1w63ar3cr4095kza400chmmdzdadb1d871pbd14pzghl63nyg4ig"; sha256 = "1hi2bxa79fbdf2n6z59xdfs7bx8cg7q2l84hrxdh3cqbnb8jvsbr";
}; };
logentries = logentries =
{ {
@ -389,8 +389,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-ns1"; repo = "terraform-provider-ns1";
version = "1.2.0"; version = "1.3.0";
sha256 = "0j9xghm84zjfgsmix1gdslr4pnhcf2xmb7n1851a3pmxd851fd9b"; sha256 = "1h21a4z7js2iwg0gj217lq4d7wccxhjmi5k37asfj18ch0x37c7v";
}; };
nsxt = nsxt =
{ {
@ -403,8 +403,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-null"; repo = "terraform-provider-null";
version = "2.1.0"; version = "2.1.1";
sha256 = "0hgdg5hl33kx9hzj2y0aqfq32q92b3hbdvx1a391c0miz6rn2k8k"; sha256 = "0sw7j2cz9d5207l1v32ahqahmsk1dzzsf83zqivaa5jk3w4bfnjz";
}; };
nutanix = nutanix =
{ {
@ -417,8 +417,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-oci"; repo = "terraform-provider-oci";
version = "3.20.0-rc1"; version = "3.23.0-rc1";
sha256 = "07z4bl2fz8wvfjznrci6dxigx8ypi2r4w8xk9fv0bpjm0a6pp813"; sha256 = "11h8na7czj4iqm9z3pd8im06qqp3mng62h8ha5afvz2phv1g096h";
}; };
oneandone = oneandone =
{ {
@ -431,15 +431,15 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-opc"; repo = "terraform-provider-opc";
version = "1.3.2"; version = "1.3.3";
sha256 = "0fm53xwgpsmfkqavichxb0vq86bqqpsadlyzqz5jafw3aavx91cb"; sha256 = "1hwbwyhjrs16cy66przs44znni0x3nwfsx18glxbikb2zx1ph93n";
}; };
openstack = openstack =
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-openstack"; repo = "terraform-provider-openstack";
version = "1.16.0"; version = "1.17.0";
sha256 = "1s0fclqclq1rrwz6217jw4qh6bz3zlk6zxsaabxvzbsg4b7vwnrh"; sha256 = "1a3asmkf3w1ndy5rpyn09msp5l1sm2cdm3ca7cx5v00pjvww9f52";
}; };
opentelekomcloud = opentelekomcloud =
{ {
@ -459,8 +459,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-oraclepaas"; repo = "terraform-provider-oraclepaas";
version = "1.5.0"; version = "1.5.1";
sha256 = "1vnaqzs7i2kn37sxf1sknxn6j1d24xlckqcvkh9xzi8jrmm4rgvr"; sha256 = "0xyyhr2n1aw1qn90535llv72cdgdqpni9l4gn8sj0ligpjhba7qz";
}; };
ovh = ovh =
{ {
@ -473,8 +473,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-packet"; repo = "terraform-provider-packet";
version = "1.5.0"; version = "1.7.2";
sha256 = "0c59f2q8ivdn47f4shy674794aijc7byb6273lfcdaal1gb0mw79"; sha256 = "103r0k626ham8wh7rwlx1hald4rik17mv2mcfjz9za65v7z139vr";
}; };
pagerduty = pagerduty =
{ {
@ -494,8 +494,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-postgresql"; repo = "terraform-provider-postgresql";
version = "0.2.1"; version = "0.3.0";
sha256 = "025s3wgj1v6iwaliyics33cb5sx4614658z1vxxrxx7xb9pf328w"; sha256 = "0z1xdzl5mn6dxgkgmysq06g3fg9cdlwa59ng42r6kffcbl0mwgfh";
}; };
powerdns = powerdns =
{ {
@ -508,8 +508,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-profitbricks"; repo = "terraform-provider-profitbricks";
version = "1.4.3"; version = "1.4.4";
sha256 = "19rqqx5ib23nhvz2smh20cii25g09sdi7kg85m4nlbh63gqg86qf"; sha256 = "0pzcl3pdhaykihvv1v38zrv607mydchvkzrzhwcakgmdkp3vq54i";
}; };
rabbitmq = rabbitmq =
{ {
@ -529,8 +529,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-random"; repo = "terraform-provider-random";
version = "2.1.0"; version = "2.1.1";
sha256 = "1219128f838szcjgjv6figrmh4r7lhxrr22mf9fpf5a30wi0ssqf"; sha256 = "0ivmxacb9pzz7av2rr6jal5vwdv24689a2806nqvvzdy2s8mlzd3";
}; };
rightscale = rightscale =
{ {
@ -585,8 +585,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-spotinst"; repo = "terraform-provider-spotinst";
version = "1.9.0"; version = "1.11.0";
sha256 = "0rpkxg50gkm9ji7s4bl1wz7j1z2iw5jq9n1pfmcs9nk0rl17j77j"; sha256 = "10q1w66gbx6863797n6n15xx4llflmavrz2qk23pb8qd5pbni9bk";
}; };
statuscake = statuscake =
{ {
@ -606,15 +606,15 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-template"; repo = "terraform-provider-template";
version = "2.1.0"; version = "2.1.1";
sha256 = "1db9gr4f5awryqxq5iahv2xj5p0msd44j3lgklkqw2q3kswlvckr"; sha256 = "182kdkbmnihpawvgfpxavg8vbczizw5mlkwp828ap0baqs09ai8i";
}; };
tencentcloud = tencentcloud =
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-tencentcloud"; repo = "terraform-provider-tencentcloud";
version = "1.3.0"; version = "1.4.0";
sha256 = "1pdzzrg4qrsjiv67yr2g6a9l1n9vqi5n4m53kbb1fp04g3s2sw31"; sha256 = "1gqxvd5ss2cg49856nj3srirny1298l3fla506r7v8xf9ybkzpb4";
}; };
terraform = terraform =
{ {
@ -627,8 +627,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-tfe"; repo = "terraform-provider-tfe";
version = "0.8.1"; version = "0.8.2";
sha256 = "0an0il8h0ly639z92cc007xjjs3cyk25jkbnkp99kkj0mf760729"; sha256 = "0apxf197g4mrxybbx1vrk2i3fnw4cf23aq1wjhks5fkvm4wshgl7";
}; };
tls = tls =
{ {
@ -648,8 +648,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-ucloud"; repo = "terraform-provider-ucloud";
version = "1.4.0"; version = "1.6.0";
sha256 = "1nl6k2313wwdzpm2n29bab9xs3l00vyhrdl14r82kax6hjm748qm"; sha256 = "0ijksfjqc91gxf45w9h2r024zgyqpr4s7z6snyzxcdbnf8ahs9q0";
}; };
ultradns = ultradns =
{ {
@ -662,8 +662,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-vault"; repo = "terraform-provider-vault";
version = "1.6.0"; version = "1.7.0";
sha256 = "06hykz37yhwhj6fjz2zi5c80mzv8i91kpsr5cdqkc8rnfmcbhzqx"; sha256 = "133ximk510kchr34zicpnp4da27nxvzab2nd8dqpf4sqg2z83i0y";
}; };
vcd = vcd =
{ {
@ -683,8 +683,8 @@
{ {
owner = "terraform-providers"; owner = "terraform-providers";
repo = "terraform-provider-yandex"; repo = "terraform-provider-yandex";
version = "0.2.0"; version = "0.4.1";
sha256 = "0y7pnl47dg83i7r95gy8h1ayilaji2k5i048l5pkavp1yxx9i22g"; sha256 = "0lvj7xlzqc6wfv1xpc4qc1gnk3wvcvnifbf4mqgjglz35cf697bb";
}; };
matchbox = matchbox =
{ {

30
pkgs/applications/networking/cluster/tilt/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "tilt";
name = "${pname}-${version}";
/* 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.7.13";
rev = "67cd823b2a07c7bb2bcb919c0963e8f23e22d57e";
src = fetchFromGitHub {
owner = "windmilleng";
repo = "tilt";
rev = "${rev}";
sha256 = "0cfmdd6wsczcmy6fkd418rvancx4qy1c3pzq9jbfsy4innhh51j7";
};
goPackagePath = "github.com/windmilleng/tilt";
subPackages = [ "cmd/tilt" ];
buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-04-18");
meta = with stdenv.lib; {
description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";
homepage = https://tilt.dev/;
license = licenses.asl20;
maintainers = with maintainers; [ anton-dessiatov ];
};
}

4
pkgs/applications/science/biology/picard-tools/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "picard-tools-${version}"; name = "picard-tools-${version}";
version = "2.18.27"; version = "2.19.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "1pc9mhp35n0dl7j06c1564b797v6iqg6vhmd2xxvysc96hnsbyvc"; sha256 = "0l2riidd9p84axj8h7fnrbwgpcpizj74i9mnm3pcqm9vlzvw6zzr";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

27
pkgs/applications/science/math/gap/default.nix
View File

@ -62,11 +62,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gap"; pname = "gap";
# https://www.gap-system.org/Releases/ # https://www.gap-system.org/Releases/
version = "4.10.0"; version = "4.10.1";
src = fetchurl { src = fetchurl {
url = "https://www.gap-system.org/pub/gap/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2"; url = "https://www.gap-system.org/pub/gap/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2";
sha256 = "1dmb8v4p7j1nnf7sx8sg54b49yln36bi9acwp7w1d3a1nxj17ird"; sha256 = "136s0zvhcw41fshj5zgsrjcy2kd58cdh2m3ddp5rdizi4rx54f10";
}; };
# remove all non-essential packages (which take up a lot of space) # remove all non-essential packages (which take up a lot of space)
@ -86,25 +86,11 @@ stdenv.mkDerivation rec {
]; ];
patches = [ patches = [
# bugfix: https://github.com/gap-system/gap/pull/3102 # https://github.com/gap-system/gap/pull/3294
(fetchpatch { (fetchpatch {
name = "fix-infinite-loop-in-writeandcheck.patch"; name = "add-make-install-targets.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/0001-a-version-of-the-writeandcheck.patch-from-Sage-that-.patch?id=5e61d7b6a0da3aa53d8176fa1fb9353cc559b098"; url = "https://github.com/gap-system/gap/commit/3361c172e6c5ff3bb3f01ba9d6f1dd4ad42cea80.patch";
sha256 = "1zkv8bbiw3jdn54sqqvfkdkfsd7jxzq0bazwsa14g4sh2265d28j"; sha256 = "1kwp9qnfvmlbpf1c3rs6j5m2jz22rj7a4hb5x1gj9vkpiyn5pdyj";
})
# needed for libgap (sage): https://github.com/gap-system/gap/pull/3043
(fetchpatch {
name = "add-error-messages-helper.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/0002-kernel-add-helper-function-for-writing-error-message.patch?id=5e61d7b6a0da3aa53d8176fa1fb9353cc559b098";
sha256 = "0c4ry5znb6hwwp8ld6k62yw8w6cqldflw3x49bbzizbmipfpidh5";
})
# needed for libgap (sage): https://github.com/gap-system/gap/pull/3096
(fetchpatch {
name = "gap-enter.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/0003-Prototype-for-GAP_Enter-Leave-macros-to-bracket-use-.patch?id=5e61d7b6a0da3aa53d8176fa1fb9353cc559b098";
sha256 = "12fg8mb8rm6khsz1r4k3k26jrkx4q1rv13hcrfnlhn0m7iikvc3q";
}) })
]; ];
@ -184,6 +170,7 @@ stdenv.mkDerivation rec {
timokau timokau
]; ];
platforms = platforms.all; platforms = platforms.all;
broken = stdenv.isDarwin;
# keeping all packages increases the package size considerably, wchich # keeping all packages increases the package size considerably, wchich
# is why a local build is preferable in that situation. The timeframe # is why a local build is preferable in that situation. The timeframe
# is reasonable and that way the binary cache doesn't get overloaded. # is reasonable and that way the binary cache doesn't get overloaded.

7
pkgs/applications/science/math/sage/sage-src.nix
View File

@ -127,6 +127,13 @@ stdenv.mkDerivation rec {
url = "https://git.sagemath.org/sage.git/patch/?h=3277ba76d0ba7174608a31a0c6623e9210c63e3d"; url = "https://git.sagemath.org/sage.git/patch/?h=3277ba76d0ba7174608a31a0c6623e9210c63e3d";
sha256 = "09avaanwmdgqv14mmllbgw9z2scf4lc0y0kzdhlriiq8ss9j8iir"; sha256 = "09avaanwmdgqv14mmllbgw9z2scf4lc0y0kzdhlriiq8ss9j8iir";
}) })
# https://trac.sagemath.org/ticket/27094
(fetchpatch {
name = "gap-4.10.1.patch";
url = "https://git.sagemath.org/sage.git/patch?id=d3483110474591ea6cc8e3210cd884f3e0018b3e";
sha256 = "028i6h8l8npwzx5z0ax0rcywl85gc83qw1jf93zf523msdfcsk0n";
})
]; ];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

18
pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
View File

@ -3,24 +3,30 @@
with rustPlatform; with rustPlatform;
buildRustPackage rec { buildRustPackage rec {
name = "git-ignore-${version}"; pname = "git-ignore";
version = "0.2.0"; version = "1.0.0";
cargoSha256 = "1fqfy8lnvpn5sd3l73x2p359zq4303vsrdgw3aphvy6580yjb84d";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sondr3"; owner = "sondr3";
repo = "git-ignore"; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1nihh5inh46r8jg9z7d6g9gqfyhrznmkn15nmzpbnzf0653dl629"; sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c";
}; };
cargoSha256 = "0r6whz8vghhjyc5vrr0n172nghmi61zj96lk26qm0bgxqyzll1kj";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ ++ stdenv.lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
]; ];
outputs = [ "out" "man" ];
preFixup = ''
mkdir -p "$man/man/man1"
cp target/release/build/git-ignore-*/out/git-ignore.1 "$man/man/man1/"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Quickly and easily fetch .gitignore templates from gitignore.io"; description = "Quickly and easily fetch .gitignore templates from gitignore.io";
homepage = https://github.com/sondr3/git-ignore; homepage = https://github.com/sondr3/git-ignore;

13
pkgs/build-support/appimage/default.nix
View File

@ -75,6 +75,8 @@ rec {
krb5 krb5
]; ];
# list of libraries expected in an appimage environment:
# https://github.com/AppImage/pkg2appimage/blob/master/excludelist
multiPkgs = pkgs: with pkgs; [ multiPkgs = pkgs: with pkgs; [
desktop-file-utils desktop-file-utils
xorg.libXcomposite xorg.libXcomposite
@ -171,6 +173,17 @@ rec {
xorg.libXft xorg.libXft
libvdpau libvdpau
alsaLib alsaLib
harfbuzz
e2fsprogs
libgpgerror
keyutils.lib
libjack2
fribidi
# libraries not on the upstream include list, but nevertheless expected
# by at least one appimage
libtool.lib # for Synfigstudio
]; ];
}; };
} }

4
pkgs/data/fonts/sarasa-gothic/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, p7zip }: { stdenv, fetchurl, p7zip }:
let let
version = "0.6.0"; version = "0.8.0";
sha256 = "08g3kzplp3v8kvni1vzl73fgh03xgfl8pwqyj7vwjihjdr1xfjyz"; sha256 = "0zafvzrh4180hmz351f1rvs29n8mfxf0qv6mdl7psf1f066dizs6";
in fetchurl rec { in fetchurl rec {
inherit sha256; inherit sha256;

8
pkgs/data/fonts/siji/default.nix
View File

@ -8,11 +8,13 @@ in fetchzip {
url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip;
postFetch = '' postFetch = ''
mkdir -p $out/share/fonts unzip -j $downloadedFile
unzip -j $downloadedFile \*.pcf -d $out/share/fonts/pcf
install -D *.pcf -t $out/share/fonts/pcf
install -D *.bdf -t $out/share/fonts/bdf
''; '';
sha256 = "1799hs7zd8w7qyja4mii9ggmrm786az7ldsqwx9mbi51b56ym640"; sha256 = "1ymcbirdbkqaf0xs2y00l0wachb4yxh1fgqm5avqwvccs0lsfj1d";
meta = { meta = {
homepage = https://github.com/stark/siji; homepage = https://github.com/stark/siji;

4
pkgs/data/icons/papirus-icon-theme/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "papirus-icon-theme-${version}"; name = "papirus-icon-theme-${version}";
version = "20190302"; version = "20190331";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam"; owner = "PapirusDevelopmentTeam";
repo = "papirus-icon-theme"; repo = "papirus-icon-theme";
rev = version; rev = version;
sha256 = "10dhjwcb9jr7nr29jxl5nj09fzlj4w25hzssw1hgm4hbp72v4z05"; sha256 = "0kprnax26qwnxjcd0rrgdbj00835byaamkabjxi2z8lh0k47ap85";
}; };
nativeBuildInputs = [ gtk3 ]; nativeBuildInputs = [ gtk3 ];

4
pkgs/data/misc/osinfo-db/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "osinfo-db"; pname = "osinfo-db";
version = "20190301"; version = "20190319";
src = fetchurl { src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "1rjqizsglgdcjxi7kpbwm26krdkrlxacinjp9684sfzhqwdqi4as"; sha256 = "1dgmi30q0jncban1fy87pdyz8j6lddmnsh48is2jg2bwyiqwc0cw";
}; };
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

10
pkgs/data/themes/nordic-polar/default.nix
View File

@ -2,16 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nordic-polar-${version}"; name = "nordic-polar-${version}";
version = "1.4.0"; version = "1.5.0";
srcs = [ srcs = [
(fetchurl { (fetchurl {
url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz"; url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v.${version}/Nordic-Polar.tar.xz";
sha256 = "0sw4m1njnxal1kkiipsvfg9ndzxsf9rxfba5vhwswyzk388264xa"; sha256 = "0ddccxvyf929045x6fm8xyx6rvb0d6wh6pylycwgqqm4vxbdwnly";
}) })
(fetchurl { (fetchurl {
url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz"; url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v.${version}/Nordic-Polar-standard-buttons.tar.xz";
sha256 = "0ix0x0pnhfd1lrfj7a7n8xfg8vvzg7m0dzrsj8gzpav6wvwlypiy"; sha256 = "0q0qfy0aw80rds6isx3pjrqx4zrq2crxrm29nrmyzh4gr7n17li6";
}) })
]; ];

10
pkgs/data/themes/nordic/default.nix
View File

@ -2,24 +2,24 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nordic-${version}"; name = "nordic-${version}";
version = "1.5.4"; version = "1.6.5";
srcs = [ srcs = [
(fetchurl { (fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz"; url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz";
sha256 = "0m00hwr6ms9fzlpl97d972wvgq5l0m11mpn213248a8sqbh2zz9g"; sha256 = "163g1kh92fhgbwi91053xs39bpdd032w2v67c3jf8lf4cgvkwggp";
}) })
(fetchurl { (fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue.tar.xz"; url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue.tar.xz";
sha256 = "05k1m9f0q4mfaqp2as3ymjsqmyz0bs5cd576srd5v952dzxmmbm2"; sha256 = "05qq1v8sil8s51aa78q2najcqdnkpgdzc8dckrx47wy36cfxbxwz";
}) })
(fetchurl { (fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz"; url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz";
sha256 = "1qps13fpp8y83c25c51w7kyds266gmks8c7kjp23iybij2lkny1m"; sha256 = "17r450xxd8v8125a4bwd0yj3f3vnwcad2f19a0vgmk63s9grvkg0";
}) })
(fetchurl { (fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue-standard-buttons.tar.xz"; url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue-standard-buttons.tar.xz";
sha256 = "1c0j6qsxa6zahrl9ad0q6pczgbmm8qn9qsd7k41yk2ndh9iqzr5y"; sha256 = "0894naw0wkl2h9l27qz9h1k02dfgfqyb02icmgadg0cb44j3zlpb";
}) })
]; ];

2
pkgs/development/beam-modules/mix-bootstrap
View File

@ -40,7 +40,7 @@ main(Args) ->
-spec fixup_app_name(file:name()) -> string(). -spec fixup_app_name(file:name()) -> string().
fixup_app_name(Path) -> fixup_app_name(Path) ->
BaseName = filename:basename(Path), BaseName = filename:basename(Path),
case string:tokens(BaseName, "-") of case string:split(BaseName, "-") of
[Name, _Version] -> Name; [Name, _Version] -> Name;
Name -> Name Name -> Name
end. end.

8
pkgs/development/interpreters/spidermonkey/52.nix
View File

@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
}) })
]; ];
configurePlatforms = [ "host" "target" ]; configurePlatforms = [ ];
preConfigure = '' preConfigure = ''
export CXXFLAGS="-fpermissive" export CXXFLAGS="-fpermissive"
@ -51,7 +51,11 @@ in stdenv.mkDerivation rec {
"--with-intl-api" "--with-intl-api"
"--enable-readline" "--enable-readline"
"--enable-shared-js" "--enable-shared-js"
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc"; ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc"
++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"--host=${stdenv.buildPlatform.config}"
"--target=${stdenv.hostPlatform.config}"
];
makeFlags = [ makeFlags = [
"HOST_CC=${buildPackages.stdenv.cc}/bin/cc" "HOST_CC=${buildPackages.stdenv.cc}/bin/cc"

4
pkgs/development/libraries/aws-c-common/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake }: { lib, stdenv, fetchFromGitHub, cmake, libexecinfo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aws-c-common"; pname = "aws-c-common";
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = lib.optional stdenv.hostPlatform.isMusl libexecinfo;
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [
"-Wno-nullability-extension" "-Wno-nullability-extension"
"-Wno-typedef-redefinition" "-Wno-typedef-redefinition"

4
pkgs/development/libraries/ndpi/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }: { stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }:
let version = "2.2"; in let version = "2.8"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ndpi-${version}"; name = "ndpi-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
owner = "ntop"; owner = "ntop";
repo = "nDPI"; repo = "nDPI";
rev = "${version}"; rev = "${version}";
sha256 = "06gg8lhn944arlczmv5i40jkjdnl1nrvsmvm843l9ybcswpayv4m"; sha256 = "0lc4vga89pm954vf92g9fa6xwsjkb13jd6wrcc35zy5j04nf9rzf";
}; };
configureScript = "./autogen.sh"; configureScript = "./autogen.sh";

11
pkgs/misc/vim-plugins/generated.nix
View File

@ -571,6 +571,17 @@ let
}; };
}; };
emodeline = buildVimPluginFrom2Nix {
pname = "emodeline";
version = "2010-10-18";
src = fetchFromGitHub {
owner = "vim-scripts";
repo = "emodeline";
rev = "19550795743876c2256021530209d83592f5924a";
sha256 = "0x9y7rzbk6g8cq6jkn37wi95wzhq0abban6w10652v4kdmjrxrr0";
};
};
ensime-vim = buildVimPluginFrom2Nix { ensime-vim = buildVimPluginFrom2Nix {
pname = "ensime-vim"; pname = "ensime-vim";
version = "2018-10-10"; version = "2018-10-10";

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -346,6 +346,7 @@ vim-scripts/a.vim
vim-scripts/bats.vim vim-scripts/bats.vim
vim-scripts/changeColorScheme.vim vim-scripts/changeColorScheme.vim
vim-scripts/Colour-Sampler-Pack vim-scripts/Colour-Sampler-Pack
vim-scripts/emodeline
vim-scripts/Improved-AnsiEsc vim-scripts/Improved-AnsiEsc
vim-scripts/matchit.zip vim-scripts/matchit.zip
vim-scripts/mayansmoke vim-scripts/mayansmoke

2
pkgs/os-specific/linux/kernel-headers/default.nix
View File

@ -12,7 +12,7 @@ let
inherit sha256; inherit sha256;
}; };
ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or (throw "missing kernelArch"); ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch;
# It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
# We do this so we have a build->build, not build->host, C compiler. # We do this so we have a build->build, not build->host, C compiler.

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib; with stdenv.lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.14.112"; version = "4.14.113";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0wp40cr3gpj8g2hghcvhz669qshd7zkfjkq78gkdg840rki02q9j"; sha256 = "1hnsmlpfbcy52dax7g194ksr9179kpigj1y5k44jkwmagziz4kdj";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib; with stdenv.lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.19.35"; version = "4.19.36";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1q2742sbi9vgk791xr1rbi5mr3ra4k1bdzq9dr610870y1hfb9rg"; sha256 = "1g7jcgg4889vj567jjl0q7ycksnm05xxzfd3jj6ji7bz2w4ba25q";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.9.169"; version = "4.9.170";
extraMeta.branch = "4.9"; extraMeta.branch = "4.9";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1c6nz27q0m6nbb7v7kba6zrhzav5bqqllvwzzqf9cmd5cdn66xmp"; sha256 = "078k8dz3nmici7rs7x25h4vr1qaa588zwymv4gs722wfzi07p21k";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.0.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib; with stdenv.lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.0.8"; version = "5.0.9";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0dalr3vym2ixmblnlrw10dfx0icdf2aab38z2j9y1qfcx128140i"; sha256 = "0n5s0nwk786qyzwkjs5sv0ldhi8wry6xrsy9vldxp17qbcvv2j07";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

8
pkgs/os-specific/linux/systemd/default.nix
View File

@ -129,12 +129,12 @@ in stdenv.mkDerivation rec {
test -e $i test -e $i
substituteInPlace $i \ substituteInPlace $i \
--replace /usr/bin/getent ${getent}/bin/getent \ --replace /usr/bin/getent ${getent}/bin/getent \
--replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ --replace /sbin/swapon ${lib.getBin utillinux}/sbin/swapon \
--replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ --replace /sbin/swapoff ${lib.getBin utillinux}/sbin/swapoff \
--replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ --replace /sbin/fsck ${lib.getBin utillinux}/sbin/fsck \
--replace /bin/echo ${coreutils}/bin/echo \ --replace /bin/echo ${coreutils}/bin/echo \
--replace /bin/cat ${coreutils}/bin/cat \ --replace /bin/cat ${coreutils}/bin/cat \
--replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ --replace /sbin/sulogin ${lib.getBin utillinux}/sbin/sulogin \
--replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
--replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
done done

6
pkgs/stdenv/default.nix
View File

@ -43,8 +43,14 @@ in
"x86_64-linux" = stagesLinux; "x86_64-linux" = stagesLinux;
"armv5tel-linux" = stagesLinux; "armv5tel-linux" = stagesLinux;
"armv6l-linux" = stagesLinux; "armv6l-linux" = stagesLinux;
"armv6m-linux" = stagesLinux;
"armv7a-linux" = stagesLinux; "armv7a-linux" = stagesLinux;
"armv7l-linux" = stagesLinux; "armv7l-linux" = stagesLinux;
"armv7r-linux" = stagesLinux;
"armv7m-linux" = stagesLinux;
"armv8a-linux" = stagesLinux;
"armv8r-linux" = stagesLinux;
"armv8m-linux" = stagesLinux;
"aarch64-linux" = stagesLinux; "aarch64-linux" = stagesLinux;
"mipsel-linux" = stagesLinux; "mipsel-linux" = stagesLinux;
"powerpc-linux" = /* stagesLinux */ stagesNative; "powerpc-linux" = /* stagesLinux */ stagesNative;

14
pkgs/stdenv/linux/default.nix
View File

@ -13,7 +13,6 @@
"x86_64-linux" = import ./bootstrap-files/x86_64.nix; "x86_64-linux" = import ./bootstrap-files/x86_64.nix;
"armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix;
"armv6l-linux" = import ./bootstrap-files/armv6l.nix; "armv6l-linux" = import ./bootstrap-files/armv6l.nix;
"armv7a-linux" = import ./bootstrap-files/armv7l.nix;
"armv7l-linux" = import ./bootstrap-files/armv7l.nix; "armv7l-linux" = import ./bootstrap-files/armv7l.nix;
"aarch64-linux" = import ./bootstrap-files/aarch64.nix; "aarch64-linux" = import ./bootstrap-files/aarch64.nix;
"mipsel-linux" = import ./bootstrap-files/loongson2f.nix; "mipsel-linux" = import ./bootstrap-files/loongson2f.nix;
@ -26,10 +25,19 @@
"powerpc64le-linux" = import ./bootstrap-files/ppc64le-musl.nix; "powerpc64le-linux" = import ./bootstrap-files/ppc64le-musl.nix;
}; };
}; };
# Try to find an architecture compatible with our current system. We
# just try every bootstrap we’ve got and test to see if it is
# compatible with or current architecture.
getCompatibleTools = lib.foldl (v: system:
if v != null then v
else if localSystem.isCompatible (lib.systems.elaborate { inherit system; }) then archLookupTable.${system}
else null) null (lib.attrNames archLookupTable);
archLookupTable = table.${localSystem.libc} archLookupTable = table.${localSystem.libc}
or (abort "unsupported libc for the pure Linux stdenv"); or (abort "unsupported libc for the pure Linux stdenv");
files = archLookupTable.${localSystem.system} files = archLookupTable.${localSystem.system} or (if getCompatibleTools != null then getCompatibleTools
or (abort "unsupported platform for the pure Linux stdenv"); else (abort "unsupported platform for the pure Linux stdenv"));
in files in files
}: }:

28
pkgs/tools/compression/dejsonlz4/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "dejsonlz4";
version = "1.1";
src = fetchFromGitHub {
owner = "avih";
repo = pname;
rev = "v${version}";
sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh";
};
buildPhase = ''
gcc -Wall -o dejsonlz4 src/dejsonlz4.c src/lz4.c
'';
installPhase = ''
mkdir -p $out/bin/
cp dejsonlz4 $out/bin/
'';
meta = with stdenv.lib; {
description = "Decompress Mozilla Firefox bookmarks backup files";
homepage = https://github.com/avih/dejsonlz4;
license = licenses.bsd2;
maintainers = with maintainers; [ mt-caret ];
platforms = platforms.linux;
};
}

4
pkgs/tools/networking/openfortivpn/default.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib; with stdenv.lib;
let repo = "openfortivpn"; let repo = "openfortivpn";
version = "1.8.1"; version = "1.9.0";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${repo}-${version}"; name = "${repo}-${version}";
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
owner = "adrienverge"; owner = "adrienverge";
inherit repo; inherit repo;
rev = "v${version}"; rev = "v${version}";
sha256 = "16k5sb7sz5blhm59rxhzhcq91pgivpbpdq6wbhcaa563nnk7pxys"; sha256 = "1nf992wjx5n2883b31hgxrb6y0n3p5yz7h42bwripwrfpdjaaqcv";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

10
pkgs/tools/package-management/appimage-run/default.nix
View File

@ -10,7 +10,15 @@ in buildFHSUserEnv (fhsArgs // {
runScript = writeScript "appimage-exec" '' runScript = writeScript "appimage-exec" ''
#!${runtimeShell} #!${runtimeShell}
if [ $# -eq 0 ]; then
echo "Usage: $0 FILE [OPTION...]"
echo
echo 'Options are passed on to the appimage.'
echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable."
exit 1
fi
APPIMAGE="$(realpath "$1")" APPIMAGE="$(realpath "$1")"
shift
if [ ! -x "$APPIMAGE" ]; then if [ ! -x "$APPIMAGE" ]; then
echo "fatal: $APPIMAGE is not executable" echo "fatal: $APPIMAGE is not executable"
@ -43,6 +51,6 @@ in buildFHSUserEnv (fhsArgs // {
exec "$APPIMAGE_DEBUG_EXEC" exec "$APPIMAGE_DEBUG_EXEC"
fi fi
exec ./AppRun exec ./AppRun "$@"
''; '';
}) })

4
pkgs/top-level/all-packages.nix
View File

@ -1328,6 +1328,8 @@ in
deja-dup = callPackage ../applications/backup/deja-dup { }; deja-dup = callPackage ../applications/backup/deja-dup { };
dejsonlz4 = callPackage ../tools/compression/dejsonlz4 { };
desync = callPackage ../applications/networking/sync/desync { }; desync = callPackage ../applications/networking/sync/desync { };
devmem2 = callPackage ../os-specific/linux/devmem2 { }; devmem2 = callPackage ../os-specific/linux/devmem2 { };
@ -23351,6 +23353,8 @@ in
terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; terragrunt = callPackage ../applications/networking/cluster/terragrunt {};
tilt = callPackage ../applications/networking/cluster/tilt {};
tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
tetra-gtk-theme = callPackage ../misc/themes/tetra { }; tetra-gtk-theme = callPackage ../misc/themes/tetra { };

4
pkgs/top-level/impure.nix
View File

@ -72,6 +72,8 @@ in
else overlays homeOverlaysDir else overlays homeOverlaysDir
else [] else []
, crossOverlays ? []
, ... , ...
} @ args: } @ args:
@ -80,7 +82,7 @@ in
assert args ? localSystem -> !(args ? system || args ? platform); assert args ? localSystem -> !(args ? system || args ? platform);
import ./. (builtins.removeAttrs args [ "system" "platform" ] // { import ./. (builtins.removeAttrs args [ "system" "platform" ] // {
inherit config overlays crossSystem; inherit config overlays crossSystem crossOverlays;
# Fallback: Assume we are building packages on the current (build, in GNU # Fallback: Assume we are building packages on the current (build, in GNU
# Autotools parlance) system. # Autotools parlance) system.
localSystem = (if args ? localSystem then {} localSystem = (if args ? localSystem then {}

1
pkgs/top-level/release-cross.nix
View File

@ -147,7 +147,6 @@ in
aarch64-embedded = mapTestOnCross lib.systems.examples.aarch64-embedded embedded; aarch64-embedded = mapTestOnCross lib.systems.examples.aarch64-embedded embedded;
i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded; i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded;
x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded; x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded;
alpha-embedded = mapTestOnCross lib.systems.examples.alpha-embedded embedded;
/* Cross-built bootstrap tools for every supported platform */ /* Cross-built bootstrap tools for every supported platform */
bootstrapTools = let bootstrapTools = let