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

Merge master into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-09-23 09:33:09 +02:00
commit 14673d61ed
217 changed files with 4075 additions and 2261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
doc/functions.xml
View File

@ -638,6 +638,48 @@ buildImage {
<literal>pkgs.cacert</literal> to <varname>contents</varname>.
</para>
</note>
<example xml:id="example-pkgs-dockerTools-buildImage-creation-date">
<title>Impurely Defining a Docker Layer's Creation Date</title>
<para>
By default <function>buildImage</function> will use a static
date of one second past the UNIX Epoch. This allows
<function>buildImage</function> to produce binary reproducible
images. When listing images with <command>docker list
images</command>, the newly created images will be listed like
this:
</para>
<screen><![CDATA[
$ docker image list
REPOSITORY TAG IMAGE ID CREATED SIZE
hello latest 08c791c7846e 48 years ago 25.2MB
]]></screen>
<para>
You can break binary reproducibility but have a sorted,
meaningful <literal>CREATED</literal> column by setting
<literal>created</literal> to <literal>now</literal>.
</para>
<programlisting><![CDATA[
pkgs.dockerTools.buildImage {
name = "hello";
tag = "latest";
created = "now";
contents = pkgs.hello;
config.Cmd = [ "/bin/hello" ];
}
]]></programlisting>
<para>
and now the Docker CLI will display a reasonable date and
sort the images as expected:
<screen><![CDATA[
$ docker image list
REPOSITORY TAG IMAGE ID CREATED SIZE
hello latest de2bf4786de6 About a minute ago 25.2MB
]]></screen>
however, the produced images will not be binary reproducible.
</para>
</example>
</section>
<section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry">

32
doc/languages-frameworks/vim.section.md
View File

@ -15,6 +15,7 @@ At the moment we support three different methods for managing plugins:
- Vim packages (*recommend*)
- VAM (=vim-addon-manager)
- Pathogen
- vim-plug
## Custom configuration
@ -59,7 +60,7 @@ vim_configurable.customize {
}
```
For Neovim the syntax is
For Neovim the syntax is:
```
neovim.override {
@ -96,6 +97,35 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n
After that you can install your special grafted `myVim` or `myNeovim` packages.
## Managing plugins with vim-plug
To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim
plugins the following example can be used:
```
vim_configurable.customize {
vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
# loaded on launch
plug.plugins = [ youcompleteme fugitive phpCompletion elm-vim ];
};
}
```
For Neovim the syntax is:
```
neovim.override {
configure = {
customRC = ''
# here your custom configuration goes!
'';
plug.plugins = with pkgs.vimPlugins; [
vim-go
];
};
}
```
## Managing plugins with VAM
### Handling dependencies of Vim plugins

60
doc/package-notes.xml
View File

@ -814,4 +814,64 @@ citrix_receiver.override {
</para>
</section>
</section>
<section xml:id="sec-ibus-typing-booster">
<title>ibus-engines.typing-booster</title>
<para>This package is an ibus-based completion method to speed up typing.</para>
<section xml:id="sec-ibus-typing-booster-activate">
<title>Activating the engine</title>
<para>
IBus needs to be configured accordingly to activate <literal>typing-booster</literal>. The configuration
depends on the desktop manager in use. For detailed instructions, please refer to the
<link xlink:href="https://mike-fabian.github.io/ibus-typing-booster/documentation.html">upstream docs</link>.
</para>
<para>
On NixOS you need to explicitly enable <literal>ibus</literal> with given engines
before customizing your desktop to use <literal>typing-booster</literal>. This can be achieved
using the <literal>ibus</literal> module:
<programlisting>{ pkgs, ... }: {
i18n.inputMethod = {
enabled = "ibus";
ibus.engines = with pkgs.ibus-engines; [ typing-booster ];
};
}</programlisting>
</para>
</section>
<section xml:id="sec-ibus-typing-booster-customize-hunspell">
<title>Using custom hunspell dictionaries</title>
<para>
The IBus engine is based on <literal>hunspell</literal> to support completion in many languages.
By default the dictionaries <literal>de-de</literal>, <literal>en-us</literal>, <literal>es-es</literal>,
<literal>it-it</literal>, <literal>sv-se</literal> and <literal>sv-fi</literal>
are in use. To add another dictionary, the package can be overridden like this:
<programlisting>ibus-engines.typing-booster.override {
langs = [ "de-at" "en-gb" ];
}</programlisting>
</para>
<para>
<emphasis>Note: each language passed to <literal>langs</literal> must be an attribute name in
<literal>pkgs.hunspellDicts</literal>.</emphasis>
</para>
</section>
<section xml:id="sec-ibus-typing-booster-emoji-picker">
<title>Built-in emoji picker</title>
<para>
The <literal>ibus-engines.typing-booster</literal> package contains a program
named <literal>emoji-picker</literal>. To display all emojis correctly,
a special font such as <literal>noto-fonts-emoji</literal> is needed:
</para>
<para>
On NixOS it can be installed using the following expression:
<programlisting>{ pkgs, ... }: {
fonts.fonts = with pkgs; [ noto-fonts-emoji ];
}</programlisting>
</para>
</section>
</section>
</chapter>

2
doc/stdenv.xml
View File

@ -2129,7 +2129,7 @@ someVar=$(stripHash $name)
The most typical use of the setup hook is actually to add other hooks which
are then run (i.e. after all the setup hooks) on each dependency. For
example, the C compiler wrapper's setup hook feeds itself flags for each
dependency that contains relevant libaries and headers. This is done by
dependency that contains relevant libraries and headers. This is done by
defining a bash function, and appending its name to one of
<envar>envBuildBuildHooks</envar>`, <envar>envBuildHostHooks</envar>`,
<envar>envBuildTargetHooks</envar>`, <envar>envHostHostHooks</envar>`,

15
maintainers/maintainer-list.nix
View File

@ -678,6 +678,11 @@
github = "Chaddai";
name = "Chaddaï Fouché";
};
chaduffy = {
email = "charles@dyfis.net";
github = "charles-dyfis-net";
name = "Charles Duffy";
};
changlinli = {
email = "mail@changlinli.com";
github = "changlinli";
@ -1847,6 +1852,11 @@
github = "jerith666";
name = "Matt McHenry";
};
jeschli = {
email = "jeschli@gmail.com";
github = "jeschli";
name = "Markus Hihn";
};
jethro = {
email = "jethrokuan95@gmail.com";
github = "jethrokuan";
@ -2813,6 +2823,11 @@
github = "muflax";
name = "Stefan Dorn";
};
mvnetbiz = {
email = "mvnetbiz@gmail.com";
github = "mvnetbiz";
name = "Matt Votava";
};
myrl = {
email = "myrl.0xf@gmail.com";
github = "myrl";

49
nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix Normal file
View File

@ -0,0 +1,49 @@
# This module contains the basic configuration for building a graphical NixOS
# installation CD.
{ config, lib, pkgs, ... }:
with lib;
{
imports = [ ./installation-cd-base.nix ];
services.xserver = {
enable = true;
# Don't start the X server by default.
autorun = mkForce false;
# Automatically login as root.
displayManager.slim = {
enable = true;
defaultUser = "root";
autoLogin = true;
};
};
# Provide networkmanager for easy wireless configuration.
networking.networkmanager.enable = true;
networking.wireless.enable = mkForce false;
# KDE complains if power management is disabled (to be precise, if
# there is no power management backend such as upower).
powerManagement.enable = true;
environment.systemPackages = [
# Include gparted for partitioning disks.
pkgs.gparted
# Include some editors.
pkgs.vim
pkgs.bvi # binary editor
pkgs.joe
# Firefox for reading the manual.
pkgs.firefox
pkgs.glxinfo
];
}

63
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
View File

@ -6,47 +6,11 @@
with lib;
{
imports = [ ./installation-cd-base.nix ];
imports = [ ./installation-cd-graphical-base.nix ];
services.xserver = {
enable = true;
# GDM doesn't start in virtual machines with ISO
displayManager.slim = {
enable = true;
defaultUser = "root";
autoLogin = true;
};
desktopManager.gnome3 = {
enable = true;
extraGSettingsOverrides = ''
[org.gnome.desktop.background]
show-desktop-icons=true
services.xserver.desktopManager.gnome3.enable = true;
[org.gnome.nautilus.desktop]
trash-icon-visible=false
volumes-visible=false
home-icon-visible=false
network-icon-visible=false
'';
extraGSettingsOverridePackages = [ pkgs.gnome3.nautilus ];
};
};
environment.systemPackages =
[ # Include gparted for partitioning disks.
pkgs.gparted
# Include some editors.
pkgs.vim
pkgs.bvi # binary editor
pkgs.joe
pkgs.glxinfo
];
# Don't start the X server by default.
services.xserver.autorun = mkForce false;
services.xserver.displayManager.slim.enable = mkForce false;
# Auto-login as root.
services.xserver.displayManager.gdm.autoLogin = {
@ -54,25 +18,4 @@ with lib;
user = "root";
};
system.activationScripts.installerDesktop = let
# Must be executable
desktopFile = pkgs.writeScript "nixos-manual.desktop" ''
[Desktop Entry]
Version=1.0
Type=Link
Name=NixOS Manual
URL=${config.system.build.manual.manual}/share/doc/nixos/index.html
Icon=system-help
'';
# use cp and chmod +x, we must be sure the apps are in the nix store though
in ''
mkdir -p /root/Desktop
ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
chmod a+rx /root/Desktop/gnome-terminal.desktop
cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
chmod a+rx /root/Desktop/gparted.desktop
'';
}

47
nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
View File

@ -1,23 +1,14 @@
# This module defines a NixOS installation CD that contains X11 and
# KDE 5.
# Plasma5.
{ config, lib, pkgs, ... }:
with lib;
{
imports = [ ./installation-cd-base.nix ];
imports = [ ./installation-cd-graphical-base.nix ];
services.xserver = {
enable = true;
# Automatically login as root.
displayManager.slim = {
enable = true;
defaultUser = "root";
autoLogin = true;
};
desktopManager.plasma5 = {
enable = true;
enableQt4Support = false;
@ -27,34 +18,14 @@ with lib;
synaptics.enable = true;
};
environment.systemPackages =
[ pkgs.glxinfo
# Include gparted for partitioning disks.
pkgs.gparted
# Firefox for reading the manual.
pkgs.firefox
# Include some editors.
pkgs.vim
pkgs.bvi # binary editor
pkgs.joe
];
# Provide networkmanager for easy wireless configuration.
networking.networkmanager.enable = true;
networking.wireless.enable = mkForce false;
# KDE complains if power management is disabled (to be precise, if
# there is no power management backend such as upower).
powerManagement.enable = true;
# Don't start the X server by default.
services.xserver.autorun = mkForce false;
environment.systemPackages = with pkgs; [
# Graphical text editor
kate
];
system.activationScripts.installerDesktop = let
desktopFile = pkgs.writeText "nixos-manual.desktop" ''
manualDesktopFile = pkgs.writeScript "nixos-manual.desktop" ''
[Desktop Entry]
Version=1.0
Type=Application
@ -65,7 +36,7 @@ with lib;
in ''
mkdir -p /root/Desktop
ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
ln -sfT ${manualDesktopFile} /root/Desktop/nixos-manual.desktop
ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop
ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
'';

2
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -233,7 +233,7 @@ let
"
# Make our own efi program, we can't rely on "grub-install" since it seems to
# probe for devices, even with --skip-fs-probe.
${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootx32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootia32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
$MODULES
cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/

8
nixos/modules/installer/tools/nix-fallback-paths.nix
View File

@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/h180y3n5k1ypxgm1pcvj243qix5j45zz-nix-2.1.1";
i686-linux = "/nix/store/v2y4k4v9ml07jmfq739wyflapg3b7b5k-nix-2.1.1";
aarch64-linux = "/nix/store/v485craglq7xm5996ci8qy5dyc17dab0-nix-2.1.1";
x86_64-darwin = "/nix/store/lc3ymlix73kaad5srjdgaxp9ngr1sg6g-nix-2.1.1";
x86_64-linux = "/nix/store/mxg4bbblxfns96yrz0nalxyiyjl7gj98-nix-2.1.2";
i686-linux = "/nix/store/bgjgmbwirx63mwwychpikd7yc4k4lbjv-nix-2.1.2";
aarch64-linux = "/nix/store/yi18azn4nwrcwvaiag04jnxc1qs38fy5-nix-2.1.2";
x86_64-darwin = "/nix/store/fpivmcck2qpw5plrp599iraw2x9jp18k-nix-2.1.2";
}

1
nixos/modules/module-list.nix
View File

@ -276,6 +276,7 @@
./services/hardware/nvidia-optimus.nix
./services/hardware/pcscd.nix
./services/hardware/pommed.nix
./services/hardware/ratbagd.nix
./services/hardware/sane.nix
./services/hardware/sane_extra_backends/brscan4.nix
./services/hardware/tcsd.nix

17
nixos/modules/programs/yabar.nix
View File

@ -44,10 +44,23 @@ in
enable = mkEnableOption "yabar";
package = mkOption {
default = pkgs.yabar;
example = literalExample "pkgs.yabar-unstable";
default = pkgs.yabar-unstable;
example = literalExample "pkgs.yabar";
type = types.package;
# `yabar-stable` segfaults under certain conditions.
apply = x: if x == pkgs.yabar-unstable then x else flip warn x ''
It's not recommended to use `yabar' with `programs.yabar', the (old) stable release
tends to segfault under certain circumstances:
* https://github.com/geommer/yabar/issues/86
* https://github.com/geommer/yabar/issues/68
* https://github.com/geommer/yabar/issues/143
Most of them don't occur on master anymore, until a new release is published, it's recommended
to use `yabar-unstable'.
'';
description = ''
The package which contains the `yabar` binary.

32
nixos/modules/services/hardware/ratbagd.nix Normal file
View File

@ -0,0 +1,32 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.ratbagd;
in
{
###### interface
options = {
services.ratbagd = {
enable = mkOption {
default = false;
description = ''
Whether to enable ratbagd for configuring gaming mice.
'';
};
};
};
###### implementation
config = mkIf cfg.enable {
# Give users access to the "ratbagctl" tool
environment.systemPackages = [ pkgs.libratbag ];
services.dbus.packages = [ pkgs.libratbag ];
systemd.packages = [ pkgs.libratbag ];
};
}

1
nixos/modules/services/monitoring/datadog-agent.nix
View File

@ -213,7 +213,6 @@ in {
Group = "datadog";
Restart = "always";
RestartSec = 2;
PrivateTmp = true;
};
restartTriggers = [ datadogPkg ] ++ map (etc: etc.source) etcfiles;
} attrs;

42
nixos/modules/services/web-apps/codimd.nix
View File

@ -407,21 +407,18 @@ in
options = {
accessKey = mkOption {
type = types.str;
default = "";
description = ''
Minio access key.
'';
};
secretKey = mkOption {
type = types.str;
default = "";
description = ''
Minio secret key.
'';
};
endpoint = mkOption {
type = types.str;
default = "";
description = ''
Minio endpoint.
'';
@ -450,21 +447,18 @@ in
options = {
accessKeyId = mkOption {
type = types.str;
default = "";
description = ''
AWS access key id.
'';
};
secretAccessKey = mkOption {
type = types.str;
default = "";
description = ''
AWS access key.
'';
};
region = mkOption {
type = types.str;
default = "";
description = ''
AWS S3 region.
'';
@ -500,14 +494,12 @@ in
options = {
connectionString = mkOption {
type = types.str;
default = "";
description = ''
Azure Blob Storage connection string.
'';
};
container = mkOption {
type = types.str;
default = "";
description = ''
Azure Blob Storage container name.
It will be created if non-existent.
@ -523,28 +515,24 @@ in
options = {
authorizationURL = mkOption {
type = types.str;
default = "";
description = ''
Specify the OAuth authorization URL.
'';
};
tokenURL = mkOption {
type = types.str;
default = "";
description = ''
Specify the OAuth token URL.
'';
};
clientID = mkOption {
type = types.str;
default = "";
description = ''
Specify the OAuth client ID.
'';
};
clientSecret = mkOption {
type = types.str;
default = "";
description = ''
Specify the OAuth client secret.
'';
@ -559,14 +547,12 @@ in
options = {
clientID = mkOption {
type = types.str;
default = "";
description = ''
Facebook API client ID.
'';
};
clientSecret = mkOption {
type = types.str;
default = "";
description = ''
Facebook API client secret.
'';
@ -581,14 +567,12 @@ in
options = {
consumerKey = mkOption {
type = types.str;
default = "";
description = ''
Twitter API consumer key.
'';
};
consumerSecret = mkOption {
type = types.str;
default = "";
description = ''
Twitter API consumer secret.
'';
@ -603,14 +587,12 @@ in
options = {
clientID = mkOption {
type = types.str;
default = "";
description = ''
GitHub API client ID.
'';
};
clientSecret = mkOption {
type = types.str;
default = "";
description = ''
Github API client secret.
'';
@ -633,14 +615,12 @@ in
};
clientID = mkOption {
type = types.str;
default = "";
description = ''
GitLab API client ID.
'';
};
clientSecret = mkOption {
type = types.str;
default = "";
description = ''
GitLab API client secret.
'';
@ -663,21 +643,18 @@ in
options = {
baseURL = mkOption {
type = types.str;
default = "";
description = ''
Mattermost authentication endpoint.
'';
};
clientID = mkOption {
type = types.str;
default = "";
description = ''
Mattermost API client ID.
'';
};
clientSecret = mkOption {
type = types.str;
default = "";
description = ''
Mattermost API client secret.
'';
@ -692,21 +669,18 @@ in
options = {
clientID = mkOption {
type = types.str;
default = "";
description = ''
Dropbox API client ID.
'';
};
clientSecret = mkOption {
type = types.str;
default = "";
description = ''
Dropbox API client secret.
'';
};
appKey = mkOption {
type = types.str;
default = "";
description = ''
Dropbox app key.
'';
@ -721,14 +695,12 @@ in
options = {
clientID = mkOption {
type = types.str;
default = "";
description = ''
Google API client ID.
'';
};
clientSecret = mkOption {
type = types.str;
default = "";
description = ''
Google API client secret.
'';
@ -750,7 +722,6 @@ in
};
url = mkOption {
type = types.str;
default = "";
example = "ldap://localhost";
description = ''
URL of LDAP server.
@ -758,21 +729,18 @@ in
};
bindDn = mkOption {
type = types.str;
default = "";
description = ''
Bind DN for LDAP access.
'';
};
bindCredentials = mkOption {
type = types.str;
default = "";
description = ''
Bind credentials for LDAP access.
'';
};
searchBase = mkOption {
type = types.str;
default = "";
example = "o=users,dc=example,dc=com";
description = ''
LDAP directory to begin search from.
@ -780,7 +748,6 @@ in
};
searchFilter = mkOption {
type = types.str;
default = "";
example = "(uid={{username}})";
description = ''
LDAP filter to search with.
@ -788,7 +755,6 @@ in
};
searchAttributes = mkOption {
type = types.listOf types.str;
default = [];
example = [ "displayName" "mail" ];
description = ''
LDAP attributes to search with.
@ -804,7 +770,6 @@ in
};
useridField = mkOption {
type = types.str;
default = "";
example = "uid";
description = ''
LDAP field which is a unique identifier for users on CodiMD.
@ -812,7 +777,6 @@ in
};
tlsca = mkOption {
type = types.str;
default = "";
example = "server-cert.pem,root.pem";
description = ''
Root CA for LDAP TLS in PEM format.
@ -828,15 +792,13 @@ in
options = {
idpSsoUrl = mkOption {
type = types.str;
default = "";
example = "https://idp.example.com/sso";
description = ''
IdP authentication endpoint.
'';
};
idPCert = mkOption {
type = types.str;
default = "";
idpCert = mkOption {
type = types.path;
example = "/path/to/cert.pem";
description = ''
Path to IdP certificate file in PEM format.

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

@ -252,7 +252,7 @@ in
};
systemd.tmpfiles.rules = [
"d /var/run/lightdm 0711 lightdm lightdm 0"
"d /run/lightdm 0711 lightdm lightdm 0"
"d /var/cache/lightdm 0711 root lightdm -"
"d /var/lib/lightdm 1770 lightdm lightdm -"
"d /var/lib/lightdm-data 1775 lightdm lightdm -"

4
nixos/modules/services/x11/display-managers/sddm.nix
View File

@ -263,7 +263,9 @@ in
};
environment.etc."sddm.conf".source = cfgFile;
environment.pathsToLink = [ "/share/sddm/themes" ];
environment.pathsToLink = [
"/share/sddm"
];
users.groups.sddm.gid = config.ids.gids.sddm;

2
nixos/release.nix
View File

@ -381,7 +381,7 @@ in rec {
tests.pgmanage = callTest tests/pgmanage.nix {};
tests.postgis = callTest tests/postgis.nix {};
tests.powerdns = callTest tests/powerdns.nix {};
#tests.pgjwt = callTest tests/pgjwt.nix {};
tests.pgjwt = callTest tests/pgjwt.nix {};
tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {};
tests.printing = callTest tests/printing.nix {};
tests.prometheus = callTest tests/prometheus.nix {};

1
nixos/tests/atd.nix
View File

@ -16,6 +16,7 @@ import ./make-test.nix ({ pkgs, ... }:
testScript = ''
startAll;
$machine->waitForUnit('atd.service'); # wait for atd to start
$machine->fail("test -f ~root/at-1");
$machine->fail("test -f ~alice/at-1");

4
nixos/tests/codimd.nix
View File

@ -40,7 +40,7 @@ import ./make-test.nix ({ pkgs, lib, ... }:
subtest "CodiMD sqlite", sub {
$codimdSqlite->waitForUnit("codimd.service");
$codimdSqlite->waitForOpenPort(3000);
$codimdPostgres->succeed("sleep 2"); # avoid 503 during startup
$codimdSqlite->sleep(10); # avoid 503 during startup
$codimdSqlite->succeed("curl -sSf http://localhost:3000/new");
};
@ -49,7 +49,7 @@ import ./make-test.nix ({ pkgs, lib, ... }:
$codimdPostgres->waitForUnit("codimd.service");
$codimdPostgres->waitForOpenPort(5432);
$codimdPostgres->waitForOpenPort(3000);
$codimdPostgres->succeed("sleep 2"); # avoid 503 during startup
$codimdPostgres->sleep(10); # avoid 503 during startup
$codimdPostgres->succeed("curl -sSf http://localhost:3000/new");
};
'';

8
nixos/tests/containers-imperative.nix
View File

@ -13,6 +13,7 @@ import ./make-test.nix ({ pkgs, ...} : {
# XXX: Sandbox setup fails while trying to hardlink files from the host's
# store file system into the prepared chroot directory.
nix.useSandbox = false;
nix.binaryCaches = []; # don't try to access cache.nixos.org
virtualisation.writableStore = true;
virtualisation.memorySize = 1024;
@ -27,9 +28,10 @@ import ./make-test.nix ({ pkgs, ...} : {
};
};
};
in [
pkgs.stdenv pkgs.stdenvNoCC emptyContainer.config.containers.foo.path
pkgs.libxslt
in with pkgs; [
stdenv stdenvNoCC emptyContainer.config.containers.foo.path
libxslt desktop-file-utils texinfo docbook5 libxml2
docbook_xsl_ns xorg.lndir documentation-highlighter
];
};

7
nixos/tests/docker-tools.nix
View File

@ -20,7 +20,10 @@ import ./make-test.nix ({ pkgs, ... }: {
''
$docker->waitForUnit("sockets.target");
# Ensure Docker images use a stable date by default
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
$docker->succeed("[ '1970-01-01T00:00:01Z' = \"\$(docker inspect ${pkgs.dockerTools.examples.bash.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]");
$docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version");
$docker->succeed("docker rmi ${pkgs.dockerTools.examples.bash.imageName}");
@ -51,5 +54,9 @@ import ./make-test.nix ({ pkgs, ... }: {
$docker->succeed("docker run --rm runasrootextracommands cat extraCommands");
$docker->succeed("docker run --rm runasrootextracommands cat runAsRoot");
$docker->succeed("docker rmi '${pkgs.dockerTools.examples.runAsRootExtraCommands.imageName}'");
# Ensure Docker images can use an unstable date
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
$docker->succeed("[ '1970-01-01T00:00:01Z' != \"\$(docker inspect ${pkgs.dockerTools.examples.unstableDate.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]");
'';
})

4
nixos/tests/ferm.nix
View File

@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
with pkgs.lib;
{
networking = {
dhcpcd.enable = false;
interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ];
interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ];
};
@ -20,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
with pkgs.lib;
{
networking = {
dhcpcd.enable = false;
interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
};
@ -51,7 +53,7 @@ import ./make-test.nix ({ pkgs, ...} : {
''
startAll;
$client->waitForUnit("network.target");
$client->waitForUnit("network-online.target");
$server->waitForUnit("ferm.service");
$server->waitForUnit("nginx.service");
$server->waitUntilSucceeds("ss -ntl | grep -q 80");

6
nixos/tests/gdk-pixbuf.nix
View File

@ -10,10 +10,12 @@ import ./make-test.nix ({ pkgs, ... }: {
environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ];
virtualisation.memorySize = 4096; # Tests allocate a lot of memory trying to exploit a CVE
# Tests allocate a lot of memory trying to exploit a CVE
# but qemu-system-i386 has a 2047M memory limit
virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096;
};
testScript = ''
$machine->succeed("gnome-desktop-testing-runner");
$machine->succeed("gnome-desktop-testing-runner -t 1800"); # increase timeout to 1800s
'';
})

2
nixos/tests/hibernate.nix
View File

@ -35,8 +35,8 @@ import ./make-test.nix (pkgs: {
$machine->waitForOpenPort(4444);
$machine->succeed("systemctl hibernate &");
$machine->waitForShutdown;
$probe->waitForUnit("multi-user.target");
$machine->start;
$probe->waitForUnit("network.target");
$probe->waitUntilSucceeds("echo test | nc machine 4444 -N");
'';

4
nixos/tests/networking.nix
View File

@ -467,7 +467,7 @@ let
# Wait for networking to come up
$machine->start;
$machine->waitForUnit("network.target");
$machine->waitForUnit("network-online.target");
# Test interfaces set up
my $list = $machine->succeed("ip tuntap list | sort");
@ -479,7 +479,9 @@ let
# Test interfaces clean up
$machine->succeed("systemctl stop network-addresses-tap0");
$machine->sleep(10);
$machine->succeed("systemctl stop network-addresses-tun0");
$machine->sleep(10);
my $residue = $machine->succeed("ip tuntap list");
$residue eq "" or die(
"Some virtual interface has not been properly cleaned:\n",

16
nixos/tests/yabar.nix
View File

@ -8,18 +8,26 @@ with lib;
maintainers = [ ma27 ];
};
nodes.yabar = {
machine = {
imports = [ ./common/x11.nix ./common/user-account.nix ];
services.xserver.displayManager.auto.user = "bob";
programs.yabar.enable = true;
programs.yabar.bars = {
top.indicators.date.exec = "YABAR_DATE";
};
};
testScript = ''
$yabar->start;
$yabar->waitForX;
$machine->start;
$machine->waitForX;
$yabar->waitForUnit("yabar.service", "bob");
# confirm proper startup
$machine->waitForUnit("yabar.service", "bob");
$machine->sleep(10);
$machine->waitForUnit("yabar.service", "bob");
$machine->screenshot("top_bar");
'';
})

4
pkgs/applications/altcoins/bitcoin.nix
View File

@ -5,13 +5,13 @@
with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "0.16.2";
version = "0.16.3";
src = fetchurl {
urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
sha256 = "1n07qykx5hc0ph8fwn7hfrbsrjv19fdzvs5h0nysq4wfgn5wa40r";
sha256 = "060223dzzk2izfzhxwlzzd0fhbgglvbgps2nyc4zz767vybysvl3";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];

4
pkgs/applications/audio/elisa/default.nix
View File

@ -7,13 +7,13 @@
mkDerivation rec {
name = "elisa-${version}";
version = "0.2.1";
version = "0.2.80";
src = fetchFromGitHub {
owner = "KDE";
repo = "elisa";
rev = "v${version}";
sha256 = "0b3rx3gh6adlrbmgj75dicqv6qzzn4fyfxbf1nwh3zd2hi0ca89w";
sha256 = "0wc2kkp28gp1rfgg14a769lalwd44yz7jxkrzanh91v5j2kkln07";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];

4
pkgs/applications/audio/gpodder/default.nix
View File

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "gpodder";
version = "3.10.3";
version = "3.10.5";
format = "other";
src = fetchFromGitHub {
owner = "gpodder";
repo = "gpodder";
rev = version;
sha256 = "0j0amjq1wvr5p10vckg900a8xfnxw6z028qw72ayh58216m5jb5l";
sha256 = "00lvma40d62h4haybabh15x1y7rnmd84whbjgjv773igwagkn9vw";
};
postPatch = with stdenv.lib; ''

4
pkgs/applications/audio/mopidy/iris.nix
View File

@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
version = "3.25.1";
version = "3.26.2";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "148ksv87lw3l3dwncmlq8qzv6xik29axdgaljdcp0g4pd98a7dlk";
sha256 = "04jg5k8znkn0iirfnsndm74f8mypj8zwj76j489l0m263k1kn715";
};
propagatedBuildInputs = [

4
pkgs/applications/audio/ncmpc/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "ncmpc-${version}";
version = "0.30";
version = "0.31";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
sha256 = "0s2bynm5szrk8bjhg200mvsm2ny0wz9s10nx7r69y9y4jsxr8624";
sha256 = "09h1m9rkk89729i2d5zsfdc6rxajvikgsi3h99rwz2192gm457rj";
};
buildInputs = [ glib ncurses mpd_clientlib ];

4
pkgs/applications/audio/praat/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "praat-${version}";
version = "6.0.42";
version = "6.0.43";
src = fetchurl {
url = "https://github.com/praat/praat/archive/v${version}.tar.gz";
sha256 = "1llcj1cq4k60lnr6jkdshd4l9nkg9yc2xmaqiinqryxrb58jmpcv";
sha256 = "1l13bvnl7sv8v6s5z63201bhzavnj6bnqcj446akippsam13z4sf";
};
configurePhase = ''

4
pkgs/applications/audio/pulseeffects/default.nix
View File

@ -44,13 +44,13 @@ let
];
in stdenv.mkDerivation rec {
name = "pulseeffects-${version}";
version = "4.3.4";
version = "4.3.5";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "0gyyqxfmmp6hbwc10i48sxrgdxansm3vsbwgc6rh89clxwcnfiml";
sha256 = "01jxkz4s3m8cqsn6wcbrw7bzr7sr7hqsp9950018riilpni7k4bd";
};
nativeBuildInputs = [

1
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
] ++ optional withQt4 qt4
++ optional withQt5 qtbase;
patches = [ ./run-dir.patch ];
preConfigure = "NOCONFIGURE=1 ./autogen.sh";

13
pkgs/applications/display-managers/lightdm/run-dir.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/data/lightdm.conf b/data/lightdm.conf
index 16b80f7..b3af435 100644
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -28,7 +28,7 @@
#guest-account-script=guest-account
#logind-check-graphical=false
#log-directory=/var/log/lightdm
-#run-directory=/var/run/lightdm
+run-directory=/run/lightdm
#cache-directory=/var/cache/lightdm
#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
#remote-sessions-directory=/usr/share/lightdm/remote-sessions

6
pkgs/applications/editors/android-studio/default.nix
View File

@ -18,9 +18,9 @@ let
sha256Hash = "0mriakxxchc0wbqkl236pp4fsqbq3gb2qrkdg5hx9zz763dc59gp";
};
latestVersion = { # canary & dev
version = "3.3.0.9"; # "Android Studio 3.3 Canary 10"
build = "182.4996246";
sha256Hash = "0g6hhfhlfj9szw48z22n869n6d0rw5fhljazj63dmw6i4v6rd92g";
version = "3.3.0.10"; # "Android Studio 3.3 Canary 11"
build = "182.5012296";
sha256Hash = "0gqwf904y2pvp10l96gr055gjl1zf9pkb7840abqhl26liliwdm4";
};
in rec {
# Old alias

4
pkgs/applications/graphics/feh/default.nix
View File

@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "feh-${version}";
version = "2.27.1";
version = "2.28";
src = fetchurl {
url = "https://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "10zk76l491s22qrv86rax6cvpgwyl3qq0izl2pbk0k1z1kw3ihvf";
sha256 = "1nfka7w6pzj2bbwx8vydr2wwm7z8mrbqiy1xrq97c1g5bxy2vlhk";
};
outputs = [ "out" "man" "doc" ];

4
pkgs/applications/graphics/yed/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "yEd-${version}";
version = "3.18.1";
version = "3.18.1.1";
src = requireFile {
name = "${name}.zip";
url = "https://www.yworks.com/en/products/yfiles/yed/";
sha256 = "6aefd87cd925b4a4c86871a3772de243b4e520a86f82158189ae8c19a9a5ecf8";
sha256 = "0jl0c18jkmy21ka5xgki8dqq2v8cy63qvmx3x01wrhiplmczn97y";
};
nativeBuildInputs = [ unzip makeWrapper ];

4
pkgs/applications/misc/exercism/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "exercism-${version}";
version = "3.0.6";
version = "3.0.9";
goPackagePath = "github.com/exercism/cli";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "exercism";
repo = "cli";
rev = "v${version}";
sha256 = "0xr5bqzm0md1vllnr384k92k7w1nxzw9lhqgm23zkxx5a4vqzy56";
sha256 = "0nr3dzipylicrbplh25dw0w84qklr0xcyq442i9aswzibqrb2vc6";
};
goDeps = ./deps.nix;

76
pkgs/applications/misc/exercism/deps.nix generated
View File

@ -5,8 +5,8 @@
fetch = {
type = "git";
url = "https://github.com/blang/semver";
rev = "3c1074078d32d767e08ab2c8564867292da86926";
sha256 = "1vqkjrag8nn5hvjz34cf9zsrgwd13ss63y6sp7y5jq39j7bcprdx";
rev = "2ee87856327ba09384cabd113bc6b5d174e9ec0f";
sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
};
}
{
@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
rev = "346938d642f2ec3594ed81d874461961cd0faa76";
sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
};
}
{
@ -23,8 +23,8 @@
fetch = {
type = "git";
url = "https://github.com/fsnotify/fsnotify";
rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
rev = "629574ca2a5df945712d3079857300b5e4da0236";
sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3";
};
}
{
@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
};
}
{
@ -59,8 +59,8 @@
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
rev = "c2353362d570a7bfa228149c62842019201cfb71";
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
rev = "be5ece7dd465ab0765a9682137865547526d1dfb";
sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8";
};
}
{
@ -68,8 +68,8 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac";
sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al";
rev = "d0303fe809921458f417bcf828397a65db30a7e4";
sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
};
}
{
@ -77,8 +77,8 @@
fetch = {
type = "git";
url = "https://github.com/pelletier/go-buffruneio";
rev = "e2f66f8164ca709d4c21e815860afd2024e9b894";
sha256 = "16h7fybbai45p5gn2la6z37a8h1ws6r3pg3nwqiw6gbbgjqicrbv";
rev = "c37440a7cf42ac63b919c752ca73a85067e05992";
sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
};
}
{
@ -86,8 +86,8 @@
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
rev = "5ccdfb18c776b740aecaf085c4d9a2779199c279";
sha256 = "1jl44j58y62rhnwkzw3mvcj725gdyzs45pq4ga81qqxwqxs3czsq";
};
}
{
@ -104,8 +104,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
rev = "787d034dfe70e44075ccc060d346146ef53270ad";
sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
rev = "9be650865eab0c12963d8753212f4f9c66cdcf12";
sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34";
};
}
{
@ -113,8 +113,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/cast";
rev = "8965335b8c7107321228e3e3702cab9832751bac";
sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4";
sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050";
};
}
{
@ -122,8 +122,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
rev = "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1";
sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7";
rev = "b26b538f693051ac6518e65672de3144ce3fbedc";
sha256 = "0pm3qlw35xygz9zz7hizlmin76wrfac8vsxvsd9i0zpnijbkmjv6";
};
}
{
@ -131,8 +131,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/jwalterweatherman";
rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
rev = "0efa5202c04663c757d84f90f5219c1250baf94f";
sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs";
};
}
{
@ -140,8 +140,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
};
}
{
@ -149,8 +149,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793";
sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh";
rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
};
}
{
@ -158,8 +158,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0";
sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb";
};
}
{
@ -167,8 +167,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd";
sha256 = "0vx7mz18p480p7fh0w5jv6mfdbsswrlac1sz4i705q7q7ygz59lm";
rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f";
sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k";
};
}
{
@ -176,8 +176,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "bd9dbc187b6e1dacfdd2722a87e83093c2d7bd6e";
sha256 = "0zj8s3q2fznmap1nfr8pv4hz8xqixmkyhr6slq4baf8rvcb4mvbj";
rev = "d8f5ea21b9295e315e612b4bcf4bedea93454d4d";
sha256 = "1gy2y20glqqqcmmrcx2wrvk4h74h8im1nxvzi91i1mxjk7p185mv";
};
}
{
@ -185,8 +185,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "0605a8320aceb4207a5fb3521281e17ec2075476";
sha256 = "1pak7q9ivwxh5bnjk00pkrs9ri9vmbyccvza56fl6138w397h49j";
rev = "3bd178b88a8180be2df394a1fbb81313916f0e7b";
sha256 = "137pp3gz8ll08q0q434dn6472bbkv81h72qqqm9idhf7cc6f51w9";
};
}
{
@ -194,8 +194,8 @@
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b";
sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44";
};
}
]

6
pkgs/applications/misc/gnuradio/nacl.nix
View File

@ -7,13 +7,13 @@ assert pythonSupport -> python != null && swig != null;
stdenv.mkDerivation rec {
name = "gnuradio-nacl-${version}";
version = "2015-11-05";
version = "2017-04-10";
src = fetchFromGitHub {
owner = "stwunsch";
repo = "gr-nacl";
rev = "d6dd3c02dcda3f601979908b61b1595476f6bf95";
sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35";
rev = "15276bb0fcabf5fe4de4e58df3d579b5be0e9765";
sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/applications/misc/gnuradio/rds.nix
View File

@ -6,12 +6,12 @@ assert pythonSupport -> python != null && swig != null;
stdenv.mkDerivation rec {
name = "gnuradio-rds-${version}";
version = "2016-08-27";
version = "1.0.0";
src = fetchFromGitHub {
owner = "bastibl";
repo = "gr-rds";
rev = "5246b75180808d47f321cb26f6c16d7c7a7af4fc";
rev = "$v{version}";
sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs";
};

42
pkgs/applications/misc/gollum/Gemfile.lock
View File

@ -1,26 +1,26 @@
GEM
remote: https://rubygems.org/
specs:
charlock_holmes (0.7.3)
charlock_holmes (0.7.6)
diff-lcs (1.3)
gemojione (3.3.0)
json
github-markup (1.6.1)
gitlab-grit (2.8.1)
github-markup (1.7.0)
gitlab-grit (2.8.2)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
mime-types (>= 1.16, < 3)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
gollum (4.1.2)
gollum (4.1.3)
gemojione (~> 3.2)
gollum-lib (>= 4.2.7)
gollum-lib (>= 4.2.9)
kramdown (~> 1.9.0)
mustache (>= 0.99.5, < 1.0.0)
sinatra (~> 1.4, >= 1.4.4)
useragent (~> 0.16.2)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gollum-lib (4.2.7)
gollum-lib (4.2.9)
gemojione (~> 3.2)
github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0)
@ -28,27 +28,35 @@ GEM
rouge (~> 2.1)
sanitize (~> 2.1)
stringex (~> 2.6)
twitter-text (= 1.14.7)
json (2.1.0)
kramdown (1.9.0)
mime-types (2.99.3)
mini_portile2 (2.2.0)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mini_portile2 (2.3.0)
mustache (0.99.8)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
posix-spawn (0.3.13)
rack (1.6.8)
rack-protection (1.5.3)
rack (1.6.10)
rack-protection (1.5.5)
rack
rouge (2.1.1)
rouge (2.2.1)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
stringex (2.7.1)
stringex (2.8.4)
tilt (2.0.8)
useragent (0.16.8)
twitter-text (1.14.7)
unf (~> 0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
useragent (0.16.10)
PLATFORMS
ruby
@ -57,4 +65,4 @@ DEPENDENCIES
gollum
BUNDLED WITH
1.15.3
1.16.3

1
pkgs/applications/misc/gollum/default.nix
View File

@ -4,6 +4,7 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "gollum";
# nix-shell -p bundix icu zlib
version = (import ./gemset.nix).gollum.version;
nativeBuildInputs = [ makeWrapper ];

89
pkgs/applications/misc/gollum/gemset.nix
View File

@ -2,10 +2,10 @@
charlock_holmes = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
type = "gem";
};
version = "0.7.3";
version = "0.7.6";
};
diff-lcs = {
source = {
@ -27,28 +27,28 @@
github-markup = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq";
sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp";
type = "gem";
};
version = "1.6.1";
version = "1.7.0";
};
gitlab-grit = {
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n";
sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
type = "gem";
};
version = "2.8.1";
version = "2.8.2";
};
gollum = {
dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "051pm2f50daiqcqy87aq4809x4c95iwwml6ca4wgvvmj5zkk6k5a";
sha256 = "1146irmnm0xyzjzw8k14wvb6h4cqh4q53ds92wk6jpsfs6r1pjq6";
type = "gem";
};
version = "4.1.2";
version = "4.1.3";
};
gollum-grit_adapter = {
dependencies = ["gitlab-grit"];
@ -60,13 +60,13 @@
version = "1.0.1";
};
gollum-lib = {
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq";
sha256 = "1w48mrjgy4ykd1ix421n96nx0w15iid2aj3sgglpl3bdkizxhfqj";
type = "gem";
};
version = "4.2.7";
version = "4.2.9";
};
json = {
source = {
@ -85,20 +85,29 @@
version = "1.9.0";
};
mime-types = {
dependencies = ["mime-types-data"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
type = "gem";
};
version = "2.99.3";
version = "3.2.2";
};
mime-types-data = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
type = "gem";
};
version = "3.2018.0812";
};
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm";
sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
type = "gem";
};
version = "2.2.0";
version = "2.3.0";
};
mustache = {
source = {
@ -112,10 +121,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn";
sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
type = "gem";
};
version = "1.8.0";
version = "1.8.4";
};
posix-spawn = {
source = {
@ -128,27 +137,27 @@
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza";
sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
type = "gem";
};
version = "1.6.8";
version = "1.6.10";
};
rack-protection = {
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
type = "gem";
};
version = "1.5.3";
version = "1.5.5";
};
rouge = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wn6rq5qjmcwh9ixkljazv6gmg746rgbgs6av5qnk0mxim5qw11p";
sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs";
type = "gem";
};
version = "2.1.1";
version = "2.2.1";
};
sanitize = {
dependencies = ["nokogiri"];
@ -171,10 +180,10 @@
stringex = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv";
sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
type = "gem";
};
version = "2.7.1";
version = "2.8.4";
};
tilt = {
source = {
@ -184,12 +193,38 @@
};
version = "2.0.8";
};
twitter-text = {
dependencies = ["unf"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg";
type = "gem";
};
version = "1.14.7";
};
unf = {
dependencies = ["unf_ext"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
type = "gem";
};
version = "0.1.4";
};
unf_ext = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
type = "gem";
};
version = "0.0.7.5";
};
useragent = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1139cjqyv1hk1qcw89k81ajjkqyakqgbcyvmfrsmjqi8yn9kgqhq";
sha256 = "1fv5kvq494swy0p17h9qya9r50w15xsi9zmvhzb8gh55kq6ki50p";
type = "gem";
};
version = "0.16.8";
version = "0.16.10";
};
}

18
pkgs/applications/misc/jekyll/basic/Gemfile.lock
View File

@ -17,13 +17,13 @@ GEM
ffi (1.9.25)
forwardable-extended (2.6.0)
gemoji (3.0.0)
html-pipeline (2.8.0)
html-pipeline (2.8.4)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.3)
jekyll (3.8.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@ -38,7 +38,7 @@ GEM
safe_yaml (~> 1.0)
jekyll-avatar (0.6.0)
jekyll (~> 3.0)
jekyll-mentions (1.4.0)
jekyll-mentions (1.4.1)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-sass-converter (1.5.2)
@ -49,7 +49,7 @@ GEM
jekyll (~> 3.3)
jekyll-watch (2.0.0)
listen (~> 3.0)
jemoji (0.10.0)
jemoji (0.10.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
@ -62,18 +62,18 @@ GEM
mercenary (0.3.6)
mini_portile2 (2.3.0)
minitest (5.11.3)
nokogiri (1.8.2)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (3.0.2)
public_suffix (3.0.3)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (3.1.1)
rouge (3.2.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.5.6)
sass (3.5.7)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@ -96,4 +96,4 @@ DEPENDENCIES
rouge
BUNDLED WITH
1.14.6
1.16.3

32
pkgs/applications/misc/jekyll/basic/gemset.nix
View File

@ -78,10 +78,10 @@
dependencies = ["activesupport" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
type = "gem";
};
version = "2.8.0";
version = "2.8.4";
};
"http_parser.rb" = {
source = {
@ -104,10 +104,10 @@
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk";
sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw";
type = "gem";
};
version = "3.8.3";
version = "3.8.4";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@ -122,10 +122,10 @@
dependencies = ["html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb";
sha256 = "0hg1rlra12im62z5yml4rlll3icz1146hkcv98mk2a96fsgniwqf";
type = "gem";
};
version = "1.4.0";
version = "1.4.1";
};
jekyll-sass-converter = {
dependencies = ["sass"];
@ -167,10 +167,10 @@
dependencies = ["gemoji" "html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25";
sha256 = "1yjbgawzmlcppmlhz5sdhjim6ki0vh0vh07mbyf05qa4994ckihs";
type = "gem";
};
version = "0.10.0";
version = "0.10.1";
};
kramdown = {
source = {
@ -225,10 +225,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
type = "gem";
};
version = "1.8.2";
version = "1.8.4";
};
pathutil = {
dependencies = ["forwardable-extended"];
@ -242,10 +242,10 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
version = "3.0.2";
version = "3.0.3";
};
rb-fsevent = {
source = {
@ -267,10 +267,10 @@
rouge = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3";
sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
type = "gem";
};
version = "3.1.1";
version = "3.2.1";
};
ruby_dep = {
source = {
@ -292,10 +292,10 @@
dependencies = ["sass-listen"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61";
type = "gem";
};
version = "3.5.6";
version = "3.5.7";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];

32
pkgs/applications/misc/jekyll/full/Gemfile.lock
View File

@ -22,19 +22,19 @@ GEM
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
execjs (2.7.0)
faraday (0.15.2)
faraday (0.15.3)
multipart-post (>= 1.2, < 3)
fast-stemmer (1.0.2)
ffi (1.9.25)
forwardable-extended (2.6.0)
gemoji (3.0.0)
html-pipeline (2.8.0)
html-pipeline (2.8.4)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.3)
jekyll (3.8.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@ -52,15 +52,15 @@ GEM
jekyll-coffeescript (1.1.1)
coffee-script (~> 2.2)
coffee-script-source (~> 1.11.1)
jekyll-feed (0.10.0)
jekyll-feed (0.11.0)
jekyll (~> 3.3)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-mentions (1.4.0)
jekyll-mentions (1.4.1)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.13.0)
jekyll-redirect-from (0.14.0)
jekyll (~> 3.3)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
@ -70,7 +70,7 @@ GEM
jekyll (~> 3.3)
jekyll-watch (2.0.0)
listen (~> 3.0)
jemoji (0.10.0)
jemoji (0.10.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
@ -83,20 +83,20 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
mime-types (3.1)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mime-types-data (3.2018.0812)
mini_portile2 (2.3.0)
minitest (5.11.3)
multi_json (1.13.1)
multipart-post (2.0.0)
nokogiri (1.8.2)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
octokit (4.9.0)
octokit (4.12.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (3.0.2)
public_suffix (3.0.3)
pygments.rb (1.2.1)
multi_json (>= 1.0.0)
rb-fsevent (0.10.3)
@ -105,10 +105,10 @@ GEM
rdiscount (2.2.0.1)
rdoc (6.0.4)
redcarpet (3.4.0)
rouge (3.1.1)
rouge (3.2.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.5.6)
sass (3.5.7)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@ -117,7 +117,7 @@ GEM
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
thread_safe (0.3.6)
tomlrb (1.2.6)
tomlrb (1.2.7)
tzinfo (1.2.5)
thread_safe (~> 0.1)
yajl-ruby (1.3.1)
@ -152,4 +152,4 @@ DEPENDENCIES
yajl-ruby (~> 1.3.1)
BUNDLED WITH
1.14.6
1.16.3

60
pkgs/applications/misc/jekyll/full/gemset.nix
View File

@ -96,10 +96,10 @@
dependencies = ["multipart-post"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg";
sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52";
type = "gem";
};
version = "0.15.2";
version = "0.15.3";
};
fast-stemmer = {
source = {
@ -137,10 +137,10 @@
dependencies = ["activesupport" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
type = "gem";
};
version = "2.8.0";
version = "2.8.4";
};
"http_parser.rb" = {
source = {
@ -163,10 +163,10 @@
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk";
sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw";
type = "gem";
};
version = "3.8.3";
version = "3.8.4";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@ -190,10 +190,10 @@
dependencies = ["jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l5w2bd6dsjnc623qjw5h06n0wslh32rqkkjlkymga24cplbln8j";
sha256 = "11mlqqbkmddnyh8xfjv5k6v7c73bbi92w7vw4x1c9xvggxrjzicp";
type = "gem";
};
version = "0.10.0";
version = "0.11.0";
};
jekyll-gist = {
dependencies = ["octokit"];
@ -208,10 +208,10 @@
dependencies = ["html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb";
sha256 = "0hg1rlra12im62z5yml4rlll3icz1146hkcv98mk2a96fsgniwqf";
type = "gem";
};
version = "1.4.0";
version = "1.4.1";
};
jekyll-paginate = {
source = {
@ -225,10 +225,10 @@
dependencies = ["jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1crm5xqgv5asbbbaxfgky4ppib5rih59yzpa3yc94gh8b9cjixrj";
sha256 = "08xfd7fvqcq6skybxsn4d60rqn4ws2y9hkhl71wz9zrc55xhgxa4";
type = "gem";
};
version = "0.13.0";
version = "0.14.0";
};
jekyll-sass-converter = {
dependencies = ["sass"];
@ -270,10 +270,10 @@
dependencies = ["gemoji" "html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25";
sha256 = "1yjbgawzmlcppmlhz5sdhjim6ki0vh0vh07mbyf05qa4994ckihs";
type = "gem";
};
version = "0.10.0";
version = "0.10.1";
};
kramdown = {
source = {
@ -321,18 +321,18 @@
dependencies = ["mime-types-data"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
type = "gem";
};
version = "3.1";
version = "3.2.2";
};
mime-types-data = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
type = "gem";
};
version = "3.2016.0521";
version = "3.2018.0812";
};
mini_portile2 = {
source = {
@ -370,19 +370,19 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
type = "gem";
};
version = "1.8.2";
version = "1.8.4";
};
octokit = {
dependencies = ["sawyer"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
sha256 = "1lki5vlsiijdmhaqdvr29zmcyvrlmkgi0x92hgan2194l2ikfjlh";
type = "gem";
};
version = "4.9.0";
version = "4.12.0";
};
pathutil = {
dependencies = ["forwardable-extended"];
@ -396,10 +396,10 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
version = "3.0.2";
version = "3.0.3";
};
"pygments.rb" = {
dependencies = ["multi_json"];
@ -454,10 +454,10 @@
rouge = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3";
sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
type = "gem";
};
version = "3.1.1";
version = "3.2.1";
};
ruby_dep = {
source = {
@ -479,10 +479,10 @@
dependencies = ["sass-listen"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61";
type = "gem";
};
version = "3.5.6";
version = "3.5.7";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@ -513,10 +513,10 @@
tomlrb = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "09gh67v8s1pr7c37490sjp782gi4wf9k9cadp4l926h1sp27bcgz";
sha256 = "1x3bg9mmma1gsl5j5kc9m8m77w6qwcq6ix2d0kwi5rcwpr7siyx6";
type = "gem";
};
version = "1.2.6";
version = "1.2.7";
};
tzinfo = {
dependencies = ["thread_safe"];

4
pkgs/applications/misc/latte-dock/default.nix
View File

@ -3,12 +3,12 @@
mkDerivation rec {
pname = "latte-dock";
version = "0.8.0";
version = "0.8.1";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
sha256 = "1zg9r162r66vcvj5rzgy61mda89sk5yfy96g5p1aahbim0rgbdbs";
sha256 = "1f480ahrsxrksiiyspg7kb1hnz4vcjbs3w039cjkq2vp4wvjd74q";
name = "${name}.tar.xz";
};

4
pkgs/applications/misc/mediainfo/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
version = "18.08";
version = "18.08.1";
name = "mediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n";
sha256 = "0rq2dczjq26g5i0ac8px7xmxjvqq4h0rzd97fy5824yb2c5ksxs9";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

4
pkgs/applications/misc/overmind/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "overmind-${version}";
version = "2.0.0.beta1";
version = "1.2.1";
goPackagePath = "github.com/DarthSim/overmind";
nativeBuildInputs = [ makeWrapper ];
@ -15,7 +15,7 @@ buildGoPackage rec {
owner = "DarthSim";
repo = "overmind";
rev = "v${version}";
sha256 = "15fch3qszdm8bj1m9hxky9zgk6f5gpbswwfslg84qdjf4iwr5drq";
sha256 = "11ws9rsy8ladjp1y3b6vva9sjmw4s24xc1w18lyhfz63xc908nfw";
};
meta = with stdenv.lib; {

6
pkgs/applications/misc/subsurface/default.nix
View File

@ -4,14 +4,14 @@
}:
let
version = "4.8.1";
version = "4.8.2";
libdc = stdenv.mkDerivation rec {
name = "libdivecomputer-ssrf-${version}";
src = fetchurl {
url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
sha256 = "1x6z08gfp9jldv7vcsdasjcarns43qns9cm8s9w27n0c2lvchjvy";
sha256 = "167qan59raibmilkc574gdqxfjg2f5ww2frn86xzk2kn4qg8190w";
};
nativeBuildInputs = [ autoreconfHook ];
@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
sha256 = "0758sw05gjy8sckvaqc0hmbh2kibmzapgp0hlk8rsp1vsldq4vd2";
sha256 = "1fzrq6rqb6pzs36wxar2453cl509dqpcy9w7nq4gw7b1v2331wfy";
};
buildInputs = [

16
pkgs/applications/misc/tint2/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "tint2-${version}";
version = "16.4";
version = "16.6.1";
src = fetchFromGitLab {
owner = "o9000";
repo = "tint2";
rev = version;
sha256 = "1h9l45zimai2hqfcf2y98g4i03imhmvm3mlsld9x99i650kxr5jm";
sha256 = "1h5bn4vi7gffwi4mpwpn0s6vxvl44rn3m9b23w8q9zyz9v24flz7";
};
enableParallelBuilding = true;
@ -24,20 +24,18 @@ stdenv.mkDerivation rec {
libXdmcp libstartup_notification hicolor-icon-theme ];
postPatch = ''
substituteInPlace CMakeLists.txt --replace /etc $out/etc
for f in ./src/launcher/apps-common.c \
./src/launcher/icon-theme-common.c \
./themes/*tint2rc
./src/launcher/icon-theme-common.c
do
substituteInPlace $f --replace /usr/share/ /run/current-system/sw/share/
done
'';
meta = {
meta = with stdenv.lib; {
homepage = https://gitlab.com/o9000/tint2;
description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.romildo ];
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
};
}

4
pkgs/applications/misc/zathura/core/default.nix
View File

@ -11,11 +11,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "zathura-core-${version}";
version = "0.4.0";
version = "0.4.1";
src = fetchurl {
url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz";
sha256 = "1j0yah09adv3bsjhhbqra5lambal32svk8fxmf89wwmcqrcr4qma";
sha256 = "1znr3psqda06xklzj8mn452w908llapcg1rj468jwpg0wzv6pxfn";
};
nativeBuildInputs = [

4
pkgs/applications/networking/browsers/links2/default.nix
View File

@ -8,12 +8,12 @@
}:
stdenv.mkDerivation rec {
version = "2.16";
version = "2.17";
name = "links2-${version}";
src = fetchurl {
url = "${meta.homepage}/download/links-${version}.tar.bz2";
sha256 = "0gsa2gpb1grhssl5jzpc5pa0zi21mxi8g25rh5bacl70slw31w42";
sha256 = "0dh2gbzcw8kxy81z4ggsynibnqs56b83vy8qgz7illsag1irff6q";
};
buildInputs = with stdenv.lib;

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -103,7 +103,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "8.0";
version = "8.0.1";
lang = "en-US";
@ -113,7 +113,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 = "139cizh33x3nzr0f4b2q3cchrv9l01n3c2v0v0mghq30hap55p79";
sha256 = "05k914066pk11qxbwr77g6v20cfc8h9mh9yc3bpsfy35p8sypv8c";
};
"i686-linux" = fetchurl {
@ -121,7 +121,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "1vw5wh193vs5x3wizz34m2nyzlxpn24727hdxqpiqwlhwhj7y3nx";
sha256 = "1w2apsiimy6d5vpql37j5bmf8y8xhx4irryd5ad3vqqsr0x5wla7";
};
};
in

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -55,11 +55,11 @@ let
in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
version = "1.16.0";
version = "1.16.2";
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0hw5h1m8fijhqybx0xijrkifn5wl50qibaxkn2mxqf4mjwlvaw9a";
sha256 = "1j1785sc8pmrhi8yhlv4brxn7zrd33skgkkvzfl60nqkh2nybh3y";
};
phases = [ "unpackPhase" "installPhase" ];

3
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -145,9 +145,10 @@ in if configure == null then weechat else
unwrapped = weechat;
};
in buildEnv {
name = "weechat-bin-env";
name = "weechat-bin-env-${weechat.version}";
paths = [
(mkWeechat "weechat")
(mkWeechat "weechat-headless")
];
meta = weechat.meta;
}

14
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig
{ stdenv, fetchFromGitHub, pkgconfig
, boost, libtorrentRasterbar, qtbase, qttools, qtsvg
, debugSupport ? false # Debugging
, guiSupport ? true, dbus ? null # GUI (disable to run headless)
@ -10,23 +10,15 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
version = "4.1.2";
version = "4.1.3";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qbittorrent";
rev = "release-${version}";
sha256 = "1756hr92rvh4xlf6bk2wl24ypczhwf1rv1pdq05flk118jciqb05";
sha256 = "1hpcn1x4z3vdjscw035d18vqhfs7c6yv002akgmbgdf9jl3vfrsl";
};
patches = [
(fetchpatch {
name = "fix-desktop-file-regression.patch";
url = "https://github.com/qbittorrent/qBittorrent/commit/078325a3eb85c286b9a3454192ed2deadeda604c.patch";
sha256 = "1xhpd4ncy2m9zxsllizkry2013ij0ii9p8b8jbb35sazw5p50c96";
})
];
# NOTE: 2018-05-31: CMake is working but it is not officially supported
nativeBuildInputs = [ pkgconfig ];

27
pkgs/applications/networking/sync/desync/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "desync-${version}";
version = "0.3.0";
rev = "v${version}";
goPackagePath = "github.com/folbricht/desync";
src = fetchFromGitHub {
inherit rev;
owner = "folbricht";
repo = "desync";
sha256 = "1h2i6ai7q1mg2ysd3cnas96rb8g0bpp1v3hh7ip9nrfxhlplyyda";
};
goDeps = ./deps.nix;
meta = with stdenv.lib; {
description = "Content-addressed binary distribution system";
longDescription = "An alternate implementation of the casync protocol and storage mechanism with a focus on production-readiness";
homepage = https://github.com/folbricht/desync;
license = licenses.bsd3;
platforms = platforms.unix; # windows temporarily broken in 0.3.0 release
maintainers = [ maintainers.chaduffy ];
};
}

129
pkgs/applications/networking/sync/desync/deps.nix generated Normal file
View File

@ -0,0 +1,129 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/datadog/zstd";
fetch = {
type = "git";
url = "https://github.com/datadog/zstd";
rev = "940731c8fc259059120b0e617a69d54dcd7c3eee";
sha256 = "04nmljnk54xm2k4ydhdiidazk3765jk8h4hvcsymkrsggrfyrjfx";
};
}
{
goPackagePath = "github.com/dchest/siphash";
fetch = {
type = "git";
url = "https://github.com/dchest/siphash";
rev = "34f201214d993633bb24f418ba11736ab8b55aa7";
sha256 = "08s076y7vmjqnq7jz0762hkm896r6r31v8b31a3gy0n8rfa01k8k";
};
}
{
goPackagePath = "github.com/folbricht/tempfile";
fetch = {
type = "git";
url = "https://github.com/folbricht/tempfile";
rev = "ee190cb5934293f187a9d43ee34de7d5cf9ceb83";
sha256 = "0vz08qvbniqxc24vhmcbq5ncnz97ncp4jbxgcf0hziazxfp114z3";
};
}
{
goPackagePath = "github.com/go-ini/ini";
fetch = {
type = "git";
url = "https://github.com/go-ini/ini";
rev = "fa25069db393aecc09b71267d0489b357781c860";
sha256 = "0fs1c48hni5gc1fyz65d138jpmqm1sqpb7vw5vhx0j6lmj1nf45z";
};
}
{
goPackagePath = "github.com/hanwen/go-fuse";
fetch = {
type = "git";
url = "https://github.com/hanwen/go-fuse";
rev = "1d35017e97018335f348413b3aeed67468d80f7b";
sha256 = "11rggvkd6lc5lcpsfvc9iip4z9cingzpkpshaskv2cirbxdynyi8";
};
}
{
goPackagePath = "github.com/kr/fs";
fetch = {
type = "git";
url = "https://github.com/kr/fs";
rev = "1455def202f6e05b95cc7bfc7e8ae67ae5141eba";
sha256 = "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q";
};
}
{
goPackagePath = "github.com/minio/minio-go";
fetch = {
type = "git";
url = "https://github.com/minio/minio-go";
rev = "f01ef22c977052d716c74724874f932a16f047bb";
sha256 = "0pn1likcwnzb2j4hi4r1ib3xlp31h2vgwyc7xnm1iv7f8l4gk2hc";
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4";
sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "c059e472caf75dbe73903f6521a20abac245b17f";
sha256 = "07xg8ym776j2w0k8445ii82lx8yz358cp1z96r739y13i1anqdzi";
};
}
{
goPackagePath = "github.com/pkg/sftp";
fetch = {
type = "git";
url = "https://github.com/pkg/sftp";
rev = "08de04f133f27844173471167014e1a753655ac8";
sha256 = "090q4xmjbllwl3rpj1hzp0iw3qw1yvp6r3kf5cgw44ai57z96271";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "0e37d006457bf46f9e6692014ba72ef82c33022c";
sha256 = "1fj8rvrhgv5j8pmckzphvm3sqkzhcqp3idkxvgv13qrjdfycsa5r";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "2f5d2388922f370f4355f327fcf4cfe9f5583908";
sha256 = "03s92ygxfrd2c1m4697sd6iksgbar6c007w1yf3h6wmd79vr5dxs";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "d47a0f3392421c5624713c9a19fe781f651f8a50";
sha256 = "01dqcv7vnynwhlmb28fn50svjb9kfj04nk7frvf7mh4jd3qnrsnv";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "905a57155faa8230500121607930ebb9dd8e139c";
sha256 = "1qlvvb44j9ss3mkb5035i20xsd6sm0n05sqpqbi8gjw64g086zcb";
};
}
]

4
pkgs/applications/office/homebank/default.nix
View File

@ -2,10 +2,10 @@
, hicolor-icon-theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
name = "homebank-5.1.8";
name = "homebank-5.2.1";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
sha256 = "0fzjmwz2pgi0nw49xljp1za3vp67kjh88gf688d9ig4wc2ygr0qh";
sha256 = "0i3pb4v4fs98xd6d4x2gjvhqrsrjvssaws3nkpjia4fagd4dvqbz";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

6
pkgs/applications/science/biology/platypus/default.nix
View File

@ -4,13 +4,13 @@ let python = python27.withPackages (ps: with ps; [ cython ]);
in stdenv.mkDerivation rec {
name = "platypus-unstable-${version}";
version = "2017-03-07";
version = "2018-07-22";
src = fetchFromGitHub {
owner = "andyrimmer";
repo = "Platypus";
rev = "cbbd914";
sha256 = "0xgj3pl7n4c12j5pp5qyjfk4rsvb5inwzrpcbhdf3br5f3mmdsb9";
rev = "3e72641c69800da0cd4906b090298e654d316ee1";
sha256 = "0nah6r54b8xm778gqyb8b7rsd76z8ji4g73sm6rvpw5s96iib1vw";
};
buildInputs = [ htslib python zlib makeWrapper ];

4
pkgs/applications/science/biology/samtools/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "samtools";
version = "1.8";
version = "1.9";
src = fetchurl {
url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2";
sha256 = "05myg7bs90i68qbqab9cdg9rqj2xh39azibrx82ipzc5kcfvqhn9";
sha256 = "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8";
};
nativeBuildInputs = [ perl ];

1
pkgs/applications/version-management/gitlab/default.nix
View File

@ -109,5 +109,6 @@ stdenv.mkDerivation rec {
description = "Web-based Git-repository manager";
homepage = https://gitlab.com;
license = licenses.mit;
platforms = platforms.linux;
};
}

4
pkgs/applications/version-management/gogs/default.nix
View File

@ -7,13 +7,13 @@ with stdenv.lib;
buildGoPackage rec {
name = "gogs-${version}";
version = "0.11.53";
version = "0.11.66";
src = fetchFromGitHub {
owner = "gogs";
repo = "gogs";
rev = "v${version}";
sha256 = "1icm4bawyic4ivzyspqc6qjv882gil8j923zrbylw3i4ifhlcdhd";
sha256 = "1b9ilk4xlsllsj5pzmxwsz4a1zvgd06a8mi9ni9hbvmfl3w8xf28";
};
patches = [ ./static-root-path.patch ];

2
pkgs/applications/version-management/mr/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit, perl }:
stdenv.mkDerivation rec {
version = "1.20170129";
version = "1.20180726";
name = "mr-${version}";
src = fetchgit {

4
pkgs/applications/video/clipgrab/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "clipgrab-${version}";
version = "3.6.9";
version = "3.7.0";
src = fetchurl {
sha256 = "16r0h286vqw1bns29sx5x2919pj3y8gxf1k7dpf9xrz0vm2zrc3v";
sha256 = "0rx12218yy6h27z3xsmmxfsw8ldlsf4y862adkz6ybrygppsaib4";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${name}.tar.gz";
};

4
pkgs/applications/video/gnomecast/default.nix
View File

@ -3,11 +3,11 @@
with python3Packages;
buildPythonApplication rec {
pname = "gnomecast";
version = "1.4.0";
version = "1.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "17hxqpisw6j6caw6bzp0wd0p3idqy6a78wwwk8kms6hpxasirwyk";
sha256 = "0mn03gqbwmhch0055bzgdwkzsl304qdyqwrgyiq0k5c5d2gyala5";
};
nativeBuildInputs = [ wrapGAppsHook ];

4
pkgs/applications/video/shotcut/default.nix
View File

@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
stdenv.mkDerivation rec {
name = "shotcut-${version}";
version = "18.08.14";
version = "18.09.16";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
sha256 = "074df9vc0rdb4byalaarq522vkfq5mrhxs4dgbyqls3ryd3hj1ds";
sha256 = "0mv28v9c45gvf1jizb7zwmhcckpy7mznpai1zncc5gb5p7kqf56y";
};
enableParallelBuilding = true;

2
pkgs/applications/virtualization/docker/proxy.nix
View File

@ -24,6 +24,6 @@ buildGoPackage rec {
license = licenses.asl20;
homepage = https://github.com/docker/libnetwork;
maintainers = with maintainers; [vdemeester];
platforms = docker.meta.platforms;
platforms = platforms.linux;
};
}

4
pkgs/applications/virtualization/open-vm-tools/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "open-vm-tools-${version}";
version = "10.1.10";
version = "10.3.0";
src = fetchFromGitHub {
owner = "vmware";
repo = "open-vm-tools";
rev = "stable-${version}";
sha256 = "13ifpi53rc2463ka8xw9zx407d1fz119x8sb9k48g5mwxm6c85fm";
sha256 = "0arx4yd8c5qszfgw8rqyi65j37r46dxibmzqqxb096isxhxjymw6";
};
sourceRoot = "${src.name}/open-vm-tools";

14
pkgs/applications/window-managers/compton/default.nix
View File

@ -42,10 +42,12 @@ let
};
});
stableSource = {
stableSource = rec {
pname = "compton";
version = "0.1_beta2.5";
COMPTON_VERSION = version;
src = fetchFromGitHub {
owner = "chjj";
repo = "compton";
@ -58,15 +60,17 @@ let
};
};
gitSource = {
gitSource = rec {
pname = "compton-git";
version = "2018-08-14";
version = "2";
COMPTON_VERSION = "v${version}";
src = fetchFromGitHub {
owner = "yshui";
repo = "compton";
rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f";
sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5";
rev = COMPTON_VERSION;
sha256 = "1b6jgkkjbmgm7d7qjs94h722kgbqjagcxznkh2r84hcmcl8pibjq";
};
meta = {

21
pkgs/build-support/docker/default.nix
View File

@ -40,7 +40,7 @@ rec {
, imageDigest
, sha256
, os ? "linux"
, arch ? "x86_64"
, arch ? "amd64"
# This used to set a tag to the pulled image
, finalImageTag ? "latest"
, name ? fixName "docker-image-${imageName}-${finalImageTag}.tar"
@ -450,11 +450,18 @@ rec {
baseName = baseNameOf name;
# Create a JSON blob of the configuration. Set the date to unix zero.
baseJson = writeText "${baseName}-config.json" (builtins.toJSON {
inherit created config;
architecture = "amd64";
os = "linux";
});
baseJson = let
pure = writeText "${baseName}-config.json" (builtins.toJSON {
inherit created config;
architecture = "amd64";
os = "linux";
});
impure = runCommand "${baseName}-config.json"
{ buildInputs = [ jq ]; }
''
jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out
'';
in if created == "now" then impure else pure;
layer =
if runAsRoot == null
@ -577,7 +584,7 @@ rec {
currentID=$layerID
while [[ -n "$currentID" ]]; do
layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1)
imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .")
imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .")
imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .")

9
pkgs/build-support/docker/examples.nix
View File

@ -141,4 +141,13 @@ rec {
runAsRoot = ''echo "(runAsRoot)" > runAsRoot'';
extraCommands = ''echo "(extraCommand)" > extraCommands'';
};
# 9. Ensure that setting created to now results in a date which
# isn't the epoch + 1
unstableDate = pkgs.dockerTools.buildImage {
name = "unstable-date";
tag = "latest";
contents = [ pkgs.coreutils ];
created = "now";
};
}

11
pkgs/build-support/fetchzip/default.nix
View File

@ -14,7 +14,7 @@
, name ? "source"
, ... } @ args:
lib.overrideDerivation (fetchurl ({
(fetchurl ({
inherit name;
recursiveHash = true;
@ -23,8 +23,6 @@ lib.overrideDerivation (fetchurl ({
postFetch =
''
export PATH=${unzip}/bin:$PATH
unpackDir="$TMPDIR/unpack"
mkdir "$unpackDir"
cd "$unpackDir"
@ -48,6 +46,7 @@ lib.overrideDerivation (fetchurl ({
mv "$unpackDir" "$out"
'') #*/
+ extraPostFetch;
} // removeAttrs args [ "stripRoot" "extraPostFetch" ]))
# Hackety-hack: we actually need unzip hooks, too
(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];})
} // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: {
# Hackety-hack: we actually need unzip hooks, too
nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ];
})

19
pkgs/data/icons/numix-cursor-theme/default.nix
View File

@ -1,24 +1,27 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, fetchFromGitHub, inkscape, xcursorgen }:
stdenv.mkDerivation rec {
version = "20160110";
version = "1.1";
package-name = "numix-cursor-theme";
name = "${package-name}-${version}";
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = "e92186d9df47c04d4e0a778eb6941ef58590b179";
sha256 = "1sr4pisgrn3632phsiny2fyr2ib6l51fnjdsanmh9ampagl4ly7g";
rev = "v${version}";
sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi";
};
dontBuild = true;
nativeBuildInputs = [ inkscape xcursorgen ];
buildPhase = ''
patchShebangs .
HOME=$TMP ./build.sh
'';
installPhase = ''
install -dm 755 $out/share/icons
cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/
cp -dr --no-preserve='ownership' Numix-Cursor{,-Light} $out/share/icons/
'';
meta = with stdenv.lib; {

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }:
stdenv.mkDerivation rec {
version = "18.08.17";
version = "18.09.19";
package-name = "numix-icon-theme-circle";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "numixproject";
repo = package-name;
rev = version;
sha256 = "1nxgm5vf2rzbg8qh48iy0vdj12ffahlp9qhj8h0k1li03s3nf15h";
sha256 = "1a1ack4kpngnb3c281pssmp3snn2idcn2c5cv3l38a0dl5g5w8nq";
};
nativeBuildInputs = [ gtk3 numix-icon-theme ];

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${package-name}-${version}";
package-name = "numix-icon-theme-square";
version = "18.08.17";
version = "18.09.19";
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = version;
sha256 = "0pn5m73zd240bk2kilcgv57xn7grhbcj5ay4w1jzzn1f4ifaa0w8";
sha256 = "0q5p901qj3gyzgpy5kk9q5sqb13ka5cfg6wvazlfch1k3kaqksz1";
};
nativeBuildInputs = [ gtk3 numix-icon-theme ];

41
pkgs/data/misc/ddccontrol-db/default.nix
View File

@ -1,34 +1,35 @@
{ stdenv
, fetchurl
, perl
, perlPackages
, libxml2
, pciutils
, pkgconfig
, gtk2
, autoconf
, automake
, libtool
, intltool
, fetchFromGitHub
}:
let version = "20061014"; in
let verName = "${version}"; in
stdenv.mkDerivation {
name = "ddccontrol-db-${verName}";
src = fetchurl {
url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2";
sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3";
name = "ddccontrol-db-20180908";
src = fetchFromGitHub {
owner = "ddccontrol";
repo = "ddccontrol-db";
rev = "5f211be363f77dc43e39f911b30f4fb19a2d7a84";
sha256 = "0vi3bzxpjdkn791vri68k7dah4v2liscniz7hxrarhl4fxlicc0w";
};
preConfigure = ''
./autogen.sh
'';
buildInputs =
[
perl
perlPackages.libxml_perl
libxml2
pciutils
pkgconfig
gtk2
autoconf
automake
libtool
intltool
];
meta = with stdenv.lib; {
description = "Monitor database for DDCcontrol";
homepage = http://ddccontrol.sourceforge.net/;
homepage = http://github.com/ddccontrol/ddccontrol-db;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ stdenv.lib.maintainers.pakhfn ];

13
pkgs/desktops/enlightenment/ephoto.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }:
{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:
stdenv.mkDerivation rec {
name = "ephoto-${version}";
@ -9,9 +9,16 @@ stdenv.mkDerivation rec {
sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb";
};
nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ];
nativeBuildInputs = [
(pkgconfig.override { vanilla = true; })
mesa_noglu.dev # otherwise pkg-config does not find gbm
makeWrapper
];
buildInputs = [ efl pcre ];
buildInputs = [
efl
pcre
];
meta = {
description = "Image viewer and editor written using the Enlightenment Foundation Libraries";

3
pkgs/desktops/enlightenment/rage.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, wrapGAppsHook }:
{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa_noglu, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "rage-${version}";
@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
meson
ninja
(pkgconfig.override { vanilla = true; })
mesa_noglu.dev
wrapGAppsHook
];

6
pkgs/development/compilers/ghc/8.6.1.nix
View File

@ -78,12 +78,12 @@ let
in
stdenv.mkDerivation (rec {
version = "8.6.0.20180810";
version = "8.6.1";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/8.6.1-beta1/ghc-${version}-src.tar.xz";
sha256 = "0b3nyjs4lsh67lfw7wh7r7kkf4g2xiypdxd77aycmwd3pdxj09yw";
url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c";
};
enableParallelBuilding = true;

4
pkgs/development/compilers/iasl/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "iasl-${version}";
version = "20180629";
version = "20180313";
src = fetchurl {
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
sha256 = "0kwssazw7pqgxvxj41q5r0g83bqqk64f2lrpnfjn9p6v58zizlbh";
sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
};
NIX_CFLAGS_COMPILE = "-O3";

4
pkgs/development/compilers/kotlin/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
let
version = "1.2.61";
version = "1.2.70";
in stdenv.mkDerivation rec {
inherit version;
name = "kotlin-${version}";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "1gsvilsbgwdvyvxjnlvs0rhrgm6x9dapziwgwgg9kbi9a0w4avdy";
sha256 = "0d44rzngpfhgh1qc99b97dczdyrmypbwzrmr00qmcy2ya2il0fm2";
};
propagatedBuildInputs = [ jre ] ;

2
pkgs/development/compilers/ocaml/generic.nix
View File

@ -90,7 +90,7 @@ stdenv.mkDerivation (args // rec {
'';
platforms = with platforms; linux ++ darwin;
broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast major_version "4.06";
broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast version "4.06";
};
})

13
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -33,7 +33,7 @@ self: super: {
unbuildable = throw "package depends on meta package 'unbuildable'";
# Use the latest version of the Cabal library.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_4_0_1; });
# The test suite depends on old versions of tasty and QuickCheck.
hackage-security = dontCheck super.hackage-security;
@ -86,7 +86,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "0a7h21cwfvprj5xfyivjzg2hbs71xp85l9v6kyp58mlqvwy3zffl";
sha256 = "1y56dlhx3azny5hzixn9x4kmzzpmakzyvw45qk8x4ffsc7jqq5bs";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -360,6 +360,7 @@ self: super: {
optional = dontCheck super.optional;
orgmode-parse = dontCheck super.orgmode-parse;
os-release = dontCheck super.os-release;
pandoc-crossref = dontCheck super.pandoc-crossref; # (most likely change when no longer 0.3.2.1) https://github.com/lierdakil/pandoc-crossref/issues/199
persistent-redis = dontCheck super.persistent-redis;
pipes-extra = dontCheck super.pipes-extra;
pipes-websockets = dontCheck super.pipes-websockets;
@ -1074,7 +1075,7 @@ self: super: {
# The tool needs a newer hpack version than the one mandated by LTS-12.x.
cabal2nix = super.cabal2nix.overrideScope (self: super: {
hpack = self.hpack_0_31_0;
yaml = self.yaml_0_10_1_1;
yaml = self.yaml_0_10_2_0;
});
# Break out of "aeson <1.3, temporary <1.3".
@ -1129,4 +1130,10 @@ self: super: {
safe-money-serialise = super.safe-money-serialise.override { safe-money = self.safe-money_0_7; };
safe-money-xmlbf = super.safe-money-xmlbf.override { safe-money = self.safe-money_0_7; };
# https://github.com/adinapoli/mandrill/pull/52
mandrill = appendPatch super.mandrill (pkgs.fetchpatch {
url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;
sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

81
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -43,7 +43,7 @@ core-packages:
default-package-overrides:
# Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
- base-compat-batteries ==0.10.1
# LTS Haskell 12.9
# LTS Haskell 12.10
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -177,7 +177,7 @@ default-package-overrides:
- amazonka-xray ==1.6.0
- amqp ==0.18.1
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.8.0.4
- ansi-terminal ==0.8.1
- ansi-wl-pprint ==0.6.8.2
- ANum ==0.2.0.2
- api-field-json-th ==0.1.0.2
@ -217,9 +217,9 @@ default-package-overrides:
- authenticate ==1.3.4
- authenticate-oauth ==1.6
- auto ==0.4.3.1
- autoexporter ==1.1.10
- autoexporter ==1.1.11
- auto-update ==0.1.4
- avro ==0.3.4.2
- avro ==0.3.5.1
- avwx ==0.3.0.2
- backprop ==0.2.5.0
- bank-holidays-england ==0.1.0.7
@ -350,6 +350,7 @@ default-package-overrides:
- cassava-records ==0.1.0.4
- cast ==0.1.0.2
- category ==0.2.0.1
- cayley-client ==0.4.7
- cborg ==0.2.0.0
- cereal ==0.5.7.0
- cereal-conduit ==0.8.0
@ -654,7 +655,7 @@ default-package-overrides:
- eliminators ==0.4.1
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
- email-validate ==2.3.2.6
- email-validate ==2.3.2.7
- enclosed-exceptions ==1.0.3
- entropy ==0.4.1.1
- enummapset ==0.5.2.2
@ -679,7 +680,7 @@ default-package-overrides:
- eventful-sqlite ==0.2.0
- eventful-test-helpers ==0.2.0
- event-list ==0.1.2
- eventstore ==1.1.5
- eventstore ==1.1.6
- every ==0.0.1
- exact-combinatorics ==0.2.0.8
- exact-pi ==0.4.1.4
@ -726,8 +727,8 @@ default-package-overrides:
- fileplow ==0.1.0.0
- filter-logger ==0.6.0.0
- filtrable ==0.1.1.0
- Fin ==0.2.5.0
- fin ==0.0.1
- Fin ==0.2.5.0
- FindBin ==0.0.5
- find-clumpiness ==0.2.3.1
- fingertree ==0.1.4.1
@ -743,14 +744,14 @@ default-package-overrides:
- flay ==0.4
- flexible-defaults ==0.0.2
- floatshow ==0.2.4
- flow ==1.0.14
- flow ==1.0.15
- fmlist ==0.9.2
- fn ==0.3.0.2
- focus ==0.1.5.2
- foldable1 ==0.1.0.0
- fold-debounce ==0.2.0.7
- fold-debounce-conduit ==0.2.0.1
- foldl ==1.4.3
- foldl ==1.4.4
- folds ==0.7.4
- FontyFruity ==0.5.3.3
- force-layout ==0.4.0.6
@ -817,7 +818,7 @@ default-package-overrides:
- getopt-generics ==0.13.0.2
- ghc-core ==0.5.6
- ghc-exactprint ==0.5.6.1
- ghcid ==0.7
- ghcid ==0.7.1
- ghcjs-base-stub ==0.2.0.0
- ghcjs-codemirror ==0.0.0.2
- ghc-parser ==0.2.0.2
@ -872,7 +873,7 @@ default-package-overrides:
- gravatar ==0.8.0
- graylog ==0.1.0.1
- greskell ==0.2.1.0
- greskell-core ==0.1.2.2
- greskell-core ==0.1.2.3
- greskell-websocket ==0.1.1.0
- groom ==0.1.2.1
- groups ==0.4.1.0
@ -950,7 +951,7 @@ default-package-overrides:
- heredoc ==0.2.0.0
- heterocephalus ==1.0.5.2
- hex ==0.1.2
- hexml ==0.3.3
- hexml ==0.3.4
- hexml-lens ==0.2.1
- hexpat ==0.20.13
- hexstring ==0.11.1
@ -1011,7 +1012,7 @@ default-package-overrides:
- hslua ==0.9.5.2
- hslua-aeson ==0.3.0.2
- hslua-module-text ==0.1.2.1
- HsOpenSSL ==0.11.4.14
- HsOpenSSL ==0.11.4.15
- HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0
- hspec ==2.5.5
@ -1080,7 +1081,7 @@ default-package-overrides:
- hw-mquery ==0.1.0.1
- hworker ==0.1.0.1
- hw-parser ==0.0.0.3
- hw-prim ==0.6.2.14
- hw-prim ==0.6.2.15
- hw-rankselect ==0.10.0.3
- hw-rankselect-base ==0.3.2.1
- hw-string-parse ==0.0.0.4
@ -1119,7 +1120,7 @@ default-package-overrides:
- indents ==0.5.0.0
- indexed-list-literals ==0.2.1.1
- inflections ==0.4.0.3
- influxdb ==1.6.0.7
- influxdb ==1.6.0.9
- ini ==0.3.6
- inline-c ==0.6.1.0
- inline-java ==0.8.4
@ -1127,7 +1128,7 @@ default-package-overrides:
- insert-ordered-containers ==0.2.1.0
- inspection-testing ==0.2.0.1
- instance-control ==0.1.2.0
- integer-logarithms ==1.0.2.1
- integer-logarithms ==1.0.2.2
- integration ==0.2.1
- intern ==0.9.2
- interpolate ==0.2.0
@ -1151,6 +1152,7 @@ default-package-overrides:
- ip6addr ==1.0.0
- iproute ==1.7.5
- IPv6Addr ==1.1.0
- IPv6DB ==0.3.1
- ipython-kernel ==0.9.1.0
- irc ==0.6.1.0
- irc-client ==1.1.0.4
@ -1222,9 +1224,9 @@ default-package-overrides:
- lawful ==0.1.0.0
- lazyio ==0.1.0.4
- lca ==0.3.1
- leancheck ==0.7.3
- leancheck ==0.7.4
- leapseconds-announced ==2017.1.0.1
- learn-physics ==0.6.2
- learn-physics ==0.6.3
- lens ==4.16.1
- lens-action ==0.2.3
- lens-aeson ==1.0.2
@ -1232,7 +1234,7 @@ default-package-overrides:
- lens-family ==1.2.2
- lens-family-core ==1.2.2
- lens-family-th ==0.5.0.2
- lens-labels ==0.2.0.1
- lens-labels ==0.2.0.2
- lens-misc ==0.0.2.0
- lens-properties ==4.11.1
- lens-regex ==0.1.0
@ -1343,7 +1345,7 @@ default-package-overrides:
- minisat-solver ==0.1
- miniutter ==0.4.7.0
- mintty ==0.1.2
- miso ==0.21.1.0
- miso ==0.21.2.0
- missing-foreign ==0.1.1
- MissingH ==1.4.0.1
- mixed-types-num ==0.3.1.4
@ -1461,6 +1463,7 @@ default-package-overrides:
- non-empty ==0.3.0.1
- non-empty-sequence ==0.2.0.2
- non-negative ==0.1.2
- not-gloss ==0.7.7.0
- nsis ==0.3.2
- numbers ==3000.2.0.2
- numeric-extras ==0.1
@ -1641,7 +1644,7 @@ default-package-overrides:
- promises ==0.3
- prompt ==0.1.1.2
- protobuf ==0.2.1.2
- protobuf-simple ==0.1.0.5
- protobuf-simple ==0.1.1.0
- protocol-buffers ==2.4.11
- protocol-buffers-descriptor ==2.4.11
- protocol-radius ==0.0.1.1
@ -1649,7 +1652,7 @@ default-package-overrides:
- proto-lens ==0.3.1.0
- proto-lens-arbitrary ==0.1.2.2
- proto-lens-combinators ==0.1.0.11
- proto-lens-optparse ==0.1.1.2
- proto-lens-optparse ==0.1.1.3
- proto-lens-protobuf-types ==0.3.0.1
- proto-lens-protoc ==0.3.1.2
- protolude ==0.2.2
@ -1668,7 +1671,7 @@ default-package-overrides:
- QuickCheck ==2.11.3
- quickcheck-arbitrary-adt ==0.3.1.0
- quickcheck-assertions ==0.3.0
- quickcheck-instances ==0.3.18
- quickcheck-instances ==0.3.19
- quickcheck-io ==0.2.0
- quickcheck-simple ==0.1.0.4
- quickcheck-special ==0.1.0.6
@ -1705,7 +1708,7 @@ default-package-overrides:
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- rebase ==1.2.4
- record-dot-preprocessor ==0.1.3
- record-dot-preprocessor ==0.1.4
- recursion-schemes ==5.0.3
- reducers ==3.12.3
- refact ==0.3.0.2
@ -1777,8 +1780,8 @@ default-package-overrides:
- sandman ==0.2.0.1
- say ==0.1.0.1
- sbp ==2.3.17
- SCalendar ==1.1.0
- scalendar ==1.2.0
- SCalendar ==1.1.0
- scalpel ==0.5.1
- scalpel-core ==0.5.1
- scanner ==0.2
@ -1894,10 +1897,11 @@ default-package-overrides:
- sort ==1.0.0.0
- sorted-list ==0.2.1.0
- sourcemap ==0.1.6
- sox ==0.2.3
- soxlib ==0.0.3
- sox ==0.2.3.1
- soxlib ==0.0.3.1
- sparkle ==0.7.4
- sparse-linear-algebra ==0.3.1
- spatial-math ==0.5.0.1
- special-values ==0.1.0.0
- speculate ==0.3.5
- speculation ==1.5.0.3
@ -1908,7 +1912,7 @@ default-package-overrides:
- split ==0.2.3.3
- splitmix ==0.0.1
- spoon ==0.3.1
- spreadsheet ==0.1.3.7
- spreadsheet ==0.1.3.8
- sqlite-simple ==0.4.16.0
- sqlite-simple-errors ==0.6.1.0
- sql-words ==0.1.6.2
@ -1925,7 +1929,7 @@ default-package-overrides:
- statistics ==0.14.0.2
- stb-image-redux ==0.2.1.2
- step-function ==0.2
- stm ==2.4.5.0
- stm ==2.4.5.1
- stm-chans ==3.0.0.4
- stm-conduit ==4.0.0
- stm-containers ==0.2.16
@ -1981,10 +1985,10 @@ default-package-overrides:
- symengine ==0.1.2.0
- sysinfo ==0.1.1
- system-argv0 ==0.1.1
- system-fileio ==0.3.16.3
- system-fileio ==0.3.16.4
- system-filepath ==0.4.14
- tabular ==0.2.2.7
- tagchup ==0.4.1
- tagchup ==0.4.1.1
- tagged ==0.8.5
- tagged-binary ==0.2.0.1
- tagged-identity ==0.1.2
@ -2026,12 +2030,12 @@ default-package-overrides:
- terminal-size ==0.3.2.1
- test-framework ==0.8.2.0
- test-framework-hunit ==0.3.0.2
- test-framework-quickcheck2 ==0.3.0.4
- test-framework-quickcheck2 ==0.3.0.5
- test-framework-smallcheck ==0.2
- test-framework-th ==0.2.4
- testing-feat ==1.1.0.0
- testing-type-modifiers ==0.1.0.1
- texmath ==0.11.0.1
- texmath ==0.11.1
- text ==1.2.3.0
- text-binary ==0.2.1.1
- text-builder ==0.5.4.3
@ -2114,6 +2118,7 @@ default-package-overrides:
- tuple-sop ==0.3.1.0
- tuple-th ==0.2.5
- turtle ==1.5.10
- TypeCompose ==0.9.13
- typed-process ==0.2.3.0
- type-fun ==0.1.1
- type-hint ==0.1
@ -2137,7 +2142,7 @@ default-package-overrides:
- unconstrained ==0.1.0.2
- unfoldable ==0.9.6
- unfoldable-restricted ==0.0.3
- unicode ==0.0.1
- unicode ==0.0.1.1
- unicode-show ==0.1.0.3
- unicode-transforms ==0.3.4
- unification-fd ==0.10.0.1
@ -2158,7 +2163,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.1
- unix-time ==0.3.8
- unliftio ==0.2.7.1
- unliftio ==0.2.8.0
- unliftio-core ==0.1.2.0
- unlit ==0.4.0.0
- unordered-containers ==0.2.9.0
@ -2208,7 +2213,7 @@ default-package-overrides:
- verbosity ==0.2.3.0
- versions ==3.4.0.1
- ViennaRNAParser ==1.3.3
- viewprof ==0.0.0.22
- viewprof ==0.0.0.23
- vinyl ==0.8.1.1
- vivid ==0.3.0.2
- vivid-osc ==0.3.0.0
@ -2237,7 +2242,7 @@ default-package-overrides:
- wai-slack-middleware ==0.2.0
- wai-transformers ==0.1.0
- wai-websockets ==3.0.1.2
- warp ==3.2.23
- warp ==3.2.25
- warp-tls ==3.2.4.3
- warp-tls-uid ==0.2.0.5
- wave ==0.1.5
@ -2301,7 +2306,7 @@ default-package-overrides:
- xls ==0.1.1
- xlsx ==0.7.2
- xml ==1.3.14
- xml-basic ==0.1.3
- xml-basic ==0.1.3.1
- xmlbf ==0.4.1
- xmlbf-xeno ==0.1.1
- xml-conduit ==1.8.0

12
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -126,9 +126,9 @@ self: super: builtins.intersectAttrs super {
# the system-fileio tests use canonicalizePath, which fails in the sandbox
system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
# Prevents needing to add security_tool as a build tool to all of x509-system's
# dependencies.
x509-system = if pkgs.stdenv.targetPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
# Prevents needing to add `security_tool` as a run-time dependency for
# everything using x509-system to give access to the `security` executable.
x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
then let inherit (pkgs.darwin) security_tool;
in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
postPatch = (drv.postPatch or "") + ''
@ -511,4 +511,10 @@ self: super: builtins.intersectAttrs super {
# Doctests hang only when compiling with nix.
# https://github.com/cdepillabout/termonad/issues/15
termonad = dontCheck super.termonad;
# Expects z3 to be on path so we replace it with a hard
sbv = overrideCabal super.sbv (drv: {
postPatch = ''
sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs'';
});
}

1
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -120,6 +120,7 @@ let
"--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
"--with-gcc=${stdenv.cc.targetPrefix}cc"
"--with-ld=${stdenv.cc.bintools.targetPrefix}ld"
"--with-ar=${stdenv.cc.bintools.targetPrefix}ar"
# use the one that comes with the cross compiler.
"--with-hsc2hs=${ghc.targetPrefix}hsc2hs"
"--with-strip=${stdenv.cc.bintools.targetPrefix}strip"

3007
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

9
pkgs/development/interpreters/acl2/default.nix
View File

@ -4,15 +4,20 @@
let hashes = {
"8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r";
"8.1" = "0isi75j94q79x4341rhd94c60228iwvccy71ssnyvh1025m93xcd";
};
revs = {
"8.0" = "8.0";
"8.1" = "8.1";
};
in stdenv.mkDerivation rec {
name = "acl2-${version}";
version = "8.0";
version = "8.1";
src = fetchFromGitHub {
owner = "acl2-devel";
repo = "acl2-devel";
rev = "${version}";
rev = revs."${version}";
sha256 = hashes."${version}";
};

32
pkgs/development/interpreters/lua-4/default.nix
View File

@ -1,32 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "lua-4.0.1";
src = fetchurl {
url = https://www.lua.org/ftp/lua-4.0.1.tar.gz;
sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z";
};
configurePhase = "sed -i -e 's/CFLAGS= -O2/CFLAGS = -O3 -fPIC/' config";
buildFlags = "all so sobin";
installFlags = "INSTALL_ROOT=$$out";
hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
meta = {
homepage = http://www.lua.org;
description = "Powerful, fast, lightweight, embeddable scripting language";
longDescription = ''
Lua combines simple procedural syntax with powerful data
description constructs based on associative arrays and extensible
semantics. Lua is dynamically typed, runs by interpreting bytecode
for a register-based virtual machine, and has automatic memory
management with incremental garbage collection, making it ideal
for configuration, scripting, and rapid prototyping.
'';
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
branch = "4";
};
}

32
pkgs/development/interpreters/lua-5/5.0.3.nix
View File

@ -1,32 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "lua-5.0.3";
src = fetchurl {
url = https://www.lua.org/ftp/lua-5.0.3.tar.gz;
sha256 = "1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671";
};
hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
configurePhase = "sed -i -e 's/MYCFLAGS=.*/MYCFLAGS=-O3 -fomit-frame-pointer -fPIC/' config";
buildFlags = "all so sobin";
installFlags = "INSTALL_ROOT=$$out";
installTargets = "install soinstall";
meta = {
homepage = http://www.lua.org;
description = "Powerful, fast, lightweight, embeddable scripting language";
longDescription = ''
Lua combines simple procedural syntax with powerful data
description constructs based on associative arrays and extensible
semantics. Lua is dynamically typed, runs by interpreting bytecode
for a register-based virtual machine, and has automatic memory
management with incremental garbage collection, making it ideal
for configuration, scripting, and rapid prototyping.
'';
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/interpreters/lua-5/5.2.nix
View File

@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
name = "lua-${version}";
luaversion = "5.2";
version = "${luaversion}.3";
version = "${luaversion}.4";
src = fetchurl {
url = "https://www.lua.org/ftp/${name}.tar.gz";
sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk";
sha256 = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr";
};
buildInputs = [ readline ];

43
pkgs/development/interpreters/php/default.nix
View File

@ -37,10 +37,7 @@ let
, opensslSupport ? config.php.openssl or true
, mbstringSupport ? config.php.mbstring or true
, gdSupport ? config.php.gd or true
# Because of an upstream bug: https://bugs.php.net/bug.php?id=76826
# We need to disable the intl support on darwin. Whenever the upstream bug is
# fixed we should revert this to just just "config.php.intl or true".
, intlSupport ? (config.php.intl or true) && (!stdenv.isDarwin)
, intlSupport ? config.php.intl or true
, exifSupport ? config.php.exif or true
, xslSupport ? config.php.xsl or false
, mcryptSupport ? config.php.mcrypt or true
@ -225,13 +222,35 @@ let
};
in {
php71 = generic {
version = "7.1.22";
sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8";
};
# Because of an upstream bug: https://bugs.php.net/bug.php?id=76826
# We can't update the darwin versions because they simply don't compile at
# all due to a bug in the intl extensions.
#
# The bug so far is present in 7.1.21, 7.1.22, 7.2.9, 7.2.10.
php72 = generic {
version = "7.2.10";
sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1";
};
php71 = generic (
if stdenv.isDarwin then
{
version = "7.1.20";
sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs";
}
else
{
version = "7.1.22";
sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8";
}
);
php72 = generic (
if stdenv.isDarwin then
{
version = "7.2.8";
sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z";
}
else
{
version = "7.2.10";
sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1";
}
);
}

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

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
stdenv.mkDerivation rec {
version = "4.12";
version = "4.12.1";
name = "cgal-" + version;
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
sha256 = "0n4yvg2rkrlb1bwhykrg4iyqg4whxadcs441k10xx0r75i6220mn";
sha256 = "0b8wwfnvbayxi18jahfdplkjqr59ynq6phk0kz62gqp8vmwia9d9";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;

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

@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
version = "3.7.16";
version = "3.7.17";
name = "afflib-${version}";
src = fetchFromGitHub {
owner = "sshock";
repo = "AFFLIBv3";
rev = "v${version}";
sha256 = "0piwkmg7jn64h57cjf5cybyvyqxj2k752g9vrf4ycds7nhvvbnb6";
sha256 = "11q20n6p5nvwmd9wwk0addlfxpxagf47ly89scn3jvc7k484ksan";
};
nativeBuildInputs = [ autoreconfHook ];

Some files were not shown because too many files have changed in this diff Show More