nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-20.03' into staging-20.03

Browse Source
This commit is contained in:
worldofpeace
2020-04-24 20:44:48 -04:00
parent 825a88e603 4e85c84cc7
commit ab577e7723
139 changed files with 5792 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/programs/cdemu.nix
View File

@@ -8,6 +8,7 @@ in {
options = {
programs.cdemu = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
<command>cdemu</command> for members of

1
nixos/modules/programs/criu.nix
View File

@@ -8,6 +8,7 @@ in {
options = {
programs.criu = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Install <command>criu</command> along with necessary kernel options.

1
nixos/modules/programs/systemtap.nix
View File

@@ -8,6 +8,7 @@ in {
options = {
programs.systemtap = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Install <command>systemtap</command> along with necessary kernel options.

1
nixos/modules/programs/zsh/oh-my-zsh.nix
View File

@@ -39,6 +39,7 @@ in
options = {
programs.zsh.ohMyZsh = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable oh-my-zsh.

1
nixos/modules/services/amqp/rabbitmq.nix
View File

@@ -17,6 +17,7 @@ in {
options = {
services.rabbitmq = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the RabbitMQ server, an Advanced Message

7
nixos/modules/services/backup/mysql-backup.nix
View File

@@ -37,12 +37,7 @@ in
services.mysqlBackup = {
enable = mkOption {
default = false;
description = ''
Whether to enable MySQL backups.
'';
};
enable = mkEnableOption "MySQL backups";
calendar = mkOption {
type = types.str;

7
nixos/modules/services/backup/postgresql-backup.nix
View File

@@ -44,12 +44,7 @@ in {
options = {
services.postgresqlBackup = {
enable = mkOption {
default = false;
description = ''
Whether to enable PostgreSQL dumps.
'';
};
enable = mkEnableOption "PostgreSQL dumps";
startAt = mkOption {
default = "*-*-* 01:15:00";

5
nixos/modules/services/databases/clickhouse.nix
View File

@@ -11,10 +11,7 @@ with lib;
services.clickhouse = {
enable = mkOption {
default = false;
description = "Whether to enable ClickHouse database server.";
};
enable = mkEnableOption "ClickHouse database server";
};

7
nixos/modules/services/databases/firebird.nix
View File

@@ -40,12 +40,7 @@ in
services.firebird = {
enable = mkOption {
default = false;
description = ''
Whether to enable the Firebird super server.
'';
};
enable = mkEnableOption "the Firebird super server";
package = mkOption {
default = pkgs.firebirdSuper;

7
nixos/modules/services/databases/memcached.nix
View File

@@ -18,12 +18,7 @@ in
services.memcached = {
enable = mkOption {
default = false;
description = "
Whether to enable Memcached.
";
};
enable = mkEnableOption "Memcached";
user = mkOption {
default = "memcached";

7
nixos/modules/services/databases/mongodb.nix
View File

@@ -29,12 +29,7 @@ in
services.mongodb = {
enable = mkOption {
default = false;
description = "
Whether to enable the MongoDB server.
";
};
enable = mkEnableOption "the MongoDB server";
package = mkOption {
default = pkgs.mongodb;

5
nixos/modules/services/databases/virtuoso.nix
View File

@@ -13,10 +13,7 @@ with lib;
services.virtuoso = {
enable = mkOption {
default = false;
description = "Whether to enable Virtuoso Opensource database server.";
};
enable = mkEnableOption "Virtuoso Opensource database server";
config = mkOption {
default = "";

7
nixos/modules/services/hardware/ratbagd.nix
View File

@@ -10,12 +10,7 @@ in
options = {
services.ratbagd = {
enable = mkOption {
default = false;
description = ''
Whether to enable ratbagd for configuring gaming mice.
'';
};
enable = mkEnableOption "ratbagd for configuring gaming mice";
};
};

7
nixos/modules/services/hardware/thermald.nix
View File

@@ -8,12 +8,7 @@ in {
###### interface
options = {
services.thermald = {
enable = mkOption {
default = false;
description = ''
Whether to enable thermald, the temperature management daemon.
'';
};
enable = mkEnableOption "thermald, the temperature management daemon";
debug = mkOption {
type = types.bool;

5
nixos/modules/services/mail/spamassassin.nix
View File

@@ -12,10 +12,7 @@ in
options = {
services.spamassassin = {
enable = mkOption {
default = false;
description = "Whether to run the SpamAssassin daemon";
};
enable = mkEnableOption "the SpamAssassin daemon";
debug = mkOption {
default = false;

1
nixos/modules/services/misc/autofs.nix
View File

@@ -19,6 +19,7 @@ in
services.autofs = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Mount filesystems on demand. Unmount them automatically.

8
nixos/modules/services/misc/cgminer.nix
View File

@@ -31,13 +31,7 @@ in
services.cgminer = {
enable = mkOption {
default = false;
description = ''
Whether to enable cgminer, an ASIC/FPGA/GPU miner for bitcoin and
litecoin.
'';
};
enable = mkEnableOption "cgminer, an ASIC/FPGA/GPU miner for bitcoin and litecoin";
package = mkOption {
default = pkgs.cgminer;

7
nixos/modules/services/misc/devmon.nix
View File

@@ -8,12 +8,7 @@ let
in {
options = {
services.devmon = {
enable = mkOption {
default = false;
description = ''
Whether to enable devmon, an automatic device mounting daemon.
'';
};
enable = mkEnableOption "devmon, an automatic device mounting daemon";
};
};

5
nixos/modules/services/misc/disnix.nix
View File

@@ -17,10 +17,7 @@ in
services.disnix = {
enable = mkOption {
default = false;
description = "Whether to enable Disnix";
};
enable = mkEnableOption "Disnix";
enableMultiUser = mkOption {
type = types.bool;

5
nixos/modules/services/misc/felix.nix
View File

@@ -17,10 +17,7 @@ in
services.felix = {
enable = mkOption {
default = false;
description = "Whether to enable the Apache Felix OSGi service";
};
enable = mkEnableOption "the Apache Felix OSGi service";
bundles = mkOption {
type = types.listOf types.package;

1
nixos/modules/services/misc/ihaskell.nix
View File

@@ -15,6 +15,7 @@ in
options = {
services.ihaskell = {
enable = mkOption {
type = types.bool;
default = false;
description = "Autostart an IHaskell notebook service.";
};

5
nixos/modules/services/misc/safeeyes.nix
View File

@@ -16,10 +16,7 @@ in
services.safeeyes = {
enable = mkOption {
default = false;
description = "Whether to enable the safeeyes OSGi service";
};
enable = mkEnableOption "the safeeyes OSGi service";
};

1
nixos/modules/services/misc/svnserve.nix
View File

@@ -18,6 +18,7 @@ in
services.svnserve = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol.";
};

16
nixos/modules/services/misc/synergy.nix
View File

@@ -19,12 +19,8 @@ in
# !!! All these option descriptions needs to be cleaned up.
client = {
enable = mkOption {
default = false;
description = "
Whether to enable the Synergy client (receive keyboard and mouse events from a Synergy server).
";
};
enable = mkEnableOption "the Synergy client (receive keyboard and mouse events from a Synergy server)";
screenName = mkOption {
default = "";
description = ''
@@ -47,12 +43,8 @@ in
};
server = {
enable = mkOption {
default = false;
description = ''
Whether to enable the Synergy server (send keyboard and mouse events).
'';
};
enable = mkEnableOption "the Synergy server (send keyboard and mouse events)";
configFile = mkOption {
default = "/etc/synergy-server.conf";
description = "The Synergy server configuration file.";

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

@@ -225,7 +225,7 @@ in {
Restart = "always";
RestartSec = 2;
};
restartTriggers = [ datadogPkg ] ++ attrNames etcfiles;
restartTriggers = [ datadogPkg ] ++ map (x: x.source) (attrValues etcfiles);
} attrs;
in {
datadog-agent = makeService {

6
nixos/modules/services/network-filesystems/netatalk.nix
View File

@@ -43,10 +43,7 @@ in
options = {
services.netatalk = {
enable = mkOption {
default = false;
description = "Whether to enable the Netatalk AFP fileserver.";
};
enable = mkEnableOption "the Netatalk AFP fileserver";
port = mkOption {
default = 548;
@@ -65,6 +62,7 @@ in
homes = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable sharing of the UNIX server user home directories.";
};

5
nixos/modules/services/network-filesystems/rsyncd.nix
View File

@@ -29,10 +29,7 @@ in
options = {
services.rsyncd = {
enable = mkOption {
default = false;
description = "Whether to enable the rsync daemon.";
};
enable = mkEnableOption "the rsync daemon";
motd = mkOption {
type = types.str;

6
nixos/modules/services/network-filesystems/xtreemfs.nix
View File

@@ -100,11 +100,13 @@ in
dir = {
enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable XtreemFS DIR service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40";
description = ''
@@ -218,11 +220,13 @@ in
mrc = {
enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable XtreemFS MRC service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41";
description = ''
@@ -354,11 +358,13 @@ in
osd = {
enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable XtreemFS OSD service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42";
description = ''

1
nixos/modules/services/network-filesystems/yandex-disk.nix
View File

@@ -21,6 +21,7 @@ in
services.yandex-disk = {
enable = mkOption {
type = types.bool;
default = false;
description = "
Whether to enable Yandex-disk client. See https://disk.yandex.ru/

1
nixos/modules/services/networking/amuled.nix
View File

@@ -16,6 +16,7 @@ in
services.amule = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to run the AMule daemon. You need to manually run "amuled --ec-config" to configure the service for the first time.

7
nixos/modules/services/networking/babeld.nix
View File

@@ -35,12 +35,7 @@ in
services.babeld = {
enable = mkOption {
default = false;
description = ''
Whether to run the babeld network routing daemon.
'';
};
enable = mkEnableOption "the babeld network routing daemon";
interfaceDefaults = mkOption {
default = null;

7
nixos/modules/services/networking/bind.nix
View File

@@ -68,12 +68,7 @@ in
services.bind = {
enable = mkOption {
default = false;
description = "
Whether to enable BIND domain name server.
";
};
enable = mkEnableOption "BIND domain name server";
cacheNetworks = mkOption {
default = ["127.0.0.0/24"];

1
nixos/modules/services/networking/bitlbee.nix
View File

@@ -48,6 +48,7 @@ in
services.bitlbee = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to run the BitlBee IRC to other chat network gateway.

7
nixos/modules/services/networking/cntlm.nix
View File

@@ -33,12 +33,7 @@ in
options.services.cntlm = {
enable = mkOption {
default = false;
description = ''
Whether to enable the cntlm, which start a local proxy.
'';
};
enable = mkEnableOption "cntlm, which starts a local proxy";
username = mkOption {
description = ''

1
nixos/modules/services/networking/flashpolicyd.nix
View File

@@ -39,6 +39,7 @@ in
services.flashpolicyd = {
enable = mkOption {
type = types.bool;
default = false;
description =
''

8
nixos/modules/services/networking/gvpe.nix
View File

@@ -42,12 +42,8 @@ in
{
options = {
services.gvpe = {
enable = mkOption {
default = false;
description = ''
Whether to run gvpe
'';
};
enable = lib.mkEnableOption "gvpe";
nodename = mkOption {
default = null;
description =''

1
nixos/modules/services/networking/hostapd.nix
View File

@@ -49,6 +49,7 @@ in
services.hostapd = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable putting a wireless interface into infrastructure mode,

7
nixos/modules/services/networking/ircd-hybrid/default.nix
View File

@@ -36,12 +36,7 @@ in
services.ircdHybrid = {
enable = mkOption {
default = false;
description = "
Enable IRCD.
";
};
enable = mkEnableOption "IRCD";
serverName = mkOption {
default = "hades.arpa";

8
nixos/modules/services/networking/mailpile.nix
View File

@@ -18,12 +18,8 @@ in
options = {
services.mailpile = {
enable = mkOption {
default = false;
description = "
Whether to enable Mailpile the mail client.
";
};
enable = mkEnableOption "Mailpile the mail client";
hostname = mkOption {
default = "localhost";
description = "Listen to this hostname or ip.";

1
nixos/modules/services/networking/ntp/chrony.nix
View File

@@ -30,6 +30,7 @@ in
options = {
services.chrony = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to synchronise your machine's time using chrony.

1
nixos/modules/services/networking/ntp/ntpd.nix
View File

@@ -38,6 +38,7 @@ in
services.ntp = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to synchronise your machine's time using ntpd, as a peer in

7
nixos/modules/services/networking/openfire.nix
View File

@@ -9,12 +9,7 @@ with lib;
services.openfire = {
enable = mkOption {
default = false;
description = "
Whether to enable OpenFire XMPP server.
";
};
enable = mkEnableOption "OpenFire XMPP server";
usePostgreSQL = mkOption {
default = true;

7
nixos/modules/services/networking/prayer.nix
View File

@@ -41,12 +41,7 @@ in
services.prayer = {
enable = mkOption {
default = false;
description = ''
Whether to run the prayer webmail http server.
'';
};
enable = mkEnableOption "the prayer webmail http server";
port = mkOption {
default = "2080";

7
nixos/modules/services/networking/quassel.nix
View File

@@ -16,12 +16,7 @@ in
services.quassel = {
enable = mkOption {
default = false;
description = ''
Whether to run the Quassel IRC client daemon.
'';
};
enable = mkEnableOption "the Quassel IRC client daemon";
certificateFile = mkOption {
type = types.nullOr types.str;

1
nixos/modules/services/networking/radvd.nix
View File

@@ -19,6 +19,7 @@ in
options = {
services.radvd.enable = mkOption {
type = types.bool;
default = false;
description =
''

1
nixos/modules/services/networking/rdnssd.nix
View File

@@ -17,6 +17,7 @@ in
options = {
services.rdnssd.enable = mkOption {
type = types.bool;
default = false;
#default = config.networking.enableIPv6;
description =

6
nixos/modules/services/networking/sabnzbd.nix
View File

@@ -15,10 +15,8 @@ in
options = {
services.sabnzbd = {
enable = mkOption {
default = false;
description = "Whether to enable the sabnzbd server.";
};
enable = mkEnableOption "the sabnzbd server";
configFile = mkOption {
default = "/var/lib/sabnzbd/sabnzbd.ini";
description = "Path to config file.";

1
nixos/modules/services/networking/shairport-sync.nix
View File

@@ -17,6 +17,7 @@ in
services.shairport-sync = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable the shairport-sync daemon.

1
nixos/modules/services/networking/ssh/lshd.nix
View File

@@ -19,6 +19,7 @@ in
services.lshd = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the GNU lshd SSH2 daemon, which allows

7
nixos/modules/services/networking/xinetd.nix
View File

@@ -44,12 +44,7 @@ in
options = {
services.xinetd.enable = mkOption {
default = false;
description = ''
Whether to enable the xinetd super-server daemon.
'';
};
services.xinetd.enable = mkEnableOption "the xinetd super-server daemon";
services.xinetd.extraDefaults = mkOption {
default = "";

7
nixos/modules/services/security/fprot.nix
View File

@@ -10,12 +10,7 @@ in {
services.fprot = {
updater = {
enable = mkOption {
default = false;
description = ''
Whether to enable automatic F-Prot virus definitions database updates.
'';
};
enable = mkEnableOption "automatic F-Prot virus definitions database updates";
productData = mkOption {
description = ''

7
nixos/modules/services/system/kerberos/default.nix
View File

@@ -51,12 +51,7 @@ in
###### interface
options = {
services.kerberos_server = {
enable = mkOption {
default = false;
description = ''
Enable the kerberos authentification server.
'';
};
enable = lib.mkEnableOption "the kerberos authentification server";
realms = mkOption {
type = types.attrsOf (types.submodule realm);

1
nixos/modules/services/system/localtime.nix
View File

@@ -8,6 +8,7 @@ in {
options = {
services.localtime = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable <literal>localtime</literal>, simple daemon for keeping the system

1
nixos/modules/services/system/uptimed.nix
View File

@@ -10,6 +10,7 @@ in
options = {
services.uptimed = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable <literal>uptimed</literal>, allowing you to track

1
nixos/modules/services/web-servers/jboss/default.nix
View File

@@ -24,6 +24,7 @@ in
services.jboss = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities.";
};

1
nixos/modules/services/x11/desktop-managers/enlightenment.nix
View File

@@ -23,6 +23,7 @@ in
options = {
services.xserver.desktopManager.enlightenment.enable = mkOption {
type = types.bool;
default = false;
description = "Enable the Enlightenment desktop environment.";
};

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

@@ -68,6 +68,7 @@ in
services.xserver.desktopManager.gnome3 = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable Gnome 3 desktop manager.";
};

1
nixos/modules/services/x11/desktop-managers/kodi.nix
View File

@@ -10,6 +10,7 @@ in
options = {
services.xserver.desktopManager.kodi = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable the kodi multimedia center.";
};

1
nixos/modules/services/x11/display-managers/startx.nix
View File

@@ -15,6 +15,7 @@ in
options = {
services.xserver.displayManager.startx = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the dummy "startx" pseudo-display manager,

1
nixos/modules/services/x11/hardware/wacom.nix
View File

@@ -15,6 +15,7 @@ in
services.xserver.wacom = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the Wacom touchscreen/digitizer/tablet.

2
nixos/modules/system/boot/networkd.nix
View File

@@ -1012,7 +1012,7 @@ in
systemd.services.systemd-networkd = {
wantedBy = [ "multi-user.target" ];
restartTriggers = attrNames unitFiles;
restartTriggers = map (x: x.source) (attrValues unitFiles);
# prevent race condition with interface renaming (#39069)
requires = [ "systemd-udev-settle.service" ];
after = [ "systemd-udev-settle.service" ];

16
nixos/modules/system/boot/systemd.nix
View File

@@ -593,6 +593,9 @@ in
each other's limit. The value may be specified in the following
units: s, min, h, ms, us. To turn off any kind of rate limiting,
set either value to 0.
See <option>services.journald.rateLimitBurst</option> for important
considerations when setting this value.
'';
};
@@ -604,6 +607,19 @@ in
interval) that is applied to all messages generated on the system.
This rate limiting is applied per-service, so that two services
which log do not interfere with each other's limit.
Note that the effective rate limit is multiplied by a factor derived
from the available free disk space for the journal as described on
<link xlink:href="https://www.freedesktop.org/software/systemd/man/journald.conf.html">
journald.conf(5)</link>.
Note that the total amount of logs stored is limited by journald settings
such as <literal>SystemMaxUse</literal>, which defaults to a 4 GB cap.
It is thus recommended to compute what period of time that you will be
able to store logs for when an application logs at full burst rate.
With default settings for log lines that are 100 Bytes long, this can
amount to just a few hours.
'';
};

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

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }:
{ mkDerivation, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }:
let
@@ -26,7 +26,7 @@ let
};
};
in stdenv.mkDerivation rec {
in mkDerivation rec {
pname = "dfasma";
version = "1.4.5";

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

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
{ mkDerivation, stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
}:
stdenv.mkDerivation {
mkDerivation {
pname = "iannix";
version = "2016-01-31";
src = fetchFromGitHub {

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

@@ -1,8 +1,8 @@
{ stdenv, fetchurl, cmake, pkgconfig
{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig
, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio
, libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
}:
stdenv.mkDerivation {
mkDerivation {
pname = "traverso";
version = "0.49.6";

4
pkgs/applications/editors/mindforger/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, qmake, qtbase, qtwebkit }:
{ mkDerivation, stdenv, fetchurl, qmake, qtbase, qtwebkit }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "mindforger";
version = "1.48.2";

4
pkgs/applications/editors/okteta/default.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig
{ mkDerivation, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig
, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts
, qca-qt5, shared-mime-info }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "okteta";
version = "0.26.3";

11
pkgs/applications/graphics/awesomebump/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }:
{ mkDerivation, lib, fetchgit, qtbase, qmake, qtscript, flex, bison, qtdeclarative }:
let
@@ -11,7 +11,7 @@ let
fetchSubmodules = true;
};
qtnproperty = stdenv.mkDerivation {
qtnproperty = mkDerivation {
name = "qtnproperty";
inherit src;
sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
@@ -22,7 +22,7 @@ let
install -D bin-linux/QtnPEG $out/bin/QtnPEG
'';
};
in stdenv.mkDerivation {
in mkDerivation {
pname = "awesomebump";
inherit version;
@@ -30,12 +30,13 @@ in stdenv.mkDerivation {
buildInputs = [ qtbase qtscript qtdeclarative ];
nativeBuildInputs = [ qmake makeWrapper ];
nativeBuildInputs = [ qmake ];
preBuild = ''
ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG
'';
dontWrapQtApps = true;
postInstall = ''
d=$out/libexec/AwesomeBump
@@ -44,7 +45,7 @@ in stdenv.mkDerivation {
cp -prd Bin/Configs Bin/Core $d/
# AwesomeBump expects to find Core and Configs in its current directory.
makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
makeQtWrapper $d/AwesomeBump $out/bin/AwesomeBump \
--run "cd $d"
'';

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

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "phototonic";
version = "2.1";

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

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
{ mkDerivation, stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "qcomicbook";
version = "0.9.1";

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

@@ -1,4 +1,4 @@
{ stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }:
{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }:
let
# taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
# license: Free for commercial use
@@ -7,7 +7,7 @@ let
sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8";
};
in
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "write_stylus";
version = "209";

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

@@ -1,8 +1,8 @@
{ stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core
{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core
, qtbase, qttools, qtsvg, qtwebkit
}:
stdenv.mkDerivation rec {
mkDerivation rec {
version = "2.11.2";

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

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }:
{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "candle";
version = "1.1";

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

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }:
{ mkDerivation, stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }:
stdenv.mkDerivation {
mkDerivation {
name = "openbrf-unstable-2016-01-09";
src = fetchFromGitHub {

5
pkgs/applications/misc/qt-box-editor/default.nix
View File

@@ -1,4 +1,5 @@
{ stdenv
{ mkDerivation
, stdenv
, fetchFromGitHub
, qtbase
, qtsvg
@@ -7,7 +8,7 @@
, tesseract
}:
stdenv.mkDerivation {
mkDerivation {
pname = "qt-box-editor";
version = "unstable-2019-07-12";

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

@@ -1,4 +1,4 @@
{ stdenv, fetchhg
{ mkDerivation, stdenv, fetchhg
, qmake, qttools
, qtbase, qtsvg, qtxmlpatterns
, poppler_utils
@@ -6,7 +6,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "valentina";
version = "0.6.1";

7
pkgs/applications/networking/browsers/chromium/common.nix
View File

@@ -149,10 +149,13 @@ let
#
# ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
] ++ optionals (useVaapi) [
] ++ optionals (useVaapi) ([
# source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
./patches/vaapi-fix.patch
];
] ++ optionals (versionRange "81" "82") [
(githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902")
(githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064")
]);
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX

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

@@ -20,7 +20,7 @@
}:
let
llvmPackages = if channel == "dev"
llvmPackages = if channel != "stable"
then llvmPackages_10
else llvmPackages_9;
stdenv = llvmPackages.stdenv;
@@ -35,7 +35,7 @@ let
mkChromiumDerivation = callPackage ./common.nix ({
inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone;
gnChromium = gn;
} // lib.optionalAttrs (channel == "dev") {
} // lib.optionalAttrs (channel != "stable") {
# TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-03-23";

18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17";
sha256bin64 = "1iwn0yyhk0jn47pn7rx9kadli47xyvz3xilfl4faifmasin2fq8v";
version = "81.0.4044.113";
};
dev = {
sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf";
sha256bin64 = "1hn2hjni5k370jhc0nikmx5ypwzcqnmr02h185a5ry697643abdd";
sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax";
version = "83.0.4103.14";
};
dev = {
sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny";
sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf";
version = "84.0.4115.5";
};
stable = {
sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17";
sha256bin64 = "0ap7flrw3h885454fa2r7psa4sh8567ql7v7x96q11gh9gjrdvp3";
version = "81.0.4044.113";
sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg";
sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w";
version = "81.0.4044.122";
};
}

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

@@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, makeDesktopItem
{ mkDerivation, stdenv, fetchurl, pkgconfig, makeDesktopItem
, qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols
, openssl, protobuf, qmake
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "ricochet";
version = "1.1.4";

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

@@ -23,7 +23,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.33.1"; # Please backport all updates to the stable channel.
version = "1.33.3"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0p9ak0cmk9b77dzbw4y2xmxqg211y62n7ckggwf7bcg48wzj0jy7";
sha256 = "1brw1hidmrznb55cb794yvgzin7sf3cxnffivmag4vf2a2vcvf4y";
};
nativeBuildInputs = [

4
pkgs/applications/networking/instant-messengers/swift-im/default.nix
View File

@@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, qttools, scons
{ mkDerivation, stdenv, fetchurl, pkgconfig, qttools, scons
, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2
, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "swift-im";
version = "4.0.2";

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

@@ -1,9 +1,9 @@
{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
{ mkDerivation, stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
# we now have libqmatrixclient so a future version of tensor that supports it
# should use that
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "tensor-git";
version = "2017-02-21";

21
pkgs/applications/office/elementary-planner/default.nix
View File

@@ -1,6 +1,12 @@
{ stdenv, fetchFromGitHub, fetchpatch
, meson, ninja, pkgconfig, desktop-file-utils
, python3, vala, wrapGAppsHook
{ stdenv
, fetchFromGitHub
, meson
, ninja
, pkgconfig
, desktop-file-utils
, python3
, vala
, wrapGAppsHook
, evolution-data-server
, libical
, libgee
@@ -53,8 +59,15 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson/post_install.py
'';
preFixup = ''
gappsWrapperArgs+=(
# the theme is hardcoded
--prefix XDG_DATA_DIRS : "${pantheon.elementary-gtk-theme}/share"
)
'';
meta = with stdenv.lib; {
description = "Task and project manager designed to elementary OS";
description = "Task manager with Todoist support designed for GNU/Linux 🚀️";
homepage = "https://planner-todo.web.app";
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ] ++ pantheon.maintainers;

4
pkgs/applications/science/electronics/caneda/default.nix
View File

@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
{ mkDerivation, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "caneda";
version = "0.3.1";

4
pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "diff-so-fancy";
version = "1.2.7";
version = "1.3.0";
src = fetchFromGitHub {
owner = "so-fancy";
repo = "diff-so-fancy";
rev = "v${version}";
sha256 = "0y5cp236gi6h7llzai5d27086l4zz58mz1zs01r97xnnmjs9vw21";
sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl";
};
# Perl is needed here for patchShebangs

4
pkgs/applications/version-management/redmine/Gemfile
View File

@@ -1,8 +1,10 @@
source 'https://rubygems.org'
ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0'
gem "bundler", ">= 1.5.0"
gem "rails", "5.2.4.1"
gem 'rails', '5.2.4.2'
gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
gem "rouge", "~> 3.12.0"
gem "request_store", "~> 1.4.1"
gem "mini_mime", "~> 1.0.1"

121
pkgs/applications/version-management/redmine/Gemfile.lock
View File

@@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.4.1)
actionpack (= 5.2.4.1)
actioncable (5.2.4.2)
actionpack (= 5.2.4.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.1)
actionpack (= 5.2.4.1)
actionview (= 5.2.4.1)
activejob (= 5.2.4.1)
actionmailer (5.2.4.2)
actionpack (= 5.2.4.2)
actionview (= 5.2.4.2)
activejob (= 5.2.4.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.4.1)
actionview (= 5.2.4.1)
activesupport (= 5.2.4.1)
actionpack (5.2.4.2)
actionview (= 5.2.4.2)
activesupport (= 5.2.4.2)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
@@ -21,26 +21,26 @@ GEM
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
actionview (5.2.4.1)
activesupport (= 5.2.4.1)
actionview (5.2.4.2)
activesupport (= 5.2.4.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.4.1)
activesupport (= 5.2.4.1)
activejob (5.2.4.2)
activesupport (= 5.2.4.2)
globalid (>= 0.3.6)
activemodel (5.2.4.1)
activesupport (= 5.2.4.1)
activerecord (5.2.4.1)
activemodel (= 5.2.4.1)
activesupport (= 5.2.4.1)
activemodel (5.2.4.2)
activesupport (= 5.2.4.2)
activerecord (5.2.4.2)
activemodel (= 5.2.4.2)
activesupport (= 5.2.4.2)
arel (>= 9.0)
activestorage (5.2.4.1)
actionpack (= 5.2.4.1)
activerecord (= 5.2.4.1)
activestorage (5.2.4.2)
actionpack (= 5.2.4.2)
activerecord (= 5.2.4.2)
marcel (~> 0.3.1)
activesupport (5.2.4.1)
activesupport (5.2.4.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -59,8 +59,8 @@ GEM
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (3.0.0)
concurrent-ruby (1.1.5)
crass (1.0.5)
concurrent-ruby (1.1.6)
crass (1.0.6)
css_parser (1.7.1)
addressable
csv (3.1.2)
@@ -73,58 +73,58 @@ GEM
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
json (2.3.0)
loofah (2.4.0)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
method_source (1.0.0)
mimemagic (0.3.4)
mini_magick (4.9.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.13.0)
mocha (1.11.1)
minitest (5.14.0)
mocha (1.11.2)
mysql2 (0.5.3)
net-ldap (0.16.2)
nio4r (2.5.2)
nokogiri (1.10.7)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
parallel (1.19.1)
parser (2.6.5.0)
parser (2.7.1.0)
ast (~> 2.4.0)
pg (1.1.4)
public_suffix (4.0.1)
puma (3.12.2)
rack (2.0.8)
public_suffix (4.0.4)
puma (3.12.4)
rack (2.2.2)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.1)
actioncable (= 5.2.4.1)
actionmailer (= 5.2.4.1)
actionpack (= 5.2.4.1)
actionview (= 5.2.4.1)
activejob (= 5.2.4.1)
activemodel (= 5.2.4.1)
activerecord (= 5.2.4.1)
activestorage (= 5.2.4.1)
activesupport (= 5.2.4.1)
rails (5.2.4.2)
actioncable (= 5.2.4.2)
actionmailer (= 5.2.4.2)
actionpack (= 5.2.4.2)
actionview (= 5.2.4.2)
activejob (= 5.2.4.2)
activemodel (= 5.2.4.2)
activerecord (= 5.2.4.2)
activestorage (= 5.2.4.2)
activesupport (= 5.2.4.2)
bundler (>= 1.3.0)
railties (= 5.2.4.1)
railties (= 5.2.4.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.4.1)
actionpack (= 5.2.4.1)
activesupport (= 5.2.4.1)
railties (5.2.4.2)
actionpack (= 5.2.4.2)
activesupport (= 5.2.4.2)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
@@ -135,15 +135,15 @@ GEM
rbpdf-font (~> 1.19.0)
rbpdf-font (1.19.1)
redcarpet (3.5.0)
regexp_parser (1.6.0)
regexp_parser (1.7.0)
request_store (1.4.1)
rack (>= 1.4)
roadie (3.5.1)
roadie (4.0.0)
css_parser (~> 1.4)
nokogiri (~> 1.8)
roadie-rails (2.1.0)
roadie-rails (2.1.1)
railties (>= 5.1, < 6.1)
roadie (~> 3.1)
roadie (>= 3.1, < 5.0)
rouge (3.12.0)
rubocop (0.76.0)
jaro_winkler (~> 1.5.1)
@@ -152,15 +152,15 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-performance (1.5.1)
rubocop-performance (1.5.2)
rubocop (>= 0.71.0)
rubocop-rails (2.3.2)
rack (>= 1.1)
rubocop (>= 0.72.0)
ruby-openid (2.9.2)
ruby-progressbar (1.10.1)
rubyzip (2.0.0)
selenium-webdriver (3.142.6)
rubyzip (2.3.0)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
simplecov (0.17.1)
@@ -177,15 +177,15 @@ GEM
sprockets (>= 3.0.0)
thor (1.0.1)
thread_safe (0.3.6)
tzinfo (1.2.5)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
unicode-display_width (1.6.1)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.20)
yard (0.9.24)
PLATFORMS
ruby
@@ -208,7 +208,7 @@ DEPENDENCIES
pg (~> 1.1.4)
puma (~> 3.7)
rack-openid
rails (= 5.2.4.1)
rails (= 5.2.4.2)
rails-dom-testing
rbpdf (~> 1.20.0)
redcarpet (~> 3.5.0)
@@ -224,5 +224,8 @@ DEPENDENCIES
tzinfo-data
yard
RUBY VERSION
ruby 2.6.6p146
BUNDLED WITH
2.1.4

6
pkgs/applications/version-management/redmine/default.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
version = "4.1.0";
version = "4.1.1";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
inherit ruby;
gemdir = ./.;
groups = [ "ldap" "openid" ];
groups = [ "development" "ldap" "markdown" "minimagick" "openid" "test" ];
};
in
stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
sha256 = "1fxc0xql54cfvj4g8v31vsv19jbij326qkgdz2h5xlp09r821wli";
sha256 = "1nndy5hz8zvfglxf1f3bsb1pkrfwinfxzkdan1vjs3rkckkszyh5";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];

308
pkgs/applications/version-management/redmine/gemset.nix
View File

@@ -1,33 +1,41 @@
{
actioncable = {
dependencies = ["actionpack" "nio4r" "websocket-driver"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yz5mcjl4is99650vq6rkv539xccq8mp5zsbvzh43wqzfga1llwm";
sha256 = "0q4by8d41n972j8cdcddrwsh7qphcki50xvgm1syrawyck6w1f5v";
type = "gem";
};
version = "5.2.4.1";
version = "5.2.4.2";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dbw3q3yyh7m7wgc4196hc3v86v123z0xz40llmic8iwx3d9vnda";
sha256 = "0kg2nayy8wmxhfp52217h80yqr0mcg793xw3cjlfg9lkvdh0nb5z";
type = "gem";
};
version = "5.2.4.1";
version = "5.2.4.2";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0f5pm62y08j679k3vhcml8436f92kripd6j3v5dyvn760kwzz72z";
sha256 = "1w1l9i6q9xns4yl41l582pyc5i1xi40yyyq802drm58gwylv3wax";
type = "gem";
};
version = "5.2.4.1";
version = "5.2.4.2";
};
actionpack-xml_parser = {
dependencies = ["actionpack" "railties"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rnm6jrw3mzcf2g3q498igmhsn0kfkxq79w0nm532iclx4g4djs0";
@@ -37,60 +45,74 @@
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hnkyx268czfb6ljv6ipcnz9dbgsb1z9n1gcr6279z9wx9550zij";
sha256 = "0fp3my6216lb9gp800s46y0404jwfl6xb3j9rvx4zf087497q8lp";
type = "gem";
};
version = "5.2.4.1";
version = "5.2.4.2";
};
activejob = {
dependencies = ["activesupport" "globalid"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k4j3fcfc8m4hxwhs8xnbxazra760j3amn5r2zm2d5r1a1nqfh91";
sha256 = "1qsvb89rwqrp779mvpn67qbzidg2q6d1fa8kwybvpc93nzb9zpvi";
type = "gem";
};
version = "5.2.4.1";
version = "5.2.4.2";
};
activemodel = {
dependencies = ["activesupport"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sg1yyz710pxhq9z0jsbpbgn666y8iv4aj7pywglydipp4i0bpx1";
sha256 = "0jcfdv00kmifj86d0z347nw55q1f8vwzr1aa9jrfnwz47ndi22di";
type = "gem";
};
version = "5.2.4.1";
version = "5.2.4.2";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p35d6pj1370mnlppqq9lhr7m1ck82xvv621wq6hy12v41qfdnrg";
sha256 = "1yaqrh23c8krrjw6rvxv7pvnkpp46nk5aq9z2daby640si4xpmp5";
type = "gem";
};
version = "5.2.4.1";
version = "5.2.4.2";
};
activestorage = {
dependencies = ["actionpack" "activerecord" "marcel"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dd8k91b88b875mypwqific2jilgzj5bx1637cwmzi4c0cy1v17f";
sha256 = "1d51zp17c9k4brivm8y46rszcz07s5rb75gmkm0dpzg3rz3v38s9";
type = "gem";
};
version = "5.2.4.1";
version = "5.2.4.2";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lmlnx79sv18xv1ddm4vq7z3mwdfa4468mq5186av0k8n1k471sp";
sha256 = "0y1397g5xxinjyxjsdmp8c92yn0y3bd2hl4wbmmrpd08bggy6flc";
type = "gem";
};
version = "5.2.4.1";
version = "5.2.4.2";
};
addressable = {
dependencies = ["public_suffix"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
@@ -99,6 +121,8 @@
version = "2.7.0";
};
arel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0";
@@ -107,6 +131,8 @@
version = "9.0.0";
};
ast = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
@@ -115,6 +141,8 @@
version = "2.4.0";
};
builder = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
@@ -124,6 +152,8 @@
};
capybara = {
dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bq1y3gy98rqgw8z69b42isc2klb75fvlwvpi36vycf1yk0sfmmx";
@@ -132,6 +162,8 @@
version = "3.25.0";
};
childprocess = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5";
@@ -140,23 +172,29 @@
version = "3.0.0";
};
concurrent-ruby = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
type = "gem";
};
version = "1.1.5";
version = "1.1.6";
};
crass = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f";
sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw";
type = "gem";
};
version = "1.0.5";
version = "1.0.6";
};
css_parser = {
dependencies = ["addressable"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw";
@@ -165,6 +203,8 @@
version = "1.7.1";
};
csv = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00szzw96bqz59r0kaab4p75qb0wq54iahmq37wpdg96bxc8y80f5";
@@ -173,6 +213,8 @@
version = "3.1.2";
};
docile = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";
@@ -181,6 +223,8 @@
version = "1.3.2";
};
erubi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
@@ -190,6 +234,8 @@
};
globalid = {
dependencies = ["activesupport"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
@@ -198,6 +244,8 @@
version = "0.4.2";
};
htmlentities = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
@@ -207,6 +255,8 @@
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
@@ -215,6 +265,8 @@
version = "1.6.0";
};
jaro_winkler = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
@@ -223,6 +275,8 @@
version = "1.5.4";
};
json = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
@@ -232,15 +286,19 @@
};
loofah = {
dependencies = ["crass" "nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn";
sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040";
type = "gem";
};
version = "2.4.0";
version = "2.5.0";
};
mail = {
dependencies = ["mini_mime"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
@@ -250,6 +308,8 @@
};
marcel = {
dependencies = ["mimemagic"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx";
@@ -258,22 +318,28 @@
version = "0.3.3";
};
method_source = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
type = "gem";
};
version = "0.9.2";
version = "1.0.0";
};
mimemagic = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw";
sha256 = "0frrfvz52fh4v1sb2xr9pyxhrxm5f7jppqxagpmd7c5ific66l9p";
type = "gem";
};
version = "0.3.3";
version = "0.3.4";
};
mini_magick = {
groups = ["minimagick"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4";
@@ -282,6 +348,8 @@
version = "4.9.5";
};
mini_mime = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
@@ -290,6 +358,8 @@
version = "1.0.2";
};
mini_portile2 = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
@@ -298,22 +368,36 @@
version = "2.4.0";
};
minitest = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi";
sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
type = "gem";
};
version = "5.13.0";
version = "5.14.0";
};
mocha = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06i2q5qjr9mvjgjc8w41pdf3qalw340y33wjvzc0rp4a1cbbb7pp";
sha256 = "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4";
type = "gem";
};
version = "1.11.1";
version = "1.11.2";
};
mysql2 = {
groups = ["default"];
platforms = [{
engine = "maglev";
} {
engine = "mingw";
} {
engine = "mingw";
} {
engine = "ruby";
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw";
@@ -322,6 +406,8 @@
version = "0.5.3";
};
net-ldap = {
groups = ["ldap"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg";
@@ -330,6 +416,8 @@
version = "0.16.2";
};
nio4r = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c";
@@ -339,14 +427,18 @@
};
nokogiri = {
dependencies = ["mini_portile2"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
type = "gem";
};
version = "1.10.7";
version = "1.10.9";
};
parallel = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
@@ -356,14 +448,26 @@
};
parser = {
dependencies = ["ast"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw";
sha256 = "07awrcwm2xibglrh7qwpj24vwzn9p64m7bmfr9xbrlffaznr0ii7";
type = "gem";
};
version = "2.6.5.0";
version = "2.7.1.0";
};
pg = {
groups = ["default"];
platforms = [{
engine = "maglev";
} {
engine = "mingw";
} {
engine = "mingw";
} {
engine = "ruby";
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
@@ -372,31 +476,39 @@
version = "1.1.4";
};
public_suffix = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz";
type = "gem";
};
version = "4.0.1";
version = "4.0.4";
};
puma = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07sb9xqc9bn5lvl9ia25w8x1fwzk52p5vgysnvjlc3hvn0r00ysj";
sha256 = "0mg8yh478mh55pg7pv8z7xyvk35ra98hy61z9lwkfr8fzyyz57zs";
type = "gem";
};
version = "3.12.2";
version = "3.12.4";
};
rack = {
groups = ["default" "openid" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1id0jsslx1ipv0pbqjfn7mjbb2vx2xybk7qypq59a17163xp30gr";
sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp";
type = "gem";
};
version = "2.0.8";
version = "2.2.2";
};
rack-openid = {
dependencies = ["rack" "ruby-openid"];
groups = ["openid"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sg85yn981j3a0iri3ch4znzdwscvz29l7vrk3dafqw4fdg31llc";
@@ -406,6 +518,8 @@
};
rack-test = {
dependencies = ["rack"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m";
@@ -415,15 +529,19 @@
};
rails = {
dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1198azwbhlhq2n9xmpb19709d6smkanimip9cagvnlihagw80b20";
sha256 = "1x8k6n4yziwf386prhvr9d9plc9fwv0j8spw2bnmkwhf54v2ias4";
type = "gem";
};
version = "5.2.4.1";
version = "5.2.4.2";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i";
@@ -433,6 +551,8 @@
};
rails-html-sanitizer = {
dependencies = ["loofah"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
@@ -442,14 +562,18 @@
};
railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iqsqyyjscwnj2d3i0zl2k9apgsm7bb92l5h4wv1zbpdbb30wsqb";
sha256 = "1p2rnd1xdqlk19k3m5gd058yzvwjj25k5hwn4km683b5dhylpd16";
type = "gem";
};
version = "5.2.4.1";
version = "5.2.4.2";
};
rainbow = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
@@ -458,6 +582,8 @@
version = "3.0.0";
};
rake = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
@@ -467,6 +593,8 @@
};
rbpdf = {
dependencies = ["htmlentities" "rbpdf-font"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sdj8frakpdms820rwlil38h9bh3p24xmwnjrxsjc1p9irc3za71";
@@ -475,6 +603,8 @@
version = "1.20.1";
};
rbpdf-font = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pxlr0l4vf785qpy55m439dyii63a26l0sd0yyhbwwcy9zm9hd1v";
@@ -483,6 +613,8 @@
version = "1.19.1";
};
redcarpet = {
groups = ["markdown"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
@@ -491,15 +623,19 @@
version = "3.5.0";
};
regexp_parser = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1l44ml30jvqpdi3707x1n1dinq7fx9887pv3q2ywyfmi4kja7yf2";
sha256 = "0l2vcj9qffj5b3v9jsyi4k994bdj3rjz7l9ql8x04lndqxfrrrv2";
type = "gem";
};
version = "1.6.0";
version = "1.7.0";
};
request_store = {
dependencies = ["rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1963330z03fk382fi8y231ygcbnh86m91dqlp5rh1mwy9ihzzl6d";
@@ -509,23 +645,29 @@
};
roadie = {
dependencies = ["css_parser" "nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zihd316bkbnrinz5s1s7pg7s0cadhhj6qs7wmc713j0g6ai1k9r";
sha256 = "01kld3drqfiih5x8c13cvr6dpvdl7jml0v9bcw4fsy322lax3kn0";
type = "gem";
};
version = "3.5.1";
version = "4.0.0";
};
roadie-rails = {
dependencies = ["railties" "roadie"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hdkmnxrmw31dn9jq43xiypz2v6rbvg4x2yd2hgl2xbl3lm1ln7i";
sha256 = "1fmn7kkbpgipjsx65rw7hqa3bwinlqykx5qf1x28ya9ag8v2q0ph";
type = "gem";
};
version = "2.1.0";
version = "2.1.1";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08fpnxbhqv5sqpnfjasl1ysxafssyq4q1yhcqamqqzmb9czj1czw";
@@ -535,6 +677,8 @@
};
rubocop = {
dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07x51ixlx76y194xsszh5lbkaqakz44ykbrjxg3qaggbs18790q0";
@@ -544,15 +688,19 @@
};
rubocop-performance = {
dependencies = ["rubocop"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kn6rb0ma32gjp5qdvrbbb9ckh66rm6xpfrw8h3kr7svirsww2h8";
sha256 = "1fk9nd3b24avgsqp726hy2pl1iyfjrh6jni97wkky6kqy0lq6zq2";
type = "gem";
};
version = "1.5.1";
version = "1.5.2";
};
rubocop-rails = {
dependencies = ["rack" "rubocop"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q7ffsq1cjm4m949nh935kjzv4zf1pacnrl00siwh8flhcn3mmjf";
@@ -561,6 +709,8 @@
version = "2.3.2";
};
ruby-openid = {
groups = ["openid"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "190p1m0bxd9xkfk1j6cpcv3x5c367g36nsglg4m1fcwqdd13k3kz";
@@ -569,6 +719,8 @@
version = "2.9.2";
};
ruby-progressbar = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
@@ -577,24 +729,30 @@
version = "1.10.1";
};
rubyzip = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gz0ri0pa2xr7b6bf66yjc2wfvk51f4gi6yk7bklwl1nr65zc4gz";
sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
type = "gem";
};
version = "2.0.0";
version = "2.3.0";
};
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11abil34dr8p1kw7hlaqd6kr430v4srmhzf72zzqvhcimlfvm4yb";
sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y";
type = "gem";
};
version = "3.142.6";
version = "3.142.7";
};
simplecov = {
dependencies = ["docile" "json" "simplecov-html"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw";
@@ -603,6 +761,8 @@
version = "0.17.1";
};
simplecov-html = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
@@ -612,6 +772,8 @@
};
sprockets = {
dependencies = ["concurrent-ruby" "rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jm37zpvvm1arxjwrd6am0wrdbfhrhc5y0l4p2i3p11z04bsvgap";
@@ -621,6 +783,8 @@
};
sprockets-rails = {
dependencies = ["actionpack" "activesupport" "sprockets"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
@@ -629,6 +793,8 @@
version = "3.2.1";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
@@ -637,6 +803,8 @@
version = "1.0.1";
};
thread_safe = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
@@ -646,23 +814,29 @@
};
tzinfo = {
dependencies = ["thread_safe"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
type = "gem";
};
version = "1.2.5";
version = "1.2.7";
};
unicode-display_width = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x";
type = "gem";
};
version = "1.6.0";
version = "1.6.1";
};
websocket-driver = {
dependencies = ["websocket-extensions"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
@@ -671,6 +845,8 @@
version = "0.7.1";
};
websocket-extensions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
@@ -680,6 +856,8 @@
};
xpath = {
dependencies = ["nokogiri"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd";
@@ -688,11 +866,13 @@
version = "3.2.0";
};
yard = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny";
sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp";
type = "gem";
};
version = "0.9.20";
version = "0.9.24";
};
}

11
pkgs/applications/video/bomi/default.nix
View File

@@ -1,7 +1,7 @@
{ config, stdenv, fetchFromGitHub
{ mkDerivation, config, stdenv, fetchFromGitHub
, fetchpatch, pkgconfig, perl, python, which
, libX11, libxcb, libGLU, libGL
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
, libchardet
, ffmpeg
@@ -29,7 +29,7 @@ assert pulseSupport -> libpulseaudio != null;
assert cddaSupport -> libcdda != null;
assert youtubeSupport -> youtube-dl != null;
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "bomi";
version = "0.9.11";
@@ -90,8 +90,9 @@ stdenv.mkDerivation rec {
patchShebangs build-mpv
'';
dontWrapQtApps = true;
postInstall = ''
wrapProgram $out/bin/bomi \
wrapQtApp $out/bin/bomi \
${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
'';
@@ -105,7 +106,7 @@ stdenv.mkDerivation rec {
++ optional cddaSupport "--enable-cdda"
;
nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ];
nativeBuildInputs = [ pkgconfig perl python which qttools qmake ];
meta = with stdenv.lib; {
description = "Powerful and easy-to-use multimedia player";

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

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }:
{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "QMediathekView";
version = "2019-01-06";

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

@@ -1,8 +1,8 @@
{ stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
{ mkDerivation, stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre
, qwt, extra-cmake-modules }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "qstopmotion";
version = "2.4.1";

4
pkgs/applications/virtualization/aqemu/default.nix
View File

@@ -1,7 +1,7 @@
{ cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv
{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "aqemu";
version = "0.9.2";

14
pkgs/applications/virtualization/virtualbox/default.nix
View File

@@ -19,10 +19,9 @@ with stdenv.lib;
let
python = python3;
buildType = "release";
# Remember to change the extpackRev and version in extpack.nix and
# guest-additions/default.nix as well.
main = "59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99";
version = "6.1.4";
# Use maintainers/scripts/update.nix to update the version and all related hashes or
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
version = "6.1.6";
iasl' = iasl.overrideAttrs (old: rec {
inherit (old) pname;
@@ -39,7 +38,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
sha256 = main;
sha256 = "b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f";
};
outputs = [ "out" "modsrc" ];
@@ -108,6 +107,10 @@ in stdenv.mkDerivation {
postPatch = ''
sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp
'' + optionalString headless ''
# Fix compile error in version 6.1.6
substituteInPlace src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11-stubs.cpp \
--replace PSHCLFORMATDATA PSHCLFORMATS
'';
# first line: ugly hack, and it isn't yet clear why it's a problem
@@ -216,6 +219,7 @@ in stdenv.mkDerivation {
passthru = {
inherit version; # for guest additions
inherit extensionPack; # for inclusion in profile to prevent gc
updateScript = ./update.sh;
};
meta = {

2
pkgs/applications/virtualization/virtualbox/extpack.nix
View File

@@ -12,7 +12,7 @@ fetchurl rec {
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
let value = "3b73798d776ff223ea8025b1a45001762f8d4e5bcd1ea61449773c1249935800";
let value = "80b96b4b51a502141f6a8981f1493ade08a00762622c39e48319e5b122119bf3";
in assert (builtins.stringLength value) == 64; value;
meta = {

2
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "e2846a7576cce1b92a7c0744f41eaac750248d6e31dfca5c45d5766648b394c7";
sha256 = "bcde4691dea7de93b65a10a43dda2b8f52e570f820992ad281c9bb5c8dede181";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

85
pkgs/applications/virtualization/virtualbox/update.py
View File

@@ -1,85 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i python3 -p python3
import os
import re
import json
import urllib.request
from distutils.version import LooseVersion
UPSTREAM_INFO_FILE = os.path.join(
os.path.dirname(os.path.abspath(__file__)),
"upstream-info.json"
)
def fetch_latest_version():
url = "http://download.virtualbox.org/virtualbox/LATEST.TXT"
return urllib.request.urlopen(url).read().strip().decode()
def load_upstream_info():
try:
with open(UPSTREAM_INFO_FILE, 'r') as fp:
return json.load(fp)
except FileNotFoundError:
return {'version': "0"}
def save_upstream_info(contents):
remark = "Generated using update.py from the same directory."
contents['__NOTE'] = remark
data = json.dumps(contents, indent=2, sort_keys=True)
with open(UPSTREAM_INFO_FILE, 'w') as fp:
fp.write(data + "\n")
def fetch_file_table(version):
url = "http://download.virtualbox.org/virtualbox/{}/SHA256SUMS"
url = url.format(version)
result = {}
for line in urllib.request.urlopen(url):
sha, name = line.rstrip().split()
result[name.lstrip(b'*').decode()] = sha.decode()
return result
def update_to_version(version):
extpack_start = 'Oracle_VM_VirtualBox_Extension_Pack-'
version_re = version.replace('.', '\\.')
attribute_map = {
'extpack': r'^' + extpack_start + r'[^-]+-[^.]+.vbox-extpack$',
'extpackRev': r'^' + extpack_start + r'[^-]+-([^.]+).vbox-extpack$',
'main': r'^VirtualBox-' + version_re + r'.tar.bz2$',
'guest': r'^VBoxGuestAdditions_' + version_re + r'.iso$',
}
table = fetch_file_table(version)
new_attrs = {'version': version}
for attr, searchexpr in attribute_map.items():
result = [re.search(searchexpr, key) for key in table.keys()]
filtered = filter(lambda m: m is not None, result)
found = [m.groups()[0] if len(m.groups()) > 0 else table[m.group(0)]
for m in filtered if m is not None]
if len(found) == 0:
msg = "No package found for attribute {}".format(attr)
raise AssertionError(msg)
elif len(found) != 1:
msg = "More than one package found for attribute {}: ".format(attr)
msg += ', '.join(found)
raise AssertionError(msg)
else:
new_attrs[attr] = found[0]
return new_attrs
info = load_upstream_info()
latest = fetch_latest_version()
if LooseVersion(info['version']) < LooseVersion(latest):
print("Updating to version {}...".format(latest), end="", flush=True)
new_attrs = update_to_version(latest)
save_upstream_info(new_attrs)
print(" done.")
else:
print("Version {} is already the latest one.".format(info['version']))

44
pkgs/applications/virtualization/virtualbox/update.sh Executable file
View File

@@ -0,0 +1,44 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl common-updater-scripts nix-prefetch-scripts jq
set -xeuo pipefail
nixpkgs="$(git rev-parse --show-toplevel)"
attr=virtualbox
oldVersion="$(nix-instantiate --eval -E "with import $nixpkgs {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"')"
latestVersion="$(curl -sS https://download.virtualbox.org/virtualbox/LATEST.TXT)"
function fileShaSum() {
echo "$1" | grep -w $2 | cut -f1 -d' '
}
function oldHash() {
nix-instantiate --eval --strict -A "$1.drvAttrs.outputHash" | tr -d '"'
}
function nixFile() {
nix-instantiate --eval --strict -A "${1}.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/'
}
if [ ! "$oldVersion" = "$latestVersion" ]; then
shaSums=$(curl -sS https://download.virtualbox.org/virtualbox/$latestVersion/SHA256SUMS)
virtualBoxShaSum=$(fileShaSum "$shaSums" "VirtualBox-$latestVersion.tar.bz2")
extpackShaSum=$(fileShaSum "$shaSums" "Oracle_VM_VirtualBox_Extension_Pack-$latestVersion.vbox-extpack")
guestAdditionsShaSum=$(fileShaSum "$shaSums" "*VBoxGuestAdditions_$latestVersion.iso")
virtualboxNixFile=$(nixFile ${attr})
extpackNixFile=$(nixFile ${attr}Extpack)
guestAdditionsNixFile=$(nixFile linuxPackages.${attr}GuestAdditions)
extpackOldShaSum=$(oldHash ${attr}Extpack)
guestAdditionsOldShaSum=$(oldHash linuxPackages.${attr}GuestAdditions.src)
update-source-version $attr $latestVersion $virtualBoxShaSum
sed -i -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' $extpackNixFile
sed -i -e 's|sha256 = "'$guestAdditionsOldShaSum'"|sha256 = "'$guestAdditionsShaSum'"|' $guestAdditionsNixFile
git add $virtualboxNixFile $extpackNixFile $guestAdditionsNixFile
git commit -m "$attr: ${oldVersion} -> ${latestVersion}"
else
echo "$attr is already up-to-date"
fi

50
pkgs/desktops/gnome-3/find-latest-version.py
View File

@@ -1,10 +1,13 @@
import argparse
import math
import json
import requests
import sys
def version_to_list(version):
return list(map(int, version.split('.')))
return list(map(int, version.split(".")))
def odd_unstable(version_str, selected):
version = version_to_list(version_str)
@@ -14,47 +17,58 @@ def odd_unstable(version_str, selected):
even = version[1] % 2 == 0
prerelease = (version[1] >= 90 and version[1] < 100) or (version[1] >= 900 and version[1] < 1000)
stable = even and not prerelease
if selected == 'stable':
if selected == "stable":
return stable
else:
return True
def no_policy(version, selected):
return True
version_policies = {
'odd-unstable': odd_unstable,
'none': no_policy,
"odd-unstable": odd_unstable,
"none": no_policy,
}
def make_version_policy(version_predicate, selected):
return lambda version: version_predicate(version, selected)
parser = argparse.ArgumentParser(description='Find latest version for a GNOME package by crawling their release server.')
parser.add_argument('package-name', help='Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.')
parser.add_argument('version-policy', help='Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.', choices=version_policies.keys(), nargs='?', default='odd-unstable')
parser.add_argument('requested-release', help='Most of the time, we will want to update to stable version but sometimes it is useful to test.', choices=['stable', 'unstable'], nargs='?', default='stable')
def make_version_policy(version_predicate, selected, upper_bound):
if not upper_bound:
upper_bound = [math.inf, math.inf]
else:
upper_bound = version_to_list(upper_bound)
return lambda version: version_predicate(version, selected) and version_to_list(version) < upper_bound
if __name__ == '__main__':
parser = argparse.ArgumentParser(description="Find latest version for a GNOME package by crawling their release server.")
parser.add_argument("package-name", help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.")
parser.add_argument("version-policy", help="Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="odd-unstable")
parser.add_argument("requested-release", help="Most of the time, we will want to update to stable version but sometimes it is useful to test.", choices=["stable", "unstable"], nargs="?", default="stable")
parser.add_argument("--upper-bound", dest="upper-bound", help="Only look for versions older than this one (useful for pinning dependencies).")
if __name__ == "__main__":
args = parser.parse_args()
package_name = getattr(args, 'package-name')
requested_release = getattr(args, 'requested-release')
version_predicate = version_policies[getattr(args, 'version-policy')]
version_policy = make_version_policy(version_predicate, requested_release)
package_name = getattr(args, "package-name")
requested_release = getattr(args, "requested-release")
upper_bound = getattr(args, "upper-bound")
version_predicate = version_policies[getattr(args, "version-policy")]
version_policy = make_version_policy(version_predicate, requested_release, upper_bound)
# The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762
cache = json.loads(requests.get('https://ftp.gnome.org/pub/GNOME/sources/{}/cache.json'.format(package_name)).text)
cache = json.loads(requests.get(f"https://ftp.gnome.org/pub/GNOME/sources/{package_name}/cache.json").text)
if type(cache) != list or cache[0] != 4:
print('Unknown format of cache.json file.', file=sys.stderr)
print("Unknown format of cache.json file.", file=sys.stderr)
sys.exit(1)
versions = cache[2][package_name]
versions = sorted(filter(version_policy, versions), key=version_to_list)
if len(versions) == 0:
print('No versions matched.', file=sys.stderr)
print("No versions matched.", file=sys.stderr)
sys.exit(1)
print(versions[-1])

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