nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-25 22:33:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-07-13 09:06:20 +02:00
commit 9403c994b1
89 changed files with 686 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/config/users-groups.nix
View File

@ -430,9 +430,9 @@ in {
(mkChangedOptionModule
[ "security" "initialRootPassword" ]
[ "users" "users" "root" "initialHashedPassword" ]
(cfg: if cfg.security.initialHashedPassword == "!"
(cfg: if cfg.security.initialRootPassword == "!"
then null
else cfg.security.initialHashedPassword))
else cfg.security.initialRootPassword))
];
###### interface

66
nixos/modules/services/backup/restic.nix
View File

@ -31,6 +31,59 @@ in
'';
};
rcloneOptions = mkOption {
type = with types; nullOr (attrsOf (oneOf [ str bool ]));
default = null;
description = ''
Options to pass to rclone to control its behavior.
See <link xlink:href="https://rclone.org/docs/#options"/> for
available options. When specifying option names, strip the
leading <literal>--</literal>. To set a flag such as
<literal>--drive-use-trash</literal>, which does not take a value,
set the value to the Boolean <literal>true</literal>.
'';
example = {
bwlimit = "10M";
drive-use-trash = "true";
};
};
rcloneConfig = mkOption {
type = with types; nullOr (attrsOf (oneOf [ str bool ]));
default = null;
description = ''
Configuration for the rclone remote being used for backup.
See the remote's specific options under rclone's docs at
<link xlink:href="https://rclone.org/docs/"/>. When specifying
option names, use the "config" name specified in the docs.
For example, to set <literal>--b2-hard-delete</literal> for a B2
remote, use <literal>hard_delete = true</literal> in the
attribute set.
Warning: Secrets set in here will be world-readable in the Nix
store! Consider using the <literal>rcloneConfigFile</literal>
option instead to specify secret values separately. Note that
options set here will override those set in the config file.
'';
example = {
type = "b2";
account = "xxx";
key = "xxx";
hard_delete = true;
};
};
rcloneConfigFile = mkOption {
type = with types; nullOr path;
default = null;
description = ''
Path to the file containing rclone configuration. This file
must contain configuration for the remote specified in this backup
set and also must be readable by root. Options set in
<literal>rcloneConfig</literal> will override those set in this
file.
'';
};
repository = mkOption {
type = types.str;
description = ''
@ -170,11 +223,22 @@ in
( resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts) )
( resticCmd + " check" )
];
# Helper functions for rclone remotes
rcloneRemoteName = builtins.elemAt (splitString ":" backup.repository) 1;
rcloneAttrToOpt = v: "RCLONE_" + toUpper (builtins.replaceStrings [ "-" ] [ "_" ] v);
rcloneAttrToConf = v: "RCLONE_CONFIG_" + toUpper (rcloneRemoteName + "_" + v);
toRcloneVal = v: if lib.isBool v then lib.boolToString v else v;
in nameValuePair "restic-backups-${name}" ({
environment = {
RESTIC_PASSWORD_FILE = backup.passwordFile;
RESTIC_REPOSITORY = backup.repository;
};
} // optionalAttrs (backup.rcloneOptions != null) (mapAttrs' (name: value:
nameValuePair (rcloneAttrToOpt name) (toRcloneVal value)
) backup.rcloneOptions) // optionalAttrs (backup.rcloneConfigFile != null) {
RCLONE_CONFIG = backup.rcloneConfigFile;
} // optionalAttrs (backup.rcloneConfig != null) (mapAttrs' (name: value:
nameValuePair (rcloneAttrToConf name) (toRcloneVal value)
) backup.rcloneConfig);
path = [ pkgs.openssh ];
restartIfChanged = false;
serviceConfig = {

28
nixos/modules/services/development/jupyter/default.nix
View File

@ -6,10 +6,7 @@ let
cfg = config.services.jupyter;
# NOTE: We don't use top-level jupyter because we don't
# want to pass in JUPYTER_PATH but use .environment instead,
# saving a rebuild.
package = pkgs.python3.pkgs.notebook;
package = cfg.package;
kernels = (pkgs.jupyter-kernel.create {
definitions = if cfg.kernels != null
@ -37,6 +34,27 @@ in {
'';
};
package = mkOption {
type = types.package;
# NOTE: We don't use top-level jupyter because we don't
# want to pass in JUPYTER_PATH but use .environment instead,
# saving a rebuild.
default = pkgs.python3.pkgs.notebook;
description = ''
Jupyter package to use.
'';
};
command = mkOption {
type = types.str;
default = "jupyter-notebook";
example = "jupyter-lab";
description = ''
Which command the service runs. Note that not all jupyter packages
have all commands, e.g. jupyter-lab isn't present in the default package.
'';
};
port = mkOption {
type = types.int;
default = 8888;
@ -157,7 +175,7 @@ in {
serviceConfig = {
Restart = "always";
ExecStart = ''${package}/bin/jupyter-notebook \
ExecStart = ''${package}/bin/${cfg.command} \
--no-browser \
--ip=${cfg.ip} \
--port=${toString cfg.port} --port-retries 0 \

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

@ -162,6 +162,8 @@ in
unitConfig.RequiresMountsFor = stateDir;
# This a HACK to fix missing dependencies of dynamic libs extracted from jars
environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib";
# Make sure package upgrades trigger a service restart
restartTriggers = [ cfg.unifiPackage cfg.mongodbPackage ];
serviceConfig = {
Type = "simple";

2
nixos/modules/system/boot/loader/grub/install-grub.pl
View File

@ -652,7 +652,7 @@ my @deviceTargets = getList('devices');
my $prevGrubState = readGrubState();
my @prevDeviceTargets = split/,/, $prevGrubState->devices;
my @extraGrubInstallArgs = getList('extraGrubInstallArgs');
my @prevExtraGrubInstallArgs = $prevGrubState->extraGrubInstallArgs;
my @prevExtraGrubInstallArgs = @{$prevGrubState->extraGrubInstallArgs};
my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference());
my $extraGrubInstallArgsDiffer = scalar (List::Compare->new( '-u', '-a', \@extraGrubInstallArgs, \@prevExtraGrubInstallArgs)->get_symmetric_difference());

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

@ -473,8 +473,6 @@ in
[ "aes" "aes_generic" "blowfish" "twofish"
"serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
"af_alg" "algif_skcipher"
(if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "aes_x86_64" else "aes_i586")
];
description = ''
A list of cryptographic kernel modules needed to decrypt the root device(s).

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

@ -818,6 +818,49 @@ in
'';
};
systemd.watchdog.device = mkOption {
type = types.nullOr types.path;
default = null;
example = "/dev/watchdog";
description = ''
The path to a hardware watchdog device which will be managed by systemd.
If not specified, systemd will default to /dev/watchdog.
'';
};
systemd.watchdog.runtimeTime = mkOption {
type = types.nullOr types.str;
default = null;
example = "30s";
description = ''
The amount of time which can elapse before a watchdog hardware device
will automatically reboot the system. Valid time units include "ms",
"s", "min", "h", "d", and "w".
'';
};
systemd.watchdog.rebootTime = mkOption {
type = types.nullOr types.str;
default = null;
example = "10m";
description = ''
The amount of time which can elapse after a reboot has been triggered
before a watchdog hardware device will automatically reboot the system.
Valid time units include "ms", "s", "min", "h", "d", and "w".
'';
};
systemd.watchdog.kexecTime = mkOption {
type = types.nullOr types.str;
default = null;
example = "10m";
description = ''
The amount of time which can elapse when kexec is being executed before
a watchdog hardware device will automatically reboot the system. This
option should only be enabled if reloadTime is also enabled. Valid
time units include "ms", "s", "min", "h", "d", and "w".
'';
};
};
@ -889,6 +932,19 @@ in
DefaultIPAccounting=yes
''}
DefaultLimitCORE=infinity
${optionalString (config.systemd.watchdog.device != null) ''
WatchdogDevice=${config.systemd.watchdog.device}
''}
${optionalString (config.systemd.watchdog.runtimeTime != null) ''
RuntimeWatchdogSec=${config.systemd.watchdog.runtimeTime}
''}
${optionalString (config.systemd.watchdog.rebootTime != null) ''
RebootWatchdogSec=${config.systemd.watchdog.rebootTime}
''}
${optionalString (config.systemd.watchdog.kexecTime != null) ''
KExecWatchdogSec=${config.systemd.watchdog.kexecTime}
''}
${config.systemd.extraConfig}
'';

55
nixos/tests/restic.nix
View File

@ -4,33 +4,50 @@ import ./make-test-python.nix (
let
password = "some_password";
repository = "/tmp/restic-backup";
passwordFile = pkgs.writeText "password" "correcthorsebatterystaple";
rcloneRepository = "rclone:local:/tmp/restic-rclone-backup";
passwordFile = "${pkgs.writeText "password" "correcthorsebatterystaple"}";
initialize = true;
paths = [ "/opt" ];
pruneOpts = [
"--keep-daily 2"
"--keep-weekly 1"
"--keep-monthly 1"
"--keep-yearly 99"
];
in
{
name = "restic";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ bbigras ];
maintainers = [ bbigras i077 ];
};
nodes = {
server =
{ ... }:
{ pkgs, ... }:
{
services.restic.backups = {
remotebackup = {
inherit repository;
passwordFile = "${passwordFile}";
initialize = true;
paths = [ "/opt" ];
pruneOpts = [
"--keep-daily 2"
"--keep-weekly 1"
"--keep-monthly 1"
"--keep-yearly 99"
];
inherit repository passwordFile initialize paths pruneOpts;
};
rclonebackup = {
repository = rcloneRepository;
rcloneConfig = {
type = "local";
one_file_system = true;
};
# This gets overridden by rcloneConfig.type
rcloneConfigFile = pkgs.writeText "rclone.conf" ''
[local]
type=ftp
'';
inherit passwordFile initialize paths pruneOpts;
};
};
environment.sessionVariables.RCLONE_CONFIG_LOCAL_TYPE = "local";
};
};
@ -38,25 +55,35 @@ import ./make-test-python.nix (
server.start()
server.wait_for_unit("dbus.socket")
server.fail(
"${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots"
"${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots",
"${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots",
)
server.succeed(
"mkdir -p /opt",
"touch /opt/some_file",
"mkdir -p /tmp/restic-rclone-backup",
"timedatectl set-time '2016-12-13 13:45'",
"systemctl start restic-backups-remotebackup.service",
"systemctl start restic-backups-rclonebackup.service",
'${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
'${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
"timedatectl set-time '2017-12-13 13:45'",
"systemctl start restic-backups-remotebackup.service",
"systemctl start restic-backups-rclonebackup.service",
"timedatectl set-time '2018-12-13 13:45'",
"systemctl start restic-backups-remotebackup.service",
"systemctl start restic-backups-rclonebackup.service",
"timedatectl set-time '2018-12-14 13:45'",
"systemctl start restic-backups-remotebackup.service",
"systemctl start restic-backups-rclonebackup.service",
"timedatectl set-time '2018-12-15 13:45'",
"systemctl start restic-backups-remotebackup.service",
"systemctl start restic-backups-rclonebackup.service",
"timedatectl set-time '2018-12-16 13:45'",
"systemctl start restic-backups-remotebackup.service",
"systemctl start restic-backups-rclonebackup.service",
'${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"',
'${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"',
)
'';
}

22
nixos/tests/systemd.nix
View File

@ -50,6 +50,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
fi
'';
};
systemd.watchdog = {
device = "/dev/watchdog";
runtimeTime = "30s";
rebootTime = "10min";
kexecTime = "5min";
};
};
testScript = ''
@ -117,5 +124,20 @@ import ./make-test-python.nix ({ pkgs, ... }: {
retcode, output = machine.execute("systemctl status testservice1.service")
assert retcode in [0, 3] # https://bugs.freedesktop.org/show_bug.cgi?id=77507
assert "CPU:" in output
# Test systemd is configured to manage a watchdog
with subtest("systemd manages hardware watchdog"):
machine.wait_for_unit("multi-user.target")
# It seems that the device's path doesn't appear in 'systemctl show' so
# check it separately.
assert "WatchdogDevice=/dev/watchdog" in machine.succeed(
"cat /etc/systemd/system.conf"
)
output = machine.succeed("systemctl show | grep Watchdog")
assert "RuntimeWatchdogUSec=30s" in output
assert "RebootWatchdogUSec=10m" in output
assert "KExecWatchdogUSec=5m" in output
'';
})

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

@ -19,13 +19,13 @@ let
in
mkDerivation rec {
pname = "mixxx";
version = "2.2.3";
version = "2.2.4";
src = fetchFromGitHub {
owner = "mixxxdj";
repo = "mixxx";
rev = "release-${version}";
sha256 = "1h7q25fv62c5m74d4cn1m6mpanmqpbl2wqbch4qvn488jb2jw1dv";
sha256 = "1dj9li8av9b2kbm76jvvbdmihy1pyrw0s4xd7dd524wfhwr1llxr";
};
nativeBuildInputs = [ scons.py2 ];

42
pkgs/applications/editors/jetbrains/default.nix
View File

@ -294,12 +294,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
version = "2020.1.3"; /* updated by script */
version = "2020.1.4"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "0pqwj4gc23gf10xqciwndimb4ml7djmx8m5rh52c07m77y4aniyn"; /* updated by script */
sha256 = "1wgcc1faqn0y9brxikh53s6ly7zvpdmpg7m5gvp5437isbllisbl"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@ -307,12 +307,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2020.1.2"; /* updated by script */
version = "2020.1.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "07gfqyp6blbf7v8p106ngpq7c5p0llcjahi205yg2jgzkhshn7ld"; /* updated by script */
sha256 = "1aycsy2pg8nw5il8p2r6bhim9y47g5rfga63f0p435mpjmzpll0s"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
@ -320,12 +320,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2020.1.2"; /* updated by script */
version = "2020.1.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
sha256 = "13qj8n5daz0z0pjizyfsvbbr1gxp5479ar3a68ygi0vrpmbdbssd"; /* updated by script */
sha256 = "188wkqcv67kizq4w6v4vg9jpr3qfgbg9x5jc77s4ki4nafkbfxas"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
@ -333,12 +333,12 @@ in
mps = buildMps rec {
name = "mps-${version}";
version = "2019.2";
version = "2020.1.2"; /* updated by script */
description = "Create your own domain-specific language";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/mps/2019.2/MPS-${version}.tar.gz";
sha256 = "0rph3bibj74ddbyrn0az1npn4san4g1alci8nlq4gaqdlcz6zx22";
url = "https://download.jetbrains.com/mps/2020.1/MPS-${version}.tar.gz";
sha256 = "0ygk31l44bxcv64h6lnqxssmx5prcb5b5xdm3qxmrv7xz1qv59c1"; /* updated by script */
};
wmClass = "jetbrains-mps";
update-channel = "MPS RELEASE";
@ -346,12 +346,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2020.1.2"; /* updated by script */
version = "2020.1.3"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "00c8vlp125j56v9g9d4rc5g4dhgvl1bhi6qrzvpaf6x77jbq4fv4"; /* updated by script */
sha256 = "0cw2rx68rl6mrnizpb69ahz4hrh8blry70cv4rjnkw19d4x877m8"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@ -359,12 +359,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2020.1.2"; /* updated by script */
version = "2020.1.3"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1s04b9w7sydix1sjqzmby63nwcvzs6iw28wz7441kxgryl9qg0qw"; /* updated by script */
sha256 = "1290k17nihiih8ipxfqax1xlx320h1vkwbcc5hc50psvpsfgiall"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@ -372,12 +372,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2020.1.2"; /* updated by script */
version = "2020.1.3"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1ysj00qbn5ik6i5953b9mln4g456fmn3phdln9m5jmcb0126y235"; /* updated by script */
sha256 = "1ag8jrfs38f0q11pyil4pvddi8lv46b0jxd3mcbmidn3p1z29f9x"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@ -385,12 +385,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
version = "2020.1.3"; /* updated by script */
version = "2020.1.4"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
sha256 = "1zzkd3b5j3q6jqrvibxz33a4fcm7pgqfx91bqjs615v3499ncng7"; /* updated by script */
sha256 = "0vicgwgsbllfw6fz4l82x4vbka3agf541576ix9akyvsskwbaxj9"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
@ -398,12 +398,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2020.1.2"; /* updated by script */
version = "2020.1.3"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "1ycwml7fyhjajjfy1fhggmx0mcdcjidkxll7357rv2z51r0yhc9h"; /* updated by script */
sha256 = "1z6z2c31aq29hzi1cifc77zz9vnw48h2jvw4w61lvgskcnzrw9vn"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";
@ -411,12 +411,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2020.1.2"; /* updated by script */
version = "2020.1.3"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "1szgiccimfk99z9x1k99lgic6ix81fdahf1k3a88rddl8hhncjwv"; /* updated by script */
sha256 = "19zqac77fkw1czf86s39ggnd24r9ljr80gj422ch4fdkz4qy832q"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";

4
pkgs/applications/misc/font-manager/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "font-manager";
version = "0.7.7";
version = "0.7.8";
src = fetchFromGitHub {
owner = "FontManager";
repo = "master";
rev = version;
sha256 = "1bzqvspplp1zj0n0869jqbc60wgbjhf0vdrn5bj8dfawxynh8s5f";
sha256 = "0s1l30y55l45rrqd9lygvp2gzrqw25rmjgnnja6s5rzs79gc668c";
};
nativeBuildInputs = [

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

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "tipp10";
version = "3.1.0";
version = "3.2.0";
src = fetchFromGitLab {
owner = "a_a";
owner = "tipp10";
repo = pname;
rev = "v${version}";
sha256 = "1mksga1zyqz1y2s524nkw86irg36zpjwz7ff87n2ygrlysczvnx1";
sha256 = "0fav5jlw6lw78iqrj7a65b8vd50hhyyaqyzmfrvyxirpsqhjk1v7";
};
nativeBuildInputs = [ cmake qttools ];

8
pkgs/applications/misc/wofi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook }:
{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }:
stdenv.mkDerivation rec {
pname = "wofi";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn";
};
nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook ];
nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ];
buildInputs = [ wayland gtk3 ];
# Fixes icon bug on NixOS.
@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
})
];
postInstall = ''
installManPage man/wofi*
'';
meta = with lib; {
description = "A launcher/menu program for wlroots based wayland compositors such as sway";
homepage = "https://hg.sr.ht/~scoopta/wofi";

6
pkgs/applications/networking/cluster/fluxctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxctl";
version = "1.19.0";
version = "1.20.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0";
sha256 = "0bfib5pg2cbip6fw45slb0h3a7qpikxsfpclzr86bcnjq60pshl1";
};
vendorSha256 = "0w5l1lkzx4frllflkbilj8qqwf54wkz7hin7q8xn1vflkv3lxcnp";
vendorSha256 = "0a5sv11pb2i6r0ffwaiqdhc0m7gz679yfmqw6ix9imk4ybhf4jp9";
subPackages = [ "cmd/fluxctl" ];

13
pkgs/applications/networking/gns3/default.nix
View File

@ -1,7 +1,7 @@
{ callPackage }:
let
stableVersion = "2.2.8";
stableVersion = "2.2.11";
previewVersion = stableVersion;
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
@ -15,18 +15,19 @@ let
src = oldAttrs.src.override {
inherit version sha256;
};
doCheck = oldAttrs.doCheck && (attrname != "psutil");
});
};
commonOverrides = [
(mkOverride "psutil" "5.6.6"
"1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd")
(mkOverride "psutil" "5.7.0"
"03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8")
(mkOverride "jsonschema" "3.2.0"
"0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
];
};
mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
guiSrcHash = "1qgzad9hdbvkdalzdnlg5gnlzn2f9qlpd1aj8djmi6w1mmdkf9q7";
serverSrcHash = "1kg38dh0xk4yvi7hz0d5dq9k0wany0sfd185l0zxs3nz78zd23an";
guiSrcHash = "1carwhp49l9zx2p6i3in03x6rjzn0x6ls2svwazd643rmrl4y7gn";
serverSrcHash = "0acbxay1pwq62yq9q67hid44byyi6rb6smz5wa8br3vka7z31iqf";
in {
guiStable = mkGui {
stable = true;

4
pkgs/applications/networking/gns3/gui.nix
View File

@ -4,8 +4,6 @@
let
defaultOverrides = commonOverrides ++ [
(mkOverride "jsonschema" "3.2.0"
"0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
];
python = python3.override {
@ -23,7 +21,7 @@ in python.pkgs.buildPythonPackage rec {
};
propagatedBuildInputs = with python.pkgs; [
raven psutil jsonschema # tox for check
sentry-sdk psutil jsonschema # tox for check
# Runtime dependencies
sip (pyqt5.override { withWebSockets = true; }) distro setuptools
pkgs.qt5Full

19
pkgs/applications/networking/gns3/server.nix
View File

@ -4,10 +4,19 @@
let
defaultOverrides = commonOverrides ++ [
(mkOverride "jsonschema" "3.2.0"
"0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
(mkOverride "aiofiles" "0.4.0"
"1vmvq9qja3wahv8m1adkyk00zm7j0x64pk3f2ry051ja66xa07h2")
(mkOverride "aiofiles" "0.5.0"
"98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af")
(self: super: {
py-cpuinfo = super.py-cpuinfo.overridePythonAttrs (oldAttrs: rec {
version = "6.0.0";
src = fetchFromGitHub {
owner = "workhorsy";
repo = "py-cpuinfo";
rev = "v${version}";
sha256 = "0595gjkd7gzmn9cfpgjw3ia2sl1y8mmw7ajyscibjx59m5mqcki5";
};
});
})
];
python = python3.override {
@ -31,7 +40,7 @@ in python.pkgs.buildPythonPackage {
propagatedBuildInputs = with python.pkgs; [
aiohttp-cors yarl aiohttp multidict setuptools
jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles
jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles
prompt_toolkit py-cpuinfo
];

6
pkgs/applications/networking/ipfs-migrator/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ipfs-migrator";
version = "1.5.1";
version = "1.6.3";
src = fetchFromGitHub {
owner = "ipfs";
repo = "fs-repo-migrations";
rev = "v${version}";
sha256 = "18pjxkxfbsbbj4hs4xyzfmmz991h31785ldx41dll6wa9zx4lsnm";
sha256 = "13ah5jk8n3wznvag6dda1ssgpqsdr9pdgvqm9gcsb7zzls89j9x5";
};
vendorSha256 = null;
@ -22,4 +22,4 @@ buildGoModule rec {
platforms = platforms.unix;
maintainers = with maintainers; [ elitak ];
};
}
}

4
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mutt";
version = "1.14.5";
version = "1.14.6";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "0p1xiqzmkqlzy5yi4l0dh0lacdq300zdj48zk0fir8j1pp512sri";
sha256 = "0i0q6vwhnb1grimsrpmz8maw255rh9k0laijzxkry6xqa80jm5s7";
};
patches = optional smimeSupport (fetchpatch {

4
pkgs/applications/networking/mumble/default.nix
View File

@ -128,14 +128,14 @@ let
} source;
source = rec {
version = "1.3.1";
version = "1.3.2";
# Needs submodules
src = fetchFromGitHub {
owner = "mumble-voip";
repo = "mumble";
rev = version;
sha256 = "1xsla9g7xbq6xniwcsjik5hbjh0xahv44qh4z9hjn7p70b8vgnwc";
sha256 = "1ljn7h7dr9iyhvq7rdh0prl7hzn9d2hhnxv0ni6dha6f7d9qbfy6";
fetchSubmodules = true;
};
};

4
pkgs/applications/networking/p2p/stig/default.nix
View File

@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec {
pname = "stig";
# This project has a different concept for pre release / alpha,
# Read the project's README for details: https://github.com/rndusr/stig#stig
version = "0.11.0a";
version = "0.11.2a0";
src = fetchFromGitHub {
owner = "rndusr";
repo = "stig";
rev = "v${version}";
sha256 = "192v8f80jfly12bqzsslpxlvm72kdqm3jl40x1az5czpg4ab3lb7";
sha256 = "05dn6mr86ly65gdqarl16a2jk1bwiw5xa6r4kyag3s6lqsv66iw8";
};
# urwidtrees 1.0.3 is requested by the developer because 1.0.2 (which is packaged

6
pkgs/applications/networking/syncthing/default.nix
View File

@ -3,17 +3,17 @@
let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
version = "1.6.1";
version = "1.7.0";
name = "${stname}-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "1lhbx1mh2hdjjwks3s17i8y9vbl3fnapc1czaf42pp7nf8245q3j";
sha256 = "0jz1xfbs5ql9z7zdldyxc6wr0y5b0pf3vg8vzva5ml9aiqjcs9fg";
};
vendorSha256 = "12g63a6jsshzqjgww792xmvybhfbkjx5aza4xnyljjsp453iky7k";
vendorSha256 = "1gmdv0g0gymq6khrwvplw6yfp146kg5ar8vqdp5dlp0myxfzi22b";
patches = [
./add-stcli-target.patch

11
pkgs/applications/science/robotics/qgroundcontrol/default.nix
View File

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchgit, SDL2
{ lib, mkDerivation, fetchFromGitHub, SDL2
, qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2
, qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools
, gst_all_1, wayland, pkgconfig
@ -6,7 +6,7 @@
mkDerivation rec {
pname = "qgroundcontrol";
version = "4.0.8";
version = "4.0.9";
qtInputs = [
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
@ -58,10 +58,11 @@ mkDerivation rec {
'';
# TODO: package mavlink so we can build from a normal source tarball
src = fetchgit {
url = "https://github.com/mavlink/qgroundcontrol.git";
src = fetchFromGitHub {
owner = "mavlink";
repo = pname;
rev = "v${version}";
sha256 = "0jr9jpjqdwizsvh9zm0fdp8k2r4536m40dxrn30fbr3ba8vnzkgq";
sha256 = "0fwibgb9wmxk2zili5vsibi2q6pk1gna21870y5abx4scbvhgq68";
fetchSubmodules = true;
};

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

@ -8,11 +8,11 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
version = "1.12.1";
version = "1.12.2";
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "0n92msf5pbgb5q6pa2p0nj9lnzs4y0qis62c5mp4hp8rc1j22wlb";
sha256 = "12zzb1c4cl07ccxaravkmia8vdyw5ffxrlx9v95ampvv6a0swpb9";
};
unpackPhase = ''

54
pkgs/applications/video/webtorrent_desktop/default.nix
View File

@ -1,14 +1,16 @@
{
alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fontconfig, freetype,
gdk-pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor,
alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype,
gdk-pixbuf, glib, gnome3, libX11, libXScrnSaver, libXcomposite, libXcursor,
libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst,
libxcb, nspr, nss, stdenv, udev
libxcb, nspr, nss, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core
}:
let
rpath = stdenv.lib.makeLibraryPath ([
alsaLib
atk
at-spi2-core
at-spi2-atk
cairo
cups
dbus
@ -17,9 +19,9 @@
freetype
gdk-pixbuf
glib
gnome2.GConf
gnome2.gtk
gnome2.pango
gnome3.gtk
pango
libuuid
libX11
libXScrnSaver
libXcomposite
@ -39,29 +41,33 @@
]);
in stdenv.mkDerivation rec {
pname = "webtorrent-desktop";
version = "0.20.0";
version = "0.21.0";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.20.0/webtorrent-desktop_${version}-1_amd64.deb";
sha256 = "1kkrnbimiip5pn2nwpln35bbdda9gc3cgrjwphq4fqasbjf2781k";
fetchzip {
url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v${version}/WebTorrent-v${version}-linux.zip";
sha256 = "13gd8isq2l10kibsc1bsc15dbgpnwa7nw4cwcamycgx6pfz9a852";
}
else
throw "Webtorrent is not currently supported on ${stdenv.hostPlatform.system}";
desktopFile = fetchurl {
url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/applications/webtorrent-desktop.desktop";
sha256 = "1v16dqbxqds3cqg3xkzxsa5fyd8ssddvjhy9g3i3lz90n47916ca";
};
icon256File = fetchurl {
url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png";
sha256 = "1dapxvvp7cx52zhyaby4bxm4rll9xc7x3wk8k0il4g3mc7zzn3yk";
};
icon48File = fetchurl {
url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png";
sha256 = "00y96w9shbbrdbf6xcjlahqd08154kkrxmqraik7qshiwcqpw7p4";
};
phases = [ "unpackPhase" "installPhase" ];
nativeBuildInputs = [ dpkg ];
unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
mkdir -p $out
cp -R opt $out
mv ./usr/share $out/share
mv $out/opt/webtorrent-desktop $out/libexec
chmod +x $out/libexec/WebTorrent
rmdir $out/opt
chmod -R g-w $out
mkdir -p $out/share/{applications,icons/hicolor/{48x48,256x256}/apps}
cp -R . $out/libexec
# Patch WebTorrent
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
@ -71,9 +77,11 @@
mkdir -p $out/bin
ln -s $out/libexec/WebTorrent $out/bin/WebTorrent
# Fix the desktop link
substituteInPlace $out/share/applications/webtorrent-desktop.desktop \
--replace /opt/webtorrent-desktop $out/bin
cp $icon48File $out/share/icons/hicolor/48x48/apps/webtorrent-desktop.png
cp $icon256File $out/share/icons/hicolor/256x256/apps/webtorrent-desktop.png
## Fix the desktop link
substitute $desktopFile $out/share/applications/webtorrent-desktop.desktop \
--replace /opt/webtorrent-desktop $out/libexec
'';
meta = with stdenv.lib; {

8
pkgs/data/fonts/jetbrains-mono/default.nix
View File

@ -1,14 +1,14 @@
{ lib, fetchzip }:
let
version = "1.0.6";
version = "2.000";
in
fetchzip rec {
fetchzip {
name = "JetBrainsMono-${version}";
url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrains.Mono.${version}.zip";
sha256 = "1198k5zw91g85h6n7rg3y7wcj1nrbby9zlr6zwlmiq0nb37n0d3g";
sha256 = "1kmb0fckiwaphqxw08xd5fbfjrwnwxz48bidj16ixw8lgcr29b8g";
postFetch = ''
mkdir -p $out/share/fonts

4
pkgs/data/icons/iconpack-jade/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "iconpack-jade";
version = "1.22";
version = "1.23";
src = fetchFromGitHub {
owner = "madmaxms";
repo = pname;
rev = "v${version}";
sha256 = "1piypv8wdxnfiy6kgh7i3wi52m4fh4x874kh01qjmymssyirn17x";
sha256 = "1q29ikfssn1vmwws3dry4ssq6b44afd9sb7dwv3rdqg0frabpj1m";
};
nativeBuildInputs = [ gtk3 ];

3
pkgs/data/themes/cde-motif-theme/default.nix → pkgs/data/themes/cdetheme/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages }:
stdenv.mkDerivation rec {
pname = "cde-motif-theme";
pname = "cdetheme";
version = "1.3";
src = fetchFromGitHub {
@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ gnidorah ];
hydraPlatforms = [];
};
}

4
pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
View File

@ -36,11 +36,11 @@
stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
version = "3.36.3";
version = "3.36.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "11f2yj8q844gks3jkfbi4ap448snz1wjflqbq4y2kk12r3w37afq";
sha256 = "17szzz2a5wpi7kwjnhimiwf8vg0bfliyk3k0adgv1pw2mcfpxp5s";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-dash-to-panel";
version = "31";
version = "38";
src = fetchFromGitHub {
owner = "home-sweet-gnome";
repo = "dash-to-panel";
rev = "v${version}";
sha256 = "0vh36mdncjvfp1jbinifznj5dw3ahsswwm3m9sjw5gydsbx6vh83";
sha256 = "1kvybb49l1vf0fvh8d0c6xkwnry8m330scamf5x40y63d4i213j1";
};
buildInputs = [

4
pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-taquin";
version = "3.36.3";
version = "3.36.4";
src = fetchurl {
url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "149bv8q2a44i9msyshhh57nxwf5a43hankbndbvjqvq95yqlnhv4";
sha256 = "0awfssqpswsyla4gn80ifj53biwq34hcadxlknnlm7jpz0z38cp0";
};
passthru = {

4
pkgs/desktops/gnome-3/games/tali/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "tali";
version = "3.36.1";
version = "3.36.4";
src = fetchurl {
url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1klnxk49rr1m2lr4zj1wvfl0iaxzdh2k8ngrcmfmcq39vlxnn94y";
sha256 = "12h6783m4634zzprlk31j0dmvgzrfjklhl0z49fdwcziw5bszr3c";
};
passthru = {

4
pkgs/development/compilers/jetbrains-jdk/default.nix
View File

@ -2,12 +2,12 @@
openjdk11.overrideAttrs (oldAttrs: rec {
pname = "jetbrains-jdk";
version = "11.0.6-b774";
version = "11.0.7-b64";
src = fetchFromGitHub {
owner = "JetBrains";
repo = "JetBrainsRuntime";
rev = "jb${stdenv.lib.replaceStrings ["."] ["_"] version}";
sha256 = "0lx3h74jwa14kr8ybwxbzc4jsjj6xnymvckdsrhqhvrciya7bxzw";
sha256 = "1gxqi6dkyriv9j29ppan638w1ns2g9m4q1sq7arf9kwqr05zim90";
};
patches = [];
meta = with stdenv.lib; {

1
pkgs/development/interpreters/evcxr/default.nix
View File

@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
postInstall = ''
wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]}
wrapProgram $out/bin/evcxr_jupyter --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]}
rm $out/bin/testing_runtime
'';

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

@ -268,24 +268,24 @@ let
};
php72base = callPackage generic (_args // {
version = "7.2.31";
sha256 = "0057x1s43f9jidmrl8daka6wpxclxc1b1pm5cjbz616p8nbmb9qv";
version = "7.2.32";
sha256 = "19wqbpvsd6c6iaad00h0m0xnx4r8fj56pwfhki2cw5xdfi10lp3i";
# https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
});
php73base = callPackage generic (_args // {
version = "7.3.19";
sha256 = "199l1lr7ima92icic7b1bqlb036md78m305lc3v6zd4zw8qix70d";
version = "7.3.20";
sha256 = "1pl9bjwvdva2yx4sh465z9cr4bnr8mvv008w71sy1kqsj6a7ivf6";
# https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
});
php74base = callPackage generic (_args // {
version = "7.4.7";
sha256 = "0ynq4fz54jpzh9nxvbgn3vrdad2clbac0989ai0yrj2ryc0hs3l0";
version = "7.4.8";
sha256 = "0ql01sfg8l7y2bfwmnjxnfw9irpibnz57ssck24b00y00nkd6j3a";
});
defaultPhpExtensions = { all, ... }: with all; ([

4
pkgs/development/libraries/console-bridge/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "console-bridge";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "ros";
repo = "console_bridge";
rev = version;
sha256 = "14f5i2qgp5clwkm8jjlvv7kxvwx52a607mnbc63x61kx9h6ymxlk";
sha256 = "18qycrjnf7v8n5bipij91jsv7ap98z5dsp93w2gz9rah4lfjb80q";
};
nativeBuildInputs = [ cmake validatePkgConfig ];

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

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "leatherman";
version = "1.12.0";
version = "1.12.1";
src = fetchFromGitHub {
sha256 = "00qigglp67a14ki4dhjxd3j540a80rkmzhysx7hra8v2rgbsqgj8";
sha256 = "1mgd7jqfg6f0y2yrh2m1njlwrpd15kas88776jdd5fsl7gvb5khn";
rev = version;
repo = "leatherman";
owner = "puppetlabs";

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

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "randomX";
version = "1.1.7";
version = "1.1.8";
nativeBuildInputs = [ cmake ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "tevador";
repo = pname;
rev = "v${version}";
sha256 = "1d42dw4zrd7mzfqs6gwk27jj6lsh6pwv85p1ckx9dxy8mw3m52ah";
sha256 = "13h2cw8drq7xn3v8fbpxrlsl8zq3fs8gd2pc1pv28ahr9qqjz1gc";
};
meta = with stdenv.lib; {

6
pkgs/development/libraries/uci/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "uci";
version = "unstable-2020-01-27";
version = "unstable-2020-04-27";
src = fetchgit {
url = "https://git.openwrt.org/project/uci.git";
rev = "e8d83732f9eb571dce71aa915ff38a072579610b";
sha256 = "1si8dh8zzw4j6m7387qciw2akfvl7c4779s8q5ns2ys6dn4sz6by";
rev = "ec8d3233948603485e1b97384113fac9f1bab5d6";
sha256 = "0p765l8znvwhzhgkq7dp36w62k5rmzav59vgdqmqq1bjmlz1yyi6";
};
hardeningDisable = [ "all" ];

34
pkgs/development/libraries/vaapi-intel/default.nix
View File

@ -1,38 +1,32 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2
{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3
, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext
, enableHybridCodec ? false, vaapi-intel-hybrid
}:
stdenv.mkDerivation rec {
pname = "intel-vaapi-driver";
version = "2.4.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "intel";
repo = "intel-vaapi-driver";
rev = version;
sha256 = "019w0hvjc9l85yqhy01z2bvvljq208nkb43ai2v377l02krgcrbl";
sha256 = "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp";
};
patchPhase = ''
patchShebangs ./src/shaders/gpp.py
'';
preConfigure = ''
sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
'';
# Set the correct install path:
LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri";
postInstall = stdenv.lib.optionalString enableHybridCodec ''
ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/
'';
configureFlags = [
"--enable-drm"
"--enable-x11"
"--enable-wayland"
] ++ stdenv.lib.optional enableHybridCodec "--enable-hybrid-codec";
nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ];
nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ];
buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ]
++ stdenv.lib.optional enableHybridCodec vaapi-intel-hybrid;
@ -42,8 +36,18 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://01.org/linuxmedia";
license = licenses.mit;
description = "Intel driver for the VAAPI library";
platforms = platforms.unix;
maintainers = with maintainers; [ ];
description = "VA-API user mode driver for Intel GEN Graphics family";
longDescription = ''
This VA-API video driver backend provides a bridge to the GEN GPUs through
the packaging of buffers and commands to be sent to the i915 driver for
exercising both hardware and shader functionality for video decode,
encode, and processing.
VA-API is an open-source library and API specification, which provides
access to graphics hardware acceleration capabilities for video
processing. It consists of a main library and driver-specific acceleration
backends for each supported hardware vendor.
'';
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ primeos ];
};
}

6
pkgs/development/ocaml-modules/lambdasoup/default.nix
View File

@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "lambdasoup";
version = "0.6.3"; # NB: double-check the license when updating
version = "0.7.1";
src = fetchFromGitHub {
owner = "aantron";
repo = pname;
rev = version;
sha256 = "1w4zp3vswijzvrx0c3fv269ncqwnvvrzc46629nnwm9shwv07vmv";
sha256 = "14lndpsnzjjg58sdwxqpsv7kz77mnwn5658lya9jyaclj8azmaks";
};
propagatedBuildInputs = [ markup ];
@ -16,7 +16,7 @@ buildDunePackage rec {
meta = {
description = "Functional HTML scraping and rewriting with CSS in OCaml";
homepage = "https://aantron.github.io/lambdasoup/";
license = lib.licenses.bsd2;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};

37
pkgs/development/python-modules/bellows/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, buildPythonPackage, fetchPypi
, click, click-log, pure-pcapy3
, pyserial, pyserial-asyncio, voluptuous, zigpy
, asynctest, pytest, pytest-asyncio }:
let
pname = "bellows";
version = "0.17.0";
in buildPythonPackage rec {
inherit pname version;
src = fetchPypi {
inherit pname version;
sha256 = "03gckhrxji8lgjsi6xr8yql405kfanii5hjrmakk1328bmq9g5f6";
};
propagatedBuildInputs = [
click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy
];
checkInputs = [
asynctest pytest pytest-asyncio
];
prePatch = ''
substituteInPlace setup.py \
--replace "click-log==0.2.0" "click-log>=0.2.0"
'';
meta = with stdenv.lib; {
description = "A Python 3 project to implement EZSP for EmberZNet devices";
homepage = "https://github.com/zigpy/bellows";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
};
}

4
pkgs/development/python-modules/coloredlogs/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "coloredlogs";
version = "10.0";
version = "14.0";
src = fetchFromGitHub {
owner = "xolox";
repo = "python-coloredlogs";
rev = version;
sha256 = "0rdvp4dfvzhx7z7s2jdl3fv7x1hazgpy5gc7bcf05bnbv2iia54a";
sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x";
};
# patch by risicle

8
pkgs/development/python-modules/fx2/default.nix
View File

@ -7,15 +7,15 @@
, crcmod
}:
buildPythonPackage {
buildPythonPackage rec {
pname = "fx2";
version = "unstable-2020-01-25";
version = "0.9";
src = fetchFromGitHub {
owner = "whitequark";
repo = "libfx2";
rev = "d3e37f640d706aac5e69ae4476f6cd1bd0cd6a4e";
sha256 = "1dsyknjpgf4wjkfr64lln1lcy7qpxdx5x3qglidrcswzv9b3i4fg";
rev = version;
sha256 = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk=";
};
nativeBuildInputs = [ sdcc ];

6
pkgs/development/python-modules/glasgow/default.nix
View File

@ -18,15 +18,15 @@
buildPythonPackage rec {
pname = "glasgow";
version = "unstable-2020-02-08";
version = "unstable-2020-06-29";
# python software/setup.py --version
realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "GlasgowEmbedded";
repo = "glasgow";
rev = "2a8bfc981b90ba5d86c310911dbd6ffe71acd498";
sha256 = "01v5269bv09ggvmq6lqyhr5am51hzmwya1p5n62h84b7rdwd8q9m";
rev = "f885790d7927b893e631c33744622d6ebc18b5e3";
sha256 = "sha256-fSorSEa5K09aPEOk4XPWOFRxYl1KGVy29jOBqIvs2hk=";
};
nativeBuildInputs = [ setuptools_scm sdcc ];

9
pkgs/development/python-modules/maxminddb/default.nix
View File

@ -1,4 +1,6 @@
{ buildPythonPackage, lib, fetchPypi
{ stdenv, lib, buildPythonPackage, pythonAtLeast
, fetchPypi
, libmaxminddb
, ipaddress
, mock
, nose
@ -13,10 +15,15 @@ buildPythonPackage rec {
sha256 = "f4d28823d9ca23323d113dc7af8db2087aa4f657fafc64ff8f7a8afda871425b";
};
buildInputs = [ libmaxminddb ];
propagatedBuildInputs = [ ipaddress ];
checkInputs = [ nose mock ];
# Tests are broken for macOS on python38
doCheck = !(stdenv.isDarwin && pythonAtLeast "3.8");
meta = with lib; {
description = "Reader for the MaxMind DB format";
homepage = "https://www.maxmind.com/en/home";

2
pkgs/development/python-modules/pillow/6.nix
View File

@ -22,7 +22,7 @@ buildPythonPackage rec {
checkPhase = ''
runHook preCheck
python -m pytest -v -x -W always
python -m pytest -v -x -W always${stdenv.lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"}
runHook postCheck
'';

18
pkgs/development/python-modules/pure-pcapy3/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "pure-pcapy3";
version = "1.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "14panfklap6wwi9avw46gvd7wg9mkv9xbixvbvmi1m2adpqlb7mr";
};
meta = with stdenv.lib; {
description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement.";
homepage = "http://bitbucket.org/viraptor/pure-pcapy";
license = licenses.bsd2;
maintainers = with maintainers; [ etu ];
};
}

7
pkgs/development/python-modules/pytorch/default.nix
View File

@ -110,7 +110,8 @@ in buildPythonPackage rec {
outputs = [
"out" # output standard python package
"dev" # output libtorch only
"dev" # output libtorch headers
"lib" # output libtorch libraries
];
src = fetchFromGitHub {
@ -239,9 +240,11 @@ in buildPythonPackage rec {
];
postInstall = ''
mkdir $dev
cp -r $out/${python.sitePackages}/torch/lib $dev/lib
cp -r $out/${python.sitePackages}/torch/include $dev/include
cp -r $out/${python.sitePackages}/torch/share $dev/share
mkdir $lib
cp -r $out/${python.sitePackages}/torch/lib $lib/lib
'';
postFixup = stdenv.lib.optionalString stdenv.isDarwin ''

6
pkgs/development/python-modules/tokenizers/default.nix
View File

@ -32,16 +32,16 @@ let
};
in rustPlatform.buildRustPackage rec {
pname = "tokenizers";
version = "0.8.0";
version = "0.8.1.rc1";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "python-v${version}";
sha256 = "0f5r1wm5ybyk3jvihj1g98y7ihq0iklg0pwkaa11pk1gv0k869w3";
sha256 = "1bzvfffnjjskx8zlq1qsqfd47570my2wnbq4ip8i1hkz10q900qv";
};
cargoSha256 = "131bvf35q5n65mq6zws1rp5fn2qkfwfg9sbxi5y6if24n8fpdz4m";
cargoSha256 = "0s5z3g1njb7wlyb32ba6xas4zc62c3zhmp1mrvghmaxpvljp6k7b";
sourceRoot = "source/bindings/python";

6
pkgs/development/python-modules/transformers/default.nix
View File

@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "transformers";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
sha256 = "1l8l82zi021sq5dnzlbjx3wx0n4yy7k96n3m2fr893y9lfkhhd8z";
sha256 = "0rdlikh2qilwd0s9f3zif51p1q7sp3amxaccqic8p5qm6dqpfpz6";
};
propagatedBuildInputs = [
@ -44,7 +44,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "tokenizers == 0.8.0-rc4" "tokenizers>=0.8,<0.9"
--replace "tokenizers == 0.8.1.rc1" "tokenizers>=0.8"
'';
preCheck = ''

4
pkgs/development/python-modules/voluptuous-serialize/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "voluptuous-serialize";
version = "2.3.0";
version = "2.4.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1xcjyp1190z6a226fg0clvhf43gjsbyn60amblsg7w7cw86d033l";
sha256 = "1r7avibzf009h5rlh7mbh1fc01daligvi2axjn5qxh810g5igfn6";
};
propagatedBuildInputs = [

24
pkgs/development/python-modules/zigpy-cc/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi
, pyserial, pyserial-asyncio, zigpy
, asynctest, pytest, pytest-asyncio }:
buildPythonPackage rec {
pname = "zigpy-cc";
version = "0.4.4";
propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
checkInputs = [ asynctest pytest pytest-asyncio ];
src = fetchPypi {
inherit pname version;
sha256 = "117a9xak4y5nksfk9rgvzd6l7hscvzspl1wf3gydyq2lc7b3ggnl";
};
meta = with stdenv.lib; {
description = "A library which communicates with Texas Instruments CC2531 radios for zigpy";
homepage = "http://github.com/sanyatuning/zigpy-cc";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
};
}

9
pkgs/development/python-modules/zigpy-deconz/default.nix
View File

@ -1,14 +1,13 @@
{ stdenv, buildPythonPackage, fetchPypi
, aiohttp, crccheck, pyserial, pyserial-asyncio, pycryptodome, zigpy
, pytest }:
, pyserial, pyserial-asyncio, zigpy
, pytest, pytest-asyncio, asynctest }:
buildPythonPackage rec {
pname = "zigpy-deconz";
version = "0.9.2";
nativeBuildInputs = [ pytest ];
buildInputs = [ aiohttp crccheck pycryptodome ];
propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
checkInputs = [ pytest pytest-asyncio asynctest ];
src = fetchPypi {
inherit pname version;
@ -19,7 +18,7 @@ buildPythonPackage rec {
description = "Library which communicates with Deconz radios for zigpy";
homepage = "https://github.com/zigpy/zigpy-deconz";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu ];
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
};
}

24
pkgs/development/python-modules/zigpy-xbee/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi
, pyserial, pyserial-asyncio, zigpy
, pytest }:
buildPythonPackage rec {
pname = "zigpy-xbee";
version = "0.12.1";
buildInputs = [ pyserial pyserial-asyncio zigpy ];
checkInputs = [ pytest ];
src = fetchPypi {
inherit pname version;
sha256 = "09488hl27qjv8shw38iiyzvzwcjkc0k4n00l2bfn1ac443xzw0vh";
};
meta = with stdenv.lib; {
description = "A library which communicates with XBee radios for zigpy";
homepage = "http://github.com/zigpy/zigpy-xbee";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
};
}

24
pkgs/development/python-modules/zigpy-zigate/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi
, pyserial, pyserial-asyncio, zigpy
, pytest }:
buildPythonPackage rec {
pname = "zigpy-zigate";
version = "0.6.1";
buildInputs = [ pyserial pyserial-asyncio zigpy ];
checkInputs = [ pytest ];
src = fetchPypi {
inherit pname version;
sha256 = "0xxqv65drrr96b9ncwsx9ayd369lpwimj1jjb0d7j6l9lil0wmf5";
};
meta = with stdenv.lib; {
description = "A library which communicates with ZiGate radios for zigpy";
homepage = "http://github.com/doudz/zigpy-zigate";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
};
}

15
pkgs/development/python-modules/zigpy/default.nix
View File

@ -1,25 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi
, aiohttp, crccheck, pycryptodome, pycrypto
, aiohttp, crccheck, pycryptodome, pycrypto, voluptuous
, pytest, pytest-asyncio, asynctest }:
buildPythonPackage rec {
pname = "zigpy-homeassistant";
version = "0.19.0";
pname = "zigpy";
version = "0.22.0";
nativeBuildInputs = [ pytest pytest-asyncio asynctest ];
buildInputs = [ aiohttp pycryptodome ];
propagatedBuildInputs = [ crccheck pycrypto ];
propagatedBuildInputs = [ aiohttp crccheck pycrypto pycryptodome voluptuous ];
checkInputs = [ pytest pytest-asyncio asynctest ];
src = fetchPypi {
inherit pname version;
sha256 = "779cff7affb86b7141aa641c188342b22be0ec766adee0d180c93e74e2b10adc";
sha256 = "1y8n96g5g6qsx8s2z028f1cyp2w8y7kksi8k2yyzpqvmanbxyjhc";
};
meta = with stdenv.lib; {
description = "Library implementing a ZigBee stack";
homepage = "https://github.com/zigpy/zigpy";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu ];
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
};
}

10
pkgs/development/tools/build-managers/redo-c/Makefile Normal file
View File

@ -0,0 +1,10 @@
CFLAGS=-Os
all: redo links
links:
sh links.do
install:
mkdir -p "$(out)/bin"
cp --no-dereference redo redo-* "$(out)/bin"

24
pkgs/development/tools/build-managers/redo-c/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "redo-c";
version = "0.2";
src = fetchFromGitHub {
owner = "leahneukirchen";
repo = pname;
rev = "v${version}";
sha256 = "11wc2sgw1ssdm83cjdc6ndnp1bv5mzhbw7njw47mk7ri1ic1x51b";
};
postPatch = ''
cp '${./Makefile}' Makefile
'';
meta = with stdenv.lib; {
description = "An implementation of the redo build system in portable C with zero dependencies";
homepage = "https://github.com/leahneukirchen/redo-c";
license = licenses.cc0;
platforms = platforms.all;
maintainers = with maintainers; [ ck3d ];
};
}

4
pkgs/development/tools/lazygit/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "lazygit";
version = "0.20.4";
version = "0.20.6";
goPackagePath = "github.com/jesseduffield/lazygit";
@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
sha256 = "134f04ybzgghm7ghyxair111aflmkjrbfj0bkxfp1w0a3jm6sfsk";
sha256 = "0zim9ipwh2vkw2g41rw3p35i8fz208hyr71npfn4as8f1nl4gi4i";
};
meta = with stdenv.lib; {

6
pkgs/development/tools/rust/cargo-inspect/default.nix
View File

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-inspect";
version = "0.10.1";
version = "0.10.3";
src = fetchFromGitHub {
owner = "mre";
repo = pname;
rev = version;
sha256 = "0rjy8jlar939fkl7wi8a6zxsrl4axz2nrhv745ny8x38ii4sfbzr";
sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "0v7g9rkw7axy99vcfi7sy2pw7wnpq424jvd8xchcv8ghh8yw9lyc";
cargoSha256 = "1ryi5qi1zz2yljyj4rn84q9zkzafc9w4nw3zc01hlzpnb1sjw5sw";
meta = with lib; {
description = "See what Rust is doing behind the curtains";

6
pkgs/development/tools/rust/maturin/default.nix
View File

@ -5,16 +5,16 @@ let
inherit (darwin.apple_sdk.frameworks) Security;
in rustPlatform.buildRustPackage rec {
name = "maturin-${version}";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
sha256 = "16bxxa261k2l6mpdd55gyzl1mx756i0zbvqp15glpzlcwhb9bm2m";
sha256 = "1y6bxqbv7k8xvqjzgpf6n2n3yad4qxr2dwwlw8cb0knd7cfl2a2n";
};
cargoSha256 = "1s1brfnhwl42jb37qqz4d8mxpyq2ck60jnmjfllkga3mhwm4r8px";
cargoSha256 = "1f12k6n58ycv79bv416566fnsnsng8jk3f6fy5j78py1qgy30swm";
nativeBuildInputs = [ pkgconfig ];

4
pkgs/games/minecraft/default.nix
View File

@ -87,11 +87,11 @@ in
stdenv.mkDerivation rec {
pname = "minecraft-launcher";
version = "2.1.15166";
version = "2.1.15852";
src = fetchurl {
url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
sha256 = "14q41zk370zvzz2jbynhfw11r98l9x49142lqf2izfl42fhv8yhw";
sha256 = "06k3npsk878dh93r7fws5r438hwll3x3kxi0zslb10z634marn2x";
};
icon = fetchurl {

10
pkgs/games/minetest/default.nix
View File

@ -39,7 +39,7 @@ let
] ++ optionals buildClient [
"-DOpenGL_GL_PREFERENCE=GLVND"
];
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
nativeBuildInputs = [ cmake doxygen graphviz ];
@ -47,7 +47,7 @@ let
buildInputs = [
irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses
gmp libspatialindex
] ++ optionals stdenv.isDarwin [
] ++ optionals stdenv.isDarwin [
libiconv OpenGL OpenAL Carbon Cocoa
] ++ optionals buildClient [
libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm
@ -76,9 +76,9 @@ let
};
v5 = {
version = "5.2.0";
sha256 = "0pj9hkxwc1vzng2khbixi79557sbawf6mqkzl589jciyqa7jqkv1";
dataSha256 = "1kjz7x3xiqqnpyrd6339a139pbdxx31c4qpg8pmns410hsm8i358";
version = "5.3.0";
sha256 = "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6";
dataSha256 = "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx";
};
in {

2
pkgs/misc/drivers/hplip/default.nix
View File

@ -230,7 +230,7 @@ python3Packages.buildPythonApplication {
# There are some binaries there, which reference gcc-unwrapped otherwise.
stripDebugList = [
"share/hplip" "lib/cups/backend" "lib/cups/filter" "lib/python3.7/site-packages" "lib/sane"
"share/hplip" "lib/cups/backend" "lib/cups/filter" python3Packages.python.sitePackages "lib/sane"
];
meta = with stdenv.lib; {

6
pkgs/os-specific/linux/hwdata/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hwdata";
version = "0.316";
version = "0.335";
src = fetchFromGitHub {
owner = "vcrhonek";
repo = "hwdata";
rev = "v${version}";
sha256 = "0k3fypykbq9943cnxlmmpk0xp9nhhf46pfdhkgm99iaa27b8s1gb";
sha256 = "0f8ikwfrs6xd5sywypd9rq9cln8a0rf3vj6nm0adwzn1p8mgmrb2";
};
preConfigure = "patchShebangs ./configure";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww";
outputHash = "101lppd1805drwd038b4njr5czzjnqqxf3xlf6v3l22wfwr2cn3l";
meta = {
homepage = "https://github.com/vcrhonek/hwdata";

4
pkgs/servers/atlassian/confluence.nix
View File

@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
stdenvNoCC.mkDerivation rec {
pname = "atlassian-confluence";
version = "7.5.1";
version = "7.6.0";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
sha256 = "0lxvff0sn1kxsm599lq72hw11qnwjn2da3mz1h8mqz0rn2adhg07";
sha256 = "1s69b19kz8z8dbac3dsj9yvkvynlygzgnlpm72fbnqg6knp95fyz";
};
buildPhase = ''

4
pkgs/servers/atlassian/jira.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "atlassian-jira";
version = "8.9.0";
version = "8.10.0";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "1rpibkp57nw084yd018924g1mdcqk8gnj99m85fmmhpppgbh9ca9";
sha256 = "1l0kxh4cwqyciylbccd4vfmsvq9cr5sfd0v2gbs3lz41av79mlwa";
};
buildPhase = ''

3
pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch
View File

@ -20,5 +20,6 @@ index 4e46f63217..b1aafee59d 100755
+ "requests>=2.23.0",
+ "ruamel.yaml>=0.15.100",
"voluptuous==0.11.7",
"voluptuous-serialize==2.3.0",
- "voluptuous-serialize==2.3.0",
+ "voluptuous-serialize>=2.3.0",
]

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -934,7 +934,7 @@
"zeroconf" = ps: with ps; [ aiohttp-cors zeroconf];
"zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc
"zestimate" = ps: with ps; [ xmltodict];
"zha" = ps: with ps; [ pyserial zha-quirks zigpy-deconz]; # missing inputs: bellows zigpy-cc zigpy-xbee zigpy-zigate zigpy
"zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy];
"zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
"ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
"zone" = ps: with ps; [ ];

4
pkgs/servers/matrix-synapse/default.nix
View File

@ -9,11 +9,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.15.2";
version = "1.16.1";
src = fetchPypi {
inherit pname version;
sha256 = "1qsrpzq6i2zakpi9sa5sjnjd4bk92n7zgkpcmpaa4sd9ya1wqifb";
sha256 = "0kkja67h5ky94q5zj3790zx0nw5r8qksndvdg6gk6h0s1xb74iqa";
};
patches = [

6
pkgs/servers/traefik/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "traefik";
version = "2.2.1";
version = "2.2.4";
src = fetchFromGitHub {
owner = "containous";
repo = "traefik";
rev = "v${version}";
sha256 = "0byi2h1lma95l77sdj8jkidmwb12ryjqwxa0zz6vwjg07p5ps3k4";
sha256 = "1zxifwbrhxaj2pl6kwyk1ivr4in0wd0q01x9ynxzbf6w2yx4xkw2";
};
vendorSha256 = "0rbwp0cxqfv4v5sii6kavdj73a0q0l4fnvxincvyy698qzx716kf";
vendorSha256 = "0kz7y64k07vlybzfjg6709fdy7krqlv1gkk01nvhs84sk8bnrcvn";
subPackages = [ "cmd/traefik" ];
nativeBuildInputs = [ go-bindata ];

4
pkgs/servers/unifi/default.nix
View File

@ -49,7 +49,7 @@ in {
};
unifiStable = generic {
version = "5.13.29";
sha256 = "0j1spid9q41l57gyphg8smn92iy52z4x4wy236a2a15p731gllh8";
version = "5.13.32";
sha256 = "0r1lz73hn4pl5jygmmfngr8sr0iybirsqlkcdkq31a36vcr567i8";
};
}

7
pkgs/stdenv/generic/default.nix
View File

@ -138,8 +138,11 @@ let
is32bit is64bit
isAarch32 isAarch64 isMips isBigEndian;
# The derivation's `system` is `buildPlatform.system`.
inherit (buildPlatform) system;
# Override `system` so that packages can get the system of the host
# platform through `stdenv.system`. `system` is originally set to the
# build platform within the derivation above so that Nix directs the build
# to correct type of machine.
inherit (hostPlatform) system;
inherit (import ./make-derivation.nix {
inherit lib config stdenv;

19
pkgs/tools/audio/bpm-tools/default.nix
View File

@ -1,8 +1,17 @@
{
stdenv,
fetchurl,
gnuplot,
sox,
flac,
id3v2,
vorbis-tools,
makeWrapper
}:
let
path = stdenv.lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ];
in
stdenv.mkDerivation rec {
pname = "bpm-tools";
version = "0.3";
@ -12,15 +21,17 @@ stdenv.mkDerivation rec {
sha256 = "151vfbs8h3cibs7kbdps5pqrsxhpjv16y2iyfqbxzsclylgfivrp";
};
patchPhase = ''
patchShebangs bpm-tag
patchShebangs bpm-graph
'';
nativeBuildInputs = [ makeWrapper ];
installFlags = [
"PREFIX=${placeholder "out"}"
];
postFixup = ''
wrapProgram $out/bin/bpm-tag --prefix PATH : "${path}"
wrapProgram $out/bin/bpm-graph --prefix PATH : "${path}"
'';
meta = with stdenv.lib; {
homepage = "http://www.pogo.org.uk/~mark/bpm-tools/";
description = "Automatically calculate BPM (tempo) of music files";

9
pkgs/tools/backup/restic/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, nixosTests}:
{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper
, nixosTests, rclone }:
buildGoPackage rec {
pname = "restic";
@ -15,11 +16,13 @@ buildGoPackage rec {
subPackages = [ "cmd/restic" ];
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [ installShellFiles makeWrapper ];
passthru.tests.restic = nixosTests.restic;
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
postInstall = ''
wrapProgram $out/bin/restic --prefix PATH : '${rclone}/bin'
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
$out/bin/restic generate \
--bash-completion restic.bash \
--zsh-completion restic.zsh \

4
pkgs/tools/misc/coreboot-utils/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
let
version = "4.11";
version = "4.12";
meta = with stdenv.lib; {
description = "Various coreboot-related tools";
@ -16,7 +16,7 @@ let
src = fetchurl {
url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
sha256 = "11xdm2c1blaqb32j98085sak78jldsw0xhrkzqs5b8ir9jdqbzcp";
sha256 = "1qibds9lsk22wf1sxwg0jg32fgcvc9an39vf74y1hwwvxq0d1jpd";
};
enableParallelBuilding = true;

11
pkgs/tools/misc/diskonaut/default.nix
View File

@ -2,21 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "diskonaut";
version = "0.3.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "imsnif";
repo = "diskonaut";
rev = version;
sha256 = "0vnmch2cac0j9b44vlcpqnayqhfdfdwvfa01bn7lwcyrcln5cd0z";
sha256 = "125ba9qwh7j8bz74w2zbw729s1wfnjg6dg8yicqrp6559x9k7gq5";
};
cargoSha256 = "03hqdg6pnfxnhwk0xwhwmbrk4dicjpjllbbai56a3391xac5wmi6";
# some tests fail due to non-portable (in terms of filesystems) measurements of block sizes
# try to re-enable tests once actual-file-size is added
# see https://github.com/imsnif/diskonaut/issues/50 for more info
doCheck = false;
cargoSha256 = "0vvbrlmviyn9w8i416767vhvd1gqm3qjvia730m0rs0w5h8khiqf";
meta = with stdenv.lib; {
description = "Terminal disk space navigator";

4
pkgs/tools/misc/fsmon/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fsmon";
version = "1.7.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "nowsecure";
repo = "fsmon";
rev = version;
sha256 = "18p80nmax8lniza324kvwq06r4w2yxcq90ypk2kqym3bnv0jm938";
sha256 = "0i7irqs4100j0g19jh64p2plbwipl6p3ld6w4sscc7n8lwkxmj03";
};
installPhase = ''

6
pkgs/tools/misc/kepubify/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kepubify";
version = "3.1.2";
version = "3.1.3";
src = fetchFromGitHub {
owner = "geek1011";
repo = pname;
rev = "v${version}";
sha256 = "13d3fl53v9pqlm555ly1dm9vc58xwkyik0qmsg173q78ysy2p4q5";
sha256 = "1fd7w9cmdca6ivppmpn5bkqxmz50xgihrm2pbz6h8jf92i485md0";
};
vendorSha256 = "04qpxl4j6v6w25i7r6wghd9xi7jzpy7dynhs9ni35wflq0rlczax";
vendorSha256 = "1gzlxdbmrqqnrjx83g65yn7n93w13ci4vr3mpywasxfad866gc24";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

9
pkgs/tools/misc/loop/default.nix
View File

@ -1,16 +1,17 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage {
name = "loop-unstable-2018-12-04";
pname = "loop";
version = "unstable-2020-07-08";
src = fetchFromGitHub {
owner = "Miserlou";
repo = "Loop";
rev = "598ccc8e52bb13b8aff78b61cfe5b10ff576cecf";
sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4";
rev = "944df766ddecd7a0d67d91cc2dfda8c197179fb0";
sha256 = "0v61kahwk1kdy8pb40rjnzcxby42nh02nyg9jqqpx3vgdrpxlnix";
};
cargoSha256 = "1ydd0sd4lvl6fdl4b13ncqcs03sbxb6v9dwfyqi64zihqzpblshv";
cargoSha256 = "0a3l580ca23vx8isd1qff870ci3p7wf4qrm53jl7nhfjh7rg5a4w";
meta = with stdenv.lib; {
description = "UNIX's missing `loop` command";

6
pkgs/tools/networking/netifd/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "netifd";
version = "unstable-2020-01-18";
version = "unstable-2020-07-11";
src = fetchgit {
url = "https://git.openwrt.org/project/netifd.git";
rev = "1321c1bd8fe921986c4eb39c3783ddd827b79543";
sha256 = "178pckyf1cydi6zzr4bmhksv8vyaks91zv9lqqd2z5nkmccl6vf3";
rev = "3d9bd73e8c2d8a1f78effbe92dd2495bbd2552c4";
sha256 = "085sx1gsigbi1jr19l387rc5p6ja1np6q2gb84khjd4pyiqwk840";
};
buildInputs = [ libnl libubox uci ubus json_c ];

10
pkgs/tools/security/sequoia/default.nix
View File

@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null;
rustPlatform.buildRustPackage rec {
pname = "sequoia";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitLab {
owner = "sequoia-pgp";
repo = pname;
rev = "v${version}";
sha256 = "0iwzi2ylrwz56s77cd4vcf89ig6ipy4w6kp2pfwqvd2d00x54dhk";
sha256 = "1rf9q67qmjfkgy6r3mz1h9ibfmc04r4j8nzacqv2l75x4mwvf6xb";
};
cargoSha256 = "0jsmvs6hr9mhapz3a74wpfgkjkq3w10014j3z30bm659mxqrknha";
cargoSha256 = "074bbr7dfk8cqdarrjy4sm37f5jmv2l5gwwh3zcmy2wrfg7vi1h6";
nativeBuildInputs = [
pkgconfig
@ -56,6 +56,10 @@ rustPlatform.buildRustPackage rec {
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
# Please check if this is still needed when updating.
# Exlude tests for sequoia-store, they often error with 'Too many open files' Hydra.
CARGO_TEST_ARGS = " --all --exclude sequoia-store";
postPatch = ''
# otherwise, the check fails because we delete the `.git` in the unpack phase
substituteInPlace openpgp-ffi/Makefile \

4
pkgs/tools/system/logrotate/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "logrotate";
version = "3.16.0";
version = "3.17.0";
src = fetchFromGitHub {
owner = "logrotate";
repo = "logrotate";
rev = version;
sha256 = "0dsz9cfh9glicrnh1rc3jrc176mimnasslihqnj0aknkv8ajq1jh";
sha256 = "133k4y24p918v4dva6dh70bdfv13jvwl2vlhq0mybrs3ripvnh4h";
};
# Logrotate wants to access the 'mail' program; to be done.

27
pkgs/tools/text/ocrmypdf/default.nix
View File

@ -29,14 +29,14 @@ let
in
buildPythonApplication rec {
pname = "ocrmypdf";
version = "9.8.2";
version = "10.2.0";
disabled = ! python3Packages.isPy3k;
src = fetchFromGitHub {
owner = "jbarlow83";
repo = "OCRmyPDF";
rev = "v${version}";
sha256 = "0zff9gsbfaf72p8zbjamn6513czpr7papyh1jy0fz1z2a9h7ya0g";
sha256 = "1dkxhy3bjl48948jj2k6d684sd76xw1q427qc4hmxncr0wxj0ljp";
};
nativeBuildInputs = with python3Packages; [
@ -49,8 +49,10 @@ buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
cffi
chardet
coloredlogs
img2pdf
pdfminer
pluggy
pikepdf
pillow
reportlab
@ -66,7 +68,7 @@ buildPythonApplication rec {
pytestcov
pytestrunner
python-xmp-toolkit
setuptools
pytestCheckHook
] ++ runtimeDeps;
patches = [
@ -76,25 +78,6 @@ buildPythonApplication rec {
})
];
# The tests take potentially 20+ minutes, depending on machine
doCheck = false;
# These tests fail and it might be upstream problem... or packaging. :)
# development is happening on macos and the pinned test versions are
# significantly newer than nixpkgs has. Program still works...
# (to the extent I've used it) -- Kiwi
checkPhase = ''
export HOME=$TMPDIR
pytest -k 'not test_force_ocr_on_pdf_with_no_images \
and not test_tesseract_crash \
and not test_tesseract_crash_autorotate \
and not test_ghostscript_pdfa_failure \
and not test_gs_render_failure \
and not test_gs_raster_failure \
and not test_bad_utf8 \
and not test_old_unpaper'
'';
makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ];
meta = with stdenv.lib; {

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

@ -11011,6 +11011,8 @@ in
redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { };
redo-c = callPackage ../development/tools/build-managers/redo-c { };
redo-sh = callPackage ../development/tools/build-managers/redo-sh { };
reno = callPackage ../development/tools/reno { };
@ -18076,7 +18078,7 @@ in
cascadia-code = callPackage ../data/fonts/cascadia-code { };
cde-gtk-theme = callPackage ../data/themes/cde-motif-theme { };
cde-gtk-theme = callPackage ../data/themes/cdetheme { };
charis-sil = callPackage ../data/fonts/charis-sil { };

1
pkgs/top-level/php-packages.nix
View File

@ -1014,6 +1014,7 @@ in
+----------------------------------------------------------------------+
| Copyright (c) The PHP Group |
'')
] ++ lib.optional (lib.versionOlder php.version "7.4.8") [
(pkgs.writeText "mysqlnd_fix_compression.patch" ''
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h

10
pkgs/top-level/python-packages.nix
View File

@ -2689,8 +2689,14 @@ in {
zigpy = callPackage ../development/python-modules/zigpy { };
zigpy-cc = callPackage ../development/python-modules/zigpy-cc { };
zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { };
zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { };
zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { };
digital-ocean = callPackage ../development/python-modules/digitalocean { };
digi-xbee = callPackage ../development/python-modules/digi-xbee { };
@ -7447,8 +7453,12 @@ in {
pulp = callPackage ../development/python-modules/pulp { };
pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { };
behave = callPackage ../development/python-modules/behave { };
bellows = callPackage ../development/python-modules/bellows { };
pyhamcrest = if isPy3k then
callPackage ../development/python-modules/pyhamcrest { }
else