BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into auto-update/python3.10-mailchecker

Browse source
This commit is contained in:
Jonas Heinrich 2022-08-08 13:41:03 +02:00 committed by GitHub
commit c2afddcaf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
333 changed files with 5140 additions and 3380 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/CODEOWNERS vendored
View file

@ -252,9 +252,8 @@
# Go
/doc/languages-frameworks/go.section.md @kalbasit @Mic92 @zowoq
/pkgs/build-support/go @kalbasit @Mic92 @zowoq
/pkgs/development/compilers/go @kalbasit @Mic92 @zowoq
/pkgs/development/go-modules @kalbasit @Mic92 @zowoq
/pkgs/development/go-packages @kalbasit @Mic92 @zowoq
# GNOME
/pkgs/desktops/gnome @jtojnar

3
.github/labeler.yml vendored
View file

@ -40,9 +40,8 @@
"6.topic: golang":
- doc/languages-frameworks/go.section.md
- pkgs/build-support/go/**/*
- pkgs/development/compilers/go/**/*
- pkgs/development/go-modules/**/*
- pkgs/development/go-packages/**/*
"6.topic: haskell":
- doc/languages-frameworks/haskell.section.md

20
doc/languages-frameworks/python.section.md
View file

@ -1664,6 +1664,26 @@ self: super: {
}
```
### How to override a Python package for all Python versions using extensions? {#how-to-override-a-python-package-for-all-python-versions-using-extensions}
The following overlay overrides the call to `buildPythonPackage` for the
`foo` package for all interpreters by appending a Python extension to the
`pythonPackagesExtensions` list of extensions.
```nix
final: prev: {
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(
python-final: python-prev: {
foo = python-prev.foo.overridePythonAttrs (oldAttrs: {
...
});
}
)
];
}
```
### How to use Intel’s MKL with numpy and scipy? {#how-to-use-intels-mkl-with-numpy-and-scipy}
MKL can be configured using an overlay. See the section "[Using overlays to

10
lib/modules.nix
View file

@ -266,6 +266,15 @@ rec {
turned off.
'';
};
_module.specialArgs = mkOption {
readOnly = true;
internal = true;
description = ''
Externally provided module arguments that can't be modified from
within a configuration, but can be used in module imports.
'';
};
};
config = {
@ -273,6 +282,7 @@ rec {
inherit extendModules;
moduleType = type;
};
_module.specialArgs = specialArgs;
};
};

9
maintainers/maintainer-list.nix
View file

@ -923,6 +923,15 @@
name = "Anselm Schüler";
matrix = "@schuelermine:matrix.org";
};
anthonyroussel = {
email = "anthony@roussel.dev";
github = "anthonyroussel";
githubId = 220084;
name = "Anthony Roussel";
keys = [{
fingerprint = "472D 368A F107 F443 F3A5 C712 9DC4 987B 1A55 E75E";
}];
};
antoinerg = {
email = "roygobeil.antoine@gmail.com";
github = "antoinerg";

1
maintainers/scripts/luarocks-packages.csv
View file

@ -71,6 +71,7 @@ luasql-sqlite3,,,,,,vyp
luassert,,,,,,
luasystem,,,,,,
luaunbound,,,,,
luaunit,,,,,,lockejan
luautf8,,,,,,pstn
luazip,,,,,,
lua-yajl,,,,,,pstn

Can't render this file because it has a wrong number of fields in line 73.

21
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View file

@ -95,6 +95,11 @@
PHP now defaults to PHP 8.1, updated from 8.0.
</para>
</listitem>
<listitem>
<para>
Cinnamon has been updated to 5.4.
</para>
</listitem>
<listitem>
<para>
<literal>hardware.nvidia</literal> has a new option
@ -126,6 +131,14 @@
<link linkend="opt-services.dragonflydb.enable">services.dragonflydb</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://hbase.apache.org/">HBase
cluster</link>, a distributed, scalable, big data store.
Available as
<link xlink:href="options.html#opt-services.hadoop.hbase.enable">services.hadoop.hbase</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/leetronics/infnoise">infnoise</link>,
@ -252,6 +265,14 @@
with Google Chrome and the Google Cast extension.
</para>
</listitem>
<listitem>
<para>
<literal>services.hbase</literal> has been renamed to
<literal>services.hbase-standalone</literal>. For production
HBase clusters, use <literal>services.hadoop.hbase</literal>
instead.
</para>
</listitem>
<listitem>
<para>
PHP 7.4 is no longer supported due to upstream not supporting

7
nixos/doc/manual/release-notes/rl-2211.section.md
View file

@ -46,6 +46,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- PHP now defaults to PHP 8.1, updated from 8.0.
- Cinnamon has been updated to 5.4.
- `hardware.nvidia` has a new option `open` that can be used to opt in the opensource version of NVIDIA kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [NVIDIA Releases Open-Source GPU Kernel Modules](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for the official announcement.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@ -56,6 +58,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable).
- [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable).
- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle.
Available as [services.infnoise](options.html#opt-services.infnoise.enable).
@ -98,6 +102,9 @@ In addition to numerous new and upgraded packages, this release has the followin
as it requires `qt4`, which reached its end-of-life 2015 and will no longer be supported by nixpkgs.
[According to Barco](https://www.barco.com/de/support/knowledge-base/4380-can-i-use-linux-os-with-clickshare-base-units) many of their base unit models can be used with Google Chrome and the Google Cast extension.
- `services.hbase` has been renamed to `services.hbase-standalone`.
For production HBase clusters, use `services.hadoop.hbase` instead.
- PHP 7.4 is no longer supported due to upstream not supporting this
version for the entire lifecycle of the 22.11 release.

27
nixos/modules/misc/documentation.nix
View file

@ -1,4 +1,4 @@
{ config, options, lib, pkgs, utils, modules, baseModules, extraModules, modulesPath, ... }:
{ config, options, lib, pkgs, utils, modules, baseModules, extraModules, modulesPath, specialArgs, ... }:
with lib;
@ -7,9 +7,6 @@ let
cfg = config.documentation;
allOpts = options;
/* Modules for which to show options even when not imported. */
extraDocModules = [ ../virtualisation/qemu-vm.nix ];
canCacheDocs = m:
let
f = import m;
@ -23,7 +20,7 @@ let
docModules =
let
p = partition canCacheDocs (baseModules ++ extraDocModules);
p = partition canCacheDocs (baseModules ++ cfg.nixos.extraModules);
in
{
lazy = p.right;
@ -41,7 +38,7 @@ let
modules = [ {
_module.check = false;
} ] ++ docModules.eager;
specialArgs = {
specialArgs = specialArgs // {
pkgs = scrubDerivations "pkgs" pkgs;
# allow access to arbitrary options for eager modules, eg for getting
# option types from lazy modules
@ -145,6 +142,12 @@ in
{
imports = [
./man-db.nix
./mandoc.nix
./assertions.nix
./meta.nix
../config/system-path.nix
../system/etc/etc.nix
(mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ])
(mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ])
(mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])
@ -236,6 +239,14 @@ in
'';
};
nixos.extraModules = mkOption {
type = types.listOf types.raw;
default = [];
description = ''
Modules for which to show options even when not imported.
'';
};
nixos.options.splitBuild = mkOption {
type = types.bool;
default = true;
@ -327,10 +338,6 @@ in
environment.systemPackages = []
++ optional cfg.man.enable manual.manpages
++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ];
services.getty.helpLine = mkIf cfg.doc.enable (
"\nRun 'nixos-help' for the NixOS manual."
);
})
]);

0
nixos/modules/misc/documentation/test-dummy.chapter.xml Normal file
View file

49
nixos/modules/misc/documentation/test.nix Normal file
View file

@ -0,0 +1,49 @@
{ nixosLib, pkgsModule, runCommand }:
let
sys = nixosLib.evalModules rec {
modules = [
pkgsModule
../documentation.nix
../version.nix
({ lib, someArg, ... }: {
# Make sure imports from specialArgs are respected
imports = [ someArg.myModule ];
# TODO test this
meta.doc = ./test-dummy.chapter.xml;
})
{
_module.args = {
baseModules = [
../documentation.nix
../version.nix
];
extraModules = [ ];
inherit modules;
};
documentation.nixos.includeAllModules = true;
}
];
specialArgs.someArg.myModule = { lib, ... }: {
options.foobar = lib.mkOption {
type = lib.types.str;
description = "The foobar option was added via specialArgs";
default = "qux";
};
};
};
in
runCommand "documentation-check"
{
inherit (sys.config.system.build.manual) optionsJSON;
} ''
json="$optionsJSON/share/doc/nixos/options.json"
echo checking $json
grep 'The foobar option was added via specialArgs' <"$json" >/dev/null
touch $out
''

12
nixos/modules/misc/version.nix
View file

@ -38,12 +38,19 @@ let
in
{
imports = [
./label.nix
(mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ])
(mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ])
(mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ])
(mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ])
];
options.boot.initrd.osRelease = mkOption {
internal = true;
readOnly = true;
default = initrdRelease;
};
options.system = {
nixos.version = mkOption {
@ -142,11 +149,6 @@ in
"os-release".text = attrsToText osReleaseContents;
};
boot.initrd.systemd.contents = {
"/etc/os-release".source = initrdRelease;
"/etc/initrd-release".source = initrdRelease;
};
# We have to use `warnings` because when warning in the default of the option
# the warning would also be shown when building the manual since the manual
# has to evaluate the default.

3
nixos/modules/module-list.nix
View file

@ -357,7 +357,7 @@
./services/databases/dgraph.nix
./services/databases/firebird.nix
./services/databases/foundationdb.nix
./services/databases/hbase.nix
./services/databases/hbase-standalone.nix
./services/databases/influxdb.nix
./services/databases/influxdb2.nix
./services/databases/memcached.nix
@ -1287,4 +1287,5 @@
./virtualisation/waydroid.nix
./virtualisation/xen-dom0.nix
./virtualisation/xe-guest-utilities.nix
{ documentation.nixos.extraModules = [ ./virtualisation/qemu-vm.nix ]; }
]

3
nixos/modules/services/cluster/hadoop/conf.nix
View file

@ -33,6 +33,7 @@ pkgs.runCommand "hadoop-conf" {} (with cfg; ''
mkdir -p $out/
cp ${siteXml "core-site.xml" (coreSite // coreSiteInternal)}/* $out/
cp ${siteXml "hdfs-site.xml" (hdfsSiteDefault // hdfsSite // hdfsSiteInternal)}/* $out/
cp ${siteXml "hbase-site.xml" (hbaseSiteDefault // hbaseSite // hbaseSiteInternal)}/* $out/
cp ${siteXml "mapred-site.xml" (mapredSiteDefault // mapredSite)}/* $out/
cp ${siteXml "yarn-site.xml" (yarnSiteDefault // yarnSite // yarnSiteInternal)}/* $out/
cp ${siteXml "httpfs-site.xml" httpfsSite}/* $out/
@ -40,5 +41,5 @@ pkgs.runCommand "hadoop-conf" {} (with cfg; ''
cp ${pkgs.writeTextDir "hadoop-user-functions.sh" userFunctions}/* $out/
cp ${pkgs.writeTextDir "hadoop-env.sh" hadoopEnv}/* $out/
cp ${log4jProperties} $out/log4j.properties
${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") extraConfDirs}
${lib.concatMapStringsSep "\n" (dir: "cp -f -r ${dir}/* $out/") extraConfDirs}
'')

2
nixos/modules/services/cluster/hadoop/default.nix
View file

@ -5,7 +5,7 @@ let
in
with lib;
{
imports = [ ./yarn.nix ./hdfs.nix ];
imports = [ ./yarn.nix ./hdfs.nix ./hbase.nix ];
options.services.hadoop = {
coreSite = mkOption {

196
nixos/modules/services/cluster/hadoop/hbase.nix Normal file
View file

@ -0,0 +1,196 @@
{ config, lib, pkgs, ...}:
with lib;
let
cfg = config.services.hadoop;
hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/";
mkIfNotNull = x: mkIf (x != null) x;
in
{
options.services.hadoop = {
gatewayRole.enableHbaseCli = mkEnableOption "HBase CLI tools";
hbaseSiteDefault = mkOption {
default = {
"hbase.regionserver.ipc.address" = "0.0.0.0";
"hbase.master.ipc.address" = "0.0.0.0";
"hbase.master.info.bindAddress" = "0.0.0.0";
"hbase.regionserver.info.bindAddress" = "0.0.0.0";
"hbase.cluster.distributed" = "true";
};
type = types.attrsOf types.anything;
description = ''
Default options for hbase-site.xml
'';
};
hbaseSite = mkOption {
default = {};
type = with types; attrsOf anything;
example = literalExpression ''
'';
description = ''
Additional options and overrides for hbase-site.xml
<link xlink:href="https://github.com/apache/hbase/blob/rel/2.4.11/hbase-common/src/main/resources/hbase-default.xml"/>
'';
};
hbaseSiteInternal = mkOption {
default = {};
type = with types; attrsOf anything;
internal = true;
description = ''
Internal option to add configs to hbase-site.xml based on module options
'';
};
hbase = {
package = mkOption {
type = types.package;
default = pkgs.hbase;
defaultText = literalExpression "pkgs.hbase";
description = "HBase package";
};
rootdir = mkOption {
description = ''
This option will set "hbase.rootdir" in hbase-site.xml and determine
the directory shared by region servers and into which HBase persists.
The URL should be 'fully-qualified' to include the filesystem scheme.
If a core-site.xml is provided, the FS scheme defaults to the value
of "fs.defaultFS".
Filesystems other than HDFS (like S3, QFS, Swift) are also supported.
'';
type = types.str;
example = "hdfs://nameservice1/hbase";
default = "/hbase";
};
zookeeperQuorum = mkOption {
description = ''
This option will set "hbase.zookeeper.quorum" in hbase-site.xml.
Comma separated list of servers in the ZooKeeper ensemble.
'';
type = with types; nullOr commas;
example = "zk1.internal,zk2.internal,zk3.internal";
default = null;
};
master = {
enable = mkEnableOption "HBase Master";
initHDFS = mkEnableOption "initialization of the hbase directory on HDFS";
openFirewall = mkOption {
type = types.bool;
default = false;
description = ''
Open firewall ports for HBase master.
'';
};
};
regionServer = {
enable = mkEnableOption "HBase RegionServer";
overrideHosts = mkOption {
type = types.bool;
default = true;
description = ''
Remove /etc/hosts entries for "127.0.0.2" and "::1" defined in nixos/modules/config/networking.nix
Regionservers must be able to resolve their hostnames to their IP addresses, through PTR records
or /etc/hosts entries.
'';
};
openFirewall = mkOption {
type = types.bool;
default = false;
description = ''
Open firewall ports for HBase master.
'';
};
};
};
};
config = mkMerge [
(mkIf cfg.hbase.master.enable {
services.hadoop.gatewayRole = {
enable = true;
enableHbaseCli = mkDefault true;
};
systemd.services.hbase-master = {
description = "HBase master";
wantedBy = [ "multi-user.target" ];
preStart = mkIf cfg.hbase.master.initHDFS ''
HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfsadmin -safemode wait
HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -mkdir -p ${cfg.hbase.rootdir}
HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -chown hbase ${cfg.hbase.rootdir}
'';
serviceConfig = {
User = "hbase";
SyslogIdentifier = "hbase-master";
ExecStart = "${cfg.hbase.package}/bin/hbase --config ${hadoopConf} " +
"master start";
Restart = "always";
};
};
services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir;
networking.firewall.allowedTCPPorts = (mkIf cfg.hbase.master.openFirewall [
16000 16010
]);
})
(mkIf cfg.hbase.regionServer.enable {
services.hadoop.gatewayRole = {
enable = true;
enableHbaseCli = mkDefault true;
};
systemd.services.hbase-regionserver = {
description = "HBase RegionServer";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = "hbase";
SyslogIdentifier = "hbase-regionserver";
ExecStart = "${cfg.hbase.package}/bin/hbase --config /etc/hadoop-conf/ " +
"regionserver start";
Restart = "always";
};
};
services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir;
networking = {
firewall.allowedTCPPorts = (mkIf cfg.hbase.regionServer.openFirewall [
16020 16030
]);
hosts = mkIf cfg.hbase.regionServer.overrideHosts {
"127.0.0.2" = mkForce [ ];
"::1" = mkForce [ ];
};
};
})
(mkIf cfg.gatewayRole.enable {
environment.systemPackages = mkIf cfg.gatewayRole.enableHbaseCli [ cfg.hbase.package ];
services.hadoop.hbaseSiteInternal = with cfg.hbase; {
"hbase.zookeeper.quorum" = mkIfNotNull zookeeperQuorum;
};
users.users.hbase = {
description = "Hadoop HBase user";
group = "hadoop";
isSystemUser = true;
};
})
];
}

4
nixos/modules/services/cluster/hadoop/hdfs.nix
View file

@ -158,8 +158,8 @@ in
50010 # datanode.address
50020 # datanode.ipc.address
];
extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = let d = cfg.hdfs.datanode.dataDirs; in
if (d!= null) then (concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs) else d;
extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = mkIf (cfg.hdfs.datanode.dataDirs!= null)
(concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs);
})
(hadoopServiceConfig {

8
nixos/modules/services/cluster/hadoop/yarn.nix
View file

@ -178,18 +178,18 @@ in
services.hadoop.gatewayRole.enable = true;
services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; {
"yarn.nodemanager.local-dirs" = localDir;
services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; mkMerge [ ({
"yarn.nodemanager.local-dirs" = mkIf (localDir!= null) (concatStringsSep "," localDir);
"yarn.scheduler.maximum-allocation-vcores" = resource.maximumAllocationVCores;
"yarn.scheduler.maximum-allocation-mb" = resource.maximumAllocationMB;
"yarn.nodemanager.resource.cpu-vcores" = resource.cpuVCores;
"yarn.nodemanager.resource.memory-mb" = resource.memoryMB;
} // mkIf useCGroups {
}) (mkIf useCGroups {
"yarn.nodemanager.linux-container-executor.cgroups.hierarchy" = "/hadoop-yarn";
"yarn.nodemanager.linux-container-executor.resources-handler.class" = "org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler";
"yarn.nodemanager.linux-container-executor.cgroups.mount" = "true";
"yarn.nodemanager.linux-container-executor.cgroups.mount-path" = "/run/wrappers/yarn-nodemanager/cgroup";
};
})];
networking.firewall.allowedTCPPortRanges = [
(mkIf (cfg.yarn.nodemanager.openFirewall) {from = 1024; to = 65535;})

25
nixos/modules/services/databases/hbase.nix → nixos/modules/services/databases/hbase-standalone.nix
View file

@ -3,8 +3,8 @@
with lib;
let
cfg = config.services.hbase;
opt = options.services.hbase;
cfg = config.services.hbase-standalone;
opt = options.services.hbase-standalone;
buildProperty = configAttr:
(builtins.concatStringsSep "\n"
@ -32,19 +32,19 @@ let
in {
imports = [
(mkRenamedOptionModule [ "services" "hbase" ] [ "services" "hbase-standalone" ])
];
###### interface
options = {
services.hbase-standalone = {
services.hbase = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Whether to run HBase.
'';
};
enable = mkEnableOption ''
HBase master in standalone mode with embedded regionserver and zookeper.
Do not use this configuration for production nor for evaluating HBase performance.
'';
package = mkOption {
type = types.package;
@ -108,12 +108,11 @@ in {
};
};
};
###### implementation
config = mkIf config.services.hbase.enable {
config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -"

121
nixos/modules/services/hardware/kanata.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, utils, ... }:
with lib;
@ -7,10 +7,20 @@ let
keyboard = {
options = {
device = mkOption {
type = types.str;
example = "/dev/input/by-id/usb-0000_0000-event-kbd";
description = lib.mdDoc "Path to the keyboard device.";
devices = mkOption {
type = types.addCheck (types.listOf types.str)
(devices: (length devices) > 0);
example = [ "/dev/input/by-id/usb-0000_0000-event-kbd" ];
# TODO replace note with tip, which has not been implemented yet in
# nixos/lib/make-options-doc/mergeJSON.py
description = mdDoc ''
Paths to keyboard devices.
::: {.note}
To avoid unnecessary triggers of the service unit, unplug devices in
the order of the list.
:::
'';
};
config = mkOption {
type = types.lines;
@ -33,18 +43,32 @@ let
;; tap within 100ms for capslk, hold more than 100ms for lctl
cap (tap-hold 100 100 caps lctl))
'';
description = lib.mdDoc ''
Configuration other than defcfg.
See <https://github.com/jtroo/kanata> for more information.
description = mdDoc ''
Configuration other than `defcfg`. See [example config
files](https://github.com/jtroo/kanata) for more information.
'';
};
extraDefCfg = mkOption {
type = types.lines;
default = "";
example = "danger-enable-cmd yes";
description = lib.mdDoc ''
Configuration of defcfg other than linux-dev.
See <https://github.com/jtroo/kanata> for more information.
description = mdDoc ''
Configuration of `defcfg` other than `linux-dev`. See [example
config files](https://github.com/jtroo/kanata) for more information.
'';
};
extraArgs = mkOption {
type = types.listOf types.str;
default = [ ];
description = mdDoc "Extra command line arguments passed to kanata.";
};
port = mkOption {
type = types.nullOr types.port;
default = null;
example = 6666;
description = mdDoc ''
Port to run the notification server on. `null` will not run the
server.
'';
};
};
@ -52,16 +76,18 @@ let
mkName = name: "kanata-${name}";
mkDevices = devices: concatStringsSep ":" devices;
mkConfig = name: keyboard: pkgs.writeText "${mkName name}-config.kdb" ''
(defcfg
${keyboard.extraDefCfg}
linux-dev ${keyboard.device})
linux-dev ${mkDevices keyboard.devices})
${keyboard.config}
'';
mkService = name: keyboard: nameValuePair (mkName name) {
description = "kanata for ${keyboard.device}";
description = "kanata for ${mkDevices keyboard.devices}";
# Because path units are used to activate service units, which
# will start the old stopped services during "nixos-rebuild
@ -72,10 +98,14 @@ let
serviceConfig = {
ExecStart = ''
${cfg.package}/bin/kanata \
--cfg ${mkConfig name keyboard}
--cfg ${mkConfig name keyboard} \
--symlink-path ''${RUNTIME_DIRECTORY}/${name} \
${optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \
${utils.escapeSystemdExecArgs keyboard.extraArgs}
'';
DynamicUser = true;
RuntimeDirectory = mkName name;
SupplementaryGroups = with config.users.groups; [
input.name
uinput.name
@ -83,15 +113,16 @@ let
# hardening
DeviceAllow = [
"/dev/uinput w"
"/dev/uinput rw"
"char-input r"
];
CapabilityBoundingSet = "";
CapabilityBoundingSet = [ "" ];
DevicePolicy = "closed";
IPAddressDeny = "any";
IPAddressAllow = optional (keyboard.port != null) "localhost";
IPAddressDeny = [ "any" ];
LockPersonality = true;
MemoryDenyWriteExecute = true;
PrivateNetwork = true;
PrivateNetwork = keyboard.port == null;
PrivateUsers = true;
ProcSubset = "pid";
ProtectClock = true;
@ -102,10 +133,11 @@ let
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
RestrictAddressFamilies = "none";
RestrictAddressFamilies =
if (keyboard.port == null) then "none" else [ "AF_INET" ];
RestrictNamespaces = true;
RestrictRealtime = true;
SystemCallArchitectures = "native";
SystemCallArchitectures = [ "native" ];
SystemCallFilter = [
"@system-service"
"~@privileged"
@ -115,13 +147,32 @@ let
};
};
mkPath = name: keyboard: nameValuePair (mkName name) {
description = "kanata trigger for ${keyboard.device}";
wantedBy = [ "multi-user.target" ];
pathConfig = {
PathExists = keyboard.device;
mkPathName = i: name: "${mkName name}-${toString i}";
mkPath = name: n: i: device:
nameValuePair (mkPathName i name) {
description =
"${toString (i+1)}/${toString n} kanata trigger for ${name}, watching ${device}";
wantedBy = optional (i == 0) "multi-user.target";
pathConfig = {
PathExists = device;
# (ab)use systemd.path to construct a trigger chain so that the
# service unit is only started when all paths exist
# however, manual of systemd.path says Unit's suffix is not ".path"
Unit =
if (i + 1) == n
then "${mkName name}.service"
else "${mkPathName (i + 1) name}.path";
};
unitConfig.StopPropagatedFrom = optional (i > 0) "${mkName name}.service";
};
};
mkPaths = name: keyboard:
let
n = length keyboard.devices;
in
imap0 (mkPath name n) keyboard.devices
;
in
{
options.services.kanata = {
@ -131,15 +182,19 @@ in
default = pkgs.kanata;
defaultText = lib.literalExpression "pkgs.kanata";
example = lib.literalExpression "pkgs.kanata-with-cmd";
description = lib.mdDoc ''
kanata package to use.
If you enable danger-enable-cmd, pkgs.kanata-with-cmd should be used.
description = mdDoc ''
The kanata package to use.
::: {.note}
If `danger-enable-cmd` is enabled in any of the keyboards, the
`kanata-with-cmd` package should be used.
:::
'';
};
keyboards = mkOption {
type = types.attrsOf (types.submodule keyboard);
default = { };
description = lib.mdDoc "Keyboard configurations.";
description = mdDoc "Keyboard configurations.";
};
};
@ -147,7 +202,11 @@ in
hardware.uinput.enable = true;
systemd = {
paths = mapAttrs' mkPath cfg.keyboards;
paths = trivial.pipe cfg.keyboards [
(mapAttrsToList mkPaths)
concatLists
listToAttrs
];
services = mapAttrs' mkService cfg.keyboards;
};
};

5
nixos/modules/services/networking/yggdrasil.nix
View file

@ -132,8 +132,9 @@ in {
systemd.services.yggdrasil = {
description = "Yggdrasil Network Service";
bindsTo = [ "network-online.target" ];
after = [ "network-online.target" ];
after = [ "network-pre.target" ];
wants = [ "network.target" ];
before = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart =

1
nixos/modules/services/ttys/getty.nix
View file

@ -104,6 +104,7 @@ in
# Note: this is set here rather than up there so that changing
# nixos.label would not rebuild manual pages
services.getty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>'';
services.getty.helpLine = mkIf (config.documentation.nixos.enable && config.documentation.doc.enable) "\nRun 'nixos-help' for the NixOS manual.";
systemd.services."getty@" =
{ serviceConfig.ExecStart = [

8
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View file

@ -82,6 +82,7 @@ in
'';
# Default services
services.blueman.enable = mkDefault true;
hardware.bluetooth.enable = mkDefault true;
hardware.pulseaudio.enable = mkDefault true;
security.polkit.enable = true;
@ -91,7 +92,7 @@ in
cinnamon-common
cinnamon-screensaver
nemo
xapps
xapp
];
services.cinnamon.apps.enable = mkDefault true;
services.gnome.glib-networking.enable = true;
@ -199,13 +200,12 @@ in
environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [
# cinnamon team apps
bulky
blueberry
warpinator
# cinnamon xapps
# cinnamon xapp
xviewer
xreader
xed
xed-editor
xplayer
pix

3
nixos/modules/system/boot/systemd/initrd.nix
View file

@ -374,6 +374,9 @@ in {
'';
"/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
"/etc/os-release".source = config.boot.initrd.osRelease;
"/etc/initrd-release".source = config.boot.initrd.osRelease;
};
storePaths = [

1
nixos/tests/all-tests.nix
View file

@ -127,6 +127,7 @@ in {
docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {};
docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};
documize = handleTest ./documize.nix {};
documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; };
doh-proxy-rust = handleTest ./doh-proxy-rust.nix {};
dokuwiki = handleTest ./dokuwiki.nix {};
domination = handleTest ./domination.nix {};

2
nixos/tests/firefox.nix
View file

@ -8,7 +8,7 @@ let firefoxPackage' = firefoxPackage.override (args: {
in
{
name = firefoxPackage'.unwrapped.binaryName;
name = firefoxPackage'.unwrapped.pname;
meta = with pkgs.lib.maintainers; {
maintainers = [ eelco shlevy ];
};

1
nixos/tests/hadoop/default.nix
View file

@ -4,4 +4,5 @@
all = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop.nix { inherit package; };
hdfs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hdfs.nix { inherit package; };
yarn = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./yarn.nix { inherit package; };
hbase = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hbase.nix { inherit package; };
}

84
nixos/tests/hadoop/hbase.nix Normal file
View file

@ -0,0 +1,84 @@
# Test a minimal hbase cluster
{ pkgs, ... }:
import ../make-test-python.nix ({ hadoop ? pkgs.hadoop, hbase ? pkgs.hbase, ... }:
with pkgs.lib;
{
name = "hadoop-hbase";
nodes = let
coreSite = {
"fs.defaultFS" = "hdfs://namenode:8020";
};
defOpts = {
enable = true;
openFirewall = true;
};
zookeeperQuorum = "zookeeper";
in {
zookeeper = { ... }: {
services.zookeeper.enable = true;
networking.firewall.allowedTCPPorts = [ 2181 ];
};
namenode = { ... }: {
services.hadoop = {
hdfs = {
namenode = defOpts // { formatOnInit = true; };
};
inherit coreSite;
};
};
datanode = { ... }: {
virtualisation.diskSize = 8192;
services.hadoop = {
hdfs.datanode = defOpts;
inherit coreSite;
};
};
master = { ... }:{
services.hadoop = {
inherit coreSite;
hbase = {
inherit zookeeperQuorum;
master = defOpts // { initHDFS = true; };
};
};
};
regionserver = { ... }:{
services.hadoop = {
inherit coreSite;
hbase = {
inherit zookeeperQuorum;
regionServer = defOpts;
};
};
};
};
testScript = ''
start_all()
# wait for HDFS cluster
namenode.wait_for_unit("hdfs-namenode")
namenode.wait_for_unit("network.target")
namenode.wait_for_open_port(8020)
namenode.wait_for_open_port(9870)
datanode.wait_for_unit("hdfs-datanode")
datanode.wait_for_unit("network.target")
datanode.wait_for_open_port(9864)
datanode.wait_for_open_port(9866)
datanode.wait_for_open_port(9867)
# wait for ZK
zookeeper.wait_for_unit("zookeeper")
zookeeper.wait_for_open_port(2181)
# wait for HBase to start up
master.wait_for_unit("hbase-master")
regionserver.wait_for_unit("hbase-regionserver")
assert "1 active master, 0 backup masters, 1 servers" in master.succeed("echo status | HADOOP_USER_NAME=hbase hbase shell -n")
regionserver.wait_until_succeeds("echo \"create 't1','f1'\" | HADOOP_USER_NAME=hbase hbase shell -n")
assert "NAME => 'f1'" in regionserver.succeed("echo \"describe 't1'\" | HADOOP_USER_NAME=hbase hbase shell -n")
'';
})

2
nixos/tests/hadoop/yarn.nix
View file

@ -19,7 +19,7 @@ import ../make-test-python.nix ({ package, ... }: {
enable = true;
openFirewall = true;
};
yarnSite = options.services.hadoop.yarnSite.default // {
yarnSite = {
"yarn.resourcemanager.hostname" = "resourcemanager";
"yarn.nodemanager.log-dirs" = "/tmp/userlogs";
};

4
nixos/tests/hbase.nix
View file

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.hbase, ... }:
{
name = "hbase";
name = "hbase-standalone";
meta = with lib.maintainers; {
maintainers = [ illustris ];
@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.hbase, ... }:
nodes = {
hbase = { pkgs, ... }: {
services.hbase = {
services.hbase-standalone = {
enable = true;
inherit package;
# Needed for standalone mode in hbase 2+

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

@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "amberol";
version = "0.8.1";
version = "0.9.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = version;
hash = "sha256-27jXpx79JNF5FjVKERNrQFS7VHZHWh57jjBWvX5IRio=";
hash = "sha256-/kZYzUzycHKre6/dvZgeqXu6mrkblftV51Z7866fZVY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-M5T+imP7up3RRiXOJRrqimcjs8r81V5jfQMjR02skko=";
hash = "sha256-1+RWL9MD6aX+zI2rtQUQCqemCephLKGEAf5xNCb+jo4=";
};
postPatch = ''

25
pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch Normal file
View file

@ -0,0 +1,25 @@
From b64b03be9edf23a80fce0c76de61ffff0914ddce Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 8 Aug 2022 10:28:33 +0100
Subject: [PATCH] Set plugindir to $PREFIX/lib/audacious
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 3f7996f72..ab09d6476 100644
--- a/meson.build
+++ b/meson.build
@@ -160,7 +160,7 @@ if (cxx.has_header('libintl.h'))
endif
-install_plugindir = audacious_dep.get_variable(pkgconfig: 'plugin_dir')
+install_plugindir = join_paths(get_option('prefix'), 'lib/audacious')
conf.set_quoted('INSTALL_PLUGINDIR', install_plugindir)
--
2.36.0

82
pkgs/applications/audio/audacious/default.nix
View file

@ -1,15 +1,16 @@
{
mkDerivation, lib, fetchurl, fetchpatch,
gettext, pkg-config,
qtbase,
alsa-lib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug,
libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
wavpack, libopenmpt
{ lib
, stdenv
, audacious-plugins
, fetchurl
, gettext
, meson
, ninja
, pkg-config
, qtbase
, wrapQtAppsHook
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "audacious";
version = "4.2";
@ -17,54 +18,39 @@ mkDerivation rec {
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
sha256 = "sha256-/rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM=";
};
pluginsSrc = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8=";
};
nativeBuildInputs = [ gettext pkg-config ];
buildInputs = [
# Core dependencies
qtbase
# Plugin dependencies
alsa-lib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb
libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli
libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
libopenmpt
nativeBuildInputs = [
gettext
meson
ninja
pkg-config
wrapQtAppsHook
];
configureFlags = [ "--disable-gtk" ];
buildInputs = [
qtbase
];
# Here we build both audacious and audacious-plugins in one
# derivation, since they really expect to be in the same prefix.
# This is slighly tricky.
builder = builtins.toFile "builder.sh" ''
# First build audacious.
(
source $stdenv/setup
genericBuild
)
# Then build the plugins.
(
nativeBuildInputs="$out $nativeBuildInputs" # to find audacious
source $stdenv/setup
rm -rfv audacious-*
src=$pluginsSrc
genericBuild
)
mesonFlags = [
"-Dgtk=false"
"-Dbuildstamp=NixOS"
];
postInstall = lib.optionalString (audacious-plugins != null) ''
ln -s ${audacious-plugins}/lib/audacious $out/lib
'';
meta = with lib; {
description = "Audio player";
description = "A lightweight and versatile audio player";
homepage = "https://audacious-media-player.org/";
maintainers = with maintainers; [ eelco ramkromberg ttuegel ];
maintainers = with maintainers; [ eelco ramkromberg ttuegel thiagokokada ];
platforms = with platforms; linux;
license = with licenses; [
bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING
gpl2 gpl3 lgpl2Plus #http://redmine.audacious-media-player.org/issues/46
bsd2
bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING
gpl2
gpl3
lgpl2Plus #http://redmine.audacious-media-player.org/issues/46
];
};
}

111
pkgs/applications/audio/audacious/plugins.nix Normal file
View file

@ -0,0 +1,111 @@
{ stdenv
, fetchurl
, alsa-lib
, audacious
, curl
, faad2
, ffmpeg
, flac
, fluidsynth
, gdk-pixbuf
, gettext
, lame
, libbs2b
, libcddb
, libcdio
, libcdio-paranoia
, libcue
, libjack2
, libmad
, libmms
, libmodplug
, libmowgli
, libnotify
, libogg
, libopenmpt
, libpulseaudio
, libsamplerate
, libsidplayfp
, libsndfile
, libvorbis
, libxml2
, lirc
, meson
, mpg123
, neon
, ninja
, pkg-config
, qtbase
, qtmultimedia
, qtx11extras
, soxr
, wavpack
}:
stdenv.mkDerivation rec {
pname = "audacious-plugins";
version = "4.2";
src = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8=";
};
patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ];
nativeBuildInputs = [
gettext
meson
ninja
pkg-config
];
buildInputs = [
audacious
alsa-lib
curl
faad2
ffmpeg
flac
fluidsynth
gdk-pixbuf
lame
libbs2b
libcddb
libcdio
libcdio-paranoia
libcue
libjack2
libmad
libmms
libmodplug
libmowgli
libnotify
libogg
libpulseaudio
libsamplerate
libsidplayfp
libsndfile
libvorbis
libxml2
lirc
mpg123
neon
qtbase
qtmultimedia
qtx11extras
soxr
wavpack
libopenmpt
];
mesonFlags = [
"-Dgtk=false"
];
dontWrapQtApps = true;
meta = audacious.meta // {
description = "Plugins for Audacious music player";
};
}

4
pkgs/applications/audio/kid3/default.nix
View file

@ -27,11 +27,11 @@
stdenv.mkDerivation rec {
pname = "kid3";
version = "3.9.1";
version = "3.9.2";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-N/HDwfJn7Py4y/GZcIDbeoMEqG+SuRGO23ITZMot8cc=";
sha256 = "sha256-R4Xv+PmzKZQF1tFtSQTFjaisGug2EKM6mPVoGutNnok=";
};
nativeBuildInputs = [

4
pkgs/applications/audio/noise-repellent/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "noise-repellent";
version = "0.2.1";
version = "0.2.3";
src = fetchFromGitHub {
owner = "lucianodato";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hMNVzhJZFGFeu5aygLkfq495O0zpaIk41ddzejvDITE=";
sha256 = "sha256-d8csYC3z3vXdmN/G6mAK+H8ia0vOCsoUpoA3W8/OADc=";
};
mesonFlags = [

10
pkgs/applications/backup/timeshift/unwrapped.nix
View file

@ -10,18 +10,18 @@
, libgee
, util-linux
, vte
, xapps
, xapp
}:
stdenv.mkDerivation rec {
pname = "timeshift";
version = "22.06.1";
version = "22.06.5";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "timeshift";
rev = "v${version}";
sha256 = "XcxwVBKMv2YwbrI3FFWDQFs8hHruhkZq3YqzkptE6KE=";
rev = version;
sha256 = "IHX/F3tnl3ckX20mnPHmuK/W4pRTFHzBUfaJg2sMpqc=";
};
patches = [
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
json-glib
libgee
vte
xapps
xapp
];
preBuild = ''

4
pkgs/applications/blockchains/btcpayserver/default.nix
View file

@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
version = "1.6.1";
version = "1.6.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-lz42emfVBWas1A2YuEkjGAX8V1Qe2YAZMEgMYwIhhKM=";
sha256 = "sha256-790/XBeFS1iM73WuBMXcEoB3gjBlU1dMPRwtQNB7taE=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";

180
pkgs/applications/blockchains/btcpayserver/deps.nix generated
View file

@ -106,18 +106,18 @@
})
(fetchNuGet {
pname = "Fido2.AspNet";
version = "2.0.1";
sha256 = "1d6bjyck3mlhb9b4c75xhzr2pcs47vdqg2ayi5wnjh1aszyam3nq";
version = "2.0.2";
sha256 = "0x2k1wyd0p7cy4ir15m2bxiggckl98znc65b4vq75ckjyd6dm1a1";
})
(fetchNuGet {
pname = "Fido2.Models";
version = "2.0.1";
sha256 = "0llpzkik82n5gpgjawx181j85d2lizimkbdkxj1wyrjvxb2xbg3q";
version = "2.0.2";
sha256 = "1vk4h9sv2dhdr0jvh2a7yk6v9rhxk9y8hxz4mkal8vd9psajz5cg";
})
(fetchNuGet {
pname = "Fido2";
version = "2.0.1";
sha256 = "1s829n970lxngbhac9lvarwa9n9hqxr79kwv8i12amnmg6ir8ny5";
version = "2.0.2";
sha256 = "1wqlk48apm7h637da7sav0r1a8yz2yy2gxhifpvydjqk1n3qybz4";
})
(fetchNuGet {
pname = "Google.Api.Gax.Rest";
@ -209,11 +209,6 @@
version = "2.4.3";
sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf";
})
(fetchNuGet {
pname = "Microsoft.AspNet.WebApi.Client";
version = "5.2.7";
sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1";
})
(fetchNuGet {
pname = "Microsoft.AspNet.WebApi.Client";
version = "5.2.9";
@ -226,13 +221,13 @@
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.Cryptography.Internal";
version = "6.0.1";
sha256 = "1mj04ynr6bxvmq9nrggi832n8hbcr9j9kjr9y2rgiq91y6skzg37";
version = "6.0.7";
sha256 = "0g9n5f0p9grjl1fzd7h6dd4ywkc1r7irqyjslkrrvnjqzqg7a2mp";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation";
version = "6.0.1";
sha256 = "0aqaviwbnwg0vpwwdbif7b9ncpckwpclm77l3ac11s8fsq3vb3sm";
version = "6.0.7";
sha256 = "0n6l22yp6qrq3wjgkgrlxf5zmpcx0cz8s9hh99g6i88fmhav7dxh";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.Hosting.Abstractions";
@ -271,33 +266,33 @@
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore";
version = "6.0.1";
sha256 = "1j9z0xzj2hlffhg28ijp33flljq75js8dvlchbpggvvd789hm4il";
version = "6.0.7";
sha256 = "1sygbi88w9kkypq3nr7i81mxll8xdnjw9dp6h1dyyr7wr37yhr81";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.JsonPatch";
version = "6.0.1";
sha256 = "0rsqng2b8a3zaha9c2x1195das5wwvmnz31xf14ancgha4lxq68r";
version = "6.0.7";
sha256 = "0l235hs1j24iqvk79p95sfrsfbj6l2kb10x9zi34jinvldyn5ln6";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson";
version = "6.0.1";
sha256 = "179b2774s68im71r32lv4nydcp586x86zggs8ml6jcfjrd9fs5b1";
version = "6.0.7";
sha256 = "08g3aq8gn917r55hnx1i36jfwy51311yns0x6wpvs9d2y4ncygk4";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions";
version = "6.0.1";
sha256 = "1grhlksdd7mwv72g78kx86mzba8mgza3i53x9jv16bkc1wxqwfcd";
version = "6.0.7";
sha256 = "0zsyqfywa6c01aflqdj4bc8cdwlcz4xiafkn6f07xbsl3p9v0lk5";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation";
version = "6.0.1";
sha256 = "0778xw230flwqkjjydp73gb6r3brrlqwqdrf4m0b92b083bysh59";
version = "6.0.7";
sha256 = "1bfrdwvz12fs31pdjxhj8arjw8pvawsp64wlj2sfmll7q3618jgp";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.Razor.Language";
version = "6.0.1";
sha256 = "11spvrnp2mz5kc11ycv2wpgn8bilwpinbl6vkvvr7jjrqlm36lk1";
version = "6.0.7";
sha256 = "0757507ivh8q6xfrbihnhnfya0g4wd5j033i2fcsinfyn576wc8c";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.SignalR.Client.Core";
@ -324,6 +319,11 @@
version = "3.3.2";
sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4";
})
(fetchNuGet {
pname = "Microsoft.CodeAnalysis.Analyzers";
version = "3.3.3";
sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6";
})
(fetchNuGet {
pname = "Microsoft.CodeAnalysis.Common";
version = "4.0.0";
@ -331,8 +331,8 @@
})
(fetchNuGet {
pname = "Microsoft.CodeAnalysis.Common";
version = "4.0.1";
sha256 = "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9";
version = "4.2.0";
sha256 = "0ld6xxgaqc3c6zgyimlvpgrxncsykbz8irqs01jyj40rv150kp8s";
})
(fetchNuGet {
pname = "Microsoft.CodeAnalysis.CSharp";
@ -341,18 +341,18 @@
})
(fetchNuGet {
pname = "Microsoft.CodeAnalysis.CSharp";
version = "4.0.1";
sha256 = "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb";
version = "4.2.0";
sha256 = "0i1c7055j3f5k1765bl66amp72dcw0zapczfszdldbg91iqmmkxg";
})
(fetchNuGet {
pname = "Microsoft.CodeAnalysis.Razor";
version = "6.0.1";
sha256 = "0dwwhiv28wyzq3177qg961ll2q3ggiw2k0zdashgym5cl67p93lm";
version = "6.0.7";
sha256 = "1jnwch6vb7v95q005wq2z7fv5pisbdi2yn0n9hmxwz3kaiqcqjdm";
})
(fetchNuGet {
pname = "Microsoft.CodeCoverage";
version = "17.0.0";
sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a";
version = "17.2.0";
sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj";
})
(fetchNuGet {
pname = "Microsoft.CSharp";
@ -371,8 +371,8 @@
})
(fetchNuGet {
pname = "Microsoft.Data.Sqlite.Core";
version = "6.0.1";
sha256 = "0gzn3rynp9k6mx4h4dhq124b7ra8m11rkjh40r2r8z4gkr0shjv1";
version = "6.0.7";
sha256 = "0r5njqyl10dv0akwl5y32ik0rpzs9lwj151j6ayz358pn4x26akk";
})
(fetchNuGet {
pname = "Microsoft.DotNet.PlatformAbstractions";
@ -386,43 +386,53 @@
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Abstractions";
version = "6.0.1";
sha256 = "15mx86i7gqlak604vr853x7a4b4l48wz5vqh9qbib7wh4pkf4rp3";
version = "6.0.5";
sha256 = "1vziijdf6kmv61i09bk0yxnbn08b48dy1jn4qbmhxaka745z1w6x";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Abstractions";
version = "6.0.7";
sha256 = "0xhkh9k3xpgjdsizg1wdncwz4rdjvffq3x0sfcarscmg2j5fa4yj";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Analyzers";
version = "6.0.1";
sha256 = "16739crhjky22j53v8varninz9bqdmdfwjnzj6xvfxqfl858jja5";
version = "6.0.7";
sha256 = "0fdh0w5c51kkpvh1p5f0dn90kikh3zdyc1k4hjvv1z8kr603nd1b";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Design";
version = "6.0.1";
sha256 = "13bi91lkasy4qj04jn2hmbwpsc6fybgllwsr87qhz5p86ig9ryq9";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Relational";
version = "6.0.0";
sha256 = "1v2r8004isvz4d8qxh5clgkbnlwivjlsqhn7skw0y9b5i61y2mwk";
version = "6.0.7";
sha256 = "0mdb2gqmb94sw38cpqm972vdhh88n7q81xhq4gq771hp2wspn5ap";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Relational";
version = "6.0.1";
sha256 = "0224qas1rl3jv02ribb2lwfqcd64ij40v6q10369h4mrwr071zr2";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Relational";
version = "6.0.5";
sha256 = "027j472gmqkrazy7b044qllsh8zbvl7lv3mdgnbghrhj06jfasm6";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Relational";
version = "6.0.7";
sha256 = "1kx0ac7jgf8nmp5nra4cd6h2xbwvb3zkyzx7cds60y1j9nm7lx1g";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Sqlite.Core";
version = "6.0.1";
sha256 = "1snpa3pzpqfsnf2dpmvhv08lzcdiqcl5af6aldlxrm82dpif95q5";
version = "6.0.7";
sha256 = "15l36dgq6rzvgx7i9g9jm3298p9g1pdahwa2dxblmm0gzsp65wpl";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Sqlite";
version = "6.0.1";
sha256 = "14r1j8bamfwnjzx6igc5nzqvp5gzl2wyfbi53pznkw61xcf6hnch";
version = "6.0.7";
sha256 = "1mam4qg6yq6qnlkx3i45gs3nwgd7njfm9r5gjs1p9wm6bm953dad";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore";
version = "6.0.1";
sha256 = "0ynspdv0f199ppwcg7hnjv6hp01qyaxfcmh1phy9nwjjxlrkwkjc";
version = "6.0.7";
sha256 = "1wcjjn70v8cyy5flga0nlnhg973s6pzb3rpnzv905ix3g70zdp4k";
})
(fetchNuGet {
pname = "Microsoft.Extensions.Caching.Abstractions";
@ -436,8 +446,8 @@
})
(fetchNuGet {
pname = "Microsoft.Extensions.Caching.Memory";
version = "6.0.0";
sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq";
version = "6.0.1";
sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk";
})
(fetchNuGet {
pname = "Microsoft.Extensions.Configuration.Abstractions";
@ -606,13 +616,13 @@
})
(fetchNuGet {
pname = "Microsoft.Extensions.Identity.Core";
version = "6.0.1";
sha256 = "1kwn30a024fqi9gpap8g2wifjzij0bcz70lgz7bdz4vy3sp9mn99";
version = "6.0.7";
sha256 = "1xxqqh3flx0g8fzi9v0565amfvc72ci8vkya08gf2h67syn63s6l";
})
(fetchNuGet {
pname = "Microsoft.Extensions.Identity.Stores";
version = "6.0.1";
sha256 = "1l2njmcg4fvg6jr9gjvcr7yfj0r0ndwsa8r1dwlaciz3a2x2pfg8";
version = "6.0.7";
sha256 = "0lsvbbfppxkz5xxq9q77k7222szy7g5974q7nr1c39gwdsy0j22d";
})
(fetchNuGet {
pname = "Microsoft.Extensions.Logging.Abstractions";
@ -756,8 +766,8 @@
})
(fetchNuGet {
pname = "Microsoft.NET.Test.Sdk";
version = "17.0.0";
sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r";
version = "17.2.0";
sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11";
})
(fetchNuGet {
pname = "Microsoft.NetCore.Analyzers";
@ -796,13 +806,13 @@
})
(fetchNuGet {
pname = "Microsoft.TestPlatform.ObjectModel";
version = "17.0.0";
sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7";
version = "17.2.0";
sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv";
})
(fetchNuGet {
pname = "Microsoft.TestPlatform.TestHost";
version = "17.0.0";
sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r";
version = "17.2.0";
sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp";
})
(fetchNuGet {
pname = "Microsoft.Win32.Primitives";
@ -821,8 +831,8 @@
})
(fetchNuGet {
pname = "MySqlConnector";
version = "2.0.0";
sha256 = "0l0r4wr1h176w6hcsfjp5kx05fpzhhgzxcmirv8zfyk899vfgqkz";
version = "2.1.2";
sha256 = "12wgwns172vjldp1cvcq212zizpw18za7z3438rdh40zkq55s5yz";
})
(fetchNuGet {
pname = "NBitcoin.Altcoins";
@ -849,6 +859,11 @@
version = "7.0.1";
sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7";
})
(fetchNuGet {
pname = "NBitcoin";
version = "7.0.10";
sha256 = "1yp43n18b9qwh1ck3hxkarncbfn7r3indfdyjimapxibk3f8jm1v";
})
(fetchNuGet {
pname = "NBitpayClient";
version = "1.0.0.39";
@ -926,13 +941,13 @@
})
(fetchNuGet {
pname = "Npgsql.EntityFrameworkCore.PostgreSQL";
version = "6.0.3";
sha256 = "0mgwm9psxvrq6vs2cy7m72wnknydgrs71hir2jqal5wbdh8g01np";
version = "6.0.5";
sha256 = "0b50hzzhd8igibxm3vkmq0h7cljx13l1fxrgznh6k2v57r0vvfnq";
})
(fetchNuGet {
pname = "Npgsql";
version = "6.0.3";
sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q";
version = "6.0.5";
sha256 = "1555xj2725kkg4jyxhz6pkqwirdqyw5j5h1q3vaykpns61i2h48q";
})
(fetchNuGet {
pname = "NSec.Cryptography";
@ -941,8 +956,8 @@
})
(fetchNuGet {
pname = "NuGet.Frameworks";
version = "5.0.0";
sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr";
version = "5.11.0";
sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z";
})
(fetchNuGet {
pname = "NUglify";
@ -966,8 +981,8 @@
})
(fetchNuGet {
pname = "Pomelo.EntityFrameworkCore.MySql";
version = "6.0.0";
sha256 = "0qvm5rh9kv8znsp8wbss81w5a2afh0dl13pwkc824j7ywklz0gzz";
version = "6.0.1";
sha256 = "1g212yfzlphn97gn7v4zcpi4ihfk1xp014kw498pcma49dqirn54";
})
(fetchNuGet {
pname = "Portable.BouncyCastle";
@ -1341,8 +1356,8 @@
})
(fetchNuGet {
pname = "System.IO.Pipelines";
version = "6.0.1";
sha256 = "0b6zvhhfdxx0wx3bzyvxbq0mk8l5lbjak5124sn0gkif5jb388w4";
version = "6.0.3";
sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz";
})
(fetchNuGet {
pname = "System.IO";
@ -1719,6 +1734,11 @@
version = "4.5.1";
sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w";
})
(fetchNuGet {
pname = "System.Text.Encoding.CodePages";
version = "6.0.0";
sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww";
})
(fetchNuGet {
pname = "System.Text.Encoding.Extensions";
version = "4.0.11";
@ -1921,8 +1941,8 @@
})
(fetchNuGet {
pname = "xunit.runner.visualstudio";
version = "2.4.3";
sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3";
version = "2.4.5";
sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs";
})
(fetchNuGet {
pname = "xunit";

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

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "charge-lnd";
version = "0.2.4";
version = "0.2.12";
src = fetchFromGitHub {
owner = "accumulator";
repo = pname;
rev = "v${version}";
sha256 = "1d1cbpmpppp7z1bmsarwfs314c7ypchlyr4calx0fzxfpxzfks5k";
sha256 = "uiXmLdQAglgLxOX6IoF1iNZvje4EM7Tr25Okx9TPyzI=";
};
propagatedBuildInputs = with python3Packages; [
@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
];
postInstall = ''
install README.md charge.config.example -Dt $out/share/doc/charge-lnd
install README.md -Dt $out/share/doc/charge-lnd
'';
doInstallCheck = true;
@ -34,6 +34,6 @@ python3Packages.buildPythonApplication rec {
description = "Simple policy-based fee manager for lightning network daemon";
homepage = "https://github.com/accumulator/charge-lnd";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ mmilata ];
maintainers = with maintainers; [ mmilata mariaa144 ];
};
}

6
pkgs/applications/blockchains/erigon.nix
View file

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "erigon";
version = "2022.07.02";
version = "2022.07.03";
src = fetchFromGitHub {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/aT8E60dCk5spj5l5Zw/8FL1LfzXWYi7agiLflLYI5c=";
sha256 = "sha256-zWygG06H5+QuG11klRq+7T2v40FNMxmYENdsK3KB+ko=";
fetchSubmodules = true;
};
vendorSha256 = "sha256-NBWK0wsUbv4bFbmW3xGaQ7LCgmgfRF5zbc/awm8ZZZY=";
vendorSha256 = "sha256-vxLe8uEjuQ96JiIDxlSrpVATScNl2fscXVUqFKmMPxs=";
proxyVendor = true;
# Build errors in mdbx when format hardening is enabled:

4
pkgs/applications/blockchains/framesh/default.nix
View file

@ -2,10 +2,10 @@
let
pname = "framesh";
version = "0.5.0-beta.21";
version = "0.5.0-beta.22";
src = fetchurl {
url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage";
sha256 = "sha256-rWZ7oC74qrylNPIfBzHnNMcsYjccGL2zeXFab9OwBNA=";
sha256 = "sha256-/y7Pf1ADtz0CBeKKCHtSPOYvU7HCpq7hM/J4Ddq1XiA=";
};
appimageContents = appimageTools.extractType2 {

6
pkgs/applications/blockchains/lndhub-go/default.nix
View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "lndhub-go";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "getAlby";
repo = "lndhub.go";
rev = "${version}";
sha256 = "sha256-QtLSI5xjXevTTr85Zsylabhay52ul8jFq1j6WzgSLcs=";
sha256 = "sha256-f/CkmO0KHupmi4XZDWRbvesLnYIxT6DlThgX3S/kdJ8=";
};
vendorSha256 = "sha256-12RTaXStvx29JjE1u3AjBTrPf6gKfLHJHMJpbQysEew=";
vendorSha256 = "sha256-SWQudULFRMrKmxY6ZgH0NL8d6UPxowQnovhRx+209D4=";
doCheck = false; # tests require networking

4
pkgs/applications/blockchains/namecoin/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "namecoin" + lib.optionalString (!withGui) "d";
version = "22.0";
version = "23.0";
src = fetchFromGitHub {
owner = "namecoin";
repo = "namecoin-core";
rev = "nc${version}";
sha256 = "sha256-Z3CLDe0c4IpFPPTie8yoh0kcuvGmiegSgl4ITNSDkgY=";
sha256 = "sha256-MfqJ7EcJvlQ01Mr1RQpXVNUlGIwNqFTxrVwGa+Hus+A=";
};
nativeBuildInputs = [

4
pkgs/applications/blockchains/nbxplorer/default.nix
View file

@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "nbxplorer";
version = "2.3.28";
version = "2.3.33";
src = fetchFromGitHub {
owner = "dgarage";
repo = "NBXplorer";
rev = "v${version}";
sha256 = "sha256-4KedlU+TMwO6C/dgNa23N4uPk8gPq2SQKzYkCZS508I=";
sha256 = "sha256-yvnWSmf4FJoZ7ajZQQJFLleIQ/hmHD+rDoktJeIll+U=";
};
projectFile = "NBXplorer/NBXplorer.csproj";

135
pkgs/applications/blockchains/nbxplorer/deps.nix generated
View file

@ -11,13 +11,13 @@
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.JsonPatch";
version = "6.0.1";
sha256 = "0rsqng2b8a3zaha9c2x1195das5wwvmnz31xf14ancgha4lxq68r";
version = "6.0.7";
sha256 = "0l235hs1j24iqvk79p95sfrsfbj6l2kb10x9zi34jinvldyn5ln6";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson";
version = "6.0.1";
sha256 = "179b2774s68im71r32lv4nydcp586x86zggs8ml6jcfjrd9fs5b1";
version = "6.0.7";
sha256 = "08g3aq8gn917r55hnx1i36jfwy51311yns0x6wpvs9d2y4ncygk4";
})
(fetchNuGet {
pname = "Microsoft.Azure.Amqp";
@ -36,8 +36,8 @@
})
(fetchNuGet {
pname = "Microsoft.CodeCoverage";
version = "16.11.0";
sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv";
version = "17.2.0";
sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj";
})
(fetchNuGet {
pname = "Microsoft.CSharp";
@ -56,43 +56,43 @@
})
(fetchNuGet {
pname = "Microsoft.Extensions.Configuration.Abstractions";
version = "2.1.0";
sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd";
version = "6.0.0";
sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j";
})
(fetchNuGet {
pname = "Microsoft.Extensions.Configuration.EnvironmentVariables";
version = "2.1.0";
sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb";
version = "6.0.0";
sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl";
})
(fetchNuGet {
pname = "Microsoft.Extensions.Configuration.FileExtensions";
version = "2.1.0";
sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40";
version = "6.0.0";
sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w";
})
(fetchNuGet {
pname = "Microsoft.Extensions.Configuration.Ini";
version = "2.1.0";
sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip";
version = "6.0.0";
sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6";
})
(fetchNuGet {
pname = "Microsoft.Extensions.Configuration";
version = "2.1.0";
sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2";
version = "6.0.0";
sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8";
})
(fetchNuGet {
pname = "Microsoft.Extensions.FileProviders.Abstractions";
version = "2.1.0";
sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3";
version = "6.0.0";
sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q";
})
(fetchNuGet {
pname = "Microsoft.Extensions.FileProviders.Physical";
version = "2.1.0";
sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w";
version = "6.0.0";
sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474";
})
(fetchNuGet {
pname = "Microsoft.Extensions.FileSystemGlobbing";
version = "2.1.0";
sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv";
version = "6.0.0";
sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4";
})
(fetchNuGet {
pname = "Microsoft.Extensions.Logging.Abstractions";
@ -101,13 +101,13 @@
})
(fetchNuGet {
pname = "Microsoft.Extensions.Logging.Abstractions";
version = "2.1.0";
sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj";
version = "6.0.0";
sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0";
})
(fetchNuGet {
pname = "Microsoft.Extensions.Primitives";
version = "2.1.0";
sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb";
version = "6.0.0";
sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2";
})
(fetchNuGet {
pname = "Microsoft.IdentityModel.Clients.ActiveDirectory";
@ -131,8 +131,8 @@
})
(fetchNuGet {
pname = "Microsoft.NET.Test.Sdk";
version = "16.11.0";
sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl";
version = "17.2.0";
sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11";
})
(fetchNuGet {
pname = "Microsoft.NETCore.Platforms";
@ -161,13 +161,13 @@
})
(fetchNuGet {
pname = "Microsoft.TestPlatform.ObjectModel";
version = "16.11.0";
sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh";
version = "17.2.0";
sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv";
})
(fetchNuGet {
pname = "Microsoft.TestPlatform.TestHost";
version = "16.11.0";
sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k";
version = "17.2.0";
sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp";
})
(fetchNuGet {
pname = "Microsoft.Win32.Primitives";
@ -186,29 +186,29 @@
})
(fetchNuGet {
pname = "NBitcoin.Altcoins";
version = "3.0.8";
sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618";
version = "3.0.11";
sha256 = "1l8v07k862apyfr7h37jl7nrlr8mlscsqdqsmp2qdl0502x0gms3";
})
(fetchNuGet {
pname = "NBitcoin.TestFramework";
version = "3.0.9";
sha256 = "08pwab9f2565day9b0fjzfv5ik3pbwvgvl190gh0bmwi5xv4vq93";
version = "3.0.11";
sha256 = "1v3g323vs65qk190dgcm3v6lzhq1ng9p1ywd39jq53hcny76fgcb";
})
(fetchNuGet {
pname = "NBitcoin";
version = "7.0.8";
sha256 = "0h76a5wha3rqchjzhvslmm8f7qkya77n8avh5i05nvnrigf0bj5q";
version = "7.0.10";
sha256 = "1yp43n18b9qwh1ck3hxkarncbfn7r3indfdyjimapxibk3f8jm1v";
})
(fetchNuGet {
pname = "NBitcoin";
version = "7.0.9";
sha256 = "0bdw54q4d5vbyrgj7r4rs8322z1knl79hmhzmq3knqf68yidi87g";
})
(fetchNuGet {
pname = "NETStandard.Library";
version = "1.6.1";
sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8";
})
(fetchNuGet {
pname = "NETStandard.Library";
version = "2.0.3";
sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y";
})
(fetchNuGet {
pname = "Newtonsoft.Json.Bson";
version = "1.0.2";
@ -236,28 +236,28 @@
})
(fetchNuGet {
pname = "NicolasDorier.CommandLine.Configuration";
version = "1.0.0.3";
sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg";
version = "2.0.0";
sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw";
})
(fetchNuGet {
pname = "NicolasDorier.CommandLine";
version = "1.0.0.2";
sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy";
version = "2.0.0";
sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f";
})
(fetchNuGet {
pname = "NicolasDorier.StandardConfiguration";
version = "1.0.0.18";
sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b";
version = "2.0.0";
sha256 = "0058dx34ja2idw468bmw7l3w21wr2am6yx57sqp7llhjl5ayy0wv";
})
(fetchNuGet {
pname = "Npgsql";
version = "6.0.3";
sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q";
version = "6.0.5";
sha256 = "1555xj2725kkg4jyxhz6pkqwirdqyw5j5h1q3vaykpns61i2h48q";
})
(fetchNuGet {
pname = "NuGet.Frameworks";
version = "5.0.0";
sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr";
version = "5.11.0";
sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z";
})
(fetchNuGet {
pname = "RabbitMQ.Client";
@ -374,16 +374,6 @@
version = "4.3.0";
sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy";
})
(fetchNuGet {
pname = "System.Buffers";
version = "4.4.0";
sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19";
})
(fetchNuGet {
pname = "System.Buffers";
version = "4.5.0";
sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c";
})
(fetchNuGet {
pname = "System.Collections.Concurrent";
version = "4.0.12";
@ -579,11 +569,6 @@
version = "4.3.0";
sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
})
(fetchNuGet {
pname = "System.Memory";
version = "4.5.0";
sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30";
})
(fetchNuGet {
pname = "System.Net.Http";
version = "4.3.0";
@ -644,11 +629,6 @@
version = "4.3.0";
sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p";
})
(fetchNuGet {
pname = "System.Numerics.Vectors";
version = "4.4.0";
sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba";
})
(fetchNuGet {
pname = "System.ObjectModel";
version = "4.0.12";
@ -754,11 +734,6 @@
version = "4.3.0";
sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49";
})
(fetchNuGet {
pname = "System.Runtime.CompilerServices.Unsafe";
version = "4.5.0";
sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43";
})
(fetchNuGet {
pname = "System.Runtime.CompilerServices.Unsafe";
version = "6.0.0";
@ -1081,8 +1056,8 @@
})
(fetchNuGet {
pname = "xunit.runner.visualstudio";
version = "2.4.3";
sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3";
version = "2.4.5";
sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs";
})
(fetchNuGet {
pname = "xunit";

4
pkgs/applications/blockchains/particl-core/default.nix
View file

@ -18,13 +18,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "particl-core";
version = "0.19.2.14";
version = "0.19.2.20";
src = fetchFromGitHub {
owner = "particl";
repo = "particl-core";
rev = "v${version}";
sha256 = "sha256-gJLEMfEvQ35xjKt8iN/FXi2T/GBMSS7eUqOC8XHKPBg=";
sha256 = "sha256-gvpqOCJTUIhzrNbOaYFftx/G/dO0BCfHAMUrBk6pczc=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

6
pkgs/applications/blockchains/polkadot/default.nix
View file

@ -10,13 +10,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.9.26";
version = "0.9.27";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
sha256 = "sha256-f/E4aK7eUlNgd9kEDjYAiNaeMTlKu1aqo8IjB++/Yts=";
sha256 = "sha256-abDkDkFXBG4C7lvE9g6cvUYTfQt7ObZ+Ya8V0W7ASBE=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "sha256-tQ5XFv5P5EE33mKsQCBqAlJFu4+uG6ArVV17W8qbyLg=";
cargoSha256 = "sha256-xDjHu6JARIFy2fVQMGhkdU9Qcz/aqumBFe4MjlH0TCY=";
buildInputs = lib.optional stdenv.isDarwin [ Security ];

4
pkgs/applications/blockchains/stellar-core/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "stellar-core";
version = "18.5.0";
version = "19.3.0";
src = fetchFromGitHub {
owner = "stellar";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wEi22R4zb8d5CJV5eWb776Yob8B6Ok4FrbYI0SGM0H8=";
sha256 = "sha256-6untHS4+2CyYfGQdbACjEbE+aSirjNk7LxOO2BWDZEM=";
fetchSubmodules = true;
};

4
pkgs/applications/blockchains/wasabiwallet/default.nix
View file

@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "wasabiwallet";
version = "1.1.13.1";
version = "2.0.1.3";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
sha256 = "sha256-AtsNbUqEBQx0DPWR2LjNl7pdviYmvkv3bYKNBoeJHbw=";
sha256 = "sha256-cATqg/n4/BDQtuCVjHAx3EfMLmlX5EjeQ01gavy/L8o=";
};
dontBuild = true;

30
pkgs/applications/blockchains/zecwallet-lite/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ lib, fetchurl, appimageTools }:
appimageTools.wrapType2 rec {
pname = "zecwallet-lite";
version = "1.7.13";
src = fetchurl {
url = "https://github.com/adityapk00/zecwallet-lite/releases/download/v${version}/Zecwallet.Lite-${version}.AppImage";
hash = "sha256-uBiLGHBgm0vurfvOJjJ+RqVoGnVccEHTFO2T7LDqUzU=";
};
extraInstallCommands =
let contents = appimageTools.extract { inherit pname version src; };
in ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${contents}/usr/share/icons $out/share
'';
meta = with lib; {
description = "A fully featured shielded wallet for Zcash";
homepage = "https://www.zecwallet.co/";
license = licenses.mit;
maintainers = with maintainers; [ colinsane ];
platforms = [ "x86_64-linux" ];
};
}

13
pkgs/applications/editors/micro/default.nix
View file

@ -2,22 +2,27 @@
buildGoModule rec {
pname = "micro";
version = "2.0.10";
version = "2.0.11";
src = fetchFromGitHub {
owner = "zyedidia";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hVFmViwGXuYVAKaCkzK/LHjCi8AtLu0tsPpT61glxys=";
sha256 = "sha256-3Rppi8UcAc4zdXOd81Y+sb5Psezx2TQsNw73WdPVMgE=";
};
nativeBuildInputs = [ installShellFiles ];
subPackages = [ "cmd/micro" ];
vendorSha256 = "sha256-YcAKl4keizkbgQLAZGiCG3CGpNTNad8EvOJEXLX2s0s=";
vendorSha256 = "sha256-/bWIn5joZOTOtuAbljOc0NgBfjrFkbFZih+cPNHnS9w=";
ldflags = [ "-s" "-w" "-X github.com/zyedidia/micro/v2/internal/util.Version=${version}" "-X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ];
ldflags = let t = "github.com/zyedidia/micro/v2/internal"; in [
"-s"
"-w"
"-X ${t}/util.Version=${version}"
"-X ${t}/util.CommitHash=${src.rev}"
];
postInstall = ''
installManPage assets/packaging/micro.1

4
pkgs/applications/editors/pinegrow/default.nix
View file

@ -14,7 +14,9 @@
stdenv.mkDerivation rec {
pname = "pinegrow";
version = "6.6";
# deactivate auto update, because an old 6.21 version is getting mixed up
# see e.g. https://github.com/NixOS/nixpkgs/pull/184460
version = "6.6"; # nixpkgs-update: no auto update
src = fetchurl {
url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip";

12
pkgs/applications/editors/vscode/vscodium.nix
View file

@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0kvmnayrwpz82jxhvi69r45nyq74v5qyx5nn8b6kz23ma02nm4y6";
x86_64-darwin = "0w6qbybzvpb886z1y5w7q36xy176f5hagzgqddzgwbzlv3lc9i9j";
aarch64-linux = "194bnz4rg6lpi1pcl3yknap2n1p9vyi86wd5rq4m0h8kmqg1i21w";
aarch64-darwin = "1vhb85zbpp399qxn7b7gdvsij174x5nzp84xw57kw9pzs5dkw12g";
armv7l-linux = "1cr3vqxl0h8a4mg920a90ykdvb3vzf8cyxls1w8m84k3b53m5qdi";
x86_64-linux = "0vwnx7fs46fkas75pnhjc81wy3hr24k2gs82i30ailaxw5r63j81";
x86_64-darwin = "0bxc74vfkw9zhxfahzhcghlnybvj8k15jbni489lf636a45xrlcc";
aarch64-linux = "10z6nv67yjd15ilxgfpjf07qbdp0cbd5761a5gcymiam4r22l6hq";
aarch64-darwin = "133nccm0hcgcd2503psxwaaq4v4l16q7w7kbcz1y5lynlvwazjrx";
armv7l-linux = "1sx3l42ls62v3apjap25ccg4mcbi71spfj5xh7y6rffzi65xwdrv";
}.${system} or throwSystem;
sourceRoot = if stdenv.isDarwin then "" else ".";
@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.69.2";
version = "1.70.0";
pname = "vscodium";
executableName = "codium";

19
pkgs/applications/editors/xed-editor/default.nix
View file

@ -1,39 +1,40 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, libxml2
, libpeas
, glib
, gtk3
, gtksourceview4
, gspell
, xapps
, xapp
, pkg-config
, python3
, meson
, ninja
, wrapGAppsHook
, intltool
, itstool }:
, itstool
}:
stdenv.mkDerivation rec {
pname = "xed-editor";
version = "3.2.2";
version = "3.2.7";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "xed";
rev = version;
sha256 = "sha256-PW7y3+Sa9FH5r5xvziysvxM08RJCPvnLs3wsm5IqToQ=";
sha256 = "sha256-aO5ilmlkSAxlkWYdSLmrcm7pC8GbITpCitd4TXp5tfY=";
};
nativeBuildInputs = [
meson
cmake
pkg-config
intltool
itstool
ninja
python3
wrapGAppsHook
];
@ -44,13 +45,9 @@ stdenv.mkDerivation rec {
gtksourceview4
libpeas
gspell
xapps
xapp
];
postInstall = ''
glib-compile-schemas $out/share/glib-2.0/schemas
'';
doInstallCheck = true;
installCheckPhase = ''
if [[ "$($out/bin/xed --version)" == "xed - Version ${version}" ]] ; then

4
pkgs/applications/emulators/retroarch/default.nix
View file

@ -5,6 +5,7 @@
, withVulkan ? stdenv.isLinux
, alsa-lib
, AppKit
, dbus
, fetchFromGitHub
, ffmpeg_4
, Foundation
@ -80,6 +81,7 @@ stdenv.mkDerivation rec {
lib.optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++
lib.optionals stdenv.isLinux [
alsa-lib
dbus
libX11
libXdmcp
libXext
@ -95,7 +97,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ];
configureFlags = lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" "--enable-dbus" ];
postInstall = ''
mkdir -p $out/share/libretro/info

59
pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch Normal file
View file

@ -0,0 +1,59 @@
diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake
index b51fd0075e..87ee317e05 100644
--- a/cmake/FindPyQt5.cmake
+++ b/cmake/FindPyQt5.cmake
@@ -25,7 +25,7 @@ ELSE(EXISTS PYQT5_VERSION_STR)
IF(SIP_BUILD_EXECUTABLE)
# SIP >= 5.0 path
- FILE(GLOB _pyqt5_metadata "${Python_SITEARCH}/PyQt5-*.dist-info/METADATA")
+ FILE(GLOB _pyqt5_metadata "@pyQt5PackageDir@/PyQt5-*.dist-info/METADATA")
IF(_pyqt5_metadata)
FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents)
STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents})
@@ -34,8 +34,8 @@ ELSE(EXISTS PYQT5_VERSION_STR)
ENDIF(_pyqt5_metadata)
IF(PYQT5_VERSION_STR)
- SET(PYQT5_MOD_DIR "${Python_SITEARCH}/PyQt5")
- SET(PYQT5_SIP_DIR "${Python_SITEARCH}/PyQt5/bindings")
+ SET(PYQT5_MOD_DIR "@pyQt5PackageDir@/PyQt5")
+ SET(PYQT5_SIP_DIR "@pyQt5PackageDir@/PyQt5/bindings")
FIND_PROGRAM(__pyuic5 "pyuic5")
GET_FILENAME_COMPONENT(PYQT5_BIN_DIR ${__pyuic5} DIRECTORY)
diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake
index 69e41c1fe9..5456c3d59b 100644
--- a/cmake/FindQsci.cmake
+++ b/cmake/FindQsci.cmake
@@ -24,7 +24,7 @@ ELSE(QSCI_MOD_VERSION_STR)
IF(SIP_BUILD_EXECUTABLE)
# SIP >= 5.0 path
- FILE(GLOB _qsci_metadata "${Python_SITEARCH}/QScintilla*.dist-info/METADATA")
+ FILE(GLOB _qsci_metadata "@qsciPackageDir@/QScintilla*.dist-info/METADATA")
IF(_qsci_metadata)
FILE(READ ${_qsci_metadata} _qsci_metadata_contents)
STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" QSCI_MOD_VERSION_STR ${_qsci_metadata_contents})
@@ -33,7 +33,7 @@ ELSE(QSCI_MOD_VERSION_STR)
ENDIF(_qsci_metadata)
IF(QSCI_MOD_VERSION_STR)
- SET(QSCI_SIP_DIR "${PYQT5_SIP_DIR}")
+ SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings")
SET(QSCI_FOUND TRUE)
ENDIF(QSCI_MOD_VERSION_STR)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 4cd19c3af4..668cc6a5e6 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -206,7 +206,7 @@ if (WITH_GUI)
install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR})
endif()
if(QSCI_SIP_DIR)
- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR})
+ set(SIP_BUILD_EXTRA_OPTIONS ${SIP_BUILD_EXTRA_OPTIONS} --include-dir=${QSCI_SIP_DIR})
else()
message(STATUS "Qsci sip file not found - disabling bindings for derived classes")
set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP)

32
pkgs/applications/gis/qgis/unwrapped-ltr.nix
View file

@ -38,6 +38,8 @@
, pdal
, zstd
, makeWrapper
, wrapGAppsHook
, substituteAll
}:
let
@ -64,7 +66,9 @@ let
urllib3
pygments
pyqt5
sip_4
pyqt-builder
sip
setuptools
owslib
six
];
@ -116,29 +120,31 @@ in mkDerivation rec {
++ lib.optional withWebKit qtwebkit
++ pythonBuildInputs;
nativeBuildInputs = [ makeWrapper cmake flex bison ninja ];
nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ];
# Force this pyqt_sip_dir variable to point to the sip dir in PyQt5
#
# TODO: Correct PyQt5 to provide the expected directory and fix
# build to use PYQT5_SIP_DIR consistently.
postPatch = ''
substituteInPlace cmake/FindPyQt5.py \
--replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"'
'';
patches = [
(substituteAll {
src = ./set-pyqt-package-dirs.patch;
pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}";
qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}";
})
];
cmakeFlags = [
"-DWITH_3D=True"
"-DWITH_PDAL=TRUE"
"-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
"-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78";
dontWrapGApps = true; # wrapper params passed below
postFixup = lib.optionalString withGrass ''
# grass has to be availble on the command line even though we baked in
# the path at build time using GRASS_PREFIX
# the path at build time using GRASS_PREFIX.
# using wrapGAppsHook also prevents file dialogs from crashing the program
# on non-NixOS
wrapProgram $out/bin/qgis \
"''${gappsWrapperArgs[@]}" \
--prefix PATH : ${lib.makeBinPath [ grass ]}
'';

32
pkgs/applications/gis/qgis/unwrapped.nix
View file

@ -38,6 +38,8 @@
, pdal
, zstd
, makeWrapper
, wrapGAppsHook
, substituteAll
}:
let
@ -64,7 +66,9 @@ let
urllib3
pygments
pyqt5
sip_4
pyqt-builder
sip
setuptools
owslib
six
];
@ -116,29 +120,31 @@ in mkDerivation rec {
++ lib.optional withWebKit qtwebkit
++ pythonBuildInputs;
nativeBuildInputs = [ makeWrapper cmake flex bison ninja ];
nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ];
# Force this pyqt_sip_dir variable to point to the sip dir in PyQt5
#
# TODO: Correct PyQt5 to provide the expected directory and fix
# build to use PYQT5_SIP_DIR consistently.
postPatch = ''
substituteInPlace cmake/FindPyQt5.py \
--replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"'
'';
patches = [
(substituteAll {
src = ./set-pyqt-package-dirs.patch;
pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}";
qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}";
})
];
cmakeFlags = [
"-DWITH_3D=True"
"-DWITH_PDAL=TRUE"
"-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
"-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78";
dontWrapGApps = true; # wrapper params passed below
postFixup = lib.optionalString withGrass ''
# grass has to be availble on the command line even though we baked in
# the path at build time using GRASS_PREFIX
# the path at build time using GRASS_PREFIX.
# using wrapGAppsHook also prevents file dialogs from crashing the program
# on non-NixOS
wrapProgram $out/bin/qgis \
"''${gappsWrapperArgs[@]}" \
--prefix PATH : ${lib.makeBinPath [ grass ]}
'';

4
pkgs/applications/graphics/drawio/default.nix
View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "19.0.3";
version = "20.2.3";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "be456d396a19dcb8881ad4bff315197306ae05cca5e47332a1e5ad572948614e";
sha256 = "sha256-O/gzXAzvaYJXpexjBSc6jNW1wX0ukwQcpFU8fq4qM4k=";
};
nativeBuildInputs = [

38
pkgs/applications/graphics/nsxiv/default.nix
View file

@ -1,43 +1,58 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchFromGitea
, fetchpatch
, giflib
, imlib2
, libXft
, libexif
, libwebp
, libinotify-kqueue
, conf ? null
}:
stdenv.mkDerivation rec {
pname = "nsxiv";
version = "29";
version = "30";
src = fetchFromGitHub {
src = fetchFromGitea {
domain = "codeberg.org";
owner = "nsxiv";
repo = pname;
repo = "nsxiv";
rev = "v${version}";
hash = "sha256-JUF2cF6QeAXk6G76uMu3reaMgxp2RcqHDbamkNufwqE=";
hash = "sha256-swzTdQ6ow1At4bKRORqz6fb0Ej92yU9rlI/OgcinPu4=";
};
patches = [
# Fix build failure when _SC_PHYS_PAGES is not defined
(fetchpatch {
url = "https://codeberg.org/nsxiv/nsxiv/commit/1a50bff9f300f84e93a6e7035657e6029e7e8183.patch";
hash = "sha256-PpUqGVWaJ06EVu3tBKVzOh8HYvT6wAG3bvY6wUD+dTM=";
})
];
buildInputs = [
giflib
imlib2
libXft
libexif
libwebp
];
] ++ lib.optional stdenv.isDarwin libinotify-kqueue;
preBuild = lib.optionalString (conf!=null) ''
cp ${(builtins.toFile "config.def.h" conf)} config.def.h
'';
makeFlags = [
"PREFIX=${placeholder "out"}"
];
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-linotify";
makeFlags = [ "CC:=$(CC)" ];
installFlags = [ "PREFIX=$(out)" ];
installTargets = [ "install-all" ];
meta = with lib; {
homepage = "https://nsxiv.github.io/nsxiv/";
homepage = "https://nsxiv.codeberg.page/";
description = "New Suckless X Image Viewer";
longDescription = ''
nsxiv is a fork of now unmaintained sxiv with the purpose of being a
@ -54,8 +69,7 @@ stdenv.mkDerivation rec {
- Display image name/path in X title
'';
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres sikmir ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}

14
pkgs/applications/misc/electrum/default.nix
View file

@ -21,7 +21,7 @@
}:
let
version = "4.2.2";
version = "4.3.0";
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
@ -30,6 +30,7 @@ let
libzbar_name =
if stdenv.isLinux then "libzbar.so.0"
else if stdenv.isDarwin then "libzbar.0.dylib"
else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}";
# Not provided in official source releases, which are what upstream signs.
@ -37,7 +38,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
sha256 = "sha256-bFceOu+3SLtD2eY+aSBEn13xJw7a3aVwX39QfAuqVSo=";
sha256 = "sha256-/bYz2KB9Fggo6cnKM3hvwL/Jy4Xsw2phx1sInuqZpFg=";
postFetch = ''
mv $out ./all
@ -53,7 +54,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "sha256-ucLLfqmTKO5Qpg+PnmcdQwht7cWMWJoFjQWnDecEtVs=";
sha256 = "sha256-E941wseIQEn1+d06NWKQLQM0C+A8a0+Xxl+LzBTwEcw=";
};
postUnpack = ''
@ -90,7 +91,6 @@ python3.pkgs.buildPythonApplication {
];
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
substituteInPlace ./electrum/ecc_fast.py \
--replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
'' + (if enableQt then ''
@ -101,17 +101,11 @@ python3.pkgs.buildPythonApplication {
'');
postInstall = lib.optionalString stdenv.isLinux ''
# Despite setting usr_share above, these files are installed under
# $out/nix ...
mv $out/${python3.sitePackages}/nix/store"/"*/share $out
rm -rf $out/${python3.sitePackages}/nix
substituteInPlace $out/share/applications/electrum.desktop \
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \
"Exec=$out/bin/electrum %u" \
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
"Exec=$out/bin/electrum --testnet %u"
'';
postFixup = lib.optionalString enableQt ''

31
pkgs/applications/misc/electrum/ltc.nix
View file

@ -20,7 +20,7 @@
}:
let
version = "4.0.9.3";
version = "4.2.2.1";
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
@ -36,7 +36,7 @@ let
owner = "pooler";
repo = "electrum-ltc";
rev = version;
sha256 = "sha256-oZjQnrnj8nCaQjrIz8bWNt6Ib8Wu2ZMXHEPfCCy2fjk=";
sha256 = "sha256-qu72LIV07pgHqvKv+Kcw9ZmNk6IBz+4/vdJELlT5tE4=";
postFetch = ''
mv $out ./all
@ -44,19 +44,6 @@ let
'';
};
py = python3.override {
packageOverrides = self: super: {
aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec {
version = "0.18.7";
src = oldAttrs.src.override {
inherit version;
sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0";
};
});
};
};
in
python3.pkgs.buildPythonApplication {
@ -65,7 +52,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
sha256 = "sha256-+oox0BGqkvj0OGOKJF8tUoKdsZFeffNb6rTF8E8mo08=";
sha256 = "sha256-7F28cve+HD5JDK5igfkGD/NvTCfA33g+DmQJ5mwPM9Q=";
};
postUnpack = ''
@ -73,19 +60,9 @@ python3.pkgs.buildPythonApplication {
cp -ar ${tests} $sourceRoot/electrum_ltc/tests
'';
prePatch = ''
substituteInPlace contrib/requirements/requirements.txt \
--replace "dnspython>=2.0,<2.1" "dnspython>=2.0"
# according to upstream, this is fine
# https://github.com/spesmilo/electrum/issues/7361
substituteInPlace contrib/requirements/requirements.txt \
--replace "qdarkstyle<2.9" "qdarkstyle>=2.7"
'';
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
propagatedBuildInputs = with py.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
aiohttp
aiohttp-socks
aiorpcx

8
pkgs/applications/misc/josm/default.nix
View file

@ -3,20 +3,20 @@
}:
let
pname = "josm";
version = "18513";
version = "18531";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "sha256-rKBDKPq6hn4VGlzW4ad/gBU4eCVRF9JgRLrDaTKjCbI=";
sha256 = "sha256-/esGbLbidQ60+auMC1W2GwH7V5qdTVzblDNsskuhcjs=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
sha256 = "sha256-M8ZV3FXZJHqaegPKQnjQkMYMWt2BUiKzM8Tit4NqtU4=";
sha256 = "sha256-ldcTuacUUxsssJqJ8cRjbP+TWlxQdcNtVbj8clDNEGw=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version;
sha256 = "sha256-cguvKl9yvthNWcLD6YDLKiialJmutJTa9egMdfKHRpU=";
sha256 = "sha256-Cga17ymUROJb5scpyOlo6JIgQ77yHavI0ciUpZN+jLk=";
};
};
in

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

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "jquake";
version = "1.6.2";
version = "1.7.0";
src = fetchurl {
url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip";
sha256 = "1k12yw9fwq1z3gg0d38dxs4mmyn912zfcm6zsbjkv27q6lvhvwng";
sha256 = "sha256-Y7yjjpptaScThiU8rHdV6cJ6FaTHOtKdsnO5y/HzoDA=";
};
nativeBuildInputs = [ unzip copyDesktopItems ];

43
pkgs/applications/misc/pueue/default.nix
View file

@ -1,23 +1,37 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, SystemConfiguration, libiconv }:
{ lib
, stdenv
, fetchFromGitHub
, SystemConfiguration
, installShellFiles
, libiconv
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "pueue";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "Nukesor";
repo = pname;
repo = "pueue";
rev = "v${version}";
sha256 = "sha256-eFO9v+CZ3sFJJ0Ksa2sV5snjBz9lUkElGSj4DfEUebs=";
hash = "sha256-xUTkjj/PdlgDEp2VMwBuRtF/9iGGiN4FZizdOdcbTag=";
};
cargoSha256 = "sha256-cyuDXMmVrVx3kluumR6WleMzuoV+261f47rpkVYHzZA=";
cargoSha256 = "sha256-7VdPu+9RYoj4Xfb3J6GLOji7Fqxkk+Fswi4C4q33+jk=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration libiconv ];
buildInputs = lib.optionals stdenv.isDarwin [
SystemConfiguration
libiconv
];
checkFlags = [ "--skip=test_single_huge_payload" "--skip=test_create_unix_socket" ];
checkFlags = [
"--test client_tests"
"--skip=test_single_huge_payload"
"--skip=test_create_unix_socket"
];
postInstall = ''
for shell in bash fish zsh; do
@ -27,10 +41,21 @@ rustPlatform.buildRustPackage rec {
'';
meta = with lib; {
description = "A daemon for managing long running shell commands";
homepage = "https://github.com/Nukesor/pueue";
description = "A daemon for managing long running shell commands";
longDescription = ''
Pueue is a command-line task management tool for sequential and parallel
execution of long-running tasks.
Simply put, it's a tool that processes a queue of shell commands. On top
of that, there are a lot of convenient features and abstractions.
Since Pueue is not bound to any terminal, you can control your tasks from
any terminal on the same machine. The queue will be continuously
processed, even if you no longer have any active ssh sessions.
'';
changelog = "https://github.com/Nukesor/pueue/raw/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = with maintainers; [ marsam ];
};
}

80
pkgs/applications/misc/rusty-psn/default.nix Normal file
View file

@ -0,0 +1,80 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, makeDesktopItem
, copyDesktopItems
, pkg-config
, openssl
, xorg
, libGL
, withGui ? false # build GUI version
}:
rustPlatform.buildRustPackage rec {
pname = "rusty-psn";
version = "0.1.2";
src = fetchFromGitHub {
owner = "RainbowCookie32";
repo = "rusty-psn";
rev = "v${version}";
sha256 = "14li5fsaj4l5al6lcxy07g3gzmi0l3cyiczq44q7clq4myhykhhb";
};
cargoSha256 = "0kjaq3ik3lwaz7rjb5jaxavpahzp33j7vln3zyifql7j7sbr300f";
nativeBuildInputs = [
pkg-config
copyDesktopItems
];
buildInputs = if withGui then [
openssl
xorg.libxcb
xorg.libX11
xorg.libXcursor
xorg.libXrandr
xorg.libXi
xorg.libxcb
libGL
libGL.dev
] else [
openssl
];
buildNoDefaultFeatures = true;
buildFeatures = [ (if withGui then "egui" else "cli") ];
postFixup = ''
patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/rusty-psn
'' + lib.optionalString withGui ''
mv $out/bin/rusty-psn $out/bin/rusty-psn-gui
'';
desktopItem = lib.optionalString withGui (makeDesktopItem {
name = "rusty-psn";
desktopName = "rusty-psn";
exec = "rusty-psn-gui";
comment = "A simple tool to grab updates for PS3 games, directly from Sony's servers using their updates API.";
categories = [
"Network"
];
keywords = [
"psn"
"ps3"
"sony"
"playstation"
"update"
];
});
desktopItems = lib.optionals withGui [ desktopItem ];
meta = with lib; {
description = "Simple tool to grab updates for PS3 games, directly from Sony's servers using their updates API";
homepage = "https://github.com/RainbowCookie32/rusty-psn/";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ AngryAnt ];
};
}

24
pkgs/applications/misc/solaar/default.nix
View file

@ -25,12 +25,19 @@ python3Packages.buildPythonApplication rec {
outputs = [ "out" "udev" ];
nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
buildInputs = [ libappindicator librsvg ];
nativeBuildInputs = [
gdk-pixbuf
gobject-introspection
wrapGAppsHook
];
buildInputs = [
libappindicator
librsvg
];
propagatedBuildInputs = with python3Packages; [
evdev
gobject-introspection
gtk3
psutil
pygobject3
@ -47,6 +54,17 @@ python3Packages.buildPythonApplication rec {
install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules
'';
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
# no tests
doCheck = false;
pythonImportsCheck = [ "solaar" ];
meta = with lib; {
description = "Linux devices manager for the Logitech Unifying Receiver";
longDescription = ''

6
pkgs/applications/misc/sticky/default.nix
View file

@ -11,14 +11,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sticky";
version = "1.8";
version = "1.11";
format = "other";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-VSD/QsG7G9hji5m6NSEkCoVM+XK3t4KmCqbocTbZwE4=";
hash = "sha256-PXJpNKzF9goQvfh3lUUfOaZFessFNrWtg8nMDxPxRMo=";
};
postPatch = ''
@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [
glib
gobject-introspection
cinnamon.xapps
cinnamon.xapp
gspell
];

12
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -19,15 +19,15 @@
}
},
"beta": {
"version": "104.0.5112.79",
"sha256": "1wxb3nl080wgg1g61g3pgzz3gaawg442iv8pxqhnayacm3qn5ilw",
"sha256bin64": "1vagpsnjrdjcisgg7i56l3zcgvb5sg4pkaq5li500vmgcjin8irq",
"version": "105.0.5195.19",
"sha256": "08wap1v2qjx8nzd8sbiv24vx0vdc2dhlzrlv3g4zpm2qj7l4mki7",
"sha256bin64": "15rhslgq77wiwiycf6m89vi3f5vry286b7kqfk0v5ibmcsf6clgf",
"deps": {
"gn": {
"version": "2022-06-08",
"version": "2022-07-11",
"url": "https://gn.googlesource.com/gn",
"rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3",
"sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra"
"rev": "9ef321772ecc161937db69acb346397e0ccc484d",
"sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng"
}
}
},

4
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -27,7 +27,7 @@ rec {
};
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr";
pname = "firefox-esr-102";
version = "102.1.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
@ -54,7 +54,7 @@ rec {
};
firefox-esr-91 = buildMozillaMach rec {
pname = "firefox-esr";
pname = "firefox-esr-91";
version = "91.12.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {

52
pkgs/applications/networking/cluster/hadoop/default.nix
View file

@ -26,13 +26,13 @@ with lib;
assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
let
common = { pname, versions, untarDir ? "${pname}-${version}", hash, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }:
common = { pname, platformAttrs, untarDir ? "${pname}-${version}", jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }:
stdenv.mkDerivation rec {
inherit pname jdk libPatches untarDir openssl;
version = versions.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}");
src = fetchurl {
url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz";
hash = hash.${stdenv.system};
inherit (platformAttrs.${stdenv.system}) hash;
};
doCheck = true;
@ -51,7 +51,8 @@ let
makeWrapper "$n" "$out/bin/$(basename $n)"\
--set-default JAVA_HOME ${jdk.home}\
--set-default HADOOP_HOME $out/lib/${untarDir}\
--set-default HADOOP_CONF_DIR /etc/hadoop-conf/\
--run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\
--set-default HADOOP_CONF_DIR $out/lib/${untarDir}/etc/hadoop/\
--prefix PATH : "${makeBinPath [ bash coreutils which]}"\
--prefix JAVA_LIBRARY_PATH : "${makeLibraryPath buildInputs}"
done
@ -62,7 +63,7 @@ let
passthru = { inherit tests; };
meta = {
meta = recursiveUpdate {
homepage = "https://hadoop.apache.org/";
description = "Framework for distributed processing of large data sets across clusters of computers";
license = licenses.asl20;
@ -80,8 +81,8 @@ let
computers, each of which may be prone to failures.
'';
maintainers = with maintainers; [ illustris ];
platforms = attrNames hash;
};
platforms = attrNames platformAttrs;
} (attrByPath [ stdenv.system "meta" ] {} platformAttrs);
};
in
{
@ -89,19 +90,20 @@ in
# https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions
hadoop_3_3 = common rec {
pname = "hadoop";
versions = rec {
x86_64-linux = "3.3.3";
x86_64-darwin = x86_64-linux;
aarch64-linux = "3.3.1";
aarch64-darwin = aarch64-linux;
};
untarDir = "${pname}-${version}";
hash = rec {
x86_64-linux = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q=";
x86_64-darwin = x86_64-linux;
aarch64-linux = "sha256-v1Om2pk0wsgKBghRD2wgTSHJoKd3jkm1wPKAeDcKlgI=";
aarch64-darwin = aarch64-linux;
platformAttrs = rec {
x86_64-linux = {
version = "3.3.3";
hash = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q=";
};
x86_64-darwin = x86_64-linux;
aarch64-linux = {
version = "3.3.1";
hash = "sha256-v1Om2pk0wsgKBghRD2wgTSHJoKd3jkm1wPKAeDcKlgI=";
meta.knownVulnerabilities = [ "CVE-2021-37404" "CVE-2021-33036" ];
};
aarch64-darwin = aarch64-linux;
};
untarDir = "${pname}-${platformAttrs.${stdenv.system}.version}";
jdk = jdk11_headless;
inherit openssl;
# TODO: Package and add Intel Storage Acceleration Library
@ -122,8 +124,10 @@ in
};
hadoop_3_2 = common rec {
pname = "hadoop";
versions.x86_64-linux = "3.2.3";
hash.x86_64-linux = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU=";
platformAttrs.x86_64-linux = {
version = "3.2.3";
hash = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU=";
};
jdk = jdk8_headless;
# not using native libs because of broken openssl_1_0_2 dependency
# can be manually overriden
@ -131,8 +135,10 @@ in
};
hadoop2 = common rec {
pname = "hadoop";
versions.x86_64-linux = "2.10.2";
hash.x86_64-linux = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo=";
platformAttrs.x86_64-linux = {
version = "2.10.2";
hash = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo=";
};
jdk = jdk8_headless;
tests = nixosTests.hadoop2;
};

8
pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helm-diff";
version = "3.1.3";
version = "3.5.0";
src = fetchFromGitHub {
owner = "databus23";
repo = pname;
rev = "v${version}";
sha256 = "sha256-h26EOjKNrlcrs2DAYj0NmDRgNRKozjfw5DtxUgHNTa4=";
sha256 = "sha256-evFdMM2AilKQPdSCUzKo6RuC4OC4zfjj+JzFvtkSrdk=";
};
vendorSha256 = "sha256-+n/QBuZqtdgUkaBG7iqSuBfljn+AdEzDoIo5SI8ErQA=";
vendorSha256 = "sha256-9i4ryBpaK7mMbsOpIaaZWBRjewD1MtTpf4zJ0yU0KMg=";
# NOTE: Remove the install and upgrade hooks.
postPatch = ''
@ -27,7 +27,7 @@ buildGoModule rec {
meta = with lib; {
description = "A Helm plugin that shows a diff";
inherit (src.meta) homepage;
homepage = "https://github.com/databus23/helm-diff";
license = licenses.asl20;
maintainers = with maintainers; [ yurrriq ];
};

2
pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
View file

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The Helm downloader plugin that provides GIT protocol support";
inherit (src.meta) homepage;
homepage = "https://github.com/aslafy-z/helm-git";
license = licenses.mit;
maintainers = with maintainers; [ flokli ];
};

2
pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
View file

@ -30,7 +30,7 @@ buildGoModule rec {
meta = with lib; {
description = "A Helm plugin that shows a diff";
inherit (src.meta) homepage;
homepage = "https://github.com/hypnoglow/helm-s3";
license = licenses.mit;
maintainers = with maintainers; [ yurrriq ];
};

4
pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
View file

@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A Helm plugin that helps manage secrets";
inherit (src.meta) homepage;
homepage = "https://github.com/jkroepke/helm-secrets";
license = licenses.asl20;
maintainers = with maintainers; [ yurrriq ];
platforms = platforms.all;
platforms = platforms.unix;
};
}

6
pkgs/applications/networking/cluster/kubebuilder/default.nix
View file

@ -9,15 +9,15 @@
buildGoModule rec {
pname = "kubebuilder";
version = "3.5.0";
version = "3.6.0";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "kubebuilder";
rev = "v${version}";
sha256 = "sha256-4R7Zpz90Bcj/OqxR+ahvYk3VsJ1R+k9q36Q77JsXJ1w=";
sha256 = "sha256-WbFY1tBwq0DjJqM5ld7W9GkhPQDsGUQCwEe42XkJlfQ=";
};
vendorSha256 = "sha256-ppeasqyr2Ow8d52P01IEf42+KTFXTEPv/giKPjTORwE=";
vendorSha256 = "sha256-tz0SHAl9SwppjA8s0m4gJOh6rf8F+kRc2HnNMjO+blQ=";
subPackages = ["cmd"];

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

@ -114,19 +114,19 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
"repo": "terraform-provider-azuread",
"rev": "v2.26.1",
"sha256": "sha256-9S+J0z9ilRqfpZv3aZe6Fv1Jyo2ShRQzeoMuRsDBiUo=",
"rev": "v2.27.0",
"sha256": "sha256-E8O0+OblKl1aSOXB5fnc34m+pUsfIZ6eHWoAq6HkKHs=",
"vendorSha256": null,
"version": "2.26.1"
"version": "2.27.0"
},
"azurerm": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
"rev": "v3.16.0",
"sha256": "sha256-b4aMwU9vDQ3t5fske5MZm5i9DJehy1WFySsJbowRjbc=",
"rev": "v3.17.0",
"sha256": "sha256-XeZwQxK0WhLv2Y7PFADsv4f6vO4E3/j/9HM1wJ8LXKE=",
"vendorSha256": null,
"version": "3.16.0"
"version": "3.17.0"
},
"azurestack": {
"owner": "hashicorp",
@ -411,13 +411,15 @@
"version": "1.31.1"
},
"fortios": {
"deleteVendor": true,
"owner": "fortinetdev",
"provider-source-address": "registry.terraform.io/fortinetdev/fortios",
"proxyVendor": true,
"repo": "terraform-provider-fortios",
"rev": "v1.14.1",
"sha256": "sha256-9e1PEg8RtJa7DR5g3cCdAhubFxt7vN5dPjaBA+F7Y4E=",
"vendorSha256": null,
"version": "1.14.1"
"rev": "v1.15.0",
"sha256": "sha256-jXaEGWt/O0Cv15ksFax571f6aoDhVpNZSbvbOFj6TZ4=",
"vendorSha256": "sha256-WkF2mVDrDlCefM4pjADoXsVwpa7E02c6kUyOgHxNFpo=",
"version": "1.15.0"
},
"gandi": {
"owner": "go-gandi",
@ -677,10 +679,10 @@
"owner": "linode",
"provider-source-address": "registry.terraform.io/linode/linode",
"repo": "terraform-provider-linode",
"rev": "v1.28.1",
"sha256": "sha256-w7PvzcgyzrkxQ+I8Bjw5C3MqMmiJS5neuGipC+H+mEM=",
"vendorSha256": "sha256-c0NtM3TkkSjrwQ9fj0XiH0BYnSsE8uzirkTv2QHzPOg=",
"version": "1.28.1"
"rev": "v1.29.1",
"sha256": "sha256-eZ13kVQplnIQNT4KecUeLAfrCime1WNEdG0yuv3dBWk=",
"vendorSha256": "sha256-PBnMIEuMGcb+qeFO4e17e9sg58DmL6BEAZJeTTVjS1g=",
"version": "1.29.1"
},
"linuxbox": {
"owner": "numtide",
@ -1012,10 +1014,10 @@
"owner": "scaleway",
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.2.6",
"sha256": "sha256-YrCpZCQGm8yFCxJRClrQJ1axFDBradJireMAW0ViLvc=",
"rev": "v2.2.7",
"sha256": "sha256-W100EYLKaFH9KGmSkgk0Ig2Z0R+RvYijrm3ikhEvBe8=",
"vendorSha256": "sha256-zswPGl4a/V8tOMMUWCjxY8ubSy5GT9pP6eBpqSrAg/k=",
"version": "2.2.6"
"version": "2.2.7"
},
"secret": {
"owner": "numtide",

4
pkgs/applications/networking/ftp/filezilla/default.nix
View file

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "filezilla";
version = "3.60.1";
version = "3.60.2";
src = fetchurl {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
hash = "sha256-gflsY2OMrxg44MY+WHT2AZISCWXYJSlKiUoit9QgZq8=";
hash = "sha256-5AfbrRaZU/+VFFK8vxONlTo6MCNfirsD0nHHEsx+V5I=";
};
configureFlags = [

4
pkgs/applications/networking/gopher/geomyidae/default.nix
View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "geomyidae";
version = "0.50.1";
version = "0.51";
src = fetchurl {
url = "gopher://bitreich.org/9/scm/geomyidae/tag/geomyidae-v${version}.tar.gz";
sha512 = "2a71b12f51c2ef8d6e791089f9eea49eb90a36be45b874d4234eba1e673186be945711be1f92508190f5c0a6f502f132c4b7cb82caf805a39a3f31903032ac47";
sha512 = "3lGAa7BCrspGBcQqjduBkIACpf3u/CkeSCBnaJ3rrz3OIidn4o4dNwZNe7u8swaJxN2dhDSKKeVT3RnFQUaXdg==";
};
buildInputs = [ libressl ];

4
pkgs/applications/networking/instant-messengers/cinny/default.nix
View file

@ -4,11 +4,11 @@ let
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
in stdenv.mkDerivation rec {
pname = "cinny";
version = "2.0.4";
version = "2.1.1";
src = fetchurl {
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
sha256 = "0p5s25nkjs9514a16c7kl0m78vn5f14mv6nbi79yz0sxb7hc12qg";
sha256 = "0qzg790yd23ja3a782ga085vgd5vvh7rgmdy8kpvc3wf8plvw5nm";
};
installPhase = ''

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

@ -1,6 +1,7 @@
{ lib
, copyDesktopItems
, electron_18
, buildGoModule
, esbuild
, fetchFromGitHub
, libdeltachat
@ -35,15 +36,18 @@ let
"${electron_18}/Applications/Electron.app/Contents/MacOS/Electron"
else
"${electron_18}/bin/electron";
esbuild' = esbuild.overrideAttrs (old: rec {
version = "0.12.29";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg=";
};
});
esbuild' = esbuild.override {
buildGoModule = args: buildGoModule (args // rec {
version = "0.12.29";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg=";
};
vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
});
};
in nodePackages.deltachat-desktop.override rec {
pname = "deltachat-desktop";
version = "1.30.1";

6
pkgs/applications/networking/instant-messengers/discord/openasar.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "openasar";
version = "unstable-2022-06-27";
version = "unstable-2022-08-07";
src = fetchFromGitHub {
owner = "GooseMod";
repo = "OpenAsar";
rev = "6f7505fb91a07035d3661a3a7bf68b3018ddfd82";
sha256 = "2tb6OgYOnpryiyk7UH39sgzwtGJf9hNOpy74YqLI+Uk=";
rev = "e0870784008a584229d3094e0988f5da155c7fd7";
hash = "sha256-t0b2SFlDDBSQEkOCQME0jsLJ8NvoXROTxoQgnoXM9eQ=";
};
postPatch = ''

4
pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
View file

@ -3,12 +3,12 @@ electron, libsecret }:
stdenv.mkDerivation rec {
pname = "tutanota-desktop";
version = "3.98.15";
version = "3.98.17";
src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
name = "tutanota-desktop-${version}.tar.gz";
sha256 = "sha256-yuSFDLQ7ckuZYuXREbW0VvMapzO2VhVIH1Ccr1uQHmo=";
sha256 = "sha256-rVAiutjFI3/KJZeiTy6H2IdMh+SFz9+NvEoriPTnW2w=";
};
nativeBuildInputs = [

4
pkgs/applications/networking/remote/freerdp/default.nix
View file

@ -52,13 +52,13 @@ let
in
stdenv.mkDerivation rec {
pname = "freerdp";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
sha256 = "sha256-XBYRhbwknVa8eXxk31b7n9gMWBcTjCecDN+j2FGcpw0=";
sha256 = "sha256-bVq/99jMkxTjckMjWoK4pBa0jD/AYezgKUPJziNSqI0=";
};
postPatch = ''

4
pkgs/applications/science/astronomy/gprojector/default.nix
View file

@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation rec {
pname = "gprojector";
version = "3.0.3";
version = "3.0.4";
src = fetchzip {
url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz";
sha256 = "sha256-60UT6z5aQ3Tk4EujEUp4ntB5GakFVhJzk5eytoIwf78=";
sha256 = "sha256-6EixVNRgYnuY9INb7gAyBzo125DhPEUPD+pGxjzmhy8=";
};
desktopItems = [ (makeDesktopItem {

4
pkgs/applications/science/biology/mafft/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mafft";
version = "7.490";
version = "7.505";
src = fetchurl {
url = "https://mafft.cbrc.jp/alignment/software/mafft-${version}-with-extensions-src.tgz";
sha256 = "0hb5jzcqdnjn3micm5z301lrnyvmn9pnnnxjz4h2wa4yicyz7vnn";
sha256 = "sha256-9Up4Zw/NmWAjO8w7PdNZ85WnHAztRae+HP6uGZUM5v8=";
};
preBuild = ''

4
pkgs/applications/science/electronics/xschem/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "xschem";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "StefanSchippers";
repo = "xschem";
rev = version;
sha256 = "sha256-C57jo8tAbiqQAgf4Xp2lpFGOr6F1knPpFcYxPiqSM4k=";
sha256 = "sha256-SHpESg5mn9lSDOURQusQUsug8Jqin/W5rqkVgmseSgA=";
};
nativeBuildInputs = [ bison flex pkg-config ];

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

@ -56,11 +56,11 @@ in
stdenv.mkDerivation rec {
pname = "root";
version = "6.26.04";
version = "6.26.06";
src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
hash = "sha256-onHPgngtbtLIfqXu9mgYA/LmnhezA2352GNjbpNYQh4=";
hash = "sha256-sfc8l2pYClxWyMigFSWCod/FYLTdgOG3VFI3tl5sics=";
};
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];

7
pkgs/applications/terminal-emulators/foot/default.nix
View file

@ -27,7 +27,7 @@
}:
let
version = "1.12.1";
version = "1.13.0";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
owner = "dnkl";
repo = pname;
rev = version;
sha256 = "14jqs4sarxbrgi5pxz0afqa9jxq90cb5ayqd21qj2n65whqa5bpk";
sha256 = "0cc262jpqp8l25p04pcqh3w671gw0p1d2zrr3d34ch8k9c6s4nzq";
};
depsBuildBuild = [
@ -144,7 +144,6 @@ stdenv.mkDerivation rec {
mesonBuildType = "release";
# See https://codeberg.org/dnkl/foot/src/tag/1.9.2/INSTALL.md#options
# TODO(@sternenseemann): install systemd user units
mesonFlags = [
# Use lto
"-Db_lto=true"
@ -154,6 +153,8 @@ stdenv.mkDerivation rec {
"-Ddefault-terminfo=foot"
# Tell foot to set TERMINFO and where to install the terminfo files
"-Dcustom-terminfo-install-location=${terminfoDir}"
# Install systemd user units for foot-server
"-Dsystemd-units-dir=${placeholder "out"}/lib/systemd/user"
];
# build and run binary generating PGO profiles,

4
pkgs/applications/terminal-emulators/wezterm/default.nix
View file

@ -22,6 +22,7 @@
, Cocoa
, Foundation
, libiconv
, UserNotifications
, nixosTests
, runCommand
}:
@ -71,6 +72,7 @@ rustPlatform.buildRustPackage rec {
CoreGraphics
Foundation
libiconv
UserNotifications
];
postInstall = ''
@ -119,7 +121,5 @@ rustPlatform.buildRustPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
platforms = platforms.unix;
# Fails on missing UserNotifications framework while linking
broken = stdenv.isDarwin;
};
}

4
pkgs/applications/version-management/fossil/default.nix
View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "fossil";
version = "2.18";
version = "2.19";
src = fetchurl {
url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz";
sha256 = "0iimdzfdl5687xyqxfadbn640x45n3933q1nfx7b32rl4v3vk778";
sha256 = "sha256-RZ9/7b4lRJqFVyfXwzutO8C/Pa6XPyxtvpp7gmEGoj4=";
};
nativeBuildInputs = [ installShellFiles tcl tcllib ];

6
pkgs/applications/version-management/git-and-tools/git-cliff/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-cliff";
version = "0.7.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "orhun";
repo = "git-cliff";
rev = "v${version}";
sha256 = "sha256-wVHL2+didmiN7UlEeIuSr+8LhkFKCOD3of4rKVg1i1o=";
sha256 = "sha256-lRONRLTByhMalN9BKilCcQn2c9f4cxOnHJLL0l0jaOs=";
};
cargoSha256 = "sha256-5jhloUnaGXXDu2LCO86SMJo8ETIxLAivv3hx9gEqtJ4=";
cargoSha256 = "sha256-1r/k3DQ/vjIjMpOHYCRRosbZ22iAFkuq4EbZUcZoWn0=";
# attempts to run the program on .git in src which is not deterministic
doCheck = false;

4
pkgs/applications/video/ffmpeg-normalize/default.nix
View file

@ -7,11 +7,11 @@
buildPythonApplication rec {
pname = "ffmpeg-normalize";
version = "1.23.1";
version = "1.24.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-23s5mYwoIUiBs1MXGJVepycGj8e1xCuFAgim5NHKZRc=";
sha256 = "sha256-sQ8Qorf74ypMmpRd9b/wrqg28TZ295t6qkKosxyaG1I=";
};
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];

9
pkgs/applications/video/gpac/default.nix
View file

@ -41,5 +41,14 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21;
maintainers = with maintainers; [ bluescreen303 mgdelacroix ];
platforms = platforms.linux;
knownVulnerabilities = [
"CVE-2022-1035"
"CVE-2022-1172"
"CVE-2022-1222"
"CVE-2022-1795"
"CVE-2022-2453"
"CVE-2022-2454"
"CVE-2022-2549"
];
};
}

6
pkgs/applications/video/hypnotix/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "hypnotix";
version = "2.8";
version = "2.9";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "hypnotix";
rev = version;
hash = "sha256-uj5Bn3K9SCKE4p1jylfQ8XnAwNnN4VXHLMLrwhKhzsk=";
hash = "sha256-jjCyO6lyhqH4xeNp5uy/KqNr5Mvv+45pJGHFOXNi0rk=";
};
patches = [
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
dontWrapGApps = true;
buildInputs = [
cinnamon.xapps
cinnamon.xapp
];
pythonPath = with python3.pkgs; [

8
pkgs/applications/video/xplayer/default.nix
View file

@ -22,7 +22,7 @@
, pkg-config
, python3
, wrapGAppsHook
, xapps
, xapp
, yelp-tools }:
let
@ -34,13 +34,13 @@ in
stdenv.mkDerivation rec {
pname = "xplayer";
version = "2.4.2";
version = "2.4.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-qoBJKY0CZyhp9foUehq5hInEENRGZuy1D6jAMjbjYhA=";
sha256 = "sha256-0hQHhf2me28YTTKOzEkzoxRoSoHLwtiaHPKNPJ/Fg+0=";
};
# configure wants to find gst-inspect-1.0 via pkgconfig but
@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
libxml2
libxplayer-plparser
pythonenv
xapps
xapp
# to satisfy configure script
pythonenv.pkgs.pygobject3
];

7
pkgs/applications/virtualization/virt-manager/default.nix
View file

@ -64,6 +64,10 @@ python3.pkgs.buildPythonApplication rec {
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ cpio e2fsprogs file findutils gzip ]}")
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
# Fixes testCLI0051virt_install_initrd_inject on Darwin: "cpio: root:root: invalid group"
substituteInPlace virtinst/install/installerinject.py \
--replace "'--owner=root:root'" "'--owner=0:0'"
'';
checkInputs = with python3.pkgs; [
@ -95,8 +99,7 @@ python3.pkgs.buildPythonApplication rec {
manages Xen and LXC (linux containers).
'';
license = licenses.gpl2;
# exclude Darwin since libvirt-glib currently doesn't build there
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ qknight offline fpletz globin ];
};
}

18
pkgs/applications/window-managers/fvwm/2.6.nix
View file

@ -17,6 +17,7 @@
, libxslt
, perl
, pkg-config
, python3Packages
, readline
, enableGestures ? false
}:
@ -32,7 +33,11 @@ stdenv.mkDerivation rec {
hash = "sha256-sBVOrrl2WrZ2wWN/r1kDUtR+tPwXgDoSJDaxGeFkXJI=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [
autoreconfHook
pkg-config
python3Packages.wrapPython
];
buildInputs = [
cairo
@ -48,14 +53,25 @@ stdenv.mkDerivation rec {
librsvg
libxslt
perl
python3Packages.python
readline
] ++ lib.optional enableGestures libstroke;
pythonPath = [
python3Packages.pyxdg
];
configureFlags = [
"--enable-mandoc"
"--disable-htmldoc"
];
postFixup = ''
wrapPythonPrograms
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "http://fvwm.org";
description = "A multiple large virtual desktop window manager";

15
pkgs/applications/window-managers/fvwm/3.nix
View file

@ -25,7 +25,7 @@
, libxslt
, perl
, pkg-config
, python3
, python3Packages
, readline
, sharutils
}:
@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
autoreconfHook
asciidoctor
pkg-config
python3Packages.wrapPython
];
buildInputs = [
@ -69,15 +70,25 @@ stdenv.mkDerivation (finalAttrs: {
libstroke
libxslt
perl
python3
python3Packages.python
readline
sharutils
];
pythonPath = [
python3Packages.pyxdg
];
configureFlags = [
"--enable-mandoc"
];
postFixup = ''
wrapPythonPrograms
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "http://fvwm.org";
description = "A multiple large virtual desktop window manager - Version 3";

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