MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Martin Weinelt 2021-08-30 16:08:03 +02:00 committed by GitHub
commit e2575c7de1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
104 changed files with 1118 additions and 895 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/config/fonts/fonts.nix
View file

@ -8,7 +8,7 @@ let
# If not running a fancy desktop environment, the cursor is likely set to
# the default `cursor.pcf` bitmap font. This is 17px wide, so it's very
# small and almost invisible on 4K displays.
fontcursormisc_hidpi = pkgs.xorg.fontcursormisc.overrideAttrs (old:
fontcursormisc_hidpi = pkgs.xorg.fontxfree86type1.overrideAttrs (old:
let
# The scaling constant is 230/96: the scalable `left_ptr` glyph at
# about 23 points is rendered as 17px, on a 96dpi display.

40
nixos/modules/services/amqp/rabbitmq.nix
View file

@ -7,12 +7,13 @@ let
inherit (builtins) concatStringsSep;
config_file_content = lib.generators.toKeyValue {} cfg.configItems;
config_file_content = lib.generators.toKeyValue { } cfg.configItems;
config_file = pkgs.writeText "rabbitmq.conf" config_file_content;
advanced_config_file = pkgs.writeText "advanced.config" cfg.config;
in {
in
{
###### interface
options = {
services.rabbitmq = {
@ -79,7 +80,7 @@ in {
};
configItems = mkOption {
default = {};
default = { };
type = types.attrsOf types.str;
example = literalExample ''
{
@ -123,16 +124,38 @@ in {
};
plugins = mkOption {
default = [];
default = [ ];
type = types.listOf types.str;
description = "The names of plugins to enable";
};
pluginDirs = mkOption {
default = [];
default = [ ];
type = types.listOf types.path;
description = "The list of directories containing external plugins";
};
managementPlugin = mkOption {
description = "The options to run the management plugin";
type = types.submodule {
options = {
enable = mkOption {
default = false;
type = types.bool;
description = ''
Whether to enable the management plugin
'';
};
port = mkOption {
default = 15672;
type = types.port;
description = ''
On which port to run the management plugin
'';
};
};
};
};
};
};
@ -157,8 +180,13 @@ in {
services.rabbitmq.configItems = {
"listeners.tcp.1" = mkDefault "${cfg.listenAddress}:${toString cfg.port}";
} // optionalAttrs cfg.managementPlugin.enable {
"management.tcp.port" = toString cfg.managementPlugin.port;
"management.tcp.ip" = cfg.listenAddress;
};
services.rabbitmq.plugins = optional cfg.managementPlugin.enable "rabbitmq_management";
systemd.services.rabbitmq = {
description = "RabbitMQ Server";
@ -180,7 +208,7 @@ in {
RABBITMQ_ENABLED_PLUGINS_FILE = pkgs.writeText "enabled_plugins" ''
[ ${concatStringsSep "," cfg.plugins} ].
'';
} // optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; };
} // optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; };
serviceConfig = {
ExecStart = "${cfg.package}/sbin/rabbitmq-server";

23
nixos/modules/services/misc/airsonic.nix
View file

@ -82,6 +82,25 @@ in {
'';
};
jre = mkOption {
type = types.package;
default = pkgs.jre8;
defaultText = literalExample "pkgs.jre8";
description = ''
JRE package to use.
Airsonic only supports Java 8, airsonic-advanced requires at least
Java 11.
'';
};
war = mkOption {
type = types.path;
default = "${pkgs.airsonic}/webapps/airsonic.war";
defaultText = "\${pkgs.airsonic}/webapps/airsonic.war";
description = "Airsonic war file to use.";
};
jvmOptions = mkOption {
description = ''
Extra command line options for the JVM running AirSonic.
@ -118,7 +137,7 @@ in {
'';
serviceConfig = {
ExecStart = ''
${pkgs.jre8}/bin/java -Xmx${toString cfg.maxMemory}m \
${cfg.jre}/bin/java -Xmx${toString cfg.maxMemory}m \
-Dairsonic.home=${cfg.home} \
-Dserver.address=${cfg.listenAddress} \
-Dserver.port=${toString cfg.port} \
@ -128,7 +147,7 @@ in {
"-Dserver.use-forward-headers=true"} \
${toString cfg.jvmOptions} \
-verbose:gc \
-jar ${pkgs.airsonic}/webapps/airsonic.war
-jar ${cfg.war}
'';
Restart = "always";
User = "airsonic";

2
nixos/modules/services/misc/mautrix-telegram.nix
View file

@ -128,7 +128,7 @@ in {
# https://github.com/tulir/mautrix-telegram/issues/584
[ -f ${settingsFile} ] && rm -f ${settingsFile}
old_umask=$(umask)
umask 0277
umask 0177
${pkgs.envsubst}/bin/envsubst \
-o ${settingsFile} \
-i ${settingsFileUnsubstituted}

54
nixos/modules/services/misc/nzbget.nix
View file

@ -7,24 +7,12 @@ let
pkg = pkgs.nzbget;
stateDir = "/var/lib/nzbget";
configFile = "${stateDir}/nzbget.conf";
configOpts = concatStringsSep " " (mapAttrsToList (name: value: "-o ${name}=${value}") nixosOpts);
nixosOpts = {
# allows nzbget to run as a "simple" service
OutputMode = "loggable";
# use journald for logging
WriteLog = "none";
ErrorTarget = "screen";
WarningTarget = "screen";
InfoTarget = "screen";
DetailTarget = "screen";
# required paths
ConfigTemplate = "${pkg}/share/nzbget/nzbget.conf";
WebDir = "${pkg}/share/nzbget/webui";
# nixos handles package updates
UpdateCheck = "none";
};
configOpts = concatStringsSep " " (mapAttrsToList (name: value: "-o ${name}=${escapeShellArg (toStr value)}") cfg.settings);
toStr = v:
if v == true then "yes"
else if v == false then "no"
else if isInt v then toString v
else v;
in
{
imports = [
@ -50,12 +38,41 @@ in
default = "nzbget";
description = "Group under which NZBGet runs";
};
settings = mkOption {
type = with types; attrsOf (oneOf [ bool int str ]);
default = {};
description = ''
NZBGet configuration, passed via command line using switch -o. Refer to
<link xlink:href="https://github.com/nzbget/nzbget/blob/master/nzbget.conf"/>
for details on supported values.
'';
example = {
MainDir = "/data";
};
};
};
};
# implementation
config = mkIf cfg.enable {
services.nzbget.settings = {
# allows nzbget to run as a "simple" service
OutputMode = "loggable";
# use journald for logging
WriteLog = "none";
ErrorTarget = "screen";
WarningTarget = "screen";
InfoTarget = "screen";
DetailTarget = "screen";
# required paths
ConfigTemplate = "${pkg}/share/nzbget/nzbget.conf";
WebDir = "${pkg}/share/nzbget/webui";
# nixos handles package updates
UpdateCheck = "none";
};
systemd.services.nzbget = {
description = "NZBGet Daemon";
after = [ "network.target" ];
@ -64,6 +81,7 @@ in
unrar
p7zip
];
preStart = ''
if [ ! -f ${configFile} ]; then
${pkgs.coreutils}/bin/install -m 0700 ${pkg}/share/nzbget/nzbget.conf ${configFile}

4
nixos/modules/services/network-filesystems/ipfs.nix
View file

@ -226,8 +226,8 @@ in {
${optionalString (! cfg.localDiscovery) "--profile=server"}
else
${if cfg.localDiscovery
then "ipfs config profile apply local-discovery"
else "ipfs config profile apply server"
then "ipfs --offline config profile apply local-discovery"
else "ipfs --offline config profile apply server"
}
fi
'' + optionalString cfg.autoMount ''

19
nixos/modules/services/networking/epmd.nix
View file

@ -4,9 +4,7 @@ with lib;
let
cfg = config.services.epmd;
in
{
###### interface
options.services.epmd = {
@ -27,16 +25,31 @@ in
an Erlang runtime that is already installed for other purposes.
'';
};
listenStream = mkOption
{
type = types.str;
default = "[::]:4369";
description = ''
the listenStream used by the systemd socket.
see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more informations.
use this to change the port epmd will run on.
if not defined, epmd will use "[::]:4369"
'';
};
};
###### implementation
config = mkIf cfg.enable {
assertions = [{
assertion = cfg.listenStream == "[::]:4369" -> config.networking.enableIPv6;
message = "epmd listens by default on ipv6, enable ipv6 or change config.services.epmd.listenStream";
}];
systemd.sockets.epmd = rec {
description = "Erlang Port Mapper Daemon Activation Socket";
wantedBy = [ "sockets.target" ];
before = wantedBy;
socketConfig = {
ListenStream = "4369";
ListenStream = cfg.listenStream;
Accept = "false";
};
};

22
nixos/modules/services/networking/syncthing.nix
View file

@ -9,7 +9,7 @@ let
devices = mapAttrsToList (name: device: {
deviceID = device.id;
inherit (device) name addresses introducer;
inherit (device) name addresses introducer autoAcceptFolders;
}) cfg.devices;
folders = mapAttrsToList ( _: folder: {
@ -149,6 +149,15 @@ in {
'';
};
autoAcceptFolders = mkOption {
type = types.bool;
default = false;
description = ''
Automatically create or share folders that this device advertises at the default path.
See <link xlink:href="https://docs.syncthing.net/users/config.html?highlight=autoaccept#config-file-format"/>.
'';
};
};
}));
};
@ -425,6 +434,15 @@ in {
defaultText = literalExample "dataDir${optionalString cond " + \"/.config/syncthing\""}";
};
extraFlags = mkOption {
type = types.listOf types.str;
default = [];
example = [ "--reset-deltas" ];
description = ''
Extra flags passed to the syncthing command in the service definition.
'';
};
openDefaultPorts = mkOption {
type = types.bool;
default = false;
@ -517,7 +535,7 @@ in {
${cfg.package}/bin/syncthing \
-no-browser \
-gui-address=${cfg.guiAddress} \
-home=${cfg.configDir}
-home=${cfg.configDir} ${escapeShellArgs cfg.extraFlags}
'';
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;

2
nixos/modules/services/web-apps/nextcloud.nix
View file

@ -502,8 +502,6 @@ in {
${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
"--database-pass" = dbpass;
${if c.dbtableprefix != null
then "--database-table-prefix" else null} = ''"${toString c.dbtableprefix}"'';
"--admin-user" = ''"${c.adminuser}"'';
"--admin-pass" = adminpass;
"--data-dir" = ''"${cfg.home}/data"'';

70
nixos/modules/services/web-apps/tt-rss.nix
View file

@ -6,10 +6,6 @@ let
configVersion = 26;
cacheDir = "cache";
lockDir = "lock";
feedIconsDir = "feed-icons";
dbPort = if cfg.database.port == null
then (if cfg.database.type == "pgsql" then 5432 else 3306)
else cfg.database.port;
@ -32,10 +28,10 @@ let
<?php
putenv('TTRSS_PHP_EXECUTABLE=${pkgs.php}/bin/php');
putenv('TTRSS_LOCK_DIRECTORY=${lockDir}');
putenv('TTRSS_CACHE_DIR=${cacheDir}');
putenv('TTRSS_ICONS_DIR=${feedIconsDir}');
putenv('TTRSS_ICONS_URL=${feedIconsDir}');
putenv('TTRSS_LOCK_DIRECTORY=${cfg.root}/lock');
putenv('TTRSS_CACHE_DIR=${cfg.root}/cache');
putenv('TTRSS_ICONS_DIR=${cfg.root}/feed-icons');
putenv('TTRSS_ICONS_URL=feed-icons');
putenv('TTRSS_SELF_URL_PATH=${cfg.selfUrlPath}');
putenv('TTRSS_MYSQL_CHARSET=UTF8');
@ -101,6 +97,22 @@ let
${cfg.extraConfig}
'';
# tt-rss and plugins and themes and config.php
servedRoot = pkgs.runCommand "tt-rss-served-root" {} ''
cp --no-preserve=mode -r ${pkgs.tt-rss} $out
cp ${tt-rss-config} $out/config.php
${optionalString (cfg.pluginPackages != []) ''
for plugin in ${concatStringsSep " " cfg.pluginPackages}; do
cp -r "$plugin"/* "$out/plugins.local/"
done
''}
${optionalString (cfg.themePackages != []) ''
for theme in ${concatStringsSep " " cfg.themePackages}; do
cp -r "$theme"/* "$out/themes.local/"
done
''}
'';
in {
###### interface
@ -544,12 +556,16 @@ let
enable = true;
virtualHosts = {
${cfg.virtualHost} = {
root = "${cfg.root}";
root = "${cfg.root}/www";
locations."/" = {
index = "index.php";
};
locations."^~ /feed-icons" = {
root = "${cfg.root}";
};
locations."~ \\.php$" = {
extraConfig = ''
fastcgi_split_path_info ^(.+\.php)(/.+)$;
@ -562,13 +578,19 @@ let
};
systemd.tmpfiles.rules = [
"d '${cfg.root}' 0755 ${cfg.user} tt_rss - -"
"Z '${cfg.root}' 0755 ${cfg.user} tt_rss - -"
"d '${cfg.root}' 0555 ${cfg.user} tt_rss - -"
"d '${cfg.root}/lock' 0755 ${cfg.user} tt_rss - -"
"d '${cfg.root}/cache' 0755 ${cfg.user} tt_rss - -"
"d '${cfg.root}/cache/upload' 0755 ${cfg.user} tt_rss - -"
"d '${cfg.root}/cache/images' 0755 ${cfg.user} tt_rss - -"
"d '${cfg.root}/cache/export' 0755 ${cfg.user} tt_rss - -"
"d '${cfg.root}/feed-icons' 0755 ${cfg.user} tt_rss - -"
"L+ '${cfg.root}/www' - - - - ${servedRoot}"
];
systemd.services = {
phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") {
restartTriggers = [ tt-rss-config pkgs.tt-rss ];
restartTriggers = [ servedRoot ];
};
tt-rss = {
@ -594,27 +616,7 @@ let
else "";
in ''
rm -rf "${cfg.root}/*"
cp -r "${pkgs.tt-rss}/"* "${cfg.root}"
${optionalString (cfg.pluginPackages != []) ''
for plugin in ${concatStringsSep " " cfg.pluginPackages}; do
cp -r "$plugin"/* "${cfg.root}/plugins.local/"
done
''}
${optionalString (cfg.themePackages != []) ''
for theme in ${concatStringsSep " " cfg.themePackages}; do
cp -r "$theme"/* "${cfg.root}/themes.local/"
done
''}
ln -sf "${tt-rss-config}" "${cfg.root}/config.php"
chmod -R 755 "${cfg.root}"
chmod -R ug+rwX "${cfg.root}/${lockDir}"
chmod -R ug+rwX "${cfg.root}/${cacheDir}"
chmod -R ug+rwX "${cfg.root}/${feedIconsDir}"
''
+ (optionalString (cfg.database.type == "pgsql") ''
in (optionalString (cfg.database.type == "pgsql") ''
exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \
| tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//')
@ -639,7 +641,7 @@ let
serviceConfig = {
User = "${cfg.user}";
Group = "tt_rss";
ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon --quiet";
ExecStart = "${pkgs.php}/bin/php ${cfg.root}/www/update.php --daemon --quiet";
Restart = "on-failure";
RestartSec = "60";
SyslogIdentifier = "tt-rss";

1
nixos/tests/nextcloud/basic.nix
View file

@ -37,6 +37,7 @@ in {
config = {
# Don't inherit adminuser since "root" is supposed to be the default
inherit adminpass;
dbtableprefix = "nixos_";
};
autoUpdateApps = {
enable = true;

18
nixos/tests/nzbget.nix
View file

@ -8,13 +8,21 @@ import ./make-test-python.nix ({ pkgs, ...} : {
server = { ... }: {
services.nzbget.enable = true;
# provide some test settings
services.nzbget.settings = {
"MainDir" = "/var/lib/nzbget";
"DirectRename" = true;
"DiskSpace" = 0;
"Server1.Name" = "this is a test";
};
# hack, don't add (unfree) unrar to nzbget's path,
# so we can run this test in CI
systemd.services.nzbget.path = pkgs.lib.mkForce [ pkgs.p7zip ];
};
};
testScript = ''
testScript = { nodes, ... }: ''
start_all()
server.wait_for_unit("nzbget.service")
@ -26,5 +34,13 @@ import ./make-test-python.nix ({ pkgs, ...} : {
server.succeed(
"${pkgs.nzbget}/bin/nzbget -n -o Control_iP=127.0.0.1 -o Control_port=6789 -o Control_password=tegbzn6789 -V"
)
config = server.succeed("${nodes.server.config.systemd.services.nzbget.serviceConfig.ExecStart} --printconfig")
# confirm the test settings are applied
assert 'MainDir = "/var/lib/nzbget"' in config
assert 'DirectRename = "yes"' in config
assert 'DiskSpace = "0"' in config
assert 'Server1.Name = "this is a test"' in config
'';
})

6
nixos/tests/rabbitmq.nix
View file

@ -7,7 +7,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
};
machine = {
services.rabbitmq.enable = true;
services.rabbitmq = {
enable = true;
managementPlugin.enable = true;
};
# Ensure there is sufficient extra disk space for rabbitmq to be happy
virtualisation.diskSize = 1024;
};
@ -19,5 +22,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.wait_until_succeeds(
'su -s ${pkgs.runtimeShell} rabbitmq -c "rabbitmqctl status"'
)
machine.wait_for_open_port("15672")
'';
})

6
pkgs/applications/audio/ncspot/default.nix
View file

@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
sha256 = "0sgnd6n8j8lygmb9qvv6i2ir28fdsrpmzlviz7d0gbx684qj0zkc";
sha256 = "1rs1jy7zzfgqzr64ld8whn0wlw8n7rk1svxx0xfxm3ynmgc7sd68";
};
cargoSha256 = "0piipqf5y5bczbwkaplv6niqh3rp2di1gn7wwpd0gaa2cw7ylbb1";
cargoSha256 = "10g7gdi1iz751wa60vr4fs0cvfsgs3pfcp8pnywicl0vsdp25fmc";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];

4
pkgs/applications/blockchains/charge-lnd/default.nix
View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "charge-lnd";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
owner = "accumulator";
repo = pname;
rev = "v${version}";
sha256 = "087y60hpld17bg2ya5nlh4m4sam4s6mx8vrqhm48idj1rmlcpfws";
sha256 = "1cj8ggahnbn55wlkxzf5b9n8rvm30mc95vgcw8b60pzs47q6vncp";
};
propagatedBuildInputs = with python3Packages; [

4
pkgs/applications/misc/dbeaver/default.nix
View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "dbeaver";
version = "21.1.5"; # When updating also update fetchedMavenDeps.sha256
version = "21.2.0"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
sha256 = "sk19Gfu+s7KG1V4f28bFsskagGAuAsEBJEFJzvNh25M=";
sha256 = "UYLX8oUHHfdsNiby+emunLRPIHo8ht3bfiredXOjkWs=";
};
fetchedMavenDeps = stdenv.mkDerivation {

22
pkgs/applications/misc/genact/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ fetchFromGitHub, lib, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "genact";
version = "0.11.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = pname;
rev = "v${version}";
sha256 = "1hc4jwk5rr1yw3pfvriash7b03j181k8c9y7m3sglkk8xnff219c";
};
cargoSha256 = "0a5ic6c7fvmg2kh3qprzffnpw40cmrgbscrlhxxs3m7nxfjdh7bc";
meta = with lib; {
description = "A nonsense activity generator";
homepage = "https://github.com/svenstaro/genact";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

2
pkgs/applications/misc/keepass/default.nix
View file

@ -84,7 +84,7 @@ with builtins; buildDotnetPackage rec {
# after loading. It is brought into plugins bin/ directory using
# buildEnv in the plugin derivation. Wrapper below makes sure it
# is found and does not pollute output path.
binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins));
binPaths = lib.concatStringsSep ":" (map (x: x + "/bin") plugins);
dynlibPath = lib.makeLibraryPath [ gtk2 ];

28
pkgs/applications/misc/merkaartor/default.nix
View file

@ -2,14 +2,13 @@
, lib
, stdenv
, fetchFromGitHub
, fetchpatch
, qmake
, qttools
, qttranslations
, gdal
, proj
, qtsvg
, qtwebkit
, qtwebengine
, withGeoimage ? true, exiv2
, withGpsdlib ? (!stdenv.isDarwin), gpsd
, withLibproxy ? false, libproxy
@ -18,31 +17,18 @@
mkDerivation rec {
pname = "merkaartor";
version = "0.18.4";
version = "0.19.0";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "merkaartor";
rev = version;
sha256 = "vwO4/a7YF9KbpxcFGTFCdG6SfwEyhISlEtcA+rMebUA=";
sha256 = "sha256-Gx+gnVbSY8JnG03kO5vVQNlSZRl/hrKTdDbh7lyIMbA=";
};
patches = [
# Fix build with Qt 5.15 (missing QPainterPath include)
(fetchpatch {
url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch";
sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U=";
})
# Added a condition to use the new timespec_t on gpsd APIs >= 9
(fetchpatch {
url = "https://github.com/openstreetmap/merkaartor/commit/13b358fa7899bb34e277b32a4c0d92833050f2c6.patch";
sha256 = "129fpjm7illz7ngx3shps5ivrxwf14apw55842xhskwwb0rf5szb";
})
];
nativeBuildInputs = [ qmake qttools ];
buildInputs = [ gdal proj qtsvg qtwebkit ]
buildInputs = [ gdal proj qtsvg qtwebengine ]
++ lib.optional withGeoimage exiv2
++ lib.optional withGpsdlib gpsd
++ lib.optional withLibproxy libproxy
@ -52,8 +38,10 @@ mkDerivation rec {
lrelease src/src.pro
'';
qmakeFlags = [ "TRANSDIR_SYSTEM=${qttranslations}/translations" ]
++ lib.optional withGeoimage "GEOIMAGE=1"
qmakeFlags = [
"TRANSDIR_SYSTEM=${qttranslations}/translations"
"USEWEBENGINE=1"
] ++ lib.optional withGeoimage "GEOIMAGE=1"
++ lib.optional withGpsdlib "GPSDLIB=1"
++ lib.optional withLibproxy "LIBPROXY=1"
++ lib.optional withZbar "ZBAR=1";

9
pkgs/applications/networking/browsers/chromium/browser.nix
View file

@ -1,4 +1,7 @@
{ lib, mkChromiumDerivation, channel, enableWideVine, ungoogled }:
{ lib, mkChromiumDerivation
, channel, chromiumVersionAtLeast
, enableWideVine, ungoogled
}:
with lib;
@ -16,8 +19,8 @@ mkChromiumDerivation (base: rec {
cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
cp -v "$buildPath/icudtl.dat" "$libExecPath/"
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
${lib.optionalString (channel != "dev") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''}
${lib.optionalString (channel == "dev") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''}
${lib.optionalString (!chromiumVersionAtLeast "94") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''}
${lib.optionalString (chromiumVersionAtLeast "94") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''}
cp -v "$buildPath/chrome" "$libExecPath/$packageName"
# Swiftshader

14
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -1,6 +1,8 @@
{ stdenv, lib, fetchurl, fetchpatch
# Channel data:
, channel, upstream-info
# Helper functions:
, chromiumVersionAtLeast, versionRange
# Native build inputs:
, ninja, pkg-config
@ -106,18 +108,6 @@ let
buildPath = "out/${buildType}";
libExecPath = "$out/libexec/${packageName}";
warnObsoleteVersionConditional = min-version: result:
let ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version;
in warnIf (versionAtLeast ungoogled-version min-version) "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it."
result;
chromiumVersionAtLeast = min-version:
let result = versionAtLeast upstream-info.version min-version;
in warnObsoleteVersionConditional min-version result;
versionRange = min-version: upto-version:
let inherit (upstream-info) version;
result = versionAtLeast version min-version && versionOlder version upto-version;
in warnObsoleteVersionConditional upto-version result;
ungoogler = ungoogled-chromium {
inherit (upstream-info.deps.ungoogled-patches) rev sha256;
};

30
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -22,15 +22,31 @@ let
llvmPackages = llvmPackages_12;
stdenv = llvmPackages.stdenv;
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
# Helper functions for changes that depend on specific versions:
warnObsoleteVersionConditional = min-version: result:
let ungoogled-version = (lib.importJSON ./upstream-info.json).ungoogled-chromium.version;
in lib.warnIf
(lib.versionAtLeast ungoogled-version min-version)
"chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it."
result;
chromiumVersionAtLeast = min-version:
let result = lib.versionAtLeast upstream-info.version min-version;
in warnObsoleteVersionConditional min-version result;
versionRange = min-version: upto-version:
let inherit (upstream-info) version;
result = lib.versionAtLeast version min-version && lib.versionOlder version upto-version;
in warnObsoleteVersionConditional upto-version result;
callPackage = newScope chromium;
chromium = rec {
inherit stdenv llvmPackages;
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
inherit stdenv llvmPackages upstream-info;
mkChromiumDerivation = callPackage ./common.nix ({
inherit channel gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs
inherit channel chromiumVersionAtLeast versionRange;
inherit gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs
cupsSupport pulseSupport ungoogled;
gnChromium = gn.overrideAttrs (oldAttrs: {
inherit (upstream-info.deps.gn) version;
@ -38,12 +54,14 @@ let
inherit (upstream-info.deps.gn) url rev sha256;
};
});
} // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "93") rec {
} // lib.optionalAttrs (chromiumVersionAtLeast "93") rec {
llvmPackages = llvmPackages_13;
stdenv = llvmPackages.stdenv;
});
browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; };
browser = callPackage ./browser.nix {
inherit channel chromiumVersionAtLeast enableWideVine ungoogled;
};
ungoogled-chromium = callPackage ./ungoogled.nix {};
};

4
pkgs/applications/networking/cloudflared/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloudflared";
version = "2021.8.3";
version = "2021.8.6";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
sha256 = "sha256-gipLjABvJ1QK98uX7Gl6feHXUei95yHlSNkqlQ7pVg4=";
sha256 = "sha256-dMZu4IRdchPeoYylz1XDZeJsAW+V8HZApNndpeu+RbA=";
};
vendorSha256 = null;

18
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -80,10 +80,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
"rev": "v3.43.0",
"sha256": "05rv93y9hf0l869q6i581748rw4bahvsgggj0h7cwjnf7xap0sxj",
"vendorSha256": "1m6pkrpknslqnv60cz5739gp5nxc7xhga402wkl37gdagmadkmrk",
"version": "3.43.0"
"rev": "v3.56.0",
"sha256": "0fa61i172maanxmxz28mj7mkgrs9a5bs61mlvb0d5y97lv6pm2xg",
"vendorSha256": "1s22k4b2zq5n0pz6iqbqsf6f7chsbvkpdn432rvyshcryxlklfvl",
"version": "3.56.0"
},
"azuread": {
"owner": "hashicorp",
@ -332,11 +332,13 @@
"version": "2.1.0"
},
"fastly": {
"owner": "terraform-providers",
"owner": "fastly",
"provider-source-address": "registry.terraform.io/fastly/fastly",
"repo": "terraform-provider-fastly",
"rev": "v0.16.1",
"sha256": "1pjrcw03a86xgkzcx778f7kk79svv8csy05b7qi0m5x77zy4pws7",
"version": "0.16.1"
"rev": "v0.34.0",
"sha256": "1za00gzmyxr6wfzzq92m3spi9563pbpjwj24sm95kj34l6mfwpyx",
"vendorSha256": null,
"version": "0.34.0"
},
"flexibleengine": {
"owner": "terraform-providers",

8
pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
View file

@ -8,19 +8,22 @@
python3.pkgs.buildPythonApplication rec {
pname = "deltachat-cursed";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "adbenitez";
repo = "deltachat-cursed";
rev = "v${version}";
sha256 = "0kbb7lh17dbkd85mcqf438qwk5masz2fxsy8ljdh23kis55nksh8";
sha256 = "0zzzrzc8yxw6ffwfirbrr5ahbidbvlwdvgdg82zjsdjjbarxph8c";
};
nativeBuildInputs = [
python3.pkgs.setuptools-scm
wrapGAppsHook
];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
buildInputs = [
gobject-introspection
libnotify
@ -28,6 +31,7 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
deltachat
notify-py
pygobject3
urwid-readline
];

17
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View file

@ -8,11 +8,26 @@
, makeWrapper
, nodePackages
, pkg-config
, rustPlatform
, stdenv
, CoreServices
}:
let
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
version = "1.56.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
sha256 = "07vcwbvpzcnvpls0hmpapi7v1npca8ydbx2i235k26xym8il89b7";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${old.pname}-${version}";
sha256 = "0pb1rcv45xa95ziqap94yy52fy02vh401iqsgi18nm1j6iyyngc8";
};
});
electronExec = if stdenv.isDarwin then
"${electron}/Applications/Electron.app/Contents/MacOS/Electron"
else
@ -37,7 +52,7 @@ in nodePackages.deltachat-desktop.override rec {
];
buildInputs = [
libdeltachat
libdeltachat'
] ++ lib.optionals stdenv.isDarwin [
CoreServices
];

27
pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
View file

@ -11,34 +11,17 @@
, qtimageformats
, qtmultimedia
, qtwebengine
, rustPlatform
}:
let
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
inherit (old) pname;
version = "1.58.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
sha256 = "03xc0jlfmvmdcipmzavbzkq010qlxzf3mj1zi7wcix7kpl8gwmy7";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "1zijxyc1xjlbyh1gh2lyw44xjcrhz1msykrlqgfkw5w1w0yh78hd";
};
});
in mkDerivation rec {
mkDerivation rec {
pname = "kdeltachat";
version = "unstable-2021-08-02";
version = "unstable-2021-08-28";
src = fetchFromSourcehut {
owner = "~link2xt";
repo = "kdeltachat";
rev = "950f4f22c01ab75f613479ef831bdf38f395d1dd";
sha256 = "007gazqkzcc0w0rq2i8ysa9f50ldj7n9f5gp1mh8bi86bdvdkzsy";
rev = "4d051bc35611fa5b75865769df7a512d90a13c65";
sha256 = "1p8pb3pwgvxy5bvr6by54f1f62imdlddy2mk52qxcvrx8f833bml";
};
nativeBuildInputs = [
@ -49,7 +32,7 @@ in mkDerivation rec {
buildInputs = [
kirigami2
libdeltachat'
libdeltachat
qtimageformats
qtmultimedia
qtwebengine

9
pkgs/applications/office/gnucash/default.nix
View file

@ -33,6 +33,15 @@ stdenv.mkDerivation rec {
sha256 = "0csp8iddhc901vv09gl5lj970g6ili696vwj4vdpkiprp7gh26r5";
};
patches = [
# Fixes a warning about an initialized variable that kills enableDebugging gnucash builds on nix.
# This will most likely be part of the 4.7 release, it will be safe to remove then.
(fetchpatch {
url = "https://github.com/Gnucash/gnucash/commit/b42052464ba9701a3d1834fc58fa0deb32ab9afe.patch";
sha256 = "092957c8jqj4v70fv0ia1wpgl6x34hbwjrichxfbk5ja8l6535gc";
})
];
nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ];
buildInputs = [

4
pkgs/applications/science/misc/snakemake/default.nix
View file

@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "snakemake";
version = "6.6.1";
version = "6.7.0";
propagatedBuildInputs = with python3Packages; [
appdirs
@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec {
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "91637a801342f3bc349c033b284fef7c0201b4e5e29d5650cb6c7f69096d4184";
sha256 = "6f53d54044c5d1718c7858f45286beeffb220c794fe5f602a5c20bf0caf8ec07";
};
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json

2
pkgs/applications/video/vdr/wrapper.nix
View file

@ -24,7 +24,7 @@ in symlinkJoin {
inherit license homepage;
description = description
+ " (with plugins: "
+ lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins))
+ lib.concatStringsSep ", " (map (x: ""+x.name) plugins)
+ ")";
};
}

2
pkgs/desktops/xfce/core/thunar/wrapper.nix
View file

@ -36,6 +36,6 @@ symlinkJoin {
description = thunar.meta.description + optionalString
(0 != length thunarPlugins)
" (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})";
" (with plugins: ${concatStringsSep ", " (map (x: x.name) thunarPlugins)})";
};
}

3
pkgs/development/compilers/gcc/common/configure-flags.nix
View file

@ -133,7 +133,7 @@ let
"--with-system-zlib"
"--enable-static"
"--enable-languages=${
lib.concatStrings (lib.intersperse ","
lib.concatStringsSep ","
( lib.optional langC "c"
++ lib.optional langCC "c++"
++ lib.optional langD "d"
@ -146,7 +146,6 @@ let
++ lib.optionals crossDarwin [ "objc" "obj-c++" ]
++ lib.optional langJit "jit"
)
)
}"
]

3
pkgs/development/compilers/llvm/11/compiler-rt/default.nix
View file

@ -112,5 +112,8 @@ stdenv.mkDerivation {
# "All of the code in the compiler-rt project is dual licensed under the MIT
# license and the UIUC License (a BSD-like license)":
license = with lib.licenses; [ mit ncsa ];
# compiler-rt requires a Clang stdenv on 32-bit RISC-V:
# https://reviews.llvm.org/D43106#1019077
broken = stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.is32bit && !stdenv.cc.isClang;
};
}

4
pkgs/development/compilers/llvm/11/default.nix
View file

@ -227,7 +227,7 @@ let
compiler-rt-libc = callPackage ./compiler-rt {
inherit llvm_meta;
stdenv = if (stdenv.hostPlatform.useLLVM or false) || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
stdenv = if (stdenv.hostPlatform.useLLVM or false) || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.is32bit)
then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc
else stdenv;
};
@ -240,7 +240,7 @@ let
};
# N.B. condition is safe because without useLLVM both are the same.
compiler-rt = if stdenv.hostPlatform.isAndroid || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
compiler-rt = if stdenv.hostPlatform.isAndroid || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.libc == "newlib")
then libraries.compiler-rt-libc
else libraries.compiler-rt-no-libc;

6
pkgs/development/compilers/llvm/update-git.py
View file

@ -79,8 +79,14 @@ hash = nix_prefetch_url(f'https://github.com/llvm/llvm-project/archive/{commit["
print('Updating default.nix...')
with fileinput.FileInput(DEFAULT_NIX, inplace=True) as f:
for line in f:
if match := re.search(r'^ rev-version = "unstable-(.+)";', line):
old_date = match.group(1)
result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line)
result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result)
result = re.sub(r'^ rev-version = ".+";', f' rev-version = "{version}";', result)
result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{hash}";', result)
print(result, end='')
# Commit the result:
commit_message = f"llvmPackages_git: {old_date} -> {date}"
subprocess.run(['git', 'add', DEFAULT_NIX], check=True)
subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True)

33
pkgs/development/compilers/llvm/update.sh
View file

@ -19,19 +19,26 @@ sed -Ei \
"$FILE"
readonly ATTRSET="llvmPackages_$VERSION_MAJOR"
readonly SOURCES=(
"clang-unwrapped.src"
"compiler-rt.src"
"clang-unwrapped.clang-tools-extra_src"
"libcxx.src"
"libcxxabi.src"
"libunwind.src"
"lld.src"
"lldb.src"
"llvm.src"
"llvm.polly_src"
"openmp.src"
)
if [ "$VERSION_MAJOR" -ge "13" ]; then
readonly SOURCES=(
"llvm.src"
)
else
readonly SOURCES=(
"clang-unwrapped.src"
"compiler-rt.src"
"clang-unwrapped.clang-tools-extra_src"
"libcxx.src"
"libcxxabi.src"
"libunwind.src"
"lld.src"
"lldb.src"
"llvm.src"
"llvm.polly_src"
"openmp.src"
)
fi
for SOURCE in "${SOURCES[@]}"; do
echo "Updating the hash of $SOURCE:"

6
pkgs/development/compilers/ocaml/4.13.nix
View file

@ -1,9 +1,9 @@
import ./generic.nix {
major_version = "4";
minor_version = "13";
patch_version = "0-alpha2";
patch_version = "0-beta1";
src = fetchTarball {
url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha2.tar.xz";
sha256 = "0krb0254i6ihbymjn6mwgzcfrzsvpk9hbagl0agm6wml21zpcsif";
url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~beta1.tar.xz";
sha256 = "0dbz69p1kqabjvzaasy2malfdfn4b93s504x2xs0dl5l3fa3p6c3";
};
}

4
pkgs/development/compilers/vyper/default.nix
View file

@ -14,11 +14,11 @@ in
buildPythonPackage rec {
pname = "vyper";
version = "0.2.15";
version = "0.2.16";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-cNnKHVKwIx0miC2VhGYBzcSckTnyWYmjNzW0bEzP4bU=";
sha256 = "6cf347440716964012d46686faefc9c689f01872f19736287a63aa8652ac3ddd";
};
nativeBuildInputs = [ pytest-runner ];

4
pkgs/development/embedded/stm32/stm32flash/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "stm32flash";
version = "0.5";
version = "0.6";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp";
sha256 = "sha256-7ptA1NPlzSi5k+CK4qLDxVm2vqhzDNfh1Acn3tsd2gk=";
};
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

4
pkgs/development/interpreters/joker/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "joker";
version = "0.17.1";
version = "0.17.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "candid82";
repo = "joker";
sha256 = "sha256-3OimYXcQ3KPav44sClbC60220/YK4Jhq+l5UfRFYoJI=";
sha256 = "sha256-rboyRancRTyrSY+13Blrz7OsIzclDS4X4hkHGD6cpyk=";
};
vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA=";

4
pkgs/development/interpreters/python/cpython/default.nix
View file

@ -47,6 +47,10 @@
# enabling LTO on *-darwin causes python3 to fail when linking.
, enableLTO ? stdenv.is64bit && stdenv.isLinux
, reproducibleBuild ? false
# enabling LTO with musl and dynamic linking fails with a linker error although it should
# be possible as alpine is doing it: https://github.com/alpinelinux/aports/blob/a8ccb04668c7729e0f0db6c6ff5f25d7519e779b/main/python3/APKBUILD#L82
, enableLTO ? stdenv.is64bit && stdenv.isLinux && !(stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isStatic)
, reproducibleBuild ? false
, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
}:

4
pkgs/development/interpreters/racket/default.nix
View file

@ -47,7 +47,7 @@ in
stdenv.mkDerivation rec {
pname = "racket";
version = "8.1"; # always change at once with ./minimal.nix
version = "8.2"; # always change at once with ./minimal.nix
src = (lib.makeOverridable ({ name, sha256 }:
fetchurl {
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
}
)) {
name = "${pname}-${version}";
sha256 = "0wlgp9dlibhv1d181arz309fszz31l5gb5gl94bqzfcav014g3k8";
sha256 = "10kl9xxl9swz8hdpycpy1vjc8biah5h07dzaygsf0ylfjdrczwx0";
};
FONTCONFIG_FILE = fontsConf;

2
pkgs/development/interpreters/racket/minimal.nix
View file

@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
src = oldAttrs.src.override {
inherit name;
sha256 = "1q54n16s0hmnry8q381wd7zfpyjndfjswn97vsbd4isngwz3w12k";
sha256 = "1iw4z962vp287q6wwvky36iqmwg1mqyxxpbk96aqr2ckfjqwnkbg";
};
meta = oldAttrs.meta // {

4
pkgs/development/libraries/cjson/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cjson";
version = "1.7.14";
version = "1.7.15";
src = fetchFromGitHub {
owner = "DaveGamble";
repo = "cJSON";
rev = "v${version}";
sha256 = "1a3i9ydl65dgwgmlg79n5q8qilmjkaakq56sam1w25zcrd8jy11q";
sha256 = "sha256-PpUVsLklcs5hCCsQcsXw0oEVIWecKnQO16Hy0Ba8ov8=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/drogon/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "drogon";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "drogonframework";
repo = "drogon";
rev = "v${version}";
sha256 = "0rhwbz3m5x3vy5zllfs8r347wqprg29pff5q7i53f25bh8y0n49i";
sha256 = "0g2fm8xb2gi7qaib6mxvg6k6y4g2d0a2jg4k5qvsjbd0n7j8746j";
fetchSubmodules = true;
};

6
pkgs/development/libraries/libdeltachat/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.56.0";
version = "1.59.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
sha256 = "sha256-ZyVEI6q+GzHLEFH01TxS7NqwT7zqVgg0vduyf/fibB8=";
sha256 = "1lwck5gb2kys7wxg08q3pnb8cqhzwwqy6nxcf2yc030gmnwm4sya";
};
patches = [
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "0pb1rcv45xa95ziqap94yy52fy02vh401iqsgi18nm1j6iyyngc8";
sha256 = "13zzc8c50cy6fknrxzw5gf6rcclsn5bcb2bi3z9mmzsl29ga32gx";
};
nativeBuildInputs = [

7
pkgs/development/libraries/libiscsi/default.nix
View file

@ -13,8 +13,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
# This can be removed after >=1.20.0, or if the build suceeds with
# pie enabled (default on Musl).
hardeningDisable = [ "pie" ];
# This problem is gone on libiscsi master.
NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.is32bit then "-Wno-error=sign-compare" else null;
NIX_CFLAGS_COMPILE =
lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare";
meta = with lib; {
description = "iscsi client library and utilities";

4
pkgs/development/libraries/libquotient/default.nix
View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "libquotient";
version = "0.6.7";
version = "0.6.8";
src = fetchFromGitHub {
owner = "quotient-im";
repo = "libQuotient";
rev = version;
sha256 = "sha256-fAzYv9OsanXqocEvbSB3OA9OVicwcZ0xT9uYbrFPEHc=";
sha256 = "sha256-CrAK0yq1upB1+C2z6mqKkSArCmzI+TDEEHTIBWB29Go=";
};
buildInputs = [ qtbase qtmultimedia ];

4
pkgs/development/libraries/portaudio/default.nix
View file

@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=nullability-completeness-on-arrays";
postConfigure = ''
substituteInPlace Makefile --replace "-Werror" ""
'';
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];

4
pkgs/development/libraries/simgear/default.nix
View file

@ -4,7 +4,7 @@
, curl
}:
let
version = "2020.3.8";
version = "2020.3.11";
shortVersion = builtins.substring 0 6 version;
in
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "sha256-UXcWV9MPu7c+QlFjrhxtQ6ruAcxuKtewwphu4tt5dWc=";
sha256 = "sha256-u438vCo7AUPR/88B0alh5WbvId0z2cx2jW2apYcdTzw=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/ocaml-modules/janestreet/0.14.nix
View file

@ -545,8 +545,8 @@ with self;
ppx_optcomp = janePackage {
pname = "ppx_optcomp";
version = "0.14.1";
hash = "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4";
version = "0.14.3";
hash = "1iflgfzs23asw3k6098v84al5zqx59rx2qjw0mhvk56avlx71pkw";
minimumOCamlVersion = "4.04.2";
meta.description = "Optional compilation for OCaml";
propagatedBuildInputs = [ ppxlib ];

12
pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
View file

@ -5,27 +5,27 @@
stdenv.mkDerivation rec {
pname = "ocsigen-toolkit";
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "2.7.0";
version = "2.12.2";
propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ];
buildInputs = [ ocaml findlib opaline ];
installPhase =
''
installPhase = ''
runHook preInstall
mkdir -p $OCAMLFIND_DESTDIR
export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
make install
opaline -prefix $out
runHook postInstall
'';
src = fetchFromGitHub {
owner = "ocsigen";
repo = pname;
rev = version;
sha256 = "0jan5779nc0jf993hmvfii15ralcs20sm4mcnqwqrnhjbq6f6zpk";
sha256 = "1fqrh7wrzs76qj3nvmxqy76pzqvsja2dwzqxyl8rkh5jg676vmqy";
};
createFindlibDestdir = true;
meta = {
homepage = "http://ocsigen.org/ocsigen-toolkit/";
description = " User interface widgets for Ocsigen applications";

4
pkgs/development/python-modules/django-haystack/default.nix
View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "django-haystack";
version = "3.0";
version = "3.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "d490f920afa85471dd1fa5000bc8eff4b704daacbe09aee1a64e75cbc426f3be";
sha256 = "6d05756b95d7d5ec1dbd4668eb999ced1504b47f588e2e54be53b1404c516a82";
};
checkInputs = [ pysolr whoosh python-dateutil geopy coverage nose mock coverage requests ];

4
pkgs/development/python-modules/dropbox/default.nix
View file

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "dropbox";
version = "11.16.0";
version = "11.18.0";
src = fetchPypi {
inherit pname version;
sha256 = "99e84367d5b983815a3680eea2c7e67bff14637c4702010c5c58611eb714dfe2";
sha256 = "fa512c87521809e93502fc6a27b1d57ffbcef2281468c8f93575eab6a9ad5f05";
};
postPatch = ''

4
pkgs/development/python-modules/elasticsearch-dsl/default.nix
View file

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "elasticsearch-dsl";
version = "7.3.0";
version = "7.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "0ed75f6ff037e36b2397a8e92cae0ddde79b83adc70a154b8946064cb62f7301";
sha256 = "c4a7b93882918a413b63bed54018a1685d7410ffd8facbc860ee7fd57f214a6d";
};
propagatedBuildInputs = [ elasticsearch python-dateutil six ]

4
pkgs/development/python-modules/gensim/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "gensim";
version = "4.0.1";
version = "4.1.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "b4d0b9562796968684028e06635e0f7aff39ffb33719057fd1667754ea09a6e4";
sha256 = "0b09983048a97c7915ab50500bc53eeec438d26366041598709ec156db3eef1f";
};
propagatedBuildInputs = [ smart-open numpy six scipy ];

4
pkgs/development/python-modules/internetarchive/default.nix
View file

@ -19,11 +19,11 @@
buildPythonPackage rec {
pname = "internetarchive";
version = "2.0.3";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "2ce0ab89fea37e5b2311bc7d163955e84f73f6beeac3942e17e9d51ad7cc9ffa";
sha256 = "72094f05df39bb1463f61f928f3a7fa0dd236cab185cb8b7e8eb6c85e09acdc4";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/ntc-templates/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "ntc-templates";
version = "2.2.2";
version = "2.3.0";
format = "pyproject";
disabled = isPy27;
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "networktocode";
repo = pname;
rev = "v${version}";
sha256 = "1f2hmayj95j3fzkyh9qvl58z0l9j9mlsi8b2r9aa2fy753y5a73b";
sha256 = "1a9v2j9s7niyacglhgp58zg1wcynakacz9zg4zcv2q85hb87m2m9";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/portalocker/default.nix
View file

@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
version = "2.3.1";
version = "2.3.2";
pname = "portalocker";
src = fetchPypi {
inherit pname version;
sha256 = "5ff2e494eccd3ff1cbaba8e4defd45bc7edb8eea3908c74f6de5d40641a1ed92";
sha256 = "75cfe02f702737f1726d83e04eedfa0bda2cc5b974b1ceafb8d6b42377efbd5f";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/tldextract/default.nix
View file

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "tldextract";
version = "3.1.0";
version = "3.1.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea";
sha256 = "sha256-HViDxJbaOoqnHR9NpIYs43TcfM9F5Ltn3rIBbsNPjTM=";
};
nativeBuildInputs = [ setuptools-scm ];

4
pkgs/development/tools/analysis/tfsec/default.nix
View file

@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.58.4";
version = "0.58.5";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gnipQyjisi1iY1SSmESrwNvxyacq9fsva8IY3W6Gpd8=";
sha256 = "sha256-awTRECHHNGebzV08Qy2I6rX4eS2z07NZLsQFPoA0UXA=";
};
goPackagePath = "github.com/aquasecurity/tfsec";

32
pkgs/development/tools/electron/default.nix
View file

@ -105,23 +105,23 @@ rec {
headers = "0gb56pxdkn8970z141l3p30lkizqca6kqj1cvgbp685xmb231hzq";
};
electron_12 = mkElectron "12.0.17" {
x86_64-linux = "00c05d20372a14b84984f1c30e4c6f293480ef0c35c63949468e9d1ab4918db7";
x86_64-darwin = "3600d64945474c7a7f7ef5ac9cbc7241432bf778096004d13fe05603a43407c2";
i686-linux = "3ee6c565f74492b658b5fd4c648dbd0b5d556c8a193125e5f7ee840b088823d7";
armv7l-linux = "fa1cde8a59c1118baf0f98c1a22b9c99ffac51fd40c65a9fef490c938106ad96";
aarch64-linux = "92c129b50c17f8a7977c2c61eb721f0c8b831201d3fa1bdcc7d93f63df705ee0";
aarch64-darwin = "58cdcefa89d4d3d8e669290fd8caced636f969e327d6c772444fda2482df3244";
headers = "0sg8ybnrmx11xm7yc0lj8yy0g57ln48gvqhrr9g725zimzza9v3l";
electron_12 = mkElectron "12.0.18" {
x86_64-linux = "09a7908b98a1783bd3840fa289f0ce8d2badada698ddc9daff4398a969292ef2";
x86_64-darwin = "ab5071568614998adc3b12c93966f82b27da2f13a7317433a32252dd83593d08";
i686-linux = "0fbf1cb8cd3e5581ee80f49453c86673b4e91c7f599fdcb53af040c6d1992cb8";
armv7l-linux = "da064a1b86f42a5091ee1162fcad55b1a1f8a8168534a86e37dabd056b54ecbd";
aarch64-linux = "7197e1ae54af3cc20f312b01a200c75f6a6e0a1b38d0ca48492ead178a607edc";
aarch64-darwin = "aed2fbafb955f879c65099aebef504fd8076a452d25ccd1cd38d4d1b8758770e";
headers = "1m1ycv1ysr3aram1d3rj7b4w5dy63irq67x3ff355h33n6dhi4cf";
};
electron_13 = mkElectron "13.2.2" {
x86_64-linux = "3d64bc0eab8dc1fd162693a5492ad694bb65b110fc846293faa3e8ed5c7b6a4b";
x86_64-darwin = "276916b97960d9e49944b9c6dcd35746feb3b55e86747b4ed0e0eb569c47ec0f";
i686-linux = "b4bcb41473d240d2078b9ca1d71fd879f5e89a8e6cafd13fa8bdcc615b77fe68";
armv7l-linux = "fd5fab50764f50dcf4b77c7617fe69895ea177d787fe58a54cc0adb5de026801";
aarch64-linux = "c4f112945d41304c796a7460018721df4598114cc087c1114c72f1e41d985d11";
aarch64-darwin = "1bc30f12cf6ff3cedde5f90e138b604cd610176be63bb87a9f023146c2f7c81d";
headers = "1992ss04078drjybh7pn0lmfmk2kcg9y2jdq9z24caf2xlabfb2d";
electron_13 = mkElectron "13.2.3" {
x86_64-linux = "495b0c96427c63f6f4d08c5b58d6379f9ee3c6c81148fbbe8a7a6a872127df6d";
x86_64-darwin = "c02f116484a5e1495d9f7451638bc0d3dea8fa2fde2e4c9c88a17cff98192ddc";
i686-linux = "03fb8cad91fcbb578027b814119b09cd1ddd414f159c9012850655f9171847c1";
armv7l-linux = "d8aaf2b49b9ab0a46caa31ed7d4358a3223efeaf90941d3d5e272532718ed754";
aarch64-linux = "cbbf9f98b1cfbee3fcd0869632a03542408dfd35f2e4d5b72cd823ce9448f659";
aarch64-darwin = "ef375063e30bc51bbcbe16fb7e5d85933eb60888ccc159c391aefc4f6d616faa";
headers = "0ayiklr84x7xhh5nz2dfzq2fkqivb9y9axfy7q9n4ps08xbqycyr";
};
}

4
pkgs/development/tools/esbuild/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.12.23";
version = "0.12.24";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-WS3Vy//5lL7xnMOgSeLh6RHAlonQDPQ3K2L+MIK+j7A=";
sha256 = "sha256-oD8QjjolEfmfxs+Q4duVUCbEp74HzIWaPrmH8Vn1H+o=";
};
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

4
pkgs/development/tools/go-tools/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "go-tools";
version = "2021.1";
version = "2021.1.1";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-tools";
rev = version;
sha256 = "sha256-QhTjzrERhbhCSkPzyLQwFyxrktNoGL9ris+XfE7n5nQ=";
sha256 = "sha256-Vj5C+PIzZUSD16U4KFO3jR/Gq11P8v3my5eODWb//4c=";
};
vendorSha256 = "sha256-EjCOMdeJ0whp2pHZvm4VV2K78UNKzl98Z/cQvGhWSyY=";

31
pkgs/development/tools/inferno/default.nix Normal file
View file

@ -0,0 +1,31 @@
{ fetchCrate, lib, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "inferno";
version = "0.10.6";
# github version doesn't have a Cargo.lock
src = fetchCrate {
inherit pname version;
sha256 = "1pn3ask36mv8byd62xhm8bjv59k12i1s533jgb5syml64w1cnn12";
};
cargoSha256 = "0w5w9pyv34x0iy9knr79491kb9bgbcagh6251pq72mv4pvx0axip";
# these tests depend on a patched version of flamegraph which is included in
# the github repository as a submodule, but absent from the crates version
checkFlags = [
"--skip=collapse::dtrace::tests::test_collapse_multi_dtrace"
"--skip=collapse::dtrace::tests::test_collapse_multi_dtrace_simple"
"--skip=collapse::perf::tests::test_collapse_multi_perf"
"--skip=collapse::perf::tests::test_collapse_multi_perf_simple"
];
meta = with lib; {
description = "A port of parts of the flamegraph toolkit to Rust";
homepage = "https://github.com/jonhoo/inferno";
changelog = "https://github.com/jonhoo/inferno/blob/v${version}/CHANGELOG.md";
license = licenses.cddl;
maintainers = with maintainers; [ figsoda ];
};
}

8
pkgs/development/tools/misc/lttng-tools/default.nix
View file

@ -2,20 +2,22 @@
stdenv.mkDerivation rec {
pname = "lttng-tools";
version = "2.11.0";
version = "2.13.0";
src = fetchurl {
url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w";
sha256 = "1ri93h45q5z6l3qmg4dakm9aj0ghfmf38i63q51yjh58lzwr9j4d";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ];
enableParallelBuilding = true;
meta = with lib; {
description = "Tracing tools (kernel + user space) for Linux";
homepage = "https://lttng.org/";
license = licenses.lgpl21;
license = with licenses; [ lgpl21Only gpl2Only ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};

13
pkgs/development/tools/misc/lttng-ust/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, liburcu, python3 }:
{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }:
# NOTE:
# ./configure ...
@ -13,14 +13,15 @@
stdenv.mkDerivation rec {
pname = "lttng-ust";
version = "2.10.5";
version = "2.13.0";
src = fetchurl {
url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2";
sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86";
sha256 = "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l";
};
buildInputs = [ python3 ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ numactl python3 ];
preConfigure = ''
patchShebangs .
@ -28,10 +29,12 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ liburcu ];
enableParallelBuilding = true;
meta = with lib; {
description = "LTTng Userspace Tracer libraries";
homepage = "https://lttng.org/";
license = licenses.lgpl21Plus;
license = with licenses; [ lgpl21Only gpl2Only mit ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};

17
pkgs/development/tools/sentry-cli/default.nix
View file

@ -2,39 +2,36 @@
, fetchFromGitHub
, lib
, openssl
, file
, rpm
, pkg-config
, stdenv
, curl
, Security
, runCommand
, SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
pname = "sentry-cli";
version = "1.66.0";
version = "1.68.0";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-cli";
rev = version;
sha256 = "sha256-ivQBn5GGb64Jq0gpywAg20309QQMpasg/Bu5sHKj02Y=";
sha256 = "sha256-JhKRfeAaSs4KwfcI88UbqIXNw0aZytPkIxkwrg1d2xM=";
};
doCheck = false;
# Needed to get openssl-sys to use pkgconfig.
OPENSSL_NO_VENDOR = 1;
buildInputs = [ openssl file rpm ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-xS88KZWYkg3v8TJZUVVgQhR++CrZGD0DQnLPktSUJQk=";
cargoSha256 = "sha256-iV3D4ka8Sg1FMRne3A6npmZm3hFP9Qi/NdmT62BtO+8=";
meta = with lib; {
homepage = "https://docs.sentry.io/cli/";
license = licenses.bsd3;
description = "A command line utility to work with Sentry.";
description = "A command line utility to work with Sentry";
changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md";
maintainers = with maintainers; [ rizary ];
platforms = platforms.unix;
};
}

4
pkgs/games/scid-vs-pc/default.nix
View file

@ -2,11 +2,11 @@
tcl.mkTclDerivation rec {
pname = "scid-vs-pc";
version = "4.21";
version = "4.22";
src = fetchurl {
url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz";
sha256 = "1lsm5s2hlhqbmwm6f38jlg2kc4j6lwp86lg6z3w6nc3jibzgvsay";
sha256 = "sha256-PSHDPrfhJI/DyEVQLo8Ckargqf/iUG5PgvUbO/4WNJM=";
};
nativeBuildInputs = [ makeWrapper ];

2
pkgs/misc/emulators/retroarch/wrapper.nix
View file

@ -31,7 +31,7 @@ stdenv.mkDerivation {
inherit license homepage platforms maintainers;
description = description
+ " (with cores: "
+ lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) cores))
+ lib.concatStringsSep ", " (map (x: ""+x.name) cores)
+ ")";
};
}

1054
pkgs/misc/vim-plugins/generated.nix
View file

File diff suppressed because it is too large Load diff

2
pkgs/misc/vim-plugins/update.py
View file

@ -66,7 +66,7 @@ class VimEditor(pluginupdate.Editor):
f.write(textwrap.indent(textwrap.dedent(
f"""
{plugin.normalized_name} = buildVimPluginFrom2Nix {{
pname = "{plugin.normalized_name}";
pname = "{plugin.name}";
version = "{plugin.version}";
src = fetchFromGitHub {{
owner = "{owner}";

4
pkgs/os-specific/linux/lttng-modules/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "lttng-modules-${kernel.version}";
version = "2.12.6";
version = "2.13.0";
src = fetchurl {
url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
sha256 = "sha256-lawqLPkthdI/+9rKah7A18FnIR0eD7hQq5AASj9HXqo=";
sha256 = "0mikc3fdjd0w6rrcyksjzmv0czvgba6yk8dfmz4a3cr8s4y2pgsy";
};
buildInputs = kernel.moduleBuildDependencies;

2
pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix
View file

@ -29,6 +29,8 @@ stdenv.mkDerivation {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
enableParallelBuilding = true;
meta = with lib; {
description = "RealTek RTL8188eus WiFi driver with monitor mode & frame injection support";
homepage = "https://github.com/aircrack-ng/rtl8188eus";

2
pkgs/os-specific/linux/rtl8812au/default.nix
View file

@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod";
homepage = "https://github.com/gordboy/rtl8812au-5.9.3.2";

2
pkgs/os-specific/linux/rtl8814au/default.nix
View file

@ -29,6 +29,8 @@ stdenv.mkDerivation {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Realtek 8814AU USB WiFi driver";
homepage = "https://github.com/morrownr/8814au";

2
pkgs/os-specific/linux/rtl8821au/default.nix
View file

@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
'';
enableParallelBuilding = true;
meta = with lib; {
description = "rtl8821AU and rtl8812AU chipset driver with firmware";
homepage = "https://github.com/morrownr/8821au";

2
pkgs/os-specific/linux/rtl8821ce/default.nix
View file

@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Realtek rtl8821ce driver";
homepage = "https://github.com/tomaspinho/rtl8821ce";

2
pkgs/os-specific/linux/rtl8821cu/default.nix
View file

@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Realtek rtl8821cu driver";
homepage = "https://github.com/morrownr/8821cu";

2
pkgs/os-specific/linux/rtl88x2bu/default.nix
View file

@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Realtek rtl88x2bu driver";
homepage = "https://github.com/morrownr/88x2bu";

2
pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix
View file

@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Aircrack-ng kernel module for Realtek 88XXau network cards\n(8811au, 8812au, 8814au and 8821au chipsets) with monitor mode and injection support.";
homepage = "https://github.com/aircrack-ng/rtl8812au";

9
pkgs/os-specific/linux/tuxedo-keyboard/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tuxedo-keyboard-${kernel.version}";
version = "3.0.7";
version = "3.0.8";
src = fetchFromGitHub {
owner = "tuxedocomputers";
repo = "tuxedo-keyboard";
rev = "v${version}";
sha256 = "sha256-JloLwfJfDdVowx1hOehjxPbnaKBCAMn7SZe09SE03HU=";
sha256 = "1rv3ns4n61v18cpnp36zi47jpnqhj410yzi8b307ghiyriapbijv";
};
buildInputs = [ linuxHeaders ];
@ -17,7 +17,10 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out/lib/modules/${kernel.modDirVersion}"
mv src/tuxedo_keyboard.ko $out/lib/modules/${kernel.modDirVersion}
for module in clevo_acpi.ko clevo_wmi.ko tuxedo_keyboard.ko tuxedo_io/tuxedo_io.ko; do
mv src/$module $out/lib/modules/${kernel.modDirVersion}
done
'';
meta = with lib; {

4
pkgs/servers/computing/slurm/default.nix
View file

@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
version = "20.11.8.1";
version = "21.08.0.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "0id2b01rvq81zd2p34il0gg880f94g9ip4gn1pyh20zz5bxlnbjc";
sha256 = "0f1i64vby1qa2y9gv9a9x595s58p6dpw4yhljbgrc2wr7glvnfi3";
};
outputs = [ "out" "dev" ];

6
pkgs/servers/monitoring/sensu-go/default.nix
View file

@ -4,19 +4,19 @@ let
generic = { subPackages, pname, postInstall ? "" }:
buildGoModule rec {
inherit pname;
version = "6.2.7";
version = "6.4.1";
shortRev = "3a1ac58"; # for internal version info
src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
rev = "v${version}";
sha256 = "sha256-JPX7MfxdlI6jLHVybAR4xtd/IiVGDrhrYUSlXohhpGc=";
sha256 = "sha256-tVmjBfRvQQ1+VtARP1lN8Fu06tujZhZj9IpGVF0mKqA=";
};
inherit subPackages postInstall;
vendorSha256 = "sha256-bGQADjT9SMxZnWb3k7wVSsF7VWWuESBL/VDG76vj+Tk=";
vendorSha256 = "sha256-fStGEKAR9fzA6Uom6r59jFGTBUfTTj0TzytoJWuicbU=";
doCheck = false;

7
pkgs/shells/elvish/default.nix
View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "elvish";
version = "0.16.1";
version = "0.16.3";
excludedPackages = [ "website" ];
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "elves";
repo = pname;
rev = "v${version}";
sha256 = "sha256-i7RJiR1Mta2TrWBSUk0WM3InMV2cwbdlp3KHUdZgQ8I=";
sha256 = "1na2fswqp4rbgvlagz9nj3cmlxavlhi2gj6k6jpjq05mcbkxr3bd";
};
vendorSha256 = "sha256-5tZwGrp/L9L+pf/yp8zlbb0voe60+if+NNf8ua2MujI=";
vendorSha256 = "06rx09vs08d9arim53al73z22hb40xj2101kbvafz6wbyp6pqws1";
doCheck = false;
@ -29,7 +29,6 @@ buildGoModule rec {
homepage = "https://elv.sh/";
license = licenses.bsd2;
maintainers = with maintainers; [ vrthra AndersonTorres ];
platforms = with platforms; linux ++ darwin;
};
passthru = {

6
pkgs/tools/admin/stripe-cli/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "stripe-cli";
version = "1.5.12";
version = "1.7.0";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eMxukwaJqsXL0+Euvk5mM+pcAsT3GsF9filuyRL4tXg=";
sha256 = "sha256-CO+2BpMIUSaOhdia75zDGR4RZQSaxY05Z6TOKxBlKIw=";
};
vendorSha256 = "sha256-e7EZ5o30vDpS904/R1y7/Mds7HxQNmsIftrnc1Bj2bc=";
vendorSha256 = "sha256-LOSHoEP0YRjfHav3MXSYPPrrjX6/ItxeVMOihRx0DTQ=";
subPackages = [
"cmd/stripe"

4
pkgs/tools/filesystems/ceph/default.nix
View file

@ -146,10 +146,10 @@ let
]);
sitePackages = ceph-python-env.python.sitePackages;
version = "16.2.4";
version = "16.2.5";
src = fetchurl {
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
sha256 = "sha256-J6FVK7feNN8cGO5BSDlfRGACAzchmRUSWR+a4ZgeWy0=";
sha256 = "sha256-uCBpFvp5k+A5SgwxoJVkuGb9E69paKrs3qda5RpsRt4=";
};
in rec {
ceph = stdenv.mkDerivation {

2
pkgs/tools/graphics/diagrams-builder/default.nix
View file

@ -36,7 +36,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
buildCommand = with lib;
concatStrings (intersperse "\n" (map exeWrapper backends));
concatStringsSep "\n" (map exeWrapper backends);
# Will be faster to build the wrapper locally then to fetch it from a binary cache.
preferLocalBuild = true;

6
pkgs/tools/misc/goreleaser/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.175.0";
version = "0.176.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-4mdQTcaIIGNZ0pgVNfy3LBtc1te2dpkMA29nAUzg9aE=";
sha256 = "sha256-7xqzt/QJOkZLVY3MbBf7QYBrEgO500ft6ahvngaw9rs=";
};
vendorSha256 = "sha256-7I/955dPHV8Rkp6VevkebkZaNtSlbzIsGc8qFjtcMXk=";
vendorSha256 = "sha256-xdK98JWfxvufewcXiMjo6hslFrCbmWrgTAwJM7f00n4=";
ldflags = [
"-s"

17
pkgs/tools/misc/mcfly/default.nix
View file

@ -2,30 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "mcfly";
version = "0.5.8";
version = "0.5.9";
src = fetchFromGitHub {
owner = "cantino";
repo = "mcfly";
rev = "v${version}";
sha256 = "sha256-D8ScF/3qyT0VuMGmWkkeGRyCu4LdOXt1wvR9whbNURE=";
sha256 = "0i3qjgq1b8h3bzc7rxa60kq1yc2im9m6dgzrvial086a1zk8s81r";
};
postInstall = ''
substituteInPlace mcfly.bash --replace '$(which mcfly)' $out/bin/mcfly
substituteInPlace mcfly.zsh --replace '$(which mcfly)' $out/bin/mcfly
substituteInPlace mcfly.fish --replace '(which mcfly)' $out/bin/mcfly
install -Dm644 -t $out/share/mcfly mcfly.bash
install -Dm644 -t $out/share/mcfly mcfly.zsh
install -Dm644 -t $out/share/mcfly mcfly.fish
'';
cargoSha256 = "sha256-VZgxfVmAa5lPfdLNbsotNoRpTLe3HID36sF8T/0mywI=";
cargoSha256 = "084v4fsdi25ahz068ssq29z7d5d3k3jh3s8b07irwybdsy18c629";
meta = with lib; {
homepage = "https://github.com/cantino/mcfly";
description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now";
changelog = "https://github.com/cantino/mcfly/blob/v${version}/CHANGELOG.txt";
changelog = "https://github.com/cantino/mcfly/raw/v${version}/CHANGELOG.txt";
license = licenses.mit;
maintainers = [ maintainers.melkor333 ];
};

17
pkgs/tools/misc/vector/default.nix
View file

@ -28,16 +28,16 @@
rustPlatform.buildRustPackage rec {
pname = "vector";
version = "0.15.2";
version = "0.16.1";
src = fetchFromGitHub {
owner = "timberio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-u/KHiny9o/q74dh/w3cShAb6oEkMxNaTMF2lOFx+1po=";
sha256 = "sha256-10e0cWt6XW8msNR/RXbaOpdwTAlRLm6jVvDed905rho=";
};
cargoSha256 = "sha256-wUNF+810Yh4hPQzraWo2mDi8KSmRKp9Z9D+4kwKQ+IU=";
cargoSha256 = "sha256-ezQ/tX/uKzJprLQt2xIUZwGuUOmuRmTO+gPsf3MLEv8=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
@ -53,7 +53,16 @@ rustPlatform.buildRustPackage rec {
# dev dependency includes httpmock which depends on iashc which depends on curl-sys with http2 feature enabled
# compilation fails because of a missing http2 include
doCheck = !stdenv.isDarwin;
checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1";
# healthcheck_grafana_cloud is trying to make a network access
# test_stream_errors is flaky on linux-aarch64
checkPhase = ''
TZDIR=${tzdata}/share/zoneinfo cargo test \
--no-default-features \
--features ${lib.concatStringsSep "," features} \
-- --test-threads 1 \
--skip=sinks::loki::tests::healthcheck_grafana_cloud \
--skip=kubernetes::api_watcher::tests::test_stream_errors
'';
# recent overhauls of DNS support in 0.9 mean that we try to resolve
# vector.dev during the checkPhase, which obviously isn't going to work.

4
pkgs/tools/misc/wlc/default.nix
View file

@ -6,11 +6,11 @@ with python3.pkgs;
buildPythonPackage rec {
pname = "wlc";
version = "1.11";
version = "1.12";
src = fetchPypi {
inherit pname version;
sha256 = "sha256:0ysx250v2qycy1m3jj0wxmyf2f5n8fxf6br69vcbyq2cnqw609nx";
sha256 = "sha256:01c1qxq6dxvpn8rgpbqs4iw5daa0rmlgygb3xhhfj7xpqv1v84ir";
};
propagatedBuildInputs = [

27
pkgs/tools/misc/yt-dlp/default.nix
View file

@ -1,12 +1,11 @@
{ lib, buildPythonPackage
, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
, fetchFromGitHub
{ lib, buildPythonPackage, fetchPypi
, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome
, websockets, mutagen
, ffmpegSupport ? true
, rtmpSupport ? true
, phantomjsSupport ? false
, hlsEncryptedSupport ? true
, installShellFiles, makeWrapper }:
}:
buildPythonPackage rec {
pname = "yt-dlp";
@ -15,15 +14,18 @@ buildPythonPackage rec {
# to the latest stable release.
version = "2021.08.10";
src = fetchFromGitHub {
owner = "yt-dlp";
repo = "yt-dlp";
rev = version;
sha256 = "sha256-8mOjIvbC3AFHCXKV5G66cFy7SM7sULzM8czXcqQKbms=";
src = fetchPypi {
inherit pname;
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
sha256 = "8da1bf4dc4641d37d137443c4783109ee8393caad5e0d270d9d1d534e8f25240";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
buildInputs = [ zip pandoc ];
# build_lazy_extractors assumes this directory exists but it is not present in
# the PyPI package
postPatch = ''
mkdir -p ytdlp_plugins/extractor
'';
propagatedBuildInputs = [ websockets mutagen ]
++ lib.optional hlsEncryptedSupport pycryptodome;
@ -48,6 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://github.com/yt-dlp/yt-dlp/";
description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)";
changelog = "https://github.com/yt-dlp/yt-dlp/raw/${version}/Changelog.md";
longDescription = ''
yt-dlp is a youtube-dl fork based on the now inactive youtube-dlc.
@ -56,7 +59,7 @@ buildPythonPackage rec {
youtube-dl is released to the public domain, which means
you can modify it, redistribute it or use it however you like.
'';
license = licenses.publicDomain;
license = licenses.unlicense;
maintainers = with maintainers; [ mkg20001 ];
};
}

4
pkgs/tools/networking/dnsproxy/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.39.2";
version = "0.39.4";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FuPNWoLsqPvz4J+ymfEKBjPmLlxwDUp/196REDnGPmQ=";
sha256 = "sha256-dF3xyyOqWzjHW8cFdGlb3BCCGVy+eWW5OesKEK7pEjw=";
};
vendorSha256 = null;

20
pkgs/tools/networking/goimapnotify/default.nix
View file

@ -1,23 +1,23 @@
{ buildGoPackage, fetchFromGitLab, lib, runtimeShell }:
{ buildGoModule, fetchFromGitLab, lib, runtimeShell }:
buildGoPackage rec {
buildGoModule rec {
pname = "goimapnotify";
version = "2.0";
goPackagePath = "gitlab.com/shackra/goimapnotify";
version = "2.3.2";
src = fetchFromGitLab {
owner = "shackra";
repo = "goimapnotify";
rev = version;
sha256 = "1d42gd3m2rkvy985d181dbcm5i3f7xsg2z8z6s4bpvw24pfnzs42";
sha256 = "sha256-pkpdIkabxz9bu0LnyU1/wu1qqPc/pQqCn8tePc2fIfg=";
};
postPatch = ''
substituteInPlace command.go --replace '"sh"' '"${runtimeShell}"'
'';
vendorSha256 = "sha256-4+2p/7BAEk+1V0TII9Q2O2YNX0rvBiw2Ss7k1dsvUbk=";
goDeps = ./deps.nix;
postPatch = ''
for f in command.go command_test.go; do
substituteInPlace $f --replace '"sh"' '"${runtimeShell}"'
done
'';
meta = with lib; {
description =

4
pkgs/tools/networking/iperf/3.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "iperf";
version = "3.9";
version = "3.10.1";
src = fetchurl {
url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
sha256 = "0f601avdmzpwsa3lbi0ppjhkrdipm5wifhhxy5czf99370k3mdi4";
sha256 = "0nkisr2215w68ivadg3sx3q50iwamznwigs63lclb8jlrih9gg03";
};
buildInputs = [ openssl ];

17
pkgs/tools/networking/libreswan/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, nixosTests
, pkg-config
, systemd
@ -43,11 +42,11 @@ in
stdenv.mkDerivation rec {
pname = "libreswan";
version = "4.4";
version = "4.5";
src = fetchurl {
url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
sha256 = "0xj974yc0y1r7235zl4jhvxqz3bpb8js2fy9ic820zq9swh0lgsz";
sha256 = "18whvmaxqfmaqbmq72calyzk21wyvxa0idddcsxd8x36vhdza0q7";
};
strictDeps = true;
@ -70,14 +69,6 @@ stdenv.mkDerivation rec {
python3 bash
] ++ lib.optional stdenv.isLinux libselinux;
patches = [
# Fix compilation on aarch64, remove on next update
(fetchpatch {
url = "https://github.com/libreswan/libreswan/commit/ea50d36d2886e44317ba5ba841de1d1bf91aee6c.patch";
sha256 = "1jp89rm9jp55zmiyimyhg7yadj0fwwxaw7i5gyclrs38w3y1aacj";
})
];
prePatch = ''
# Correct iproute2 path
sed -e 's|"/sbin/ip"|"${iproute2}/bin/ip"|' \
@ -111,10 +102,8 @@ stdenv.mkDerivation rec {
-i configs/Makefile
'';
# Set appropriate paths for build
preBuild = "export INC_USRLOCAL=\${out}";
makeFlags = [
"PREFIX=$(out)"
"INITSYSTEM=systemd"
"UNITDIR=$(out)/etc/systemd/system/"
"TMPFILESDIR=$(out)/lib/tmpfiles.d/"

6
pkgs/tools/networking/mu/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "mu";
version = "1.6.4";
version = "1.6.5";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
sha256 = "rRBi6bgxkVQ94wLBqVQikIE0jVkvm1fjtEzFMsQTJz8=";
sha256 = "ZHEUJiEJzQzSwWgY07dDflY5GRiD1We435htY/7IOdQ=";
};
postPatch = lib.optionalString (batchSize != null) ''
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
homepage = "https://www.djcbsoftware.nl/code/mu/";
changelog = "https://github.com/djcb/mu/releases/tag/${version}";
maintainers = with maintainers; [ antono peterhoeg ];
maintainers = with maintainers; [ antono chvp peterhoeg ];
platforms = platforms.mesaPlatforms;
};
}

4
pkgs/tools/networking/nzbget/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, libxml2, ncurses, libsigcxx, libpar2
, gnutls, libgcrypt, zlib, openssl }:
, gnutls, libgcrypt, zlib, openssl, nixosTests }:
stdenv.mkDerivation rec {
pname = "nzbget";
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.tests = { inherit (nixosTests) nzbget; };
meta = with lib; {
homepage = "https://nzbget.net";
license = licenses.gpl2Plus;

4
pkgs/tools/networking/proxychains/default.nix
View file

@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "-Werror" "-Werror -Wno-stringop-truncation"
'';
postInstall = ''
cp src/proxychains.conf $out/etc
'';
meta = with lib; {
description = "Proxifier for SOCKS proxies";
homepage = "http://proxychains.sourceforge.net";

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