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

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2022-06-24 00:12:39 +00:00 committed by GitHub
commit e0e5ed5d0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
402 changed files with 2662 additions and 2762 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/default.nix
View File

@ -131,7 +131,8 @@ let
getValues getFiles
optionAttrSetToDocList optionAttrSetToDocList'
scrubOptionValue literalExpression literalExample literalDocBook
showOption showFiles unknownModule mkOption mkPackageOption
showOption showOptionWithDefLocs showFiles
unknownModule mkOption mkPackageOption
mdDoc literalMD;
inherit (self.types) isType setType defaultTypeMerge defaultFunctor
isOptionType mkOptionType;

6
lib/options.nix
View File

@ -7,6 +7,7 @@ let
collect
concatLists
concatMap
concatMapStringsSep
elemAt
filter
foldl'
@ -340,6 +341,11 @@ rec {
in "\n- In `${def.file}'${result}"
) defs;
showOptionWithDefLocs = opt: ''
${showOption opt.loc}, with values defined in:
${concatMapStringsSep "\n" (defFile: " - ${defFile}") opt.files}
'';
unknownModule = "<unknown-file>";
}

12
maintainers/maintainer-list.nix
View File

@ -596,6 +596,12 @@
githubId = 60479013;
name = "Alma Cemerlic";
};
alternateved = {
email = "alternateved@pm.me";
github = "alternateved";
githubId = 45176912;
name = "Tomasz Hołubowicz";
};
alunduil = {
email = "alunduil@gmail.com";
github = "alunduil";
@ -1177,6 +1183,12 @@
github = "attila-lendvai";
githubId = 840345;
};
auchter = {
name = "Michael Auchter";
email = "a@phire.org";
github = "auchter";
githubId = 1190483;
};
auntie = {
email = "auntieNeo@gmail.com";
github = "auntieNeo";

67
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View File

@ -31,6 +31,65 @@
<literal>stdenv.buildPlatform.canExecute stdenv.hostPlatform</literal>.
</para>
</listitem>
<listitem>
<para>
The <literal>nixpkgs.hostPlatform</literal> and
<literal>nixpkgs.buildPlatform</literal> options have been
added. These cover and override the
<literal>nixpkgs.{system,localSystem,crossSystem}</literal>
options.
</para>
<itemizedlist spacing="compact">
<listitem>
<para>
<literal>hostPlatform</literal> is the platform or
<quote><literal>system</literal></quote> string of the
NixOS system described by the configuration.
</para>
</listitem>
<listitem>
<para>
<literal>buildPlatform</literal> is the platform that is
responsible for building the NixOS configuration. It
defaults to the <literal>hostPlatform</literal>, for a
non-cross build configuration. To cross compile, set
<literal>buildPlatform</literal> to a different value.
</para>
</listitem>
</itemizedlist>
<para>
The new options convey the same information, but with fewer
options, and following the Nixpkgs terminology.
</para>
<para>
The existing options
<literal>nixpkgs.{system,localSystem,crossSystem}</literal>
have not been formally deprecated, to allow for evaluation of
the change and to allow for a transition period so that in
time the ecosystem can switch without breaking compatibility
with any supported NixOS release.
</para>
</listitem>
<listitem>
<para>
<literal>nixos-generate-config</literal> now generates
configurations that can be built in pure mode. This is
achieved by setting the new
<literal>nixpkgs.hostPlatform</literal> option.
</para>
<para>
You may have to unset the <literal>system</literal> parameter
in <literal>lib.nixosSystem</literal>, or similarly remove
definitions of the
<literal>nixpkgs.{system,localSystem,crossSystem}</literal>
options.
</para>
<para>
Alternatively, you can remove the
<literal>hostPlatform</literal> line and use NixOS like you
would in NixOS 22.05 and earlier.
</para>
</listitem>
<listitem>
<para>
PHP now defaults to PHP 8.1, updated from 8.0.
@ -176,6 +235,14 @@
<section xml:id="sec-release-22.11-notable-changes">
<title>Other Notable Changes</title>
<itemizedlist>
<listitem>
<para>
The <literal>xplr</literal> package has been updated from
0.18.0 to 0.19.0, which brings some breaking changes. See the
<link xlink:href="https://github.com/sayanarijit/xplr/releases/tag/v0.19.0">upstream
release notes</link> for more details.
</para>
</listitem>
<listitem>
<para>
A new module was added for the Saleae Logic device family,

29
nixos/doc/manual/release-notes/rl-2211.section.md
View File

@ -17,6 +17,33 @@ In addition to numerous new and upgraded packages, this release has the followin
built for `stdenv.hostPlatform` (i.e. produced by `stdenv.cc`) by evaluating
`stdenv.buildPlatform.canExecute stdenv.hostPlatform`.
- The `nixpkgs.hostPlatform` and `nixpkgs.buildPlatform` options have been added.
These cover and override the `nixpkgs.{system,localSystem,crossSystem}` options.
- `hostPlatform` is the platform or "`system`" string of the NixOS system
described by the configuration.
- `buildPlatform` is the platform that is responsible for building the NixOS
configuration. It defaults to the `hostPlatform`, for a non-cross
build configuration. To cross compile, set `buildPlatform` to a different
value.
The new options convey the same information, but with fewer options, and
following the Nixpkgs terminology.
The existing options `nixpkgs.{system,localSystem,crossSystem}` have not
been formally deprecated, to allow for evaluation of the change and to allow
for a transition period so that in time the ecosystem can switch without
breaking compatibility with any supported NixOS release.
- `nixos-generate-config` now generates configurations that can be built in pure
mode. This is achieved by setting the new `nixpkgs.hostPlatform` option.
You may have to unset the `system` parameter in `lib.nixosSystem`, or similarly
remove definitions of the `nixpkgs.{system,localSystem,crossSystem}` options.
Alternatively, you can remove the `hostPlatform` line and use NixOS like you
would in NixOS 22.05 and earlier.
- PHP now defaults to PHP 8.1, updated from 8.0.
- `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.
@ -69,6 +96,8 @@ Use `configure.packages` instead.
## Other Notable Changes {#sec-release-22.11-notable-changes}
- The `xplr` package has been updated from 0.18.0 to 0.19.0, which brings some breaking changes. See the [upstream release notes](https://github.com/sayanarijit/xplr/releases/tag/v0.19.0) for more details.
- A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`.
- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.

9
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -84,6 +84,15 @@ sub debug {
}
# nixpkgs.system
my ($status, @systemLines) = runCommand("nix-instantiate --impure --eval --expr builtins.currentSystem");
if ($status != 0 || join("", @systemLines) =~ /error/) {
die "Failed to retrieve current system type from nix.\n";
}
chomp(my $system = @systemLines[0]);
push @attrs, "nixpkgs.hostPlatform = lib.mkDefault $system;";
my $cpuinfo = read_file "/proc/cpuinfo";

104
nixos/modules/misc/nixpkgs.nix
View File

@ -55,7 +55,44 @@ let
check = builtins.isAttrs;
};
defaultPkgs = import ../../.. {
hasBuildPlatform = opt.buildPlatform.highestPrio < (mkOptionDefault {}).priority;
hasHostPlatform = opt.hostPlatform.isDefined;
hasPlatform = hasHostPlatform || hasBuildPlatform;
# Context for messages
hostPlatformLine = optionalString hasHostPlatform "${showOptionWithDefLocs opt.hostPlatform}";
buildPlatformLine = optionalString hasBuildPlatform "${showOptionWithDefLocs opt.buildPlatform}";
platformLines = optionalString hasPlatform ''
Your system configuration configures nixpkgs with platform parameters:
${hostPlatformLine
}${buildPlatformLine
}'';
legacyOptionsDefined =
optional opt.system.isDefined opt.system
++ (optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem)
++ (optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem)
;
defaultPkgs =
if opt.hostPlatform.isDefined
then
let isCross = cfg.buildPlatform != cfg.hostPlatform;
systemArgs =
if isCross
then {
localSystem = cfg.buildPlatform;
crossSystem = cfg.hostPlatform;
}
else {
localSystem = cfg.hostPlatform;
};
in
import ../../.. ({
inherit (cfg) config overlays;
} // systemArgs)
else
import ../../.. {
inherit (cfg) config overlays localSystem crossSystem;
};
@ -157,6 +194,46 @@ in
'';
};
hostPlatform = mkOption {
type = types.either types.str types.attrs; # TODO utilize lib.systems.parsedPlatform
example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; };
# Make sure that the final value has all fields for sake of other modules
# referring to this. TODO make `lib.systems` itself use the module system.
apply = lib.systems.elaborate;
defaultText = literalExpression
''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
description = ''
Specifies the platform where the NixOS configuration will run.
To cross-compile, set also <code>nixpkgs.buildPlatform</code>.
Ignored when <code>nixpkgs.pkgs</code> is set.
'';
};
buildPlatform = mkOption {
type = types.either types.str types.attrs; # TODO utilize lib.systems.parsedPlatform
default = cfg.hostPlatform;
example = { system = "x86_64-linux"; config = "x86_64-unknown-linux-gnu"; };
# Make sure that the final value has all fields for sake of other modules
# referring to this.
apply = lib.systems.elaborate;
defaultText = literalExpression
''config.nixpkgs.hostPlatform'';
description = ''
Specifies the platform on which NixOS should be built.
By default, NixOS is built on the system where it runs, but you can
change where it's built. Setting this option will cause NixOS to be
cross-compiled.
For instance, if you're doing distributed multi-platform deployment,
or if you're building machines, you can set this to match your
development system and/or build farm.
Ignored when <code>nixpkgs.pkgs</code> is set.
'';
};
localSystem = mkOption {
type = types.attrs; # TODO utilize lib.systems.parsedPlatform
default = { inherit (cfg) system; };
@ -176,10 +253,13 @@ in
deployment, or when building virtual machines. See its
description in the Nixpkgs manual for more details.
Ignored when <code>nixpkgs.pkgs</code> is set.
Ignored when <code>nixpkgs.pkgs</code> or <code>hostPlatform</code> is set.
'';
};
# TODO deprecate. "crossSystem" is a nonsense identifier, because "cross"
# is a relation between at least 2 systems in the context of a
# specific build step, not a single system.
crossSystem = mkOption {
type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform
default = null;
@ -193,7 +273,7 @@ in
should be set as null, the default. See its description in the
Nixpkgs manual for more details.
Ignored when <code>nixpkgs.pkgs</code> is set.
Ignored when <code>nixpkgs.pkgs</code> or <code>hostPlatform</code> is set.
'';
};
@ -216,8 +296,7 @@ in
</programlisting>
See <code>nixpkgs.localSystem</code> for more information.
Ignored when <code>nixpkgs.localSystem</code> is set.
Ignored when <code>nixpkgs.pkgs</code> is set.
Ignored when <code>nixpkgs.pkgs</code>, <code>nixpkgs.localSystem</code> or <code>nixpkgs.hostPlatform</code> is set.
'';
};
};
@ -240,10 +319,23 @@ in
else "nixpkgs.localSystem";
pkgsSystem = finalPkgs.stdenv.targetPlatform.system;
in {
assertion = nixosExpectedSystem == pkgsSystem;
assertion = !hasPlatform -> nixosExpectedSystem == pkgsSystem;
message = "The NixOS nixpkgs.pkgs option was set to a Nixpkgs invocation that compiles to target system ${pkgsSystem} but NixOS was configured for system ${nixosExpectedSystem} via NixOS option ${nixosOption}. The NixOS system settings must match the Nixpkgs target system.";
}
)
{
assertion = hasPlatform -> legacyOptionsDefined == [];
message = ''
Your system configures nixpkgs with the platform parameter${optionalString hasBuildPlatform "s"}:
${hostPlatformLine
}${buildPlatformLine
}
However, it also defines the legacy options:
${concatMapStrings showOptionWithDefLocs legacyOptionsDefined}
For a future proof system configuration, we recommend to remove
the legacy definitions.
'';
}
];
};

61
nixos/modules/misc/nixpkgs/test.nix
View File

@ -1,8 +1,63 @@
{ evalMinimalConfig, pkgs, lib, stdenv }:
let
eval = mod: evalMinimalConfig {
imports = [ ../nixpkgs.nix mod ];
};
withHost = eval {
nixpkgs.hostPlatform = "aarch64-linux";
};
withHostAndBuild = eval {
nixpkgs.hostPlatform = "aarch64-linux";
nixpkgs.buildPlatform = "aarch64-darwin";
};
ambiguous = {
_file = "ambiguous.nix";
nixpkgs.hostPlatform = "aarch64-linux";
nixpkgs.buildPlatform = "aarch64-darwin";
nixpkgs.system = "x86_64-linux";
nixpkgs.localSystem.system = "x86_64-darwin";
nixpkgs.crossSystem.system = "i686-linux";
imports = [
{ _file = "repeat.nix";
nixpkgs.hostPlatform = "aarch64-linux";
}
];
};
getErrors = module:
let
uncheckedEval = lib.evalModules { modules = [ ../nixpkgs.nix module ]; };
in map (ass: ass.message) (lib.filter (ass: !ass.assertion) uncheckedEval.config.assertions);
in
lib.recurseIntoAttrs {
invokeNixpkgsSimple =
(evalMinimalConfig ({ config, modulesPath, ... }: {
imports = [ (modulesPath + "/misc/nixpkgs.nix") ];
(eval {
nixpkgs.system = stdenv.hostPlatform.system;
}))._module.args.pkgs.hello;
})._module.args.pkgs.hello;
assertions =
assert withHost._module.args.pkgs.stdenv.hostPlatform.system == "aarch64-linux";
assert withHost._module.args.pkgs.stdenv.buildPlatform.system == "aarch64-linux";
assert withHostAndBuild._module.args.pkgs.stdenv.hostPlatform.system == "aarch64-linux";
assert withHostAndBuild._module.args.pkgs.stdenv.buildPlatform.system == "aarch64-darwin";
assert builtins.trace (lib.head (getErrors ambiguous))
getErrors ambiguous ==
[''
Your system configures nixpkgs with the platform parameters:
nixpkgs.hostPlatform, with values defined in:
- repeat.nix
- ambiguous.nix
nixpkgs.buildPlatform, with values defined in:
- ambiguous.nix
However, it also defines the legacy options:
nixpkgs.system, with values defined in:
- ambiguous.nix
nixpkgs.localSystem, with values defined in:
- ambiguous.nix
nixpkgs.crossSystem, with values defined in:
- ambiguous.nix
For a future proof system configuration, we recommend to remove
the legacy definitions.
''];
pkgs.emptyFile;
}

127
nixos/modules/services/databases/cassandra.nix
View File

@ -4,11 +4,12 @@ let
inherit (lib)
concatStringsSep
flip
literalDocBook
literalMD
literalExpression
optionalAttrs
optionals
recursiveUpdate
mdDoc
mkEnableOption
mkIf
mkOption
@ -107,7 +108,7 @@ in
clusterName = mkOption {
type = types.str;
default = "Test Cluster";
description = ''
description = mdDoc ''
The name of the cluster.
This setting prevents nodes in one logical cluster from joining
another. All nodes in a cluster must have the same value.
@ -117,19 +118,19 @@ in
user = mkOption {
type = types.str;
default = defaultUser;
description = "Run Apache Cassandra under this user.";
description = mdDoc "Run Apache Cassandra under this user.";
};
group = mkOption {
type = types.str;
default = defaultUser;
description = "Run Apache Cassandra under this group.";
description = mdDoc "Run Apache Cassandra under this group.";
};
homeDir = mkOption {
type = types.path;
default = "/var/lib/cassandra";
description = ''
description = mdDoc ''
Home directory for Apache Cassandra.
'';
};
@ -139,7 +140,7 @@ in
default = pkgs.cassandra;
defaultText = literalExpression "pkgs.cassandra";
example = literalExpression "pkgs.cassandra_3_11";
description = ''
description = mdDoc ''
The Apache Cassandra package to use.
'';
};
@ -147,8 +148,8 @@ in
jvmOpts = mkOption {
type = types.listOf types.str;
default = [ ];
description = ''
Populate the JVM_OPT environment variable.
description = mdDoc ''
Populate the `JVM_OPT` environment variable.
'';
};
@ -156,20 +157,20 @@ in
type = types.nullOr types.str;
default = "127.0.0.1";
example = null;
description = ''
description = mdDoc ''
Address or interface to bind to and tell other Cassandra nodes
to connect to. You _must_ change this if you want multiple
nodes to be able to communicate!
Set listenAddress OR listenInterface, not both.
Set {option}`listenAddress` OR {option}`listenInterface`, not both.
Leaving it blank leaves it up to
InetAddress.getLocalHost(). This will always do the Right
Thing _if_ the node is properly configured (hostname, name
`InetAddress.getLocalHost()`. This will always do the "Right
Thing" _if_ the node is properly configured (hostname, name
resolution, etc), and the Right Thing is to use the address
associated with the hostname (it might not be).
Setting listen_address to 0.0.0.0 is always wrong.
Setting {option}`listenAddress` to `0.0.0.0` is always wrong.
'';
};
@ -177,8 +178,8 @@ in
type = types.nullOr types.str;
default = null;
example = "eth1";
description = ''
Set listenAddress OR listenInterface, not both. Interfaces
description = mdDoc ''
Set `listenAddress` OR `listenInterface`, not both. Interfaces
must correspond to a single address, IP aliasing is not
supported.
'';
@ -188,18 +189,18 @@ in
type = types.nullOr types.str;
default = "127.0.0.1";
example = null;
description = ''
description = mdDoc ''
The address or interface to bind the native transport server to.
Set rpcAddress OR rpcInterface, not both.
Set {option}`rpcAddress` OR {option}`rpcInterface`, not both.
Leaving rpcAddress blank has the same effect as on
listenAddress (i.e. it will be based on the configured hostname
Leaving {option}`rpcAddress` blank has the same effect as on
{option}`listenAddress` (i.e. it will be based on the configured hostname
of the node).
Note that unlike listenAddress, you can specify 0.0.0.0, but you
must also set extraConfig.broadcast_rpc_address to a value other
than 0.0.0.0.
Note that unlike {option}`listenAddress`, you can specify `"0.0.0.0"`, but you
must also set `extraConfig.broadcast_rpc_address` to a value other
than `"0.0.0.0"`.
For security reasons, you should not expose this port to the
internet. Firewall it if needed.
@ -210,8 +211,8 @@ in
type = types.nullOr types.str;
default = null;
example = "eth1";
description = ''
Set rpcAddress OR rpcInterface, not both. Interfaces must
description = mdDoc ''
Set {option}`rpcAddress` OR {option}`rpcInterface`, not both. Interfaces must
correspond to a single address, IP aliasing is not supported.
'';
};
@ -233,7 +234,7 @@ in
<logger name="com.thinkaurelius.thrift" level="ERROR"/>
</configuration>
'';
description = ''
description = mdDoc ''
XML logback configuration for cassandra
'';
};
@ -241,24 +242,24 @@ in
seedAddresses = mkOption {
type = types.listOf types.str;
default = [ "127.0.0.1" ];
description = ''
description = mdDoc ''
The addresses of hosts designated as contact points in the cluster. A
joining node contacts one of the nodes in the seeds list to learn the
topology of the ring.
Set to 127.0.0.1 for a single node cluster.
Set to `[ "127.0.0.1" ]` for a single node cluster.
'';
};
allowClients = mkOption {
type = types.bool;
default = true;
description = ''
description = mdDoc ''
Enables or disables the native transport server (CQL binary protocol).
This server uses the same address as the <literal>rpcAddress</literal>,
but the port it uses is not <literal>rpc_port</literal> but
<literal>native_transport_port</literal>. See the official Cassandra
This server uses the same address as the {option}`rpcAddress`,
but the port it uses is not `rpc_port` but
`native_transport_port`. See the official Cassandra
docs for more information on these variables and set them using
<literal>extraConfig</literal>.
{option}`extraConfig`.
'';
};
@ -269,8 +270,8 @@ in
{
commitlog_sync_batch_window_in_ms = 3;
};
description = ''
Extra options to be merged into cassandra.yaml as nix attribute set.
description = mdDoc ''
Extra options to be merged into {file}`cassandra.yaml` as nix attribute set.
'';
};
@ -278,8 +279,8 @@ in
type = types.lines;
default = "";
example = literalExpression ''"CLASSPATH=$CLASSPATH:''${extraJar}"'';
description = ''
Extra shell lines to be appended onto cassandra-env.sh.
description = mdDoc ''
Extra shell lines to be appended onto {file}`cassandra-env.sh`.
'';
};
@ -287,13 +288,13 @@ in
type = types.nullOr types.str;
default = "3w";
example = null;
description = ''
description = mdDoc ''
Set the interval how often full repairs are run, i.e.
<literal>nodetool repair --full</literal> is executed. See
https://cassandra.apache.org/doc/latest/operating/repair.html
{command}`nodetool repair --full` is executed. See
<https://cassandra.apache.org/doc/latest/operating/repair.html>
for more information.
Set to <literal>null</literal> to disable full repairs.
Set to `null` to disable full repairs.
'';
};
@ -301,7 +302,7 @@ in
type = types.listOf types.str;
default = [ ];
example = [ "--partitioner-range" ];
description = ''
description = mdDoc ''
Options passed through to the full repair command.
'';
};
@ -310,13 +311,13 @@ in
type = types.nullOr types.str;
default = "3d";
example = null;
description = ''
description = mdDoc ''
Set the interval how often incremental repairs are run, i.e.
<literal>nodetool repair</literal> is executed. See
https://cassandra.apache.org/doc/latest/operating/repair.html
{command}`nodetool repair` is executed. See
<https://cassandra.apache.org/doc/latest/operating/repair.html>
for more information.
Set to <literal>null</literal> to disable incremental repairs.
Set to `null` to disable incremental repairs.
'';
};
@ -324,7 +325,7 @@ in
type = types.listOf types.str;
default = [ ];
example = [ "--partitioner-range" ];
description = ''
description = mdDoc ''
Options passed through to the incremental repair command.
'';
};
@ -333,15 +334,15 @@ in
type = types.nullOr types.str;
default = null;
example = "4G";
description = ''
Must be left blank or set together with heapNewSize.
description = mdDoc ''
Must be left blank or set together with {option}`heapNewSize`.
If left blank a sensible value for the available amount of RAM and CPU
cores is calculated.
Override to set the amount of memory to allocate to the JVM at
start-up. For production use you may wish to adjust this for your
environment. MAX_HEAP_SIZE is the total amount of memory dedicated
to the Java heap. HEAP_NEWSIZE refers to the size of the young
environment. `MAX_HEAP_SIZE` is the total amount of memory dedicated
to the Java heap. `HEAP_NEWSIZE` refers to the size of the young
generation.
The main trade-off for the young generation is that the larger it
@ -354,21 +355,21 @@ in
type = types.nullOr types.str;
default = null;
example = "800M";
description = ''
Must be left blank or set together with heapNewSize.
description = mdDoc ''
Must be left blank or set together with {option}`heapNewSize`.
If left blank a sensible value for the available amount of RAM and CPU
cores is calculated.
Override to set the amount of memory to allocate to the JVM at
start-up. For production use you may wish to adjust this for your
environment. HEAP_NEWSIZE refers to the size of the young
environment. `HEAP_NEWSIZE` refers to the size of the young
generation.
The main trade-off for the young generation is that the larger it
is, the longer GC pause times will be. The shorter it is, the more
expensive GC will be (usually).
The example HEAP_NEWSIZE assumes a modern 8-core+ machine for decent pause
The example `HEAP_NEWSIZE` assumes a modern 8-core+ machine for decent pause
times. If in doubt, and if you do not particularly want to tweak, go with
100 MB per physical CPU core.
'';
@ -378,7 +379,7 @@ in
type = types.nullOr types.int;
default = null;
example = 4;
description = ''
description = mdDoc ''
Set this to control the amount of arenas per-thread in glibc.
'';
};
@ -386,19 +387,19 @@ in
remoteJmx = mkOption {
type = types.bool;
default = false;
description = ''
description = mdDoc ''
Cassandra ships with JMX accessible *only* from localhost.
To enable remote JMX connections set to true.
Be sure to also enable authentication and/or TLS.
See: https://wiki.apache.org/cassandra/JmxSecurity
See: <https://wiki.apache.org/cassandra/JmxSecurity>
'';
};
jmxPort = mkOption {
type = types.int;
default = 7199;
description = ''
description = mdDoc ''
Specifies the default port over which Cassandra will be available for
JMX connections.
For security reasons, you should not expose this port to the internet.
@ -408,11 +409,11 @@ in
jmxRoles = mkOption {
default = [ ];
description = ''
Roles that are allowed to access the JMX (e.g. nodetool)
BEWARE: The passwords will be stored world readable in the nix-store.
description = mdDoc ''
Roles that are allowed to access the JMX (e.g. {command}`nodetool`)
BEWARE: The passwords will be stored world readable in the nix store.
It's recommended to use your own protected file using
<literal>jmxRolesFile</literal>
{option}`jmxRolesFile`
Doesn't work in versions older than 3.11 because they don't like that
it's world readable.
@ -437,7 +438,7 @@ in
if versionAtLeast cfg.package.version "3.11"
then pkgs.writeText "jmx-roles-file" defaultJmxRolesFile
else null;
defaultText = literalDocBook ''generated configuration file if version is at least 3.11, otherwise <literal>null</literal>'';
defaultText = literalMD ''generated configuration file if version is at least 3.11, otherwise `null`'';
example = "/var/lib/cassandra/jmx.password";
description = ''
Specify your own jmx roles file.

13
nixos/modules/services/networking/tailscale.nix
View File

@ -6,6 +6,7 @@ let
cfg = config.services.tailscale;
firewallOn = config.networking.firewall.enable;
rpfMode = config.networking.firewall.checkReversePath;
isNetworkd = config.networking.useNetworkd;
rpfIsStrict = rpfMode == true || rpfMode == "strict";
in {
meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ];
@ -69,5 +70,17 @@ in {
# linux distros.
stopIfChanged = false;
};
networking.dhcpcd.denyInterfaces = [ cfg.interfaceName ];
systemd.network.networks."50-tailscale" = mkIf isNetworkd {
matchConfig = {
Name = cfg.interfaceName;
};
linkConfig = {
Unmanaged = true;
ActivationPolicy = "manual";
};
};
};
}

20
nixos/modules/services/networking/trickster.nix
View File

@ -6,6 +6,9 @@ let
cfg = config.services.trickster;
in
{
imports = [
(mkRenamedOptionModule [ "services" "trickster" "origin" ] [ "services" "trickster" "origin-url" ])
];
options = {
services.trickster = {
@ -58,11 +61,19 @@ in
'';
};
origin = mkOption {
origin-type = mkOption {
type = types.enum [ "prometheus" "influxdb" ];
default = "prometheus";
description = ''
Type of origin (prometheus, influxdb)
'';
};
origin-url = mkOption {
type = types.str;
default = "http://prometheus:9090";
description = ''
URL to the Prometheus Origin. Enter it like you would in grafana, e.g., http://prometheus:9090 (default http://prometheus:9090).
URL to the Origin. Enter it like you would in grafana, e.g., http://prometheus:9090 (default http://prometheus:9090).
'';
};
@ -87,7 +98,7 @@ in
config = mkIf cfg.enable {
systemd.services.trickster = {
description = "Dashboard Accelerator for Prometheus";
description = "Reverse proxy cache and time series dashboard accelerator";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
@ -96,7 +107,8 @@ in
${cfg.package}/bin/trickster \
-log-level ${cfg.log-level} \
-metrics-port ${toString cfg.metrics-port} \
-origin ${cfg.origin} \
-origin-type ${cfg.origin-type} \
-origin-url ${cfg.origin-url} \
-proxy-port ${toString cfg.proxy-port} \
${optionalString (cfg.configFile != null) "-config ${cfg.configFile}"} \
${optionalString (cfg.profiler-port != null) "-profiler-port ${cfg.profiler-port}"} \

1
nixos/tests/kernel-generic.nix
View File

@ -30,7 +30,6 @@ let
linux_5_4_hardened
linux_5_10_hardened
linux_5_15_hardened
linux_5_17_hardened
linux_5_18_hardened
linux_testing;

15
nixos/tests/systemd-networkd-vrf.nix
View File

@ -159,23 +159,18 @@ in {
node2.wait_for_unit("network.target")
node3.wait_for_unit("network.target")
# NOTE: please keep in mind that the trailing whitespaces in the following strings
# are intentional as the output is compared against the raw `iproute2`-output.
# editorconfig-checker-disable
client_ipv4_table = """
192.168.1.2 dev vrf1 proto static metric 100
192.168.1.2 dev vrf1 proto static metric 100\x20
192.168.2.3 dev vrf2 proto static metric 100
""".strip()
vrf1_table = """
broadcast 192.168.1.0 dev eth1 proto kernel scope link src 192.168.1.1
192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1
local 192.168.1.1 dev eth1 proto kernel scope host src 192.168.1.1
192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1\x20
local 192.168.1.1 dev eth1 proto kernel scope host src 192.168.1.1\x20
broadcast 192.168.1.255 dev eth1 proto kernel scope link src 192.168.1.1
""".strip()
vrf2_table = """
broadcast 192.168.2.0 dev eth2 proto kernel scope link src 192.168.2.1
192.168.2.0/24 dev eth2 proto kernel scope link src 192.168.2.1
local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1
192.168.2.0/24 dev eth2 proto kernel scope link src 192.168.2.1\x20
local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1\x20
broadcast 192.168.2.255 dev eth2 proto kernel scope link src 192.168.2.1
""".strip()
# editorconfig-checker-enable

1
pkgs/applications/audio/baudline/default.nix
View File

@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
# See http://www.baudline.com/faq.html#licensing_terms.
# (Do NOT (re)distribute on hydra.)
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ maintainers.bjornfor ];
};

1
pkgs/applications/audio/hqplayer-desktop/default.nix
View File

@ -86,6 +86,7 @@ mkDerivation rec {
homepage = "https://www.signalyst.com/custom.html";
description = "High-end upsampling multichannel software HD-audio player";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ lovesegfault ];
};

1
pkgs/applications/audio/losslessaudiochecker/default.nix
View File

@ -22,6 +22,7 @@ stdenv.mkDerivation {
meta = {
description = "Utility to check whether audio is truly lossless or not";
homepage = "https://losslessaudiochecker.com";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ p-h ];

1
pkgs/applications/audio/midas/generic.nix
View File

@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
inherit homepage;
description = "Editor for the ${brand} ${type} digital mixer";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = platforms.linux;
maintainers = [ maintainers.magnetophon ];

1
pkgs/applications/audio/ocenaudio/default.nix
View File

@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Cross-platform, easy to use, fast and functional audio editor";
homepage = "https://www.ocenaudio.com";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ onny ];

1
pkgs/applications/audio/pocket-casts/default.nix
View File

@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Pocket Casts webapp, packaged for the Linux Desktop";
homepage = "https://github.com/felicianotech/pocket-casts-desktop-app";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.mit;
maintainers = with maintainers; [ wolfangaukang ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/audio/reaper/default.nix
View File

@ -76,6 +76,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Digital audio workstation";
homepage = "https://www.reaper.fm/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer ];

1
pkgs/applications/audio/redux/default.nix
View File

@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Sample-based instrument, with a powerful phrase sequencer";
homepage = "https://www.renoise.com/products/redux";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ mihnea-s ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/audio/renoise/default.nix
View File

@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Modern tracker-based DAW";
homepage = "https://www.renoise.com/";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = [];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/audio/rymcast/default.nix
View File

@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Player for Mega Drive/Genesis VGM files";
homepage = "https://www.inphonik.com/products/rymcast-genesis-vgm-player/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ astsmtl ];

1
pkgs/applications/audio/soundwireserver/default.nix
View File

@ -35,6 +35,7 @@ qt5.mkDerivation {
homepage = "https://georgielabs.net/";
maintainers = with maintainers; [ mkg20001 ];
platforms = [ "x86_64-linux" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
};
}

1
pkgs/applications/audio/spotify/default.nix
View File

@ -167,6 +167,7 @@ stdenv.mkDerivation {
meta = with lib; {
homepage = "https://www.spotify.com/";
description = "Play music from the Spotify music service";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ma27 ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/audio/sunvox/default.nix
View File

@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Small, fast and powerful modular synthesizer with pattern-based sequencer";
license = licenses.unfreeRedistributable;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
homepage = "http://www.warmplace.ru/soft/sunvox/";
maintainers = with maintainers; [ puffnfresh ];
platforms = [ "i686-linux" "x86_64-linux" ];

1
pkgs/applications/audio/tonelib-gfx/default.nix
View File

@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass.";
homepage = "https://tonelib.net/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ dan4ik605743 orivej ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/audio/tonelib-jam/default.nix
View File

@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "ToneLib Jam – the learning and practice software for guitar players";
homepage = "https://tonelib.net/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/audio/tonelib-metal/default.nix
View File

@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "ToneLib Metal – Guitar amp simulator targeted at metal players";
homepage = "https://tonelib.net/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/audio/tonelib-zoom/default.nix
View File

@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal";
homepage = "https://tonelib.net/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/audio/transcribe/default.nix
View File

@ -95,6 +95,7 @@ stdenv.mkDerivation rec {
conventional music players.
'';
homepage = "https://www.seventhstring.com/xscribe/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = platforms.linux;
};

1
pkgs/applications/audio/virtual-ans/default.nix
View File

@ -80,6 +80,7 @@ stdenv.mkDerivation rec {
+ supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA.
'';
homepage = "https://warmplace.ru/soft/ans/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.free;
# I cannot test the Darwin version, so I'll leave it disabled
platforms = [ "x86_64-linux" "i686-linux" ];

1
pkgs/applications/blockchains/exodus/default.nix
View File

@ -76,6 +76,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.exodus.io/";
description = "Top-rated cryptocurrency wallet with Trezor integration and built-in Exchange";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ mmahut rople380 ];

6
pkgs/applications/blockchains/nearcore/default.nix
View File

@ -4,7 +4,7 @@
}:
rustPlatform.buildRustPackage rec {
pname = "nearcore";
version = "1.26.1";
version = "1.27.0";
# https://github.com/near/nearcore/tags
src = fetchFromGitHub {
@ -12,10 +12,10 @@ rustPlatform.buildRustPackage rec {
repo = "nearcore";
# there is also a branch for this version number, so we need to be explicit
rev = "refs/tags/${version}";
sha256 = "sha256-WoQtDdbFcvl6Wp5uv2tr/W/YYH8dyezF+LzSJ5oJcYY=";
sha256 = "sha256-B9HqUa0mBSvsCPzxPt4NqpV99rV4lmQ9Q/z9lxob9oM=";
};
cargoSha256 = "sha256-7h14XzhhPmkPoTx0kkJl7I7CPqbRAtxa1zpplYxg4p4=";
cargoSha256 = "sha256-6GIt3J6y/O8XaHQJKRSPRgK2XbghMLif4e2Btdww9Ng=";
postPatch = ''
substituteInPlace neard/build.rs \

4
pkgs/applications/blockchains/sparrow/default.nix
View File

@ -225,6 +225,10 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability.";
homepage = "https://sparrowwallet.com";
sourceProvenance = with sourceTypes; [
binaryBytecode
binaryNativeCode
];
license = licenses.asl20;
maintainers = with maintainers; [ emmanuelrosa _1000101 ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/blockchains/wasabibackend/default.nix
View File

@ -43,6 +43,7 @@ buildDotnetModule rec {
meta = with lib; {
description = "Backend for the Wasabi Wallet";
homepage = "https://wasabiwallet.io/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.mit;
maintainers = with maintainers; [ mmahut ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/blockchains/wasabiwallet/default.nix
View File

@ -60,6 +60,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Privacy focused Bitcoin wallet";
homepage = "https://wasabiwallet.io/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ mmahut ];

1
pkgs/applications/editors/atom/default.nix
View File

@ -86,6 +86,7 @@ let
meta = with lib; {
description = "A hackable text editor for the 21st Century";
homepage = "https://atom.io/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.mit;
maintainers = with maintainers; [ offline ysndr ];
platforms = platforms.x86_64;

1
pkgs/applications/editors/eclipse/build-eclipse.nix
View File

@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.eclipse.org/";
inherit description;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
platforms = [ "x86_64-linux" ];
};

1
pkgs/applications/editors/pinegrow/default.nix
View File

@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
homepage = "https://pinegrow.com";
description = "UI Web Editor";
platforms = [ "x86_64-linux" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = with licenses; [ unfreeRedistributable ];
maintainers = with maintainers; [ gador ];
};

1
pkgs/applications/editors/quartus-prime/quartus.nix
View File

@ -89,6 +89,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
inherit homepage;
description = "FPGA design and simulation software";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = platforms.linux;
hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore

2
pkgs/applications/editors/rehex/default.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/solemnwarning/rehex";
changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt";
license = licenses.gpl2Only;
maintainers = with maintainers; [ markus1189 SuperSandro2000 ];
maintainers = with maintainers; [ markus1189 ];
platforms = platforms.all;
};
}

1
pkgs/applications/editors/sublime/2/default.nix
View File

@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Sophisticated text editor for code, markup and prose";
license = lib.licenses.unfree;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

1
pkgs/applications/editors/sublime/3/common.nix
View File

@ -131,6 +131,7 @@ in stdenv.mkDerivation (rec {
description = "Sophisticated text editor for code, markup and prose";
homepage = "https://www.sublimetext.com/";
maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" "i686-linux" ];
};

1
pkgs/applications/editors/sublime/4/common.nix
View File

@ -142,6 +142,7 @@ in stdenv.mkDerivation (rec {
description = "Sophisticated text editor for code, markup and prose";
homepage = "https://www.sublimetext.com/";
maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "aarch64-linux" "x86_64-linux" ];
};

13
pkgs/applications/editors/vim/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkg-config
{ lib, stdenv, fetchurl, callPackage, ncurses, bash, gawk, gettext, pkg-config
# default vimrc
, vimrc ? fetchurl {
name = "default-vimrc";
@ -18,9 +18,11 @@ stdenv.mkDerivation {
inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
nativeBuildInputs = [ gettext pkg-config ];
buildInputs = [ ncurses ]
buildInputs = [ ncurses bash gawk ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ];
strictDeps = true;
configureFlags = [
"--enable-multibyte"
"--enable-nls"
@ -36,6 +38,13 @@ stdenv.mkDerivation {
"vim_cv_memmove_handles_overlap=yes"
];
# which.sh is used to for vim's own shebang patching, so make it find
# binaries for the host platform.
preConfigure = ''
export HOST_PATH
substituteInPlace src/which.sh --replace '$PATH' '$HOST_PATH'
'';
postInstall = ''
ln -s $out/bin/vim $out/bin/vi
mkdir -p $out/share/vim

844
pkgs/applications/editors/vim/plugins/generated.nix
View File

File diff suppressed because it is too large Load Diff

88
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -191,6 +191,10 @@ self: super: {
dependencies = with self; [ nvim-cmp ];
});
cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: {
dependencies = with self; [ nvim-cmp ];
});
cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs (old: {
dependencies = with self; [ nvim-cmp pandoc plenary-nvim ];
});
@ -212,22 +216,18 @@ self: super: {
'';
});
cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: {
dependencies = with self; [ nvim-cmp ];
});
cmp-tmux = super.cmp-tmux.overrideAttrs (old: {
dependencies = with self; [ nvim-cmp tmux ];
});
cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: {
dependencies = with self; [ nvim-cmp vimwiki ];
});
cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs (old: {
dependencies = with self; [ nvim-cmp vim-lsp ];
});
cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: {
dependencies = with self; [ nvim-cmp vimwiki ];
});
cmp-zsh = super.cmp-zsh.overrideAttrs (old: {
dependencies = with self; [ nvim-cmp zsh ];
});
@ -328,15 +328,15 @@ self: super: {
};
});
diffview-nvim = super.diffview-nvim.overrideAttrs (oa: {
diffview-nvim = super.diffview-nvim.overrideAttrs (old: {
dependencies = with self; [ plenary-nvim ];
doInstallCheck = true;
nvimRequireCheck = "diffview";
});
direnv-vim = super.direnv-vim.overrideAttrs (oa: {
preFixup = oa.preFixup or "" + ''
direnv-vim = super.direnv-vim.overrideAttrs (old: {
preFixup = old.preFixup or "" + ''
substituteInPlace $out/autoload/direnv.vim \
--replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \
"let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')"
@ -376,7 +376,7 @@ self: super: {
patches = [
(substituteAll {
src = ./patches/fruzzy/get_version.patch;
version = old.version;
inherit (old) version;
})
];
configurePhase = ''
@ -445,31 +445,10 @@ self: super: {
dependencies = with self; [ plenary-nvim ];
});
# plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim);
plenary-nvim = super.plenary-nvim.overrideAttrs (old: {
postPatch = ''
sed -Ei lua/plenary/curl.lua \
-e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@'
'';
doInstallCheck = true;
nvimRequireCheck = "plenary";
});
gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: {
dependencies = with self; [ lush-nvim ];
});
jedi-vim = super.jedi-vim.overrideAttrs (old: {
# checking for python3 support in vim would be neat, too, but nobody else seems to care
buildInputs = [ python3.pkgs.jedi ];
meta = {
description = "code-completion for python using python-jedi";
license = lib.licenses.mit;
};
});
himalaya-vim = buildVimPluginFrom2Nix {
pname = "himalaya-vim";
inherit (himalaya) src version;
@ -485,6 +464,15 @@ self: super: {
'';
};
jedi-vim = super.jedi-vim.overrideAttrs (old: {
# checking for python3 support in vim would be neat, too, but nobody else seems to care
buildInputs = [ python3.pkgs.jedi ];
meta = {
description = "code-completion for python using python-jedi";
license = lib.licenses.mit;
};
});
LanguageClient-neovim =
let
version = "0.1.161";
@ -659,7 +647,19 @@ self: super: {
configurePhase = "cd vim";
});
parinfer-rust = parinfer-rust;
inherit parinfer-rust;
# plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim);
plenary-nvim = super.plenary-nvim.overrideAttrs (old: {
postPatch = ''
sed -Ei lua/plenary/curl.lua \
-e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@'
'';
doInstallCheck = true;
nvimRequireCheck = "plenary";
});
range-highlight-nvim = super.range-highlight-nvim.overrideAttrs (old: {
dependencies = with self; [ cmd-parser-nvim ];
@ -676,7 +676,7 @@ self: super: {
skim = buildVimPluginFrom2Nix {
pname = "skim";
version = skim.version;
inherit (skim) version;
src = skim.vim;
};
@ -789,16 +789,16 @@ self: super: {
dependencies = with self; [ sqlite-lua telescope-nvim ];
});
telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: {
dependencies = with self; [ telescope-nvim ];
});
telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: {
dependencies = with self; [ telescope-nvim ];
buildPhase = "make";
meta.platforms = lib.platforms.all;
});
telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: {
dependencies = with self; [ telescope-nvim ];
});
telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: {
dependencies = with self; [ telescope-nvim ];
preFixup =
@ -974,7 +974,7 @@ self: super: {
libiconv
];
cargoSha256 = "sha256-XmQTRmOO/tyA0F6FQQRxZPcVXCYZkEAiNIzU/ismjc0=";
cargoSha256 = "sha256-9Vr1gpggfAQlMgM/s8j6FTTYFppHql2PQ7cPtg1wNmo=";
};
in
''
@ -1103,13 +1103,13 @@ self: super: {
vim-markdown-composer =
let
vim-markdown-composer-bin = rustPlatform.buildRustPackage rec {
vim-markdown-composer-bin = rustPlatform.buildRustPackage {
pname = "vim-markdown-composer-bin";
inherit (super.vim-markdown-composer) src version;
cargoSha256 = "0q0i6kyihswrjrfdj4p3z54b779sdg2wz38z943ypj6dqphhcklx";
cargoSha256 = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4=";
};
in
super.vim-markdown-composer.overrideAttrs (oldAttrs: rec {
super.vim-markdown-composer.overrideAttrs (old: {
preFixup = ''
substituteInPlace "$out"/after/ftplugin/markdown/composer.vim \
--replace "s:plugin_root . '/target/release/markdown-composer'" \
@ -1287,9 +1287,9 @@ self: super: {
"coc-smartf"
"coc-snippets"
"coc-solargraph"
"coc-sqlfluff"
"coc-stylelint"
"coc-sumneko-lua"
"coc-sqlfluff"
"coc-tabnine"
"coc-texlab"
"coc-toml"

8
pkgs/applications/editors/vim/plugins/update.py
View File

@ -116,13 +116,7 @@ class VimEditor(pluginupdate.Editor):
def main():
global luaPlugins
# whitelist
luaPlugins = run_nix_expr(GET_PLUGINS_LUA) + [
"diffview-nvim",
"marks-nvim",
"nvim-biscuits"
]
luaPlugins = run_nix_expr(GET_PLUGINS_LUA)
editor = VimEditor("vim", ROOT, GET_PLUGINS)
parser = editor.create_parser()

41
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -1041,6 +1041,22 @@ let
};
};
grapecity.gc-excelviewer = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "gc-excelviewer";
publisher = "grapecity";
version = "4.2.55";
sha256 = "sha256-yHl6ZTGIKOEsqmyeYtgDUhNAN9uRpoFApA7FKkPWW3E=";
};
meta = with lib; {
description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=grapecity.gc-excelviewer";
homepage = "https://github.com/jjuback/gc-excelviewer";
license = licenses.mit;
maintainers = with maintainers; [ kamadorueda ];
};
};
humao.rest-client = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "humao";
@ -1286,8 +1302,8 @@ let
mktplcRef = {
name = "latex-workshop";
publisher = "James-Yu";
version = "8.23.0";
sha256 = "sha256-IHLsAuTi+GBZViL2KozudebNY745RiOYNATzabQfnOY=";
version = "8.27.2";
sha256 = "sha256-scvT6cjlMrfG4yrhWlUwGM7ozu1E0xAryPRpV7FGCas=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
@ -1495,6 +1511,23 @@ let
};
};
mattn.lisp = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "lisp";
publisher = "mattn";
version = "0.1.12";
sha256 = "sha256-x6aFrcX0YElEFEr0qA669/LPlab15npmXd5Q585pIEw=";
};
meta = with lib; {
description = "Lisp syntax for vscode";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=mattn.lisp";
homepage = "https://github.com/mattn/vscode-lisp";
changelog = "https://marketplace.visualstudio.com/items/mattn.lisp/changelog";
license = licenses.mit;
maintainers = with maintainers; [ kamadorueda ];
};
};
mhutchie.git-graph = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "git-graph";
@ -2369,8 +2402,8 @@ let
mktplcRef = {
name = "vim";
publisher = "vscodevim";
version = "1.21.5";
sha256 = "1v1xs1wcigisr6xip31i02cfryxrb157sla34y59pwlnhc5x1gny";
version = "1.22.2";
sha256 = "sha256-dtIlgODzRdoMKnG9050ZcCX3w15A/R3FaMc+ZylvBbU=";
};
meta = {
license = lib.licenses.mit;

1
pkgs/applications/emulators/kega-fusion/default.nix
View File

@ -72,6 +72,7 @@ in stdenv.mkDerivation {
description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator";
homepage = "https://www.carpeludum.com/kega-fusion/";
maintainers = with maintainers; [ abbradar ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfreeRedistributable;
platforms = [ "i686-linux" ];
};

4
pkgs/applications/emulators/wine/base.nix
View File

@ -191,6 +191,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
inherit version;
homepage = "https://www.winehq.org/";
license = with lib.licenses; [ lgpl21Plus ];
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryNativeCode # mono, gecko
];
description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms;
maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ];

1
pkgs/applications/finance/cryptowatch/default.nix
View File

@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
homepage = "https://cryptowat.ch";
description = "Application for visualising real-time cryptocurrency market data";
platforms = platforms.linux;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ livnev ];
};

4
pkgs/applications/gis/qgis/unwrapped-ltr.nix
View File

@ -69,14 +69,14 @@ let
six
];
in mkDerivation rec {
version = "3.22.6";
version = "3.22.8";
pname = "qgis-ltr-unwrapped";
src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "sha256-ACNEIU+kYmOa+/1nbFPTSDgyvviXqKP9kvL6aRykueY=";
sha256 = "sha256-YxF7FzyNNt+bdk96g2sWWv9haqV0L6Ab96D0hV0BFrA=";
};
passthru = {

4
pkgs/applications/gis/qgis/unwrapped.nix
View File

@ -69,14 +69,14 @@ let
six
];
in mkDerivation rec {
version = "3.24.2";
version = "3.26.0";
pname = "qgis-unwrapped";
src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "sha256-skoepsX9xREqN5SoA4eUN7LKa6KGvixPd5k0KKXzKJo=";
sha256 = "sha256-yHQi5ai7fdgznTf562Bj0QPE+SXg972O7+r01RY7itE=";
};
passthru = {

1
pkgs/applications/gis/udig/default.nix
View File

@ -18,6 +18,7 @@ let
meta = with lib; {
description = "User-friendly Desktop Internet GIS";
homepage = "http://udig.refractions.net/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = with licenses; [ epl10 bsd3 ];
maintainers = with maintainers; [ sikmir ];
platforms = builtins.attrNames srcs;

1
pkgs/applications/graphics/avocode/default.nix
View File

@ -99,6 +99,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://avocode.com/";
description = "The bridge between designers and developers";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ megheaiulian ];

1
pkgs/applications/graphics/drawio/default.nix
View File

@ -95,6 +95,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A desktop application for creating diagrams";
homepage = "https://about.draw.io/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.asl20;
changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}";
maintainers = with maintainers; [ darkonion0 ];

5
pkgs/applications/graphics/fiji/default.nix
View File

@ -66,7 +66,10 @@ stdenv.mkDerivation rec {
homepage = "https://imagej.net/software/fiji/";
description = "batteries-included distribution of ImageJ2, bundling a lot of plugins which facilitate scientific image analysis";
platforms = [ "x86_64-linux" ];
sourceProvenance = with sourceTypes; [ binaryBytecode ];
sourceProvenance = with sourceTypes; [
binaryBytecode
binaryNativeCode
];
license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ];
maintainers = with maintainers; [ zane ];
};

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

@ -48,13 +48,13 @@
mkDerivation rec {
pname = "freecad";
version = "0.19.2";
version = "0.20";
src = fetchFromGitHub {
owner = "FreeCAD";
repo = "FreeCAD";
rev = version;
hash = "sha256-XZ+fRl3CPCIFu3nHeMTLibwwFBlG/cWpKJlI58hTAuU=";
hash = "sha256-Em4XVxDfvVG1Kf7q+6uHNA/VcMGLKMTv5TCh2XF/BtQ=";
};
nativeBuildInputs = [

1
pkgs/applications/graphics/kodelife/default.nix
View File

@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://hexler.net/products/kodelife";
description = "Real-time GPU shader editor";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ prusnak ];
platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ];

1
pkgs/applications/graphics/lightburn/default.nix
View File

@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Layout, editing, and control software for your laser cutter";
homepage = "https://lightburnsoftware.com/";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ q3k ];
platforms = [ "x86_64-linux" ];

124
pkgs/applications/graphics/lorien/default.nix Normal file
View File

@ -0,0 +1,124 @@
{ lib
, stdenv
, fetchFromGitHub
, copyDesktopItems
, makeDesktopItem
, godot-export-templates
, godot-headless
, alsa-lib
, libGL
, libGLU
, libX11
, libXcursor
, libXext
, libXfixes
, libXi
, libXinerama
, libXrandr
, libXrender
, zlib
, udev # for libudev
}:
let
preset =
if stdenv.isLinux then "Linux/X11"
else if stdenv.isDarwin then "Mac OSX"
else throw "unsupported platform";
in
stdenv.mkDerivation rec {
pname = "lorien";
version = "0.5.0";
src = fetchFromGitHub {
owner = "mbrlabs";
repo = "Lorien";
rev = "v${version}";
sha256 = "sha256-x81Obana2BEGrYSoJHDdCkL6UaULfQGQ94tlrH5+kdY=";
};
nativeBuildInputs = [
copyDesktopItems
godot-headless
];
buildInputs = [
alsa-lib
libGL
libGLU
libX11
libXcursor
libXext
libXfixes
libXi
libXinerama
libXrandr
libXrender
zlib
udev
];
desktopItems = [
(makeDesktopItem {
name = "lorien";
exec = "lorien";
icon = "lorien";
desktopName = "Lorien";
genericName = "Whiteboard";
comment = meta.description;
categories = [ "Graphics" "Office" ];
keywords = [ "whiteboard" ];
})
];
buildPhase = ''
runHook preBuild
# Cannot create file '/homeless-shelter/.config/godot/projects/...'
export HOME=$TMPDIR
# Link the export-templates to the expected location. The --export commands
# expects the template-file at .../templates/{godot-version}.stable/linux_x11_64_release
mkdir -p $HOME/.local/share/godot
ln -s ${godot-export-templates}/share/godot/templates $HOME/.local/share/godot
mkdir -p $out/share/lorien
godot-headless --path lorien --export "${preset}" $out/share/lorien/lorien
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
ln -s $out/share/lorien/lorien $out/bin
# Patch binaries.
interpreter=$(cat $NIX_CC/nix-support/dynamic-linker)
patchelf \
--set-interpreter $interpreter \
--set-rpath ${lib.makeLibraryPath buildInputs} \
$out/share/lorien/lorien
install -Dm644 images/lorien.png $out/share/pixmaps/lorien.png
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/mbrlabs/Lorien";
description = "An infinite canvas drawing/note-taking app";
longDescription = ''
An infinite canvas drawing/note-taking app that is focused on performance,
small savefiles and simplicity
'';
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ hqurve ];
};
}

1
pkgs/applications/graphics/odafileconverter/default.nix
View File

@ -46,6 +46,7 @@ in mkDerivation {
meta = with lib; {
description = "For converting between different versions of .dwg and .dxf";
homepage = "https://www.opendesign.com/guestfiles/oda_file_converter";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ nagisa ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/graphics/pencil/default.nix
View File

@ -99,6 +99,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "GUI prototyping/mockup tool";
homepage = "https://pencil.evolus.vn/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.gpl2; # Commercial license is also available
maintainers = with maintainers; [ bjornfor prikhi mrVanDalo ];
platforms = platforms.linux;

1
pkgs/applications/graphics/pixeluvo/default.nix
View File

@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A Beautifully Designed Image and Photo Editor for Windows and Linux";
homepage = "http://www.pixeluvo.com/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ wolfangaukang ];

1
pkgs/applications/graphics/pixinsight/default.nix
View File

@ -124,6 +124,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Scientific image processing program for astrophotography";
homepage = "https://pixinsight.com/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.sheepforce ];

1
pkgs/applications/graphics/sane/backends/brscan4/default.nix
View File

@ -89,6 +89,7 @@ stdenv.mkDerivation rec {
description = "Brother brscan4 sane backend driver";
homepage = "http://www.brother.com";
platforms = [ "i686-linux" "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ jraygauthier ];
};

1
pkgs/applications/graphics/sane/backends/brscan5/default.nix
View File

@ -102,6 +102,7 @@ stdenv.mkDerivation rec {
description = "Brother brscan5 sane backend driver";
homepage = "https://www.brother.com";
platforms = [ "i686-linux" "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ mattchrist ];
};

1
pkgs/applications/graphics/sane/backends/dsseries/default.nix
View File

@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
description = "Brother DSSeries SANE backend driver";
homepage = "http://www.brother.com";
platforms = lib.platforms.linux;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ callahad ];
};

1
pkgs/applications/graphics/unigine-heaven/default.nix
View File

@ -100,6 +100,7 @@ stdenv.mkDerivation
{
description = "The Unigine Heaven GPU benchmarking tool";
homepage = "https://benchmark.unigine.com/heaven";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.BarinovMaxim ];
platforms = [ "x86_64-linux" "i686-linux" ];

1
pkgs/applications/graphics/unigine-sanctuary/default.nix
View File

@ -90,6 +90,7 @@ stdenv.mkDerivation rec{
meta = {
description = "The Unigine Heaven GPU benchmarking tool";
homepage = "https://benchmark.unigine.com/sanctuary";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.BarinovMaxim ];
platforms = [ "x86_64-linux" "i686-linux" ];

1
pkgs/applications/graphics/unigine-superposition/default.nix
View File

@ -139,6 +139,7 @@ buildFHSUserEnv {
meta = {
description = "The Unigine Superposition GPU benchmarking tool";
homepage = "https://benchmark.unigine.com/superposition";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.BarinovMaxim ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/graphics/unigine-tropics/default.nix
View File

@ -88,6 +88,7 @@ stdenv.mkDerivation {
meta = {
description = "The Unigine Heaven GPU benchmarking tool";
homepage = "https://benchmark.unigine.com/tropics";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.BarinovMaxim ];
platforms = [ "x86_64-linux" "i686-linux" ];

1
pkgs/applications/graphics/unigine-valley/default.nix
View File

@ -128,6 +128,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The Unigine Valley GPU benchmarking tool";
homepage = "https://unigine.com/products/benchmarks/valley/";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf
maintainers = [ lib.maintainers.kierdavis ];
platforms = [ "x86_64-linux" "i686-linux" ];

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

@ -54,6 +54,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "http://www.styluslabs.com/";
description = "Write is a word processor for handwriting";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = platforms.linux;
license = lib.licenses.unfree;
maintainers = with maintainers; [ oyren ];

1
pkgs/applications/misc/1password-gui/beta.nix
View File

@ -129,6 +129,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Multi-platform password manager";
homepage = "https://1password.com/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ];
platforms = [ "x86_64-linux" ];

1
pkgs/applications/misc/1password-gui/default.nix
View File

@ -131,6 +131,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Multi-platform password manager";
homepage = "https://1password.com/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ];
platforms = [ "x86_64-linux" ];

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

@ -67,6 +67,7 @@ stdenv.mkDerivation {
homepage = "https://developer.1password.com/docs/cli/";
downloadPage = "https://app-updates.agilebits.com/product_history/CLI2";
maintainers = with maintainers; [ joelburget marsam ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
inherit mainProgram platforms;
};

1
pkgs/applications/misc/adobe-reader/default.nix
View File

@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Adobe Reader, a viewer for PDF documents";
homepage = "http://www.adobe.com/products/reader";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
knownVulnerabilities = [
"Numerous unresolved vulnerabilities"

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

@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.authy.com";
description = "Twilio Authy two factor authentication desktop application";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ iammrinal0 ];
platforms = [ "x86_64-linux" ];

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

@ -166,6 +166,7 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ xavierzwirtz ];
description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW";
homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfreeRedistributable;
platforms = [ "x86_64-linux" ];
};

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

@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Binance Cryptoexchange Official Desktop Client";
homepage = "https://www.binance.com/en/desktop-download";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ wolfangaukang ];
platforms = [ "x86_64-linux" ];

18
pkgs/applications/misc/confclerk/default.nix
View File

@ -1,22 +1,20 @@
{ lib, stdenv, fetchurl, qt4, qmake4Hook }:
{ lib, mkDerivation, fetchurl, qtbase, qmake }:
let version = "0.6.4"; in
stdenv.mkDerivation {
mkDerivation rec {
pname = "confclerk";
inherit version;
version = "0.7.1";
src = fetchurl {
url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";
sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3";
sha256 = "0l5i4d6lymh0k6gzihs41x4i8v1dz0mrwpga096af0vchpvlcarg";
};
buildInputs = [ qt4 ];
buildInputs = [ qtbase ];
nativeBuildInputs = [ qmake ];
nativeBuildInputs = [ qmake4Hook ];
installPhase = ''
postInstall = ''
mkdir -p $out/bin
cp src/bin/confclerk $out/bin
mv $out/confclerk $out/bin/
'';
meta = {

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

@ -127,6 +127,10 @@
PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access,
Teradata, Firebird, Derby, etc.
'';
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # dependencies from maven
];
license = licenses.asl20;
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
maintainers = with maintainers; [ jojosch mkg20001 ];

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

@ -73,6 +73,7 @@ mkDerivation rec {
meta = with lib; {
description = "A viewer for PDF documents";
homepage = "https://www.foxitsoftware.com/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ p-h rhoriguchi ];

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

@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Analytic-Tracking tool for GoLance";
homepage = "https://golance.com/download-gometer";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ wolfangaukang ];
};

1
pkgs/applications/misc/googleearth-pro/default.nix
View File

@ -115,6 +115,7 @@ mkDerivation rec {
meta = with lib; {
description = "A world sphere viewer";
homepage = "https://www.google.com/earth/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ friedelino shamilton ];
platforms = platforms.linux;

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

@ -70,6 +70,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Time tracking software";
homepage = "https://hubstaff.com/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ michalrus srghma ];

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

@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GPU-accelerated procedural modeler and slicer for 3D printing";
homepage = "https://icesl.loria.fr/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.inria-icesl;
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = with maintainers; [ mgttlinger ];

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

@ -70,6 +70,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.raise3d.com/ideamaker/";
description = "Raise3D's 3D slicer software";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ lovesegfault ];

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

@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Supermicro IPMI configuration tool";
homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ sorki ];

5
pkgs/applications/misc/ipmiview/default.nix
View File

@ -72,7 +72,10 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
sourceProvenance = with sourceTypes; [ binaryBytecode ];
sourceProvenance = with sourceTypes; [
binaryBytecode
binaryNativeCode
];
license = licenses.unfree;
maintainers = with maintainers; [ vlaci ];
platforms = [ "x86_64-linux" "i686-linux" ];

1
pkgs/applications/misc/join-desktop/default.nix
View File

@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/joaomgcd/JoinDesktop/";
description = "Desktop app for Join";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
# on https://joaoapps.com/join/desktop/ "Join Desktop is an open source app" but no license
license = licenses.free;
platforms = [ "x86_64-linux" ];

1
pkgs/applications/misc/jotta-cli/default.nix
View File

@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.jottacloud.com/";
downloadPage = "https://repo.jotta.us/archives/linux/";
maintainers = with maintainers; [ evenbrenden ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
};

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

@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Analytics and time-series database";
homepage = "http://www.kx.com/";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
platforms = [ "i686-linux" ];
maintainers = [ lib.maintainers.thoughtpolice ];

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

@ -56,6 +56,7 @@ in stdenv.mkDerivation rec {
homepage = "https://github.com/koreader/koreader";
description =
"An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = intersectLists platforms.x86_64 platforms.linux;
license = licenses.agpl3Only;
maintainers = with maintainers; [ contrun neonfuz];

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

@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Master PDF Editor";
homepage = "https://code-industry.net/free-pdf-editor/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfreeRedistributable;
platforms = with platforms; [ "x86_64-linux" ];
maintainers = with maintainers; [ cmcdragonkai ];

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

@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Master PDF Editor - version 4, without watermark";
homepage = "https://code-industry.net/free-pdf-editor/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfreeRedistributable;
platforms = with platforms; [ "x86_64-linux" ];
};

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

@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Morphological analysis of Russian text";
homepage = "https://yandex.ru/dev/mystem/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ abbradar ];
platforms = [ "x86_64-linux" ];

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