ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2021-11-07 00:07:34 +00:00 committed by GitHub
commit 381728e98b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
210 changed files with 5537 additions and 3856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maintainers/maintainer-list.nix
View File

@ -5797,6 +5797,16 @@
githubId = 20658981;
name = "Jarosław Wygoda";
};
jyooru = {
email = "joel@joel.tokyo";
github = "jyooru";
githubId = 63786778;
name = "Joel";
keys = [{
longkeyid = "rsa4096/18550BD205E9EF64";
fingerprint = "9148 DC9E F4D5 3EB6 A30E 8EF0 1855 0BD2 05E9 EF64";
}];
};
jyp = {
email = "jeanphilippe.bernardy@gmail.com";
github = "jyp";

7
nixos/doc/manual/development/writing-nixos-tests.section.md
View File

@ -162,7 +162,9 @@ The following methods are available on machine objects:
If the command detaches, it must close stdout, as `execute` will wait
for this to consume all output reliably. This can be achieved by
redirecting stdout to stderr `>&2`, to `/dev/console`, `/dev/null` or
a file.
a file. Examples of detaching commands are `sleep 365d &`, where the
shell forks a new process that can write to stdout and `xclip -i`, where
the `xclip` command itself forks without closing stdout.
Takes an optional parameter `check_return` that defaults to `True`.
Setting this parameter to `False` will not check for the return code
and return -1 instead. This can be used for commands that shut down
@ -183,7 +185,8 @@ The following methods are available on machine objects:
- Dereferencing unset variables fail the command.
- It will wait for stdout to be closed. See `execute`.
- It will wait for stdout to be closed. See `execute` for the
implications.
`fail`

11
nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml
View File

@ -271,8 +271,13 @@ start_all()
for this to consume all output reliably. This can be achieved
by redirecting stdout to stderr <literal>&gt;&amp;2</literal>,
to <literal>/dev/console</literal>,
<literal>/dev/null</literal> or a file. Takes an optional
parameter <literal>check_return</literal> that defaults to
<literal>/dev/null</literal> or a file. Examples of detaching
commands are <literal>sleep 365d &amp;</literal>, where the
shell forks a new process that can write to stdout and
<literal>xclip -i</literal>, where the
<literal>xclip</literal> command itself forks without closing
stdout. Takes an optional parameter
<literal>check_return</literal> that defaults to
<literal>True</literal>. Setting this parameter to
<literal>False</literal> will not check for the return code
and return -1 instead. This can be used for commands that shut
@ -314,7 +319,7 @@ start_all()
<listitem>
<para>
It will wait for stdout to be closed. See
<literal>execute</literal>.
<literal>execute</literal> for the implications.
</para>
</listitem>
</itemizedlist>

23
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -441,6 +441,14 @@
<literal>code-server</literal>-module now available
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/xmrig/xmrig">xmrig</link>,
a high performance, open source, cross platform RandomX,
KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and
RandomX benchmark.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-incompatibilities">
@ -450,9 +458,10 @@
<para>
The NixOS VM test framework,
<literal>pkgs.nixosTest</literal>/<literal>make-test-python.nix</literal>,
now requires non-terminating commands such as
<literal>succeed(&quot;foo &amp;&quot;)</literal> to close
stdout. This can be done with a redirect such as
now requires detaching commands such as
<literal>succeed(&quot;foo &amp;&quot;)</literal> and
<literal>succeed(&quot;foo | xclip -i&quot;)</literal> to
close stdout. This can be done with a redirect such as
<literal>succeed(&quot;foo &gt;&amp;2 &amp;&quot;)</literal>.
This breaking change was necessitated by a race condition
causing tests to fail or hang. It applies to all methods that
@ -1850,6 +1859,14 @@ Superuser created successfully.
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
<literal>security.pam.services.&lt;name&gt;.makeHomeDir</literal>
now uses <literal>umask=0077</literal> instead of
<literal>umask=0022</literal> when creating the home
directory.
</para>
</listitem>
</itemizedlist>
</section>
</section>

6
nixos/doc/manual/release-notes/rl-2111.section.md
View File

@ -131,9 +131,11 @@ In addition to numerous new and upgraded packages, this release has the followin
- `code-server`-module now available
- [xmrig](https://github.com/xmrig/xmrig), a high performance, open source, cross platform RandomX, KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and RandomX benchmark.
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
- The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix`, now requires non-terminating commands such as `succeed("foo &")` to close stdout.
- The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix`, now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout.
This can be done with a redirect such as `succeed("foo >&2 &")`. This breaking change was necessitated by a race condition causing tests to fail or hang.
It applies to all methods that invoke commands on the nodes, including `execute`, `succeed`, `fail`, `wait_until_succeeds`, `wait_until_fails`.
@ -514,3 +516,5 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `services.unifi.dataDir` option is removed and the data is now always located under `/var/lib/unifi/data`. This is done to make better use of systemd state direcotiry and thus making the service restart more reliable.
- The unifi logs can now be found under: `/var/log/unifi` instead of `/var/lib/unifi/logs`.
- The unifi run directory can now be found under: `/run/unifi` instead of `/var/lib/unifi/run`.
- `security.pam.services.<name>.makeHomeDir` now uses `umask=0077` instead of `umask=0022` when creating the home directory.

2
nixos/modules/security/pam.nix
View File

@ -483,7 +483,7 @@ let
if config.boot.isContainer then "optional" else "required"
} pam_loginuid.so"}
${optionalString cfg.makeHomeDir
"session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0022"}
"session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077"}
${optionalString cfg.updateWtmp
"session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"}
${optionalString config.security.pam.enableEcryptfs

71
nixos/modules/services/misc/xmrig.nix Normal file
View File

@ -0,0 +1,71 @@
{ config, pkgs, lib, ... }:
let
cfg = config.services.xmrig;
json = pkgs.formats.json { };
configFile = json.generate "config.json" cfg.settings;
in
with lib;
{
options = {
services.xmrig = {
enable = mkEnableOption "XMRig Mining Software";
package = mkOption {
type = types.package;
default = pkgs.xmrig;
example = literalExpression "pkgs.xmrig-mo";
description = "XMRig package to use.";
};
settings = mkOption {
default = { };
type = json.type;
example = literalExpression ''
{
autosave = true;
cpu = true;
opencl = false;
cuda = false;
pools = [
{
url = "pool.supportxmr.com:443";
user = "your-wallet";
keepalive = true;
tls = true;
}
]
}
'';
description = ''
XMRig configuration. Refer to
<link xlink:href="https://xmrig.com/docs/miner/config"/>
for details on supported values.
'';
};
};
};
config = mkIf cfg.enable {
systemd.services.xmrig = {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
description = "XMRig Mining Software Service";
serviceConfig = {
ExecStartPre = "${cfg.package}/bin/xmrig --config=${configFile} --dry-run";
ExecStart = "${cfg.package}/bin/xmrig --config=${configFile}";
DynamicUser = true;
};
};
};
meta = with lib; {
description = "XMRig Mining Software Service";
license = licenses.gpl3Only;
maintainers = with maintainers; [ ratsclub ];
};
}

32
nixos/modules/services/networking/ddclient.nix
View File

@ -28,6 +28,16 @@ let
'';
configFile = if (cfg.configFile != null) then cfg.configFile else configFile';
preStart = ''
install ${configFile} /run/${RuntimeDirectory}/ddclient.conf
${lib.optionalString (cfg.configFile == null) (if (cfg.passwordFile != null) then ''
password=$(head -n 1 ${cfg.passwordFile})
sed -i "s/^password=$/password=$password/" /run/${RuntimeDirectory}/ddclient.conf
'' else ''
sed -i '/^password=$/d' /run/${RuntimeDirectory}/ddclient.conf
'')}
'';
in
with lib;
@ -57,6 +67,15 @@ with lib;
'';
};
package = mkOption {
type = package;
default = pkgs.ddclient;
defaultText = "pkgs.ddclient";
description = ''
The ddclient executable package run by the service.
'';
};
domains = mkOption {
default = [ "" ];
type = listOf str;
@ -195,20 +214,13 @@ with lib;
serviceConfig = {
DynamicUser = true;
RuntimeDirectoryMode = "0700";
inherit RuntimeDirectory;
inherit StateDirectory;
Type = "oneshot";
ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -file /run/${RuntimeDirectory}/ddclient.conf";
ExecStartPre = "!${pkgs.writeShellScript "ddclient-prestart" preStart}";
ExecStart = "${lib.getBin cfg.package}/bin/ddclient -file /run/${RuntimeDirectory}/ddclient.conf";
};
preStart = ''
install -m 600 ${configFile} /run/${RuntimeDirectory}/ddclient.conf
${optionalString (cfg.configFile == null) (if (cfg.passwordFile != null) then ''
password=$(head -n 1 ${cfg.passwordFile})
sed -i "s/^password=$/password=$password/" /run/${RuntimeDirectory}/ddclient.conf
'' else ''
sed -i '/^password=$/d' /run/${RuntimeDirectory}/ddclient.conf
'')}
'';
};
systemd.timers.ddclient = {

102
nixos/modules/services/networking/mosquitto.md Normal file
View File

@ -0,0 +1,102 @@
# Mosquitto {#module-services-mosquitto}
Mosquitto is a MQTT broker often used for IoT or home automation data transport.
## Quickstart {#module-services-mosquitto-quickstart}
A minimal configuration for Mosquitto is
```nix
services.mosquitto = {
enable = true;
listeners = [ {
acl = [ "pattern readwrite #" ];
omitPasswordAuth = true;
settings.allow_anonymous = true;
} ];
};
```
This will start a broker on port 1883, listening on all interfaces of the machine, allowing
read/write access to all topics to any user without password requirements.
User authentication can be configured with the `users` key of listeners. A config that gives
full read access to a user `monitor` and restricted write access to a user `service` could look
like
```nix
services.mosquitto = {
enable = true;
listeners = [ {
users = {
monitor = {
acl = [ "read #" ];
password = "monitor";
};
service = {
acl = [ "write service/#" ];
password = "service";
};
};
} ];
};
```
TLS authentication is configured by setting TLS-related options of the listener:
```nix
services.mosquitto = {
enable = true;
listeners = [ {
port = 8883; # port change is not required, but helpful to avoid mistakes
# ...
settings = {
cafile = "/path/to/mqtt.ca.pem";
certfile = "/path/to/mqtt.pem";
keyfile = "/path/to/mqtt.key";
};
} ];
```
## Configuration {#module-services-mosquitto-config}
The Mosquitto configuration has four distinct types of settings:
the global settings of the daemon, listeners, plugins, and bridges.
Bridges and listeners are part of the global configuration, plugins are part of listeners.
Users of the broker are configured as parts of listeners rather than globally, allowing
configurations in which a given user is only allowed to log in to the broker using specific
listeners (eg to configure an admin user with full access to all topics, but restricted to
localhost).
Almost all options of Mosquitto are available for configuration at their appropriate levels, some
as NixOS options written in camel case, the remainders under `settings` with their exact names in
the Mosquitto config file. The exceptions are `acl_file` (which is always set according to the
`acl` attributes of a listener and its users) and `per_listener_settings` (which is always set to
`true`).
### Password authentication {#module-services-mosquitto-config-passwords}
Mosquitto can be run in two modes, with a password file or without. Each listener has its own
password file, and different listeners may use different password files. Password file generation
can be disabled by setting `omitPasswordAuth = true` for a listener; in this case it is necessary
to either set `settings.allow_anonymous = true` to allow all logins, or to configure other
authentication methods like TLS client certificates with `settings.use_identity_as_username = true`.
The default is to generate a password file for each listener from the users configured to that
listener. Users with no configured password will not be added to the password file and thus
will not be able to use the broker.
### ACL format {#module-services-mosquitto-config-acl}
Every listener has a Mosquitto `acl_file` attached to it. This ACL is configured via two
attributes of the config:
* the `acl` attribute of the listener configures pattern ACL entries and topic ACL entries
for anonymous users. Each entry must be prefixed with `pattern` or `topic` to distinguish
between these two cases.
* the `acl` attribute of every user configures in the listener configured the ACL for that
given user. Only topic ACLs are supported by Mosquitto in this setting, so no prefix is
required or allowed.
The default ACL for a listener is empty, disallowing all accesses from all clients. To configure
a completely open ACL, set `acl = [ "pattern readwrite #" ]` in the listener.

21
nixos/modules/services/networking/mosquitto.nix
View File

@ -257,18 +257,28 @@ let
users = mkOption {
type = attrsOf userOptions;
example = { john = { password = "123456"; acl = [ "topic readwrite john/#" ]; }; };
example = { john = { password = "123456"; acl = [ "readwrite john/#" ]; }; };
description = ''
A set of users and their passwords and ACLs.
'';
default = {};
};
omitPasswordAuth = mkOption {
type = bool;
description = ''
Omits password checking, allowing anyone to log in with any user name unless
other mandatory authentication methods (eg TLS client certificates) are configured.
'';
default = false;
};
acl = mkOption {
type = listOf str;
description = ''
Additional ACL items to prepend to the generated ACL file.
'';
example = [ "pattern read #" "topic readwrite anon/report/#" ];
default = [];
};
@ -294,9 +304,9 @@ let
formatListener = idx: listener:
[
"listener ${toString listener.port} ${toString listener.address}"
"password_file ${cfg.dataDir}/passwd-${toString idx}"
"acl_file ${makeACLFile idx listener.users listener.acl}"
]
++ optional (! listener.omitPasswordAuth) "password_file ${cfg.dataDir}/passwd-${toString idx}"
++ formatFreeform {} listener.settings
++ concatMap formatAuthPlugin listener.authPlugins;
@ -645,5 +655,10 @@ in
};
meta.maintainers = with lib.maintainers; [ pennae ];
meta = {
maintainers = with lib.maintainers; [ pennae ];
# Don't edit the docbook xml directly, edit the md and generate it:
# `pandoc mosquitto.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > mosquitto.xml`
doc = ./mosquitto.xml;
};
}

147
nixos/modules/services/networking/mosquitto.xml Normal file
View File

@ -0,0 +1,147 @@
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-mosquitto">
<title>Mosquitto</title>
<para>
Mosquitto is a MQTT broker often used for IoT or home automation
data transport.
</para>
<section xml:id="module-services-mosquitto-quickstart">
<title>Quickstart</title>
<para>
A minimal configuration for Mosquitto is
</para>
<programlisting language="bash">
services.mosquitto = {
enable = true;
listeners = [ {
acl = [ &quot;pattern readwrite #&quot; ];
omitPasswordAuth = true;
settings.allow_anonymous = true;
} ];
};
</programlisting>
<para>
This will start a broker on port 1883, listening on all interfaces
of the machine, allowing read/write access to all topics to any
user without password requirements.
</para>
<para>
User authentication can be configured with the
<literal>users</literal> key of listeners. A config that gives
full read access to a user <literal>monitor</literal> and
restricted write access to a user <literal>service</literal> could
look like
</para>
<programlisting language="bash">
services.mosquitto = {
enable = true;
listeners = [ {
users = {
monitor = {
acl = [ &quot;read #&quot; ];
password = &quot;monitor&quot;;
};
service = {
acl = [ &quot;write service/#&quot; ];
password = &quot;service&quot;;
};
};
} ];
};
</programlisting>
<para>
TLS authentication is configured by setting TLS-related options of
the listener:
</para>
<programlisting language="bash">
services.mosquitto = {
enable = true;
listeners = [ {
port = 8883; # port change is not required, but helpful to avoid mistakes
# ...
settings = {
cafile = &quot;/path/to/mqtt.ca.pem&quot;;
certfile = &quot;/path/to/mqtt.pem&quot;;
keyfile = &quot;/path/to/mqtt.key&quot;;
};
} ];
</programlisting>
</section>
<section xml:id="module-services-mosquitto-config">
<title>Configuration</title>
<para>
The Mosquitto configuration has four distinct types of settings:
the global settings of the daemon, listeners, plugins, and
bridges. Bridges and listeners are part of the global
configuration, plugins are part of listeners. Users of the broker
are configured as parts of listeners rather than globally,
allowing configurations in which a given user is only allowed to
log in to the broker using specific listeners (eg to configure an
admin user with full access to all topics, but restricted to
localhost).
</para>
<para>
Almost all options of Mosquitto are available for configuration at
their appropriate levels, some as NixOS options written in camel
case, the remainders under <literal>settings</literal> with their
exact names in the Mosquitto config file. The exceptions are
<literal>acl_file</literal> (which is always set according to the
<literal>acl</literal> attributes of a listener and its users) and
<literal>per_listener_settings</literal> (which is always set to
<literal>true</literal>).
</para>
<section xml:id="module-services-mosquitto-config-passwords">
<title>Password authentication</title>
<para>
Mosquitto can be run in two modes, with a password file or
without. Each listener has its own password file, and different
listeners may use different password files. Password file
generation can be disabled by setting
<literal>omitPasswordAuth = true</literal> for a listener; in
this case it is necessary to either set
<literal>settings.allow_anonymous = true</literal> to allow all
logins, or to configure other authentication methods like TLS
client certificates with
<literal>settings.use_identity_as_username = true</literal>.
</para>
<para>
The default is to generate a password file for each listener
from the users configured to that listener. Users with no
configured password will not be added to the password file and
thus will not be able to use the broker.
</para>
</section>
<section xml:id="module-services-mosquitto-config-acl">
<title>ACL format</title>
<para>
Every listener has a Mosquitto <literal>acl_file</literal>
attached to it. This ACL is configured via two attributes of the
config:
</para>
<itemizedlist spacing="compact">
<listitem>
<para>
the <literal>acl</literal> attribute of the listener
configures pattern ACL entries and topic ACL entries for
anonymous users. Each entry must be prefixed with
<literal>pattern</literal> or <literal>topic</literal> to
distinguish between these two cases.
</para>
</listitem>
<listitem>
<para>
the <literal>acl</literal> attribute of every user
configures in the listener configured the ACL for that given
user. Only topic ACLs are supported by Mosquitto in this
setting, so no prefix is required or allowed.
</para>
</listitem>
</itemizedlist>
<para>
The default ACL for a listener is empty, disallowing all
accesses from all clients. To configure a completely open ACL,
set <literal>acl = [ &quot;pattern readwrite #&quot; ]</literal>
in the listener.
</para>
</section>
</section>
</chapter>

16
nixos/modules/services/web-apps/mastodon.nix
View File

@ -38,7 +38,7 @@ let
// (if cfg.smtp.authenticate then { SMTP_LOGIN = cfg.smtp.user; } else {})
// cfg.extraConfig;
systemCallsList = [ "@clock" "@cpu-emulation" "@debug" "@keyring" "@module" "@mount" "@obsolete" "@raw-io" "@reboot" "@setuid" "@swap" ];
systemCallsList = [ "@cpu-emulation" "@debug" "@keyring" "@ipc" "@mount" "@obsolete" "@privileged" "@setuid" ];
cfgService = {
# User and group
@ -50,6 +50,9 @@ let
# Logs directory and mode
LogsDirectory = "mastodon";
LogsDirectoryMode = "0750";
# Proc filesystem
ProcSubset = "pid";
ProtectProc = "invisible";
# Access write directories
UMask = "0027";
# Capabilities
@ -74,6 +77,7 @@ let
MemoryDenyWriteExecute = false;
RestrictRealtime = true;
RestrictSUIDSGID = true;
RemoveIPC = true;
PrivateMounts = true;
# System Call Filtering
SystemCallArchitectures = "native";
@ -464,7 +468,7 @@ in {
Type = "oneshot";
WorkingDirectory = cfg.package;
# System Call Filtering
SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ]);
SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ];
} // cfgService;
after = [ "network.target" ];
@ -491,7 +495,7 @@ in {
EnvironmentFile = "/var/lib/mastodon/.secrets_env";
WorkingDirectory = cfg.package;
# System Call Filtering
SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ]);
SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ];
} // cfgService;
after = [ "mastodon-init-dirs.service" "network.target" ] ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []);
wantedBy = [ "multi-user.target" ];
@ -517,7 +521,7 @@ in {
RuntimeDirectory = "mastodon-streaming";
RuntimeDirectoryMode = "0750";
# System Call Filtering
SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" "@resources" ]);
SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@memlock" "@resources" ])) "pipe" "pipe2" ];
} // cfgService;
};
@ -541,7 +545,7 @@ in {
RuntimeDirectory = "mastodon-web";
RuntimeDirectoryMode = "0750";
# System Call Filtering
SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ]);
SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ];
} // cfgService;
path = with pkgs; [ file imagemagick ffmpeg ];
};
@ -563,7 +567,7 @@ in {
EnvironmentFile = "/var/lib/mastodon/.secrets_env";
WorkingDirectory = cfg.package;
# System Call Filtering
SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList;
SystemCallFilter = [ ("~" + lib.concatStringsSep " " systemCallsList) "@chown" "pipe" "pipe2" ];
} // cfgService;
path = with pkgs; [ file imagemagick ffmpeg ];
};

4
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -189,6 +189,10 @@ in
];
services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-workspace ];
# Default to be `plasma` (X11) instead of `plasmawayland`, since plasma wayland currently has
# many tiny bugs.
# See: https://github.com/NixOS/nixpkgs/issues/143272
services.xserver.displayManager.defaultSession = mkDefault "plasma";
security.wrappers = {
kcheckpass = {

2
nixos/modules/services/x11/display-managers/default.nix
View File

@ -280,7 +280,7 @@ in
null;
example = "gnome";
description = ''
Graphical session to pre-select in the session chooser (only effective for GDM and LightDM).
Graphical session to pre-select in the session chooser (only effective for GDM, LightDM and SDDM).
On GDM, LightDM and SDDM, it will also be used as a session for auto-login.
'';

3
nixos/modules/services/x11/display-managers/sddm.nix
View File

@ -30,6 +30,9 @@ let
HaltCommand = "/run/current-system/systemd/bin/systemctl poweroff";
RebootCommand = "/run/current-system/systemd/bin/systemctl reboot";
Numlock = if cfg.autoNumlock then "on" else "none"; # on, off none
# Implementation is done via pkgs/applications/display-managers/sddm/sddm-default-session.patch
DefaultSession = optionalString (dmcfg.defaultSession != null) "${dmcfg.defaultSession}.desktop";
};
Theme = {

2
nixos/modules/virtualisation/libvirtd.nix
View File

@ -254,7 +254,7 @@ in
"allow ${e}")
cfg.allowedBridges;
systemPackages = with pkgs; [ libressl.nc iptables cfg.package cfg.qemu.package ];
etc.ethertypes.source = "${pkgs.ebtables}/etc/ethertypes";
etc.ethertypes.source = "${pkgs.iptables}/etc/ethertypes";
};
boot.kernelModules = [ "tun" ];

4
nixos/tests/chromium.nix
View File

@ -86,7 +86,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
options.append("--use-gl=swiftshader")
# Launch the process:
options.append("file://${startupHTML}")
machine.succeed(ru(f'ulimit -c unlimited; {binary} {shlex.join(options)} & disown'))
machine.succeed(ru(f'ulimit -c unlimited; {binary} {shlex.join(options)} >&2 & disown'))
if binary.startswith("google-chrome"):
# Need to click away the first window:
machine.wait_for_text("Make Google Chrome the default browser")
@ -215,7 +215,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
clipboard = machine.succeed(
ru(
"echo void | ${pkgs.xclip}/bin/xclip -i"
"echo void | ${pkgs.xclip}/bin/xclip -i >&2"
)
)
machine.succeed(

41
nixos/tests/mosquitto.nix
View File

@ -3,6 +3,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
let
port = 1888;
tlsPort = 1889;
anonPort = 1890;
password = "VERY_secret";
hashedPassword = "$7$101$/WJc4Mp+I+uYE9sR$o7z9rD1EYXHPwEP5GqQj6A7k4W1yVbePlb8TqNcuOLV9WNCiDgwHOB0JHC1WCtdkssqTBduBNUnUGd6kmZvDSw==";
topic = "test/foo";
@ -63,7 +64,7 @@ in {
};
in {
server = { pkgs, ... }: {
networking.firewall.allowedTCPPorts = [ port tlsPort ];
networking.firewall.allowedTCPPorts = [ port tlsPort anonPort ];
services.mosquitto = {
enable = true;
settings = {
@ -112,6 +113,18 @@ in {
use_identity_as_username = true;
};
}
{
port = anonPort;
omitPasswordAuth = true;
settings.allow_anonymous = true;
acl = [ "pattern read #" ];
users = {
anonWriter = {
password = "<ignored>" + password;
acl = [ "write ${topic}" ];
};
};
}
];
};
};
@ -136,9 +149,8 @@ in {
def publish(args, user, topic="${topic}", port=${toString port}):
return "{} {}".format(mosquitto_cmd("pub", user, topic, port), args)
def subscribe(args, user, topic="${topic}", port=${toString port}):
return "{} -C 1 {}".format(mosquitto_cmd("sub", user, topic, port), args)
return "{} -W 5 -C 1 {}".format(mosquitto_cmd("sub", user, topic, port), args)
def parallel(*fns):
from threading import Thread
@ -150,17 +162,15 @@ in {
start_all()
server.wait_for_unit("mosquitto.service")
def check_passwords():
with subtest("check passwords"):
client1.succeed(publish("-m test", "password_store"))
client1.succeed(publish("-m test", "password_file"))
client1.succeed(publish("-m test", "hashed_store"))
client1.succeed(publish("-m test", "hashed_file"))
check_passwords()
def check_acl():
with subtest("check acl"):
client1.succeed(subscribe("", "reader", topic="$SYS/#"))
client1.fail(subscribe("-W 5", "writer", topic="$SYS/#"))
client1.fail(subscribe("", "writer", topic="$SYS/#"))
parallel(
lambda: client1.succeed(subscribe("-i 3688cdd7-aa07-42a4-be22-cb9352917e40", "reader")),
@ -170,15 +180,13 @@ in {
])
parallel(
lambda: client1.fail(subscribe("-W 5 -i 24ff16a2-ae33-4a51-9098-1b417153c712", "reader")),
lambda: client1.fail(subscribe("-i 24ff16a2-ae33-4a51-9098-1b417153c712", "reader")),
lambda: [
server.wait_for_console_text("24ff16a2-ae33-4a51-9098-1b417153c712"),
client2.succeed(publish("-m test", "reader"))
])
check_acl()
def check_tls():
with subtest("check tls"):
client1.succeed(
subscribe(
"--cafile ${snakeOil}/ca.crt "
@ -188,6 +196,13 @@ in {
port=${toString tlsPort},
user="no_such_user"))
check_tls()
with subtest("check omitPasswordAuth"):
parallel(
lambda: client1.succeed(subscribe("-i fd56032c-d9cb-4813-a3b4-6be0e04c8fc3",
"anonReader", port=${toString anonPort})),
lambda: [
server.wait_for_console_text("fd56032c-d9cb-4813-a3b4-6be0e04c8fc3"),
client2.succeed(publish("-m test", "anonWriter", port=${toString anonPort}))
])
'';
})

2
nixos/tests/pantheon.nix
View File

@ -51,7 +51,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
machine.wait_for_window("plank")
with subtest("Open elementary terminal"):
machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal &'")
machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal >&2 &'")
machine.wait_for_window("io.elementary.terminal")
machine.sleep(20)
machine.screenshot("screen")

6
nixos/tests/plasma5.nix
View File

@ -42,15 +42,15 @@ import ./make-test-python.nix ({ pkgs, ...} :
machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
with subtest("Run Dolphin"):
machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin &'")
machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'")
machine.wait_for_window(" Dolphin")
with subtest("Run Konsole"):
machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 konsole &'")
machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 konsole >&2 &'")
machine.wait_for_window("Konsole")
with subtest("Run systemsettings"):
machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 systemsettings5 &'")
machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 systemsettings5 >&2 &'")
machine.wait_for_window("Settings")
with subtest("Wait to get a screenshot"):

2
nixos/tests/seafile.nix
View File

@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
};
in {
name = "seafile";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
maintainers = [ kampfschlaefer schmittlauch ];
};

2
nixos/tests/service-runner.nix
View File

@ -24,7 +24,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.succeed(
"""
mkdir -p /run/nginx /var/log/nginx /var/cache/nginx
${nodes.machine.config.systemd.services.nginx.runner} &
${nodes.machine.config.systemd.services.nginx.runner} >&2 &
echo $!>my-nginx.pid
"""
)

2
nixos/tests/systemd-boot.nix
View File

@ -42,7 +42,7 @@ in
# Check that specialisations create corresponding boot entries.
specialisation = makeTest {
name = "systemd-boot-specialisation";
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ lukegb ];
meta.maintainers = with pkgs.lib.maintainers; [ lukegb ];
machine = { pkgs, lib, ... }: {
imports = [ common ];

2
nixos/tests/xfce.nix
View File

@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
# Check that logging in has given the user ownership of devices.
machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 xfce4-terminal &'")
machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 xfce4-terminal >&2 &'")
machine.wait_for_window("Terminal")
machine.sleep(10)
machine.screenshot("screen")

11
pkgs/applications/audio/ecasound/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, pkg-config
, alsa-lib
, audiofile
@ -28,6 +29,16 @@ stdenv.mkDerivation rec {
sha256 = "1m7njfjdb7sqf0lhgc4swihgdr4snkg8v02wcly08wb5ar2fr2s6";
};
patches = [
# Pull patch pending upstream inclusion for ncurses-6.3:
# https://sourceforge.net/p/ecasound/bugs/54/
(fetchpatch {
name = "ncursdes-6.3.patch";
url = "https://sourceforge.net/p/ecasound/bugs/54/attachment/0001-ecasignalview.cpp-always-use-s-style-format-for-prin.patch";
sha256 = "1x1gsjzd43lh19mhpmwrbq269h56s8bxgyv0yfi5yf0sqjf9vaq0";
})
];
nativeBuildInputs = [
pkg-config
];

114
pkgs/applications/audio/jconvolver/default.nix Normal file
View File

@ -0,0 +1,114 @@
{ lib, stdenv, fetchurl, flac, unzip, fftwFloat, hybridreverb2, libclthreads, libjack2, libsndfile, zita-convolver }:
stdenv.mkDerivation rec {
pname = "jconvolver";
version = "1.1.0";
src = fetchurl {
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "03fq1rk5wyn32w0aaa9vqijnw9x9i0i7sv4nhsf949bk5lvi2nmc";
};
reverbs = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/jconvolver-reverbs.tar.bz2";
sha256 = "127aj211xfqp37c94d9cn0mmwzbjkj3f6br5gr67ckqirvsdkndi";
};
weird = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/weird.wav";
sha256 = "14xchdikx5k8zlgwglrqi168vki3n3rwhn73dkbj5qwh2ndrlyrc";
};
porihall-sf = fetchurl {
url = "http://legacy.spa.aalto.fi/projects/poririrs/wavs/sndfld.zip";
sha256 = "0z1kmdin3vcy6wmnym9jlfh8hwvci9404hff02cb98iw2slxid42";
};
porihall-bd = fetchurl {
url = "http://legacy.spa.aalto.fi/projects/poririrs/wavs/bin_dfeq.zip";
sha256 = "03m2brfxs851sag4z7kd71h6anv6hj34zcambwib0v1byg8vyplp";
};
porihall-c = fetchurl {
url = "http://legacy.spa.aalto.fi/projects/poririrs/wavs/cardioid.zip";
sha256 = "0ilbfvb2kvg5z6zi0mf2k4n0vgpir3iz5fa53xw92c07fs0cx36w";
};
spacenet-hm2 = fetchurl {
url = "https://webfiles.york.ac.uk/OPENAIR/IRs/hamilton-mausoleum/b-format/hm2_000_bformat_48k.wav";
sha256 = "1icnzfzq3mccbmnvmvh22mw8g8dci4i9h7lgrpmycj58v3gnb1p5";
};
spacenet-lyd3 = fetchurl {
url = "https://webfiles.york.ac.uk/OPENAIR/IRs/st-andrews-church/b-format/lyd3_000_bformat_48k.wav";
sha256 = "144cc0i91q5i72lwbxydx3nvxrd12j7clxjhwa2b8sf69ypz58wd";
};
spacenet-mh3 = fetchurl {
url = "https://webfiles.york.ac.uk/OPENAIR/IRs/maes-howe/b-format/mh3_000_bformat_48k.wav";
sha256 = "1c6v9jlm88l1sx2383yivycdrs9jqfsfx8cpbkjg19v2x1dfns0b";
};
spacenet-minster1 = fetchurl {
url = "https://webfiles.york.ac.uk/OPENAIR/IRs/york-minster/b-format/minster1_bformat_48k.wav";
sha256 = "1cs26pawjkv6qvwhfirfvzh21xvnmx8yh7f4xcr79cxv5c6hhnrw";
};
nativeBuildInputs = [ flac unzip ];
buildInputs = [
fftwFloat
hybridreverb2
libclthreads
libjack2
libsndfile
zita-convolver
];
outputs = [ "bin" "out" "doc" ];
preConfigure = ''
cd source
'';
makeFlags = [
"PREFIX=$(bin)"
];
postInstall = ''
mkdir -p $doc/share/doc/jconvolver
cp -r ../[A-Z]* $doc/share/doc/jconvolver/
mkdir -p $out/share/jconvolver
cp -r ../config-files $out/share/jconvolver/
cd $out/share/jconvolver
for conf in */*.conf */*/*.conf; do
if grep -q /audio/ $conf; then
substituteInPlace $conf --replace /audio/ $out/share/jconvolver/
fi
done
substituteInPlace config-files/xtalk-cancel/EYCv2-44.conf --replace /cd "#/cd"
ln -s ${weird} config-files/weird.wav
tar xf ${reverbs}
cd reverbs
unzip -d porihall ${porihall-sf} s1_r4_sf.wav
unzip -d porihall ${porihall-bd} s1_r3_bd.wav
unzip -d porihall ${porihall-c} s1_r3_c.wav
mkdir spacenet
ln -s ${spacenet-hm2} spacenet/HM2_000_WXYZ_48k.amb
ln -s ${spacenet-lyd3} spacenet/Lyd3_000_WXYZ_48k.amb
ln -s ${spacenet-mh3} spacenet/MH3_000_WXYZ_48k.amb
ln -s ${spacenet-minster1} spacenet/Minster1_000_WXYZ_48k.amb
mkdir -p hybridreverb-database/large_concert_hall/music/8m
for flac in ${hybridreverb2}/share/HybridReverb2/RIR_Database/large_concert_hall/music/8m/*.flac; do
flac --output-prefix=hybridreverb-database/large_concert_hall/music/8m/ -d $flac
done
'';
enableParallelBuilding = true;
meta = with lib; {
description = "A JACK client and audio file convolver with reverb samples";
homepage = "https://kokkinizita.linuxaudio.org/linuxaudio/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ orivej ];
platforms = platforms.linux;
};
}

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

@ -53,13 +53,13 @@
mkDerivation rec {
pname = "mixxx";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "mixxxdj";
repo = "mixxx";
rev = version;
sha256 = "18sx4l3zzbn5142xfv5bp0crdd615a5728fkprqacnx3zpa144x6";
sha256 = "sha256-6M1qaRyRYWTIKqclewuD+RUVDdxVbBHcfpw2qYgO6BA=";
};
nativeBuildInputs = [ cmake pkg-config ];
@ -117,7 +117,7 @@ mkDerivation rec {
# mixxx installs udev rules to DATADIR instead of SYSCONFDIR
# let's disable this and install udev rules manually via postInstall
# see https://github.com/mixxxdj/mixxx/blob/2.3.0/CMakeLists.txt#L1381-L1392
# see https://github.com/mixxxdj/mixxx/blob/2.3.1/CMakeLists.txt#L1381-L1392
cmakeFlags = [
"-DINSTALL_USER_UDEV_RULES=OFF"
];

5
pkgs/applications/audio/tagutil/default.nix
View File

@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
zlib
];
prePatch = ''
substituteInPlace CMakeLists.txt \
--replace "-o aslr" ""
'';
meta = with lib; {
description = "Scriptable music files tags tool and editor";
homepage = "https://github.com/kaworu/tagutil";

1
pkgs/applications/display-managers/sddm/default.nix
View File

@ -19,6 +19,7 @@ in mkDerivation {
patches = [
./sddm-ignore-config-mtime.patch
./sddm-default-session.patch
# Load `/etc/profile` for `environment.variables` with zsh default shell.
# See: https://github.com/sddm/sddm/pull/1382
(fetchpatch {

71
pkgs/applications/display-managers/sddm/sddm-default-session.patch Normal file
View File

@ -0,0 +1,71 @@
diff --git a/src/common/Configuration.h b/src/common/Configuration.h
index cf44a62..7bb9c03 100644
--- a/src/common/Configuration.h
+++ b/src/common/Configuration.h
@@ -44,6 +44,7 @@ namespace SDDM {
"NOTE: Currently ignored if autologin is enabled."));
Entry(InputMethod, QString, QStringLiteral("qtvirtualkeyboard"), _S("Input method module"));
Entry(Namespaces, QStringList, QStringList(), _S("Comma-separated list of Linux namespaces for user session to enter"));
+ Entry(DefaultSession, QString, QString(), _S("System-wide default session"));
// Name Entries (but it's a regular class again)
Section(Theme,
Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path"));
diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp
index 1953c76..54fe2f2 100644
--- a/src/greeter/SessionModel.cpp
+++ b/src/greeter/SessionModel.cpp
@@ -43,6 +43,7 @@ namespace SDDM {
beginResetModel();
populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());
populate(Session::X11Session, mainConfig.X11.SessionDir.get());
+ selectDefaultSession();
endResetModel();
// refresh everytime a file is changed, added or removed
@@ -52,6 +53,7 @@ namespace SDDM {
d->sessions.clear();
populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());
populate(Session::X11Session, mainConfig.X11.SessionDir.get());
+ selectDefaultSession();
endResetModel();
});
watcher->addPath(mainConfig.Wayland.SessionDir.get());
@@ -149,11 +151,25 @@ namespace SDDM {
else
delete si;
}
+ }
+
+ void SessionModel::selectDefaultSession() {
+ d->lastIndex = 0;
+
// find out index of the last session
for (int i = 0; i < d->sessions.size(); ++i) {
if (d->sessions.at(i)->fileName() == stateConfig.Last.Session.get()) {
d->lastIndex = i;
- break;
+ return;
+ }
+ }
+
+ // Otherwise, fallback to system-wide default session.
+ auto defaultSession = mainConfig.DefaultSession.get();
+ for (int i = 0; i < d->sessions.size(); ++i) {
+ if (QFileInfo(d->sessions.at(i)->fileName()).fileName() == defaultSession) {
+ d->lastIndex = i;
+ return;
}
}
}
diff --git a/src/greeter/SessionModel.h b/src/greeter/SessionModel.h
index 2e2efa9..a93315c 100644
--- a/src/greeter/SessionModel.h
+++ b/src/greeter/SessionModel.h
@@ -58,6 +58,7 @@ namespace SDDM {
SessionModelPrivate *d { nullptr };
void populate(Session::Type type, const QString &path);
+ void selectDefaultSession();
};
}

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, zlib, ncurses }:
{ lib, stdenv, fetchurl, fetchpatch, zlib, ncurses }:
stdenv.mkDerivation rec {
pname = "aewan";
@ -9,6 +9,17 @@ stdenv.mkDerivation rec {
sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817";
};
patches = [
# Pull patch pending upstream inclusion:
# https://sourceforge.net/p/aewan/bugs/13/
(fetchpatch {
url = "https://sourceforge.net/p/aewan/bugs/13/attachment/aewan-cvs-ncurses-6.3.patch";
sha256 = "0pgpk1l3d6d5y37lvvavipwnmv9gmpfdy21jkz6baxhlkgf43r4p";
# patch is in CVS diff format, add 'a/' prefix
extraPrefix = "";
})
];
buildInputs = [ zlib ncurses ];
meta = {

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

@ -168,8 +168,8 @@ mkDerivation rec {
'';
postInstall = ''
mkdir -p $out/share/icons $out/bin
ln $out/lib/rstudio/rstudio.png $out/share/icons
mkdir -p $out/share/icons/hicolor/48x48/apps $out/bin
ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps
for f in {diagnostics,rpostback,rstudio}; do
ln -s $out/lib/rstudio/bin/$f $out/bin

9
pkgs/applications/graphics/imgbrd-grabber/default.nix
View File

@ -6,6 +6,7 @@
, qttools
, qtscript
, qtdeclarative
, qtnetworkauth
, qtbase
, autogen
, automake
@ -17,15 +18,16 @@
, rsync
, typescript
}:
stdenv.mkDerivation rec {
pname = "imgbrd-grabber";
version = "7.5.1";
version = "7.3.2";
src = fetchFromGitHub {
owner = "Bionus";
repo = "imgbrd-grabber";
rev = "v${version}";
sha256 = "053rwvcr88fcba0447a6r115cgnqsm9rl066z8d5jacqnhdij58k";
sha256 = "sha256-40JCdtRhAQpz2lBGmYh2MgA9rRzHmOZx7lWW0IbfjP4=";
fetchSubmodules = true;
};
@ -41,6 +43,7 @@ stdenv.mkDerivation rec {
qtbase
qtdeclarative
qttools
qtnetworkauth
nodejs
cmake
wrapQtAppsHook
@ -67,6 +70,8 @@ stdenv.mkDerivation rec {
# link the catch2 sources from nixpkgs
ln -sf ${catch2.src} tests/src/vendor/catch
sed "s|strict\": true|strict\": false|g" -i ./sites/tsconfig.json
'';
postInstall = ''

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

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, sqlite, xdg-utils}:
{ lib, stdenv, rustPlatform, fetchFromGitHub, Security, sqlite, xdg-utils}:
rustPlatform.buildRustPackage rec {
pname = "anup";
@ -14,6 +14,8 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
sqlite
xdg-utils
] ++ lib.optionals stdenv.isDarwin [
Security
];
cargoSha256 = "sha256-1TA2HDHKA3twFtlAWaC2zcRzS8TJwcbBt1OTQ3hC3qM=";

11
pkgs/applications/misc/bemenu/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cairo, libxkbcommon
{ stdenv, lib, fetchFromGitHub, fetchpatch, cairo, libxkbcommon
, pango, fribidi, harfbuzz, pcre, pkg-config
, ncursesSupport ? true, ncurses ? null
, waylandSupport ? true, wayland ? null, wayland-protocols ? null
@ -20,6 +20,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-U4IMfDvQ0rfEJhE3Uext2c/Cs0mjy1tw+k8uk441Ag8=";
};
patches = [
# Pull upstream fix for build against ncurses-6.3
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/Cloudef/bemenu/commit/d31164db756989579468946aba62969e42c7ed28.patch";
sha256 = "sha256-oyndQI7SaR8cK0IO5wIIxMpmakhfUzwUqLIKRbPkEdw=";
})
];
nativeBuildInputs = [ pkg-config pcre ];
makeFlags = ["PREFIX=$(out)"];

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

@ -13,12 +13,12 @@
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
in stdenv.mkDerivation rec {
pname = "koreader";
version = "2021.09";
version = "2021.10.1";
src = fetchurl {
url =
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
sha256 = "1q2mbmczx2y5ylriq4k3lbjlpw4pwfq2vvcx06ymax31fsrvix84";
sha256 = "sha256-UpDwexBfjlne/uNMTtNjIyZb3TDMYFeDvtwtTFARovw=";
};
sourceRoot = ".";

10
pkgs/applications/misc/mkgmap/deps.nix generated
View File

@ -9,23 +9,23 @@
sha256 = "0zb4pqkwly5z30ww66qhhasdhdrzwmrw00347yrbgyk2ii4wjad3";
};
protobuf = fetchurl {
url = "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar";
url = "mirror://maven/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar";
sha256 = "0x6c4pbsizvk3lm6nxcgi1g2iqgrxcna1ip74lbn01f0fm2wdhg0";
};
xpp3 = fetchurl {
url = "https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar";
url = "mirror://maven/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar";
sha256 = "1f9ifnxxj295xb1494jycbfm76476xm5l52p7608gf0v91d3jh83";
};
jaxb-api = fetchurl {
url = "https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar";
url = "mirror://maven/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar";
sha256 = "00rxpc0m30d3jc572ni01ryxq8gcbnr955xsabrijg9pknc0fc48";
};
junit = fetchurl {
url = "https://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar";
url = "mirror://maven/junit/junit/4.11/junit-4.11.jar";
sha256 = "1zh6klzv8w30dx7jg6pkhllk4587av4znflzhxz8x97c7rhf3a4h";
};
hamcrest-core = fetchurl {
url = "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar";
url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar";
sha256 = "1sfqqi8p5957hs9yik44an3lwpv8ln2a6sh9gbgli4vkx68yzzb6";
};
}

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

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "pipr";
version = "0.0.15";
version = "0.0.16";
src = fetchFromGitHub {
owner = "ElKowar";
repo = pname;
rev = "v${version}";
sha256 = "1pbj198nqi27kavz9bm31a3h7h70by6l00046x09yf9n8qjpp01w";
sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8=";
};
cargoSha256 = "05ryaxi479fxzdcl51r1xlqbiasfzxcxgvl4wnxync8qi8q2yqk0";
cargoSha256 = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI=";
nativeBuildInputs = [ makeWrapper ];
postFixup = ''

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

@ -18,9 +18,9 @@
}
},
"beta": {
"version": "96.0.4664.27",
"sha256": "1ym9llqmkhlnrmawc0dcnzkvr714kykvdcldkar5yqp0x46k7bi6",
"sha256bin64": "1x4y589qmiz0zgkpv17phcl8h5c7qankpfvv6c42w5bysx6mn1f7",
"version": "96.0.4664.35",
"sha256": "047zc1hl5iwhrgnypl7r5ga2cx1yz26lf1x5cnvdqmarmmkq380m",
"sha256bin64": "1cw89fafxxhr85x4vzhxv3jkmqfnxjisc7gj9v8y2ixqpn190hjl",
"deps": {
"gn": {
"version": "2021-09-24",
@ -31,15 +31,15 @@
}
},
"dev": {
"version": "97.0.4682.3",
"sha256": "1z2d3r3d4g3ng1p73s243jllvvfkh085vvqz0vaa6pv7c9631pn4",
"sha256bin64": "0xravg4jjbwj7vifabz94mfammv0zx754hpa6kynjaqzvlxbax2a",
"version": "97.0.4688.2",
"sha256": "0a5i64gxb24z5mfvmf50g4fafvqqbj7k5077arnhwzp3xiznld88",
"sha256bin64": "0l70qlna8x05rrlcfgv2xyl8g5nlmd42i8n0yc9dw3mwq8m4c4db",
"deps": {
"gn": {
"version": "2021-10-08",
"version": "2021-10-30",
"url": "https://gn.googlesource.com/gn",
"rev": "693f9fb87e4febdd4299db9f73d8d2c958e63148",
"sha256": "1qfjj2mdpflry4f9fkagvb76zwfibys4nqz9lddy1zh5nnbd9mff"
"rev": "8926696a4186279489cc2b8d768533e61bba73d7",
"sha256": "1084lnyb0a1khbgjvak05fcx6jy973wqvsf77n0alxjys18sg2yk"
}
}
},

9
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -43,12 +43,11 @@
# Hardening
, graphene-hardened-malloc
# crashes with intel driver
, useHardenedMalloc ? false
# Whether to use graphene-hardened-malloc
, useHardenedMalloc ? true
# Whether to disable multiprocess support to work around crashing tabs
# TODO: fix the underlying problem instead of this terrible work-around
, disableContentSandbox ? true
# Whether to disable multiprocess support
, disableContentSandbox ? false
# Extra preferences
, extraPrefs ? ""

1
pkgs/applications/networking/browsers/yandex-browser/default.nix
View File

@ -131,5 +131,6 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = [ "x86_64-linux" ];
broken = true;
};
}

10
pkgs/applications/networking/cluster/nerdctl/default.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.12.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FRu1h6DT43rPaa9dcgz83w9K+xtzJgB4l/eTu+Fbb+c=";
sha256 = "sha256-uyLY2yH/6J0rtra0brBATadPqrNyyuCcaGfOrng9h4Y=";
};
vendorSha256 = "sha256-QFACe1/5MVbXKTknEyqjWclEQgJSZAJ/QljhLq/tWe4=";
vendorSha256 = "sha256-r7xzvntTIJocdYMQpFXunI2XV65eRG+piEEzS5N2xsY=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
@ -35,7 +35,9 @@ buildGoModule rec {
--prefix CNI_PATH : "${cni-plugins}/bin"
installShellCompletion --cmd nerdctl \
--bash <($out/bin/nerdctl completion bash)
--bash <($out/bin/nerdctl completion bash) \
--fish <($out/bin/nerdctl completion fish) \
--zsh <($out/bin/nerdctl completion zsh)
'';
doInstallCheck = true;

4
pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix
View File

@ -15,8 +15,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/NixOS/nixops-aws.git";
rev = "371aedeb7fd53b8978a60dd7c37d3a6c38101c48";
sha256 = "15jz9x3ra3hsh6xj4cbri1fvvjk2rplnnhnccz7qc6f176b5r01j";
rev = "44f774272bd522cc7e87074c056f2225f771ded0";
sha256 = "0x9pv186nkcfisr1c1nxw8gpazkrg546dfl95140rif0xzw3pizx";
};
}
);

65
pkgs/applications/networking/cluster/nixops/poetry.lock generated
View File

@ -38,14 +38,14 @@ python-versions = "*"
[[package]]
name = "boto3"
version = "1.18.64"
version = "1.19.9"
description = "The AWS SDK for Python"
category = "main"
optional = false
python-versions = ">= 3.6"
[package.dependencies]
botocore = ">=1.21.64,<1.22.0"
botocore = ">=1.22.9,<1.23.0"
jmespath = ">=0.7.1,<1.0.0"
s3transfer = ">=0.5.0,<0.6.0"
@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
[[package]]
name = "botocore"
version = "1.21.64"
version = "1.22.9"
description = "Low-level, data-driven core of boto 3."
category = "main"
optional = false
@ -173,7 +173,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
[[package]]
name = "libvirt-python"
version = "7.8.0"
version = "7.9.0"
description = "The libvirt virtualization API python binding"
category = "main"
optional = false
@ -228,7 +228,7 @@ typing-extensions = "^3.7.4"
type = "git"
url = "https://github.com/NixOS/nixops-aws.git"
reference = "master"
resolved_reference = "371aedeb7fd53b8978a60dd7c37d3a6c38101c48"
resolved_reference = "44f774272bd522cc7e87074c056f2225f771ded0"
[[package]]
name = "nixops-encrypted-links"
@ -344,14 +344,14 @@ resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8"
[[package]]
name = "packaging"
version = "21.0"
version = "21.2"
description = "Core utilities for Python packages"
category = "dev"
optional = false
python-versions = ">=3.6"
[package.dependencies]
pyparsing = ">=2.0.2"
pyparsing = ">=2.0.2,<3"
[[package]]
name = "pluggy"
@ -621,12 +621,12 @@ boto = [
{file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"},
]
boto3 = [
{file = "boto3-1.18.64-py3-none-any.whl", hash = "sha256:b4d6299dd16a3042b7750cde00fe38d57fd59d3ce242308ba8488618ca931694"},
{file = "boto3-1.18.64.tar.gz", hash = "sha256:9223b433b0d3b74f2b9574fb3c384048998343ccd6b608044318a7f9b904f661"},
{file = "boto3-1.19.9-py3-none-any.whl", hash = "sha256:efa4aea4d30e93f8913a5731ab4de7b6d2020ee77cdde7e61bfae56670da1a14"},
{file = "boto3-1.19.9.tar.gz", hash = "sha256:2fe4edec0e02705059e6baac52e29f97fae6086bf8b817e6ca0e49b48c0fbbf2"},
]
botocore = [
{file = "botocore-1.21.64-py3-none-any.whl", hash = "sha256:d57287377e4c7c7d7bf6c5fa39e02994de1d99fced9492a58a00e5a54bae1cca"},
{file = "botocore-1.21.64.tar.gz", hash = "sha256:0a30dca4dad7d43fd856e671ace95f9afc4726caa1e22f0ae11b654fc76e0c7d"},
{file = "botocore-1.22.9-py3-none-any.whl", hash = "sha256:612d26b58f790d267cc7714e82262104b681db799655b6dd6b64fcd9caf08bef"},
{file = "botocore-1.22.9.tar.gz", hash = "sha256:7b59367bace96595e9feeed9765c7178278c55531b2b9e07b7618911e9f0a00b"},
]
certifi = [
{file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
@ -699,6 +699,8 @@ cryptography = [
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"},
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"},
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"},
{file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"},
{file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"},
{file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"},
{file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"},
{file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"},
@ -732,15 +734,31 @@ jmespath = [
{file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"},
]
libvirt-python = [
{file = "libvirt-python-7.8.0.tar.gz", hash = "sha256:9d07416d66805bf1a17f34491b3ced2ac6c42b6a012ddf9177e0e3ae1b103fd5"},
{file = "libvirt-python-7.9.0.tar.gz", hash = "sha256:8535cffa5fbf05185648f9f57a2f71899c3bc12c897d320351c53725a48e5359"},
]
markupsafe = [
{file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"},
{file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"},
{file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"},
{file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"},
{file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"},
{file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"},
{file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"},
{file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"},
{file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"},
{file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"},
@ -749,14 +767,27 @@ markupsafe = [
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"},
{file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"},
{file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"},
{file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"},
{file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"},
{file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"},
{file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"},
{file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"},
{file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"},
@ -766,6 +797,12 @@ markupsafe = [
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"},
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"},
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"},
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"},
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"},
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"},
{file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"},
{file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"},
{file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"},
{file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"},
{file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"},
{file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
@ -779,8 +816,8 @@ nixops-virtd = []
nixopsvbox = []
nixos-modules-contrib = []
packaging = [
{file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"},
{file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"},
{file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"},
{file = "packaging-21.2.tar.gz", hash = "sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966"},
]
pluggy = [
{file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"},

6
pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terraform-provider-lxd";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "sl1pm4t";
repo = "terraform-provider-lxd";
rev = "v${version}";
sha256 = "sha256-ikI8LQ6qawdeUSb1Ee03H409DQw2M4QtsIxAESxXNRI=";
sha256 = "sha256-fl9sYoyrVV6LvnIrnyAXy18QLLazQajjcLO1JWsqAR4=";
};
vendorSha256 = "sha256-IjpC7bFodqdrqVUEQdZBc6N8py5+t2kRYvcQiPr7CHc=";
vendorSha256 = "sha256-ervfG/BAaF4M+BXsp0eCDM6nPWQOS3pthClhArsUoYc=";
doCheck = false;

12
pkgs/applications/networking/instant-messengers/mcabber/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, openssl, ncurses, pkg-config, glib, loudmouth, libotr
{ lib, stdenv, fetchurl, fetchpatch, openssl, ncurses, pkg-config, glib, loudmouth, libotr
, gpgme
}:
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4";
};
patches = [
# Pull upstream patch for ncurses-6.3.
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/McKael/mcabber/commit/5a0893d69023b77b7671731defbdca5d47731130.patch";
sha256 = "01bc23z0mva9l9jv587sq2r9w3diachgkmb9ad99hlzgj02fmq4v";
stripLen = 1;
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ];

4
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "purple-lurch";
version = "0.6.7";
version = "0.7.0";
src = fetchFromGitHub {
owner = "gkdr";
repo = "lurch";
rev = "v${version}";
sha256 = "029jjqinsfhpv0zgji3sv1cyk54fn9qp176fwy97d1clf0vflxrz";
sha256 = "sha256-yyzotKL1Z4B2BxloJndJKemONMPLG9pVDVe2K5AL05g=";
fetchSubmodules = true;
};

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

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

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

@ -66,7 +66,7 @@ let
in
mkDerivation rec {
pname = "telegram-desktop";
version = "3.1.9";
version = "3.1.11";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -75,7 +75,7 @@ mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "1nmakl9jxmw3k8gka56cyywbjwv06a5983dy6h9jhkkq950fn33s";
sha256 = "0hpcsraw3gx37wk3r88q51qf68ny0kb3kd6slnklwf22d1jqr3fn";
};
postPatch = ''

6
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation {
pname = "tg_owt";
version = "unstable-2021-09-15";
version = "unstable-2021-10-21";
src = fetchFromGitHub {
owner = "desktop-app";
repo = "tg_owt";
rev = "575fb17d2853c43329e45f6693370f5e41668055";
sha256 = "17lhy5g4apdakspv75zm070k7003crf1i80m8wy8f631s86v30md";
rev = "d578c760dc6f1ae5f0f3bb5317b0b2ed04b79138";
sha256 = "12lr50nma3j9df55sxi6p48yhn9yxrwzz5yrx7r29p8p4fv1c75w";
fetchSubmodules = true;
};

11
pkgs/applications/networking/instant-messengers/toxic/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl
{ lib, stdenv, fetchFromGitHub, fetchpatch, libsodium, ncurses, curl
, libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus
, qrencode, gdk-pixbuf, libnotify }:
@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-5jLXXI+IMrYa7ZtdMjJrah1zB5TJ3GdHfvcMd1TYE4E=";
};
patches = [
# Pending for upstream inclusion fix for ncurses-6.3 compatibility.
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/JFreegman/toxic/commit/41e93adbdbd56db065166af5a6676a7996e9e451.patch";
sha256 = "sha256-LYEseB5FmXFNifa1RZUxhkXeWlkEEMm3ASD55IoUPa0=";
})
];
makeFlags = [ "PREFIX=$(out)"];
installFlags = [ "PREFIX=$(out)"];

2
pkgs/applications/networking/mullvad-vpn/default.nix
View File

@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
mv usr/bin/* $out/bin
mv opt/Mullvad\ VPN/* $out/share/mullvad
sed -i 's|\/opt\/Mullvad.*VPN|env MULLVAD_DISABLE_UPDATE_NOTIFICATION=1 '$out'/bin|g' $out/share/applications/mullvad-vpn.desktop
sed -i 's|"\/opt\/Mullvad.*VPN|env MULLVAD_DISABLE_UPDATE_NOTIFICATION=1 "'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop
ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/
ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nextdns";
version = "1.37.2";
version = "1.37.3";
src = fetchFromGitHub {
owner = "nextdns";
repo = "nextdns";
rev = "v${version}";
sha256 = "sha256-R0n/wRCaQ8WvQer3bBLUmOdIojtfjXU0bs0pTn7L0lc=";
sha256 = "sha256-BCDVn4JaRYIexI7NrRDchUl9u4AEJa+An9ItYYJDs3A=";
};
vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48=";

136
pkgs/applications/science/electronics/picoscope/default.nix Normal file
View File

@ -0,0 +1,136 @@
{ stdenv, lib, fetchurl, dpkg, makeWrapper , mono, gtk-sharp-3_0
, glib, libusb1 , zlib, gtk3-x11, callPackage
, scopes ? [
"picocv"
"ps2000"
"ps2000a"
"ps3000"
"ps3000a"
"ps4000"
"ps4000a"
"ps5000"
"ps5000a"
"ps6000"
"ps6000a"
] }:
let
shared_meta = lib:
with lib; {
homepage = "https://www.picotech.com/downloads/linux";
maintainers = with maintainers; [ expipiplus1 yorickvp wirew0rm ];
platforms = [ "x86_64-linux" ];
license = licenses.unfree;
};
libpicoipp = callPackage ({ stdenv, lib, fetchurl, autoPatchelfHook, dpkg }:
stdenv.mkDerivation rec {
pname = "libpicoipp";
inherit (sources.libpicoipp) version;
src = fetchurl { inherit (sources.libpicoipp) url sha256; };
nativeBuildInputs = [ dpkg autoPatchelfHook ];
buildInputs = [ stdenv.cc.cc.lib ];
sourceRoot = ".";
unpackCmd = "dpkg-deb -x $src .";
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp -d opt/picoscope/lib/* $out/lib
install -Dt $out/usr/share/doc/libpicoipp usr/share/doc/libpicoipp/copyright
runHook postInstall
'';
meta = with lib;
shared_meta lib // {
description = "library for picotech oscilloscope software";
};
}) { };
# If we don't have a platform available, put a dummy version here, so at
# least evaluation succeeds.
sources =
(lib.importJSON ./sources.json).${stdenv.system} or { picoscope.version = "unknown"; };
scopePkg = name:
{ url, version, sha256 }:
stdenv.mkDerivation rec {
pname = "lib${name}";
inherit version;
src = fetchurl { inherit url sha256; };
# picoscope does a signature check, so we can't patchelf these
nativeBuildInputs = [ dpkg ];
sourceRoot = ".";
unpackCmd = "dpkg-deb -x $src .";
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp -d opt/picoscope/lib/* $out/lib
runHook postInstall
'';
meta = with lib;
shared_meta lib // {
description = "library for picotech oscilloscope ${name} series";
};
};
scopePkgs = lib.mapAttrs scopePkg sources;
in stdenv.mkDerivation rec {
pname = "picoscope";
inherit (sources.picoscope) version;
src = fetchurl { inherit (sources.picoscope) url sha256; };
nativeBuildInputs = [ dpkg makeWrapper ];
buildInputs = [ gtk-sharp-3_0 mono glib libusb1 zlib ];
unpackCmd = "dpkg-deb -x $src .";
sourceRoot = ".";
scopeLibs = lib.attrVals (map (x: "lib${x}") scopes) scopePkgs;
MONO_PATH = "${gtk-sharp-3_0}/lib/mono/gtk-sharp-3.0:" + (lib.makeLibraryPath
([
glib
gtk3-x11
gtk-sharp-3_0
libusb1
zlib
libpicoipp
] ++ scopeLibs));
installPhase = ''
runHook preInstall
mkdir -p $out/
cp -dr usr/share $out/share
cp -dr opt/picoscope/* $out/
makeWrapper "$(command -v mono)" $out/bin/picoscope \
--add-flags $out/lib/PicoScope.GTK.exe \
--prefix MONO_PATH : "$MONO_PATH" \
--prefix LD_LIBRARY_PATH : "$MONO_PATH"
runHook postInstall
'';
# usage:
# services.udev.packages = [ pkgs.picoscope.rules ];
# users.groups.pico = {};
# users.users.you.extraGroups = [ "pico" ];
passthru.rules = lib.writeTextDir "lib/udev/rules.d/95-pico.rules" ''
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ce9", MODE="664",GROUP="pico"
'';
meta = with lib;
shared_meta lib // {
description =
"Oscilloscope application that works with all PicoScope models";
longDescription = ''
PicoScope for Linux is a powerful oscilloscope application that works
with all PicoScope models. The most important features from PicoScope
for Windows are included—scope, spectrum analyzer, advanced triggers,
automated measurements, interactive zoom, persistence modes and signal
generator control. More features are being added all the time.
Waveform captures can be saved for off-line analysis, and shared with
PicoScope for Linux, PicoScope for macOS and PicoScope for Windows
users, or exported in text, CSV and MathWorks MATLAB 4 formats.
'';
};
}

69
pkgs/applications/science/electronics/picoscope/sources.json Normal file
View File

@ -0,0 +1,69 @@
{
"x86_64-linux": {
"libpicocv": {
"sha256": "c2e74c2b0679df0226993d063b38d0eda5b05ff59f29bbfa12ded5226df37024",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.27-1r153_amd64.deb",
"version": "1.1.27-1r153"
},
"libpicoipp": {
"sha256": "87ae49cd5e8dda4a73a835b95ea13e4c3fc4d1c4c9d6495c9affdf6fa6b1b4aa",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.3.0-4r121_amd64.deb",
"version": "1.3.0-4r121"
},
"libps2000": {
"sha256": "792e506c08cebbd617e833e1547d3e5a13a186f93cea3f84608b7ed9451fb077",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.75-3r2957_amd64.deb",
"version": "3.0.75-3r2957"
},
"libps2000a": {
"sha256": "f31b3a8e9c6af14a59e348e4b302f12f582cdb08a47a3c04d8a6a612b4630305",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.75-5r2957_amd64.deb",
"version": "2.1.75-5r2957"
},
"libps3000": {
"sha256": "27dce3c924bb0169768a4964ce567b4a18ce74079537ca1fcba61e9234691580",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.75-3r2957_amd64.deb",
"version": "4.0.75-3r2957"
},
"libps3000a": {
"sha256": "31cf00ce136526af6e8b211a44a56b221d137de6eaec4d6fd7f31593b4245d62",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.75-6r2957_amd64.deb",
"version": "2.1.75-6r2957"
},
"libps4000": {
"sha256": "c976f09647f1fd2c980aafd1efe7f557bfc7c283fb9c135725c38dd59cc297e9",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.75-2r2957_amd64.deb",
"version": "2.1.75-2r2957"
},
"libps4000a": {
"sha256": "727f24fa74759385902d41d52a26a4636b3e3f08a8743901d15cc49622207b97",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.75-2r2957_amd64.deb",
"version": "2.1.75-2r2957"
},
"libps5000": {
"sha256": "3237c1dfdb384079b7039d2b4a8e0b0126e804830b29d60e89ae018182667edb",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.75-3r2957_amd64.deb",
"version": "2.1.75-3r2957"
},
"libps5000a": {
"sha256": "27947f8461a16cf59d64cd23d7a78ddd27826e38dfe9fca3902e3b553591fb19",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.75-5r2957_amd64.deb",
"version": "2.1.75-5r2957"
},
"libps6000": {
"sha256": "d65e923db969e306fb9f3f3892229a297d6187574d901dde44375270cc1e1404",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.75-6r2957_amd64.deb",
"version": "2.1.75-6r2957"
},
"libps6000a": {
"sha256": "eff8644ad44f9cc1cf9052e27786a1480a4ab599766c1c01e370fef40a76b224",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.75-0r2957_amd64.deb",
"version": "1.0.75-0r2957"
},
"picoscope": {
"sha256": "3d2a0e360c8143fc03c29b394c16bfc2387164e33099a46b6905af992cfab440",
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.0.83-1r9320_amd64.deb",
"version": "7.0.83-1r9320"
}
}
}

44
pkgs/applications/science/electronics/picoscope/update.py Executable file
View File

@ -0,0 +1,44 @@
#!/usr/bin/env nix-shell
#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])"
import json
import os
import requests
import sys
def parse_packages(text):
res = []
for package in resp.text.split("\n\n"):
if not package: continue
pkg = {}
for field in package.split("\n"):
if field.startswith(" "): # multiline string
pkg[k] += "\n" + field[1:]
else:
[k, v] = field.split(": ", 1)
pkg[k] = v
res.append(pkg)
return res
def generate_sources(packages):
sources_spec = {}
for pkg in pkgs:
sources_spec[pkg['Package']] = {
"url": "https://labs.picotech.com/rc/picoscope7/debian/" + pkg["Filename"],
"sha256": pkg["SHA256"],
"version": pkg["Version"]
}
return sources_spec
out = {}
for nix_system, release in {"x86_64-linux": "amd64"}.items():
resp = requests.get("https://labs.picotech.com/rc/picoscope7/debian//dists/picoscope/main/binary-"+release+"/Packages")
if resp.status_code != 200:
print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr)
sys.exit(1)
pkgs = parse_packages(resp.text)
out[nix_system] = generate_sources(pkgs)
with open(os.path.dirname(__file__) + "/sources.json", "w") as f:
json.dump(out, f, indent=2, sort_keys=True)
f.write('\n')

5
pkgs/applications/science/math/R/default.nix
View File

@ -14,11 +14,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "R";
version = "4.1.1";
version = "4.1.2";
src = fetchurl {
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
sha256 = "0r6kpnxjbvb7gdfg4m1z8zc6xd225vw81wrnf05ps9ajawk06pji";
sha256 = "sha256-IDYiXp9yB9TOCX5Ulyrs2qi0DX2ZEc0mSR+sWg+rOK8=";
};
dontUseImakeConfigure = true;
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
patches = [
./no-usr-local-search-paths.patch
./skip-check-for-aarch64.patch
];
prePatch = lib.optionalString stdenv.isDarwin ''

11
pkgs/applications/science/math/R/skip-check-for-aarch64.patch
View File

@ -1,11 +0,0 @@
diff -ur a/src/library/stats/man/nls.Rd b/src/library/stats/man/nls.Rd
--- a/src/library/stats/man/nls.Rd 2021-05-21 19:15:02.000000000 -0300
+++ b/src/library/stats/man/nls.Rd 2021-08-12 12:39:00.094758280 -0300
@@ -287,7 +287,7 @@
options(digits = 10) # more accuracy for 'trace'
## IGNORE_RDIFF_BEGIN
try(nlm1 <- update(nlmod, control = list(tol = 1e-7))) # where central diff. work here:
- (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE), trace=TRUE))
+ (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE, warnOnly=TRUE), trace=TRUE))
## --> convergence tolerance 4.997e-8 (in 11 iter.)
## IGNORE_RDIFF_END

8
pkgs/applications/science/math/cemu/default.nix
View File

@ -1,6 +1,5 @@
{ fetchFromGitHub
, lib
, mkDerivation
, SDL2
, libGL
, libarchive
@ -10,9 +9,11 @@
, git
, libpng_apng
, pkg-config
, wrapQtAppsHook
, stdenv
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "CEmu";
version = "1.3";
src = fetchFromGitHub {
@ -26,6 +27,7 @@ mkDerivation rec {
nativeBuildInputs = [
qmake
git
wrapQtAppsHook
pkg-config
];
@ -40,6 +42,7 @@ mkDerivation rec {
qmakeFlags = [
"gui/qt"
"CONFIG+=ltcg"
];
meta = with lib; {
@ -49,5 +52,6 @@ mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ luc65r ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
broken = stdenv.isDarwin;
};
}

2
pkgs/applications/science/medicine/xmedcon/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
version = "0.21.2";
src = fetchurl {
url = "https://prdownloads.sourceforge.net/${pname}/${pname}-${version}.tar.bz2";
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0svff8rc3j2p47snaq1hx9mv4ydmxawpb0hf3d165g1ccjwvmm6m";
};

2
pkgs/applications/video/entangle/default.nix
View File

@ -35,6 +35,7 @@
, udev
, util-linux
, xorg
, zstd
}:
stdenv.mkDerivation rec {
@ -86,6 +87,7 @@ stdenv.mkDerivation rec {
pcre
udev
util-linux
zstd
] ++ (with xorg; [
libXdmcp
libXtst

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

@ -6,10 +6,10 @@
mkDerivation rec {
pname = "minitube";
version = "3.8.1";
version = "3.9.1";
src = fetchFromGitHub {
sha256 = "3lpZyPwo4NnxZJKfmCFsH4WdakV4KB5BtCr5xsleeIQ=";
sha256 = "sha256-1BVHxB7WtXCAJqP+uADszdVPc+T3ctCCzfoJPCb5ZTE=";
rev = version;
repo = "minitube";
owner = "flaviotordini";

38
pkgs/applications/video/openshot-qt/default.nix
View File

@ -1,7 +1,14 @@
{ lib, stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch
, doxygen, python3Packages, libopenshot
, wrapGAppsHook, gtk3
, qtsvg }:
{ lib
, stdenv
, mkDerivationWith
, fetchFromGitHub
, doxygen
, gtk3
, libopenshot
, python3Packages
, qtsvg
, wrapGAppsHook
}:
mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "openshot-qt";
@ -14,11 +21,23 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
sha256 = "0pa8iwl217503bjlqg2zlrw5lxyq5hvxrf5apxrh3843hj1w1myv";
};
nativeBuildInputs = [ doxygen wrapGAppsHook ];
nativeBuildInputs = [
doxygen
wrapGAppsHook
];
buildInputs = [ gtk3 ];
buildInputs = [
gtk3
];
propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip_4 httplib2 pyzmq ];
propagatedBuildInputs = with python3Packages; [
httplib2
libopenshot
pyqt5_with_qtwebkit
pyzmq
requests
sip_4
];
dontWrapGApps = true;
dontWrapQtApps = true;
@ -56,4 +75,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
passthru = {
inherit libopenshot;
inherit (libopenshot) libopenshot-audio;
};
}

56
pkgs/applications/video/openshot-qt/libopenshot-audio.nix
View File

@ -1,34 +1,58 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, doxygen
, alsa-lib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor
, zlib, AGL, Cocoa, Foundation
{ lib
, stdenv
, fetchFromGitHub
, alsa-lib
, cmake
, doxygen
, libX11
, libXcursor
, libXext
, libXft
, libXinerama
, libXrandr
, pkg-config
, zlib
, AGL
, Cocoa
, Foundation
}:
with lib;
stdenv.mkDerivation rec {
pname = "libopenshot-audio";
version = "0.2.0";
version = "0.2.2";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot-audio";
rev = "v${version}";
sha256 = "13if0m5mvlqly8gmbhschzb9papkgp3yqivklhb949dhy16m8zgf";
sha256 = "sha256-XtwTZsj/L/sw/28E7Qr5UyghGlBFFXvbmZLGXBB8vg0=";
};
nativeBuildInputs =
[ pkg-config cmake doxygen ];
nativeBuildInputs = [
cmake
doxygen
pkg-config
];
buildInputs =
optionals stdenv.isLinux [ alsa-lib ]
++ (if stdenv.isDarwin then
[ zlib AGL Cocoa Foundation ]
else
[ libX11 libXft libXrandr libXinerama libXext libXcursor ])
;
buildInputs = lib.optionals stdenv.isLinux [
alsa-lib
] ++ (if stdenv.isDarwin then [
AGL
Cocoa
Foundation
zlib
] else [
libX11
libXcursor
libXext
libXft
libXinerama
libXrandr
]);
doCheck = false;
meta = {
meta = with lib; {
homepage = "http://openshot.org/";
description = "High-quality sound editing library";
longDescription = ''

77
pkgs/applications/video/openshot-qt/libopenshot.nix
View File

@ -1,56 +1,69 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, pkg-config, cmake, doxygen
, libopenshot-audio, imagemagick, ffmpeg
, swig, python3, jsoncpp
, cppzmq, zeromq
, qtbase, qtmultimedia
{ lib
, stdenv
, fetchFromGitHub
, alsa-lib
, cmake
, cppzmq
, doxygen
, ffmpeg
, imagemagick
, jsoncpp
, libopenshot-audio
, llvmPackages
, pkg-config
, python3
, qtbase
, qtmultimedia
, swig
, zeromq
}:
with lib;
stdenv.mkDerivation rec {
pname = "libopenshot";
version = "0.2.5";
version = "0.2.7";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot";
rev = "v${version}";
sha256 = "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp";
sha256 = "sha256-aF8wrPxFIjCy5gw72e/WyL/Wcx9tUGDkrqHS+ZDVK0U=";
};
patches = [
# Fix build with GCC 10.
(fetchpatch {
name = "fix-build-with-gcc-10.patch";
url = "https://github.com/OpenShot/libopenshot/commit/13290364e7bea54164ab83d973951f2898ad9e23.diff";
sha256 = "0i7rpdsr8y9dphil8yq75qbh20vfqjc2hp5ahv0ws58z9wj6ngnz";
})
];
postPatch = ''
sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt
sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' src/bindings/python/CMakeLists.txt
sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' bindings/python/CMakeLists.txt
export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out)
'';
nativeBuildInputs = [ pkg-config cmake doxygen swig ];
nativeBuildInputs = [
alsa-lib
cmake
doxygen
pkg-config
swig
];
buildInputs =
[ imagemagick ffmpeg python3 jsoncpp
cppzmq zeromq qtbase qtmultimedia ]
++ optional stdenv.isDarwin llvmPackages.openmp
;
buildInputs = [
cppzmq
ffmpeg
imagemagick
jsoncpp
libopenshot-audio
python3
qtbase
qtmultimedia
zeromq
] ++ lib.optionals stdenv.isDarwin [
llvmPackages.openmp
];
dontWrapQtApps = true;
LIBOPENSHOT_AUDIO_DIR = libopenshot-audio;
doCheck = false;
cmakeFlags = [ "-DENABLE_RUBY=OFF" ];
meta = {
meta = with lib; {
homepage = "http://openshot.org/";
description = "Free, open-source video editor library";
longDescription = ''
@ -58,8 +71,12 @@ stdenv.mkDerivation rec {
delivering high quality video editing, animation, and playback solutions
to the world. API currently supports C++, Python, and Ruby.
'';
license = with licenses; gpl3Plus;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
platforms = platforms.unix;
};
passthru = {
inherit libopenshot-audio;
};
}

6
pkgs/applications/window-managers/i3/status-rust.nix
View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.20.4";
version = "0.20.5";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lohMrsMCAnb2p7H+xfa24Wx3LEFxCAlGHfP9A70Hg48=";
sha256 = "sha256-7KEG4akn6tOUrgQUZFX0Wiz8YAKFUAr8AN16Xg8CLO4=";
};
cargoSha256 = "sha256-pe96VNTH49qgQ4yxKcAcQPN31W2k1mD9TdhNKBp4x5Q=";
cargoSha256 = "sha256-GTE1KJ/ZpiqwmmKYx6kNzPNNmz0QHYWrIyKN49uzdZA=";
nativeBuildInputs = [ pkg-config makeWrapper ];

2
pkgs/applications/window-managers/oroborus/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
libXft libXpm libXrandr libXrender xorgproto libXinerama ];
src = fetchurl {
url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz";
url = "mirror://debian/pool/main/o/oroborus/oroborus_${version}.tar.gz";
sha256 = "12bvk8x8rfnymbfbwmdcrd9g8m1zxbcq7rgvfdkjr0gnpi0aa82j";
};

237
pkgs/build-support/fetchurl/mirrors.nix
View File

@ -2,7 +2,7 @@
# Content-addressable Nix mirrors.
hashedMirrors = [
"http://tarballs.nixos.org"
"https://tarballs.nixos.org"
];
# Mirrors for mirror://site/filename URIs, where "site" is
@ -11,7 +11,7 @@
luarocks = [
"https://luarocks.org/"
"https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"
"http://luafr.org/moonrocks/"
"https://luafr.org/moonrocks/"
"http://luarocks.logiceditor.com/rocks/"
];
@ -41,21 +41,22 @@
# mirror.
"https://ftpmirror.gnu.org/"
"http://ftp.nluug.nl/pub/gnu/"
"http://mirrors.kernel.org/gnu/"
"http://mirror.ibcp.fr/pub/gnu/"
"http://mirror.dogado.de/gnu/"
"http://mirror.tochlab.net/pub/gnu/"
"ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/"
"https://ftp.nluug.nl/pub/gnu/"
"https://mirrors.kernel.org/gnu/"
"https://mirror.ibcp.fr/pub/gnu/"
"https://mirror.dogado.de/gnu/"
"https://mirror.tochlab.net/pub/gnu/"
# This one is the master repository, and thus it's always up-to-date.
"http://ftp.gnu.org/pub/gnu/"
"https://ftp.gnu.org/pub/gnu/"
"ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/"
];
# GCC.
gcc = [
"https://bigsearcher.com/mirrors/gcc/"
"http://mirror.koddos.net/gcc/"
"https://mirror.koddos.net/gcc/"
"ftp://ftp.nluug.nl/mirror/languages/gcc/"
"ftp://ftp.fu-berlin.de/unix/languages/gcc/"
"ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/"
@ -65,18 +66,16 @@
# GnuPG.
gnupg = [
"https://gnupg.org/ftp/gcrypt/"
"https://mirrors.dotsrc.org/gcrypt/"
"https://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/"
"https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/"
"http://www.ring.gr.jp/pub/net/"
"http://mirrors.dotsrc.org/gcrypt/"
"http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/"
"http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/"
];
# kernel.org's /pub (/pub/{linux,software}) tree.
kernel = [
"http://cdn.kernel.org/pub/"
"http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/"
"https://cdn.kernel.org/pub/"
"http://linux-kernel.uio.no/pub/"
"http://kernel.osuosl.org/pub/"
"ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/"
];
@ -85,52 +84,46 @@
"https://download.kde.org/download.php?url="
"https://ftp.gwdg.de/pub/linux/kde/"
"https://mirrors.ocf.berkeley.edu/kde/"
"http://mirrors.mit.edu/kde/"
"https://mirrors.mit.edu/kde/"
"https://mirrors.ustc.edu.cn/kde/"
"http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/"
"https://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/"
];
# Gentoo files.
gentoo = [
"http://ftp.snt.utwente.nl/pub/os/linux/gentoo/"
"http://distfiles.gentoo.org/"
"ftp://mirrors.kernel.org/gentoo/"
"https://ftp.snt.utwente.nl/pub/os/linux/gentoo/"
"https://distfiles.gentoo.org/"
"https://mirrors.kernel.org/gentoo/"
];
savannah = [
# Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html
"http://mirror.easyname.at/nongnu/"
"https://mirror.easyname.at/nongnu/"
"https://savannah.c3sl.ufpr.br/"
"https://mirror.csclub.uwaterloo.ca/nongnu/"
"https://mirror.cedia.org.ec/nongnu/"
"https://ftp.igh.cnrs.fr/pub/nongnu/"
"https://mirror6.layerjet.com/nongnu"
"https://mirror.netcologne.de/savannah/"
"https://ftp.cc.uoc.gr/mirrors/nongnu.org/"
"https://nongnu.uib.no/"
"https://ftp.acc.umu.se/mirror/gnu.org/savannah/"
"http://mirror2.klaus-uwe.me/nongnu/"
"http://savannah.c3sl.ufpr.br/"
"http://mirror.csclub.uwaterloo.ca/nongnu/"
"http://mirror.cedia.org.ec/nongnu/"
"http://ftp.igh.cnrs.fr/pub/nongnu/"
"http://mirror6.layerjet.com/nongnu"
"http://mirror.netcologne.de/savannah/"
"http://ftp.cc.uoc.gr/mirrors/nongnu.org/"
"http://nongnu.uib.no/"
"http://mirrors.fe.up.pt/pub/nongnu/"
"http://ftp.acc.umu.se/mirror/gnu.org/savannah/"
"http://ftp.twaren.net/Unix/NonGNU/"
"http://ftp.yzu.edu.tw/pub/nongnu/"
"http://mirror.rackdc.com/savannah/"
"http://savannah-nongnu-org.ip-connect.vn.ua/"
"http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/"
"http://gnu.mirrors.pair.com/savannah/savannah/"
"ftp://mirror.easyname.at/nongnu/"
"ftp://mirror2.klaus-uwe.me/nongnu/"
"ftp://savannah.c3sl.ufpr.br/savannah-nongnu/"
"ftp://mirror.csclub.uwaterloo.ca/nongnu/"
"ftp://mirror.cedia.org.ec/nongnu"
"ftp://ftp.igh.cnrs.fr/pub/nongnu/"
"ftp://mirror.netcologne.de/savannah/"
"ftp://nongnu.uib.no/pub/nongnu/"
"ftp://mirrors.fe.up.pt/pub/nongnu/"
"ftp://ftp.twaren.net/Unix/NonGNU/"
"ftp://ftp.yzu.edu.tw/pub/nongnu/"
"ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/"
"ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/"
"ftp://spinellicreations.com/gnu_dot_org_savannah_mirror/"
];
samba = [
@ -140,8 +133,8 @@
# BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html .
bitlbee = [
"http://get.bitlbee.org/"
"http://ftp.snt.utwente.nl/pub/software/bitlbee/"
"https://get.bitlbee.org/"
"https://ftp.snt.utwente.nl/pub/software/bitlbee/"
"http://bitlbee.intergenia.de/"
];
@ -150,109 +143,92 @@
"https://www.imagemagick.org/download/"
"https://mirror.checkdomain.de/imagemagick/"
"https://ftp.nluug.nl/ImageMagick/"
"ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/" # also contains older versions removed from most mirrors
"http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/"
"ftp://ftp.imagemagick.org/pub/ImageMagick/"
"http://ftp.fifi.org/ImageMagick/"
"ftp://ftp.fifi.org/ImageMagick/"
"https://ftp.sunet.se/mirror/imagemagick.org/ftp/"
"ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors
];
# CPAN mirrors.
cpan = [
"https://cpan.metacpan.org/"
"https://cpan.perl.org/"
"http://backpan.perl.org/" # for old releases
"https://backpan.perl.org/" # for old releases
];
# CentOS.
centos = [
"http://mirror.centos.org/centos/"
# For old releases
"http://vault.centos.org/"
"https://vault.centos.org/"
"https://archive.kernel.org/centos-vault/"
"http://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/"
"http://mirrors.aliyun.com/centos-vault/"
"https://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/"
"https://mirrors.aliyun.com/centos-vault/"
"https://mirror.chpc.utah.edu/pub/vault.centos.org/"
"https://mirror.math.princeton.edu/pub/centos-vault/"
"https://mirrors.tripadvisor.com/centos-vault/"
"http://mirror.centos.org/centos/"
];
# Debian.
debian = [
"http://httpredir.debian.org/debian/"
"https://httpredir.debian.org/debian/"
"https://ftp.debian.org/debian/"
"ftp://ftp.de.debian.org/debian/"
"ftp://ftp.fr.debian.org/debian/"
"ftp://ftp.nl.debian.org/debian/"
"ftp://ftp.ru.debian.org/debian/"
"http://ftp.debian.org/debian/"
"http://archive.debian.org/debian-archive/debian/"
"ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/"
];
# Ubuntu.
ubuntu = [
"http://nl.archive.ubuntu.com/ubuntu/"
"https://nl.archive.ubuntu.com/ubuntu/"
"https://old-releases.ubuntu.com/ubuntu/"
"http://de.archive.ubuntu.com/ubuntu/"
"http://archive.ubuntu.com/ubuntu/"
"http://old-releases.ubuntu.com/ubuntu/"
];
# Fedora (please only add full mirrors that carry old Fedora distributions as well).
# See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content).
fedora = [
"http://archives.fedoraproject.org/pub/fedora/"
"http://fedora.osuosl.org/"
"https://archives.fedoraproject.org/pub/fedora/"
"https://fedora.osuosl.org/"
"https://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/"
"https://ftp.linux.cz/pub/linux/fedora/"
"https://archives.fedoraproject.org/pub/archive/fedora/"
"http://ftp.nluug.nl/pub/os/Linux/distr/fedora/"
"http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/"
"http://fedora.bhs.mirrors.ovh.net/"
"http://mirror.csclub.uwaterloo.ca/fedora/"
"http://ftp.linux.cz/pub/linux/fedora/"
"http://ftp.heanet.ie/pub/fedora/"
"http://mirror.1000mbps.com/fedora/"
"http://archives.fedoraproject.org/pub/archive/fedora/"
];
# openSUSE.
opensuse = [
"http://opensuse.hro.nl/opensuse/distribution/"
"http://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/"
"http://ftp.belnet.be/mirror/ftp.opensuse.org/distribution/"
"http://ftp.uni-kassel.de/opensuse/distribution/"
"http://ftp.opensuse.org/pub/opensuse/distribution/"
"http://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/"
"https://opensuse.hro.nl/opensuse/distribution/"
"https://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/"
"https://ftp.opensuse.org/pub/opensuse/distribution/"
"https://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/"
"http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/"
"http://opensuse.mirror.server4you.net/distribution/"
"http://ftp.nsysu.edu.tw/Linux/OpenSuSE/distribution/"
];
# Gnome (see http://ftp.gnome.org/pub/GNOME/MIRRORS).
gnome = [
# This one redirects to some mirror closeby, so it should be all you need.
"http://download.gnome.org/"
"https://download.gnome.org/"
"http://ftp.unina.it/pub/linux/GNOME/"
"http://fr2.rpmfind.net/linux/gnome.org/"
"ftp://ftp.dit.upm.es/pub/GNOME/"
"http://ftp.acc.umu.se/pub/GNOME/"
"http://ftp.belnet.be/mirror/ftp.gnome.org/"
"http://linorg.usp.br/gnome/"
"http://mirror.aarnet.edu.au/pub/GNOME/"
"https://fr2.rpmfind.net/linux/gnome.org/"
"https://ftp.acc.umu.se/pub/GNOME/"
"https://ftp.belnet.be/mirror/ftp.gnome.org/"
"ftp://ftp.cse.buffalo.edu/pub/Gnome/"
"ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/"
];
xfce = [
"http://archive.xfce.org/"
"http://mirror.netcologne.de/xfce/"
"https://archive.xfce.org/"
"https://mirror.netcologne.de/xfce/"
"https://archive.be.xfce.org/xfce/"
"https://archive.al-us.xfce.org/"
"http://archive.se.xfce.org/xfce/"
"http://archive.be.xfce.org/xfce/"
"http://mirror.perldude.de/archive.xfce.org/"
"http://archive.be2.xfce.org/"
"http://ftp.udc.es/xfce/"
"http://archive.al-us.xfce.org/"
"http://mirror.yongbok.net/X11/xfce-mirror/"
"http://mirrors.tummy.com/pub/archive.xfce.org/"
"http://xfce.mirror.uber.com.au/"
];
# X.org.
@ -261,24 +237,19 @@
"https://ftp.x.org/archive/"
];
# Apache mirrors (see http://www.apache.org/mirrors/).
apache = [
"https://www-eu.apache.org/dist/"
"https://ftp.wayne.edu/apache/"
"http://www.eu.apache.org/dist/"
"ftp://ftp.fu-berlin.de/unix/www/apache/"
"http://ftp.tudelft.nl/apache/"
"http://mirror.cc.columbia.edu/pub/software/apache/"
"https://www.apache.org/dist/"
"https://archive.apache.org/dist/" # fallback for old releases
"https://apache.cs.uu.nl/"
"https://apache.cs.utah.edu/"
"http://ftp.tudelft.nl/apache/"
"ftp://ftp.funet.fi/pub/mirrors/apache.org/"
"http://apache.cs.uu.nl/"
"http://apache.cs.utah.edu/"
];
postgresql = [
"http://ftp.postgresql.org/pub/"
"ftp://ftp.postgresql.org/pub/"
"https://ftp.postgresql.org/pub/"
];
metalab = [
@ -286,7 +257,7 @@
"ftp://ftp.metalab.unc.edu/pub/linux/"
];
# Bioconductor mirrors (from http://bioconductor.org/about/mirrors)
# Bioconductor mirrors (from https://bioconductor.org/about/mirrors/)
# The commented-out ones don't seem to allow direct package downloads;
# they serve error messages that result in hash mismatches instead.
bioc = [
@ -295,82 +266,80 @@
# http://bioconductor.fmrp.usp.br/
# http://mirror.aarnet.edu.au/pub/bioconductor/
# http://watson.nci.nih.gov/bioc_mirror/
"https://bioconductor.statistik.tu-dortmund.de/packages/"
"https://mirrors.ustc.edu.cn/bioc/"
"http://bioconductor.jp/packages/"
"http://bioconductor.statistik.tu-dortmund.de/packages/"
"http://mirrors.ustc.edu.cn/bioc/"
];
# Hackage mirrors
hackage = [
"http://hackage.haskell.org/package/"
"http://hdiff.luite.com/packages/archive/package/"
"http://hackage.fpcomplete.com/package/"
"http://objects-us-east-1.dream.io/hackage-mirror/package/"
"https://hackage.haskell.org/package/"
];
# Roy marples mirrors
roy = [
"http://roy.marples.name/downloads/"
"http://cflags.cc/roy/"
"https://roy.marples.name/downloads/"
"https://cflags.cc/roy/"
];
# Sage mirrors (http://www.sagemath.org/mirrors.html)
# Sage mirrors (https://www.sagemath.org/mirrors.html)
sageupstream = [
# Africa
"ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/"
"http://sagemath.mirror.ac.za/spkg/upstream/"
"https://ftp.leg.uct.ac.za/pub/packages/sage/spkg/upstream/"
"http://mirror.ufs.ac.za/sagemath/spkg/upstream/"
# Africa (HTTPS)
"https://sagemath.mirror.ac.za/spkg/upstream/"
"https://mirror.ufs.ac.za/sagemath/spkg/upstream/"
# America, North
"http://mirrors-usa.go-parts.com/sage/sagemath/spkg/upstream/"
"http://mirrors.mit.edu/sage/spkg/upstream/"
"http://www.cecm.sfu.ca/sage/spkg/upstream/"
"http://files.sagemath.org/spkg/upstream/"
"http://mirror.clibre.uqam.ca/sage/spkg/upstream/"
# America, North (HTTPS)
"https://mirrors.mit.edu/sage/spkg/upstream/"
"https://mirrors.xmission.com/sage/spkg/upstream/"
# America, South
"http://sagemath.c3sl.ufpr.br/spkg/upstream/"
"http://linorg.usp.br/sage/spkg/upstream"
# Asia
"http://mirror.hust.edu.cn/sagemath/spkg/upstream/"
"https://ftp.iitm.ac.in/sage/spkg/upstream/"
"http://ftp.kaist.ac.kr/sage/spkg/upstream/"
"http://ftp.riken.jp/sagemath/spkg/upstream/"
# Asia (HTTPS)
"https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/"
"https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/"
"http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/"
"http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/"
"https://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/"
"https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/"
# Australia
"http://mirror.aarnet.edu.au/pub/sage/spkg/upstream/"
# Australia (HTTPS)
"https://mirror.aarnet.edu.au/pub/sage/spkg/upstream/"
# Europe
"http://sage.mirror.garr.it/mirrors/sage/spkg/upstream/"
"http://mirror.switch.ch/mirror/sagemath/spkg/upstream/"
# Europe (HTTPS)
"https://sage.mirror.garr.it/mirrors/sage/spkg/upstream/"
"https://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/"
# Africa (non-HTTPS)
"ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/"
# America, North (non-HTTPS)
"http://www.cecm.sfu.ca/sage/spkg/upstream/"
# America, South (non-HTTPS)
"http://sagemath.c3sl.ufpr.br/spkg/upstream/"
"http://linorg.usp.br/sage/spkg/upstream"
# Asia (non-HTTPS)
"http://ftp.kaist.ac.kr/sage/spkg/upstream/"
"http://ftp.riken.jp/sagemath/spkg/upstream/"
# Europe (non-HTTPS)
"http://mirrors.fe.up.pt/pub/sage/spkg/upstream/"
"http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/"
"http://ftp.ntua.gr/pub/sagemath/spkg/upstream/"
];
# MySQL mirrors
mysql = [
"http://cdn.mysql.com/Downloads/"
"https://cdn.mysql.com/Downloads/"
];
# OpenBSD mirrors
openbsd = [
"http://ftp.openbsd.org/pub/OpenBSD/"
"https://ftp.openbsd.org/pub/OpenBSD/"
"ftp://ftp.nluug.nl/pub/OpenBSD/"
"ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/"
];
# Steam Runtime mirrors
steamrt = [
"http://repo.steampowered.com/steamrt/"
"https://repo.steampowered.com/steamrt/"
"https://public.abbradar.moe/steamrt/"
];
@ -389,7 +358,7 @@
# Mozilla projects.
mozilla = [
"http://download.cdn.mozilla.net/pub/mozilla.org/"
"https://download.cdn.mozilla.net/pub/mozilla.org/"
"https://archive.mozilla.org/pub/"
];

2
pkgs/build-support/libredirect/default.nix
View File

@ -38,11 +38,11 @@ stdenv.mkDerivation rec {
install -vD "$libName" "$out/lib/$libName"
# Provide a setup hook that injects our library into every process.
mkdir -p "$hook/nix-support"
cat <<SETUP_HOOK > "$hook/nix-support/setup-hook"
${if stdenv.isDarwin then ''
export DYLD_INSERT_LIBRARIES="$out/lib/$libName"
export DYLD_FORCE_FLAT_NAMESPACE=1
'' else ''
export LD_PRELOAD="$out/lib/$libName"
''}

143
pkgs/build-support/libredirect/libredirect.c
View File

@ -2,6 +2,7 @@
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
#include <unistd.h>
#include <dlfcn.h>
#include <sys/types.h>
#include <sys/stat.h>
@ -13,6 +14,22 @@
#define MAX_REDIRECTS 128
#ifdef __APPLE__
struct dyld_interpose {
const void * replacement;
const void * replacee;
};
#define WRAPPER(ret, name) static ret _libredirect_wrapper_##name
#define LOOKUP_REAL(name) &name
#define WRAPPER_DEF(name) \
__attribute__((used)) static struct dyld_interpose _libredirect_interpose_##name \
__attribute__((section("__DATA,__interpose"))) = { &_libredirect_wrapper_##name, &name };
#else
#define WRAPPER(ret, name) ret name
#define LOOKUP_REAL(name) dlsym(RTLD_NEXT, #name)
#define WRAPPER_DEF(name)
#endif
static int nrRedirects = 0;
static char * from[MAX_REDIRECTS];
static char * to[MAX_REDIRECTS];
@ -80,9 +97,9 @@ static int open_needs_mode(int flags)
it contains only what we needed for programs in Nixpkgs. Just add
more functions as needed. */
int open(const char * path, int flags, ...)
WRAPPER(int, open)(const char * path, int flags, ...)
{
int (*open_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");
int (*open_real) (const char *, int, mode_t) = LOOKUP_REAL(open);
mode_t mode = 0;
if (open_needs_mode(flags)) {
va_list ap;
@ -93,10 +110,12 @@ int open(const char * path, int flags, ...)
char buf[PATH_MAX];
return open_real(rewrite(path, buf), flags, mode);
}
WRAPPER_DEF(open)
int open64(const char * path, int flags, ...)
#ifndef __APPLE__
WRAPPER(int, open64)(const char * path, int flags, ...)
{
int (*open64_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");
int (*open64_real) (const char *, int, mode_t) = LOOKUP_REAL(open64);
mode_t mode = 0;
if (open_needs_mode(flags)) {
va_list ap;
@ -107,10 +126,12 @@ int open64(const char * path, int flags, ...)
char buf[PATH_MAX];
return open64_real(rewrite(path, buf), flags, mode);
}
WRAPPER_DEF(open64)
#endif
int openat(int dirfd, const char * path, int flags, ...)
WRAPPER(int, openat)(int dirfd, const char * path, int flags, ...)
{
int (*openat_real) (int, const char *, int, mode_t) = dlsym(RTLD_NEXT, "openat");
int (*openat_real) (int, const char *, int, mode_t) = LOOKUP_REAL(openat);
mode_t mode = 0;
if (open_needs_mode(flags)) {
va_list ap;
@ -121,57 +142,73 @@ int openat(int dirfd, const char * path, int flags, ...)
char buf[PATH_MAX];
return openat_real(dirfd, rewrite(path, buf), flags, mode);
}
WRAPPER_DEF(openat)
FILE * fopen(const char * path, const char * mode)
WRAPPER(FILE *, fopen)(const char * path, const char * mode)
{
FILE * (*fopen_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen");
FILE * (*fopen_real) (const char *, const char *) = LOOKUP_REAL(fopen);
char buf[PATH_MAX];
return fopen_real(rewrite(path, buf), mode);
}
WRAPPER_DEF(fopen)
FILE * __nss_files_fopen(const char * path)
#ifndef __APPLE__
WRAPPER(FILE *, __nss_files_fopen)(const char * path)
{
FILE * (*__nss_files_fopen_real) (const char *) = dlsym(RTLD_NEXT, "__nss_files_fopen");
FILE * (*__nss_files_fopen_real) (const char *) = LOOKUP_REAL(__nss_files_fopen);
char buf[PATH_MAX];
return __nss_files_fopen_real(rewrite(path, buf));
}
WRAPPER_DEF(__nss_files_fopen)
#endif
FILE * fopen64(const char * path, const char * mode)
#ifndef __APPLE__
WRAPPER(FILE *, fopen64)(const char * path, const char * mode)
{
FILE * (*fopen64_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen64");
FILE * (*fopen64_real) (const char *, const char *) = LOOKUP_REAL(fopen64);
char buf[PATH_MAX];
return fopen64_real(rewrite(path, buf), mode);
}
WRAPPER_DEF(fopen64)
#endif
int __xstat(int ver, const char * path, struct stat * st)
#ifndef __APPLE__
WRAPPER(int, __xstat)(int ver, const char * path, struct stat * st)
{
int (*__xstat_real) (int ver, const char *, struct stat *) = dlsym(RTLD_NEXT, "__xstat");
int (*__xstat_real) (int ver, const char *, struct stat *) = LOOKUP_REAL(__xstat);
char buf[PATH_MAX];
return __xstat_real(ver, rewrite(path, buf), st);
}
WRAPPER_DEF(__xstat)
#endif
int __xstat64(int ver, const char * path, struct stat64 * st)
#ifndef __APPLE__
WRAPPER(int, __xstat64)(int ver, const char * path, struct stat64 * st)
{
int (*__xstat64_real) (int ver, const char *, struct stat64 *) = dlsym(RTLD_NEXT, "__xstat64");
int (*__xstat64_real) (int ver, const char *, struct stat64 *) = LOOKUP_REAL(__xstat64);
char buf[PATH_MAX];
return __xstat64_real(ver, rewrite(path, buf), st);
}
WRAPPER_DEF(__xstat64)
#endif
int stat(const char * path, struct stat * st)
WRAPPER(int, stat)(const char * path, struct stat * st)
{
int (*__stat_real) (const char *, struct stat *) = dlsym(RTLD_NEXT, "stat");
int (*__stat_real) (const char *, struct stat *) = LOOKUP_REAL(stat);
char buf[PATH_MAX];
return __stat_real(rewrite(path, buf), st);
}
WRAPPER_DEF(stat)
int access(const char * path, int mode)
WRAPPER(int, access)(const char * path, int mode)
{
int (*access_real) (const char *, int mode) = dlsym(RTLD_NEXT, "access");
int (*access_real) (const char *, int mode) = LOOKUP_REAL(access);
char buf[PATH_MAX];
return access_real(rewrite(path, buf), mode);
}
WRAPPER_DEF(access)
int posix_spawn(pid_t * pid, const char * path,
WRAPPER(int, posix_spawn)(pid_t * pid, const char * path,
const posix_spawn_file_actions_t * file_actions,
const posix_spawnattr_t * attrp,
char * const argv[], char * const envp[])
@ -179,12 +216,13 @@ int posix_spawn(pid_t * pid, const char * path,
int (*posix_spawn_real) (pid_t *, const char *,
const posix_spawn_file_actions_t *,
const posix_spawnattr_t *,
char * const argv[], char * const envp[]) = dlsym(RTLD_NEXT, "posix_spawn");
char * const argv[], char * const envp[]) = LOOKUP_REAL(posix_spawn);
char buf[PATH_MAX];
return posix_spawn_real(pid, rewrite(path, buf), file_actions, attrp, argv, envp);
}
WRAPPER_DEF(posix_spawn)
int posix_spawnp(pid_t * pid, const char * file,
WRAPPER(int, posix_spawnp)(pid_t * pid, const char * file,
const posix_spawn_file_actions_t * file_actions,
const posix_spawnattr_t * attrp,
char * const argv[], char * const envp[])
@ -192,43 +230,48 @@ int posix_spawnp(pid_t * pid, const char * file,
int (*posix_spawnp_real) (pid_t *, const char *,
const posix_spawn_file_actions_t *,
const posix_spawnattr_t *,
char * const argv[], char * const envp[]) = dlsym(RTLD_NEXT, "posix_spawnp");
char * const argv[], char * const envp[]) = LOOKUP_REAL(posix_spawnp);
char buf[PATH_MAX];
return posix_spawnp_real(pid, rewrite(file, buf), file_actions, attrp, argv, envp);
}
WRAPPER_DEF(posix_spawnp)
int execv(const char * path, char * const argv[])
WRAPPER(int, execv)(const char * path, char * const argv[])
{
int (*execv_real) (const char * path, char * const argv[]) = dlsym(RTLD_NEXT, "execv");
int (*execv_real) (const char * path, char * const argv[]) = LOOKUP_REAL(execv);
char buf[PATH_MAX];
return execv_real(rewrite(path, buf), argv);
}
WRAPPER_DEF(execv)
int execvp(const char * path, char * const argv[])
WRAPPER(int, execvp)(const char * path, char * const argv[])
{
int (*_execvp) (const char *, char * const argv[]) = dlsym(RTLD_NEXT, "execvp");
int (*_execvp) (const char *, char * const argv[]) = LOOKUP_REAL(execvp);
char buf[PATH_MAX];
return _execvp(rewrite(path, buf), argv);
}
WRAPPER_DEF(execvp)
int execve(const char * path, char * const argv[], char * const envp[])
WRAPPER(int, execve)(const char * path, char * const argv[], char * const envp[])
{
int (*_execve) (const char *, char * const argv[], char * const envp[]) = dlsym(RTLD_NEXT, "execve");
int (*_execve) (const char *, char * const argv[], char * const envp[]) = LOOKUP_REAL(execve);
char buf[PATH_MAX];
return _execve(rewrite(path, buf), argv, envp);
}
WRAPPER_DEF(execve)
DIR * opendir(const char * path)
WRAPPER(DIR *, opendir)(const char * path)
{
char buf[PATH_MAX];
DIR * (*_opendir) (const char*) = dlsym(RTLD_NEXT, "opendir");
DIR * (*_opendir) (const char*) = LOOKUP_REAL(opendir);
return _opendir(rewrite(path, buf));
}
WRAPPER_DEF(opendir)
#define SYSTEM_CMD_MAX 512
char *replace_substring(char * source, char * buf, char * replace_string, char * start_ptr, char * suffix_ptr) {
static char * replace_substring(char * source, char * buf, char * replace_string, char * start_ptr, char * suffix_ptr) {
char head[SYSTEM_CMD_MAX] = {0};
strncpy(head, source, start_ptr - source);
@ -241,7 +284,7 @@ char *replace_substring(char * source, char * buf, char * replace_string, char *
return buf;
}
char *replace_string(char * buf, char * from, char * to) {
static char * replace_string(char * buf, char * from, char * to) {
int num_matches = 0;
char * matches[SYSTEM_CMD_MAX];
int from_len = strlen(from);
@ -264,32 +307,48 @@ char *replace_string(char * buf, char * from, char * to) {
return buf;
}
void rewriteSystemCall(const char * command, char * buf) {
strcpy(buf, command);
static void rewriteSystemCall(const char * command, char * buf) {
char * p = buf;
#ifdef __APPLE__
// The dyld environment variable is not inherited by the subprocess spawned
// by system(), so this hack redefines it.
Dl_info info;
dladdr(&rewriteSystemCall, &info);
p = stpcpy(p, "export DYLD_INSERT_LIBRARIES=");
p = stpcpy(p, info.dli_fname);
p = stpcpy(p, ";");
#endif
stpcpy(p, command);
for (int n = 0; n < nrRedirects; ++n) {
replace_string(buf, from[n], to[n]);
}
}
int system(const char *command)
WRAPPER(int, system)(const char *command)
{
int (*_system) (const char*) = dlsym(RTLD_NEXT, "system");
int (*_system) (const char*) = LOOKUP_REAL(system);
char newCommand[SYSTEM_CMD_MAX];
rewriteSystemCall(command, newCommand);
return _system(newCommand);
}
WRAPPER_DEF(system)
int mkdir(const char *path, mode_t mode)
WRAPPER(int, mkdir)(const char *path, mode_t mode)
{
int (*mkdir_real) (const char *path, mode_t mode) = dlsym(RTLD_NEXT, "mkdir");
int (*mkdir_real) (const char *path, mode_t mode) = LOOKUP_REAL(mkdir);
char buf[PATH_MAX];
return mkdir_real(rewrite(path, buf), mode);
}
WRAPPER_DEF(mkdir)
int mkdirat(int dirfd, const char *path, mode_t mode)
WRAPPER(int, mkdirat)(int dirfd, const char *path, mode_t mode)
{
int (*mkdirat_real) (int dirfd, const char *path, mode_t mode) = dlsym(RTLD_NEXT, "mkdirat");
int (*mkdirat_real) (int dirfd, const char *path, mode_t mode) = LOOKUP_REAL(mkdirat);
char buf[PATH_MAX];
return mkdirat_real(dirfd, rewrite(path, buf), mode);
}
WRAPPER_DEF(mkdirat)

4
pkgs/data/fonts/arphic/default.nix
View File

@ -6,7 +6,7 @@ in {
arphic-ukai = fetchzip {
name = "arphic-ukai-${version}";
url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2";
url = "mirror://ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2";
postFetch = ''
tar -xjvf $downloadedFile --strip-components=1
@ -31,7 +31,7 @@ in {
arphic-uming = fetchzip {
name = "arphic-uming-${version}";
url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2";
url = "mirror://ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2";
postFetch = ''
tar -xjvf $downloadedFile --strip-components=1

7
pkgs/data/fonts/sarasa-gothic/default.nix
View File

@ -5,8 +5,10 @@ let
in fetchurl {
name = "sarasa-gothic-${version}";
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttf-${version}.7z";
sha256 = "094sl6gklrdv9pk4r6451dvz0fjyjmwys7i81qrz4ik1km5dfq9b";
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
sha256 = "0fzbqj32jiffqsr4s0i8fignk01v5d1rik6ldg2q7dgl1298sgk8";
recursiveHash = true;
downloadToTemp = true;
@ -21,7 +23,6 @@ in fetchurl {
homepage = "https://github.com/be5invis/Sarasa-Gothic";
license = licenses.ofl;
maintainers = [ maintainers.ChengCat ];
hydraPlatforms = [ ]; # disabled from hydra because it's so big
platforms = platforms.all;
};
}

4
pkgs/data/icons/tela-icon-theme/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "tela-icon-theme";
version = "2021-10-08";
version = "2021-11-05";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "sha256-4h6c7asjUC7pqi4GkxCN13LOpVVbjBdvjUMN7sXAlNE=";
sha256 = "sha256-mvkgHBdZm6vF+/DS3CRLl1m14U0Lj4Xtz4J/vpJUTQM=";
};
nativeBuildInputs = [ gtk3 jdupes ];

2
pkgs/desktops/plasma-5/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.1/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.2/ -A '*.tar.xz' )

22
pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch → pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch
View File

@ -1,19 +1,31 @@
From fef6bfe87db4411e3dda2f96741cd8204fe41d85 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 2 Nov 2021 05:57:50 -0500
Subject: [PATCH 1/3] encfs path
---
kded/engine/backends/encfs/encfsbackend.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp
index 628af7b..6edd38e 100644
index 2d15fa2..3f49867 100644
--- a/kded/engine/backends/encfs/encfsbackend.cpp
+++ b/kded/engine/backends/encfs/encfsbackend.cpp
@@ -100,12 +100,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
@@ -101,12 +101,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "EncfsBackend");
- return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
+ return process(NIXPKGS_ENCFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
}
QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const
{
- return process("encfsctl", arguments, {});
+ return process(NIXPKGS_ENCFSCTL, arguments, {});
}
} // namespace PlasmaVault
--
2.33.1

25
pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch Normal file
View File

@ -0,0 +1,25 @@
From a89a0d3f9088d272c01ccb9b730d1dbb500f9cb8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 2 Nov 2021 05:59:34 -0500
Subject: [PATCH 2/3] cryfs path
---
kded/engine/backends/cryfs/cryfsbackend.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
index 64138b6..1a9fde2 100644
--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
@@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "CryfsBackend");
- return process("cryfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
+ return process(NIXPKGS_CRYFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
}
} // namespace PlasmaVault
--
2.33.1

25
pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch Normal file
View File

@ -0,0 +1,25 @@
From 63571e28c65935f32567c0b179a096d62726b778 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 2 Nov 2021 06:00:32 -0500
Subject: [PATCH 3/3] fusermount path
---
kded/engine/fusebackend_p.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
index 91f3523..1c19d88 100644
--- a/kded/engine/fusebackend_p.cpp
+++ b/kded/engine/fusebackend_p.cpp
@@ -86,7 +86,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
QProcess *FuseBackend::fusermount(const QStringList &arguments) const
{
- return process("fusermount", arguments, {});
+ return process(NIXPKGS_FUSERMOUNT, arguments, {});
}
FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload)
--
2.33.1

13
pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch
View File

@ -1,13 +0,0 @@
diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
index 58a6929..7212980 100644
--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
@@ -241,7 +241,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
KConfigGroup backendConfig(config, "CryfsBackend");
- return process("cryfs",
+ return process(NIXPKGS_CRYFS,
arguments + backendConfig.readEntry("extraMountOptions", QStringList{}),
{ { "CRYFS_FRONTEND", "noninteractive" } });
}

6
pkgs/desktops/plasma-5/plasma-vault/default.nix
View File

@ -18,9 +18,9 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
patches = [
./encfs-path.patch
./cryfs-path.patch
./fusermount-path.patch
./0001-encfs-path.patch
./0002-cryfs-path.patch
./0003-fusermount-path.patch
];
buildInputs = [

18
pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch
View File

@ -1,18 +0,0 @@
diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
index d07e313..ea7d81c 100644
--- a/kded/engine/fusebackend_p.cpp
+++ b/kded/engine/fusebackend_p.cpp
@@ -106,7 +106,7 @@ QProcess *FuseBackend::process(const QString &executable,
QProcess *FuseBackend::fusermount(const QStringList &arguments) const
{
- return process("fusermount", arguments, {});
+ return process(NIXPKGS_FUSERMOUNT, arguments, {});
}
@@ -279,4 +279,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const
}
} // namespace PlasmaVault
-

8
pkgs/desktops/plasma-5/plasma-workspace/default.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib, fetchpatch,
mkDerivation, lib,
extra-cmake-modules, kdoctools,
@ -53,12 +53,6 @@ mkDerivation {
./0001-startkde.patch
./0002-absolute-wallpaper-install-dir.patch
./0003-startkde-unit-detection.patch
# Included in 5.23.2
(fetchpatch {
name = "ignore-placeholder-screens";
url = "https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1125.patch";
sha256 = "sha256-lvcAxb301lQbfEKPcxMlfap9g7TjHOk50ZYX91RC7gY=";
})
];
# QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools

424
pkgs/desktops/plasma-5/srcs.nix
View File

@ -4,427 +4,427 @@
{
bluedevil = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/bluedevil-5.23.1.tar.xz";
sha256 = "1fxl1v27jk1hnxn7s9cqnw1h0pcghpyr2kxbqlx6fhnk0gp44gra";
name = "bluedevil-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/bluedevil-5.23.2.tar.xz";
sha256 = "0whg8d95vm6zc4vzdlffyvm5kqhi5b501z3749zx743jx8r125nb";
name = "bluedevil-5.23.2.tar.xz";
};
};
breeze = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/breeze-5.23.1.tar.xz";
sha256 = "108l31v692f0yp1chbgw7nfjxs9qqyxm491zwg5p1n27jdgxq4dc";
name = "breeze-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/breeze-5.23.2.tar.xz";
sha256 = "1b2n0wcwfp96k76cmm8llr6cvdxvpb6h17r0r4rnl4ypg36i03sb";
name = "breeze-5.23.2.tar.xz";
};
};
breeze-grub = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/breeze-grub-5.23.1.tar.xz";
sha256 = "1qmixw5q8i1inx65yn84sc44rbllffmjpzbbrxhjxazfa90kjh63";
name = "breeze-grub-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/breeze-grub-5.23.2.tar.xz";
sha256 = "0zbych6hyfxjc4rl0m9nij6vgyg66s4b51vm5rjd9p0s6zhipzrl";
name = "breeze-grub-5.23.2.tar.xz";
};
};
breeze-gtk = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/breeze-gtk-5.23.1.tar.xz";
sha256 = "11yjanh6m52sv717bma5m7is8mmz8raqf3i7xjgd9kiafdbp6rjh";
name = "breeze-gtk-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/breeze-gtk-5.23.2.tar.xz";
sha256 = "1ays2z6gmy1yx4ka5fjcmymlvq67p2wjwijciw4ambx1bxz6s5ci";
name = "breeze-gtk-5.23.2.tar.xz";
};
};
breeze-plymouth = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/breeze-plymouth-5.23.1.tar.xz";
sha256 = "0f4lxp4h2aji2gnrbplvs2xmwca0zcq3z1dm4fa31qy7ipr0b9qw";
name = "breeze-plymouth-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/breeze-plymouth-5.23.2.tar.xz";
sha256 = "1lpri3rnfip9a24wrdm5b959l9lqkgk48l5ngisfly3619jz5aml";
name = "breeze-plymouth-5.23.2.tar.xz";
};
};
discover = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/discover-5.23.1.tar.xz";
sha256 = "0wgfws2m5x2bgqcx8h50jhvgj98pmyywr5h3f560mxwd3admq9a4";
name = "discover-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/discover-5.23.2.tar.xz";
sha256 = "0560qrq6c7hd29cjhxvl9qyn4a97vzp5hwgdlbzmrw6kcyjy83cy";
name = "discover-5.23.2.tar.xz";
};
};
drkonqi = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/drkonqi-5.23.1.tar.xz";
sha256 = "19fksscf29lw4dvdf4s8z97q60yn77w35qmz298myw0n6cd9n1vk";
name = "drkonqi-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/drkonqi-5.23.2.tar.xz";
sha256 = "0ilg9x2ipncsbjms2l97dd0vdnay4jpsrbvamvfavdffqvzibd9f";
name = "drkonqi-5.23.2.tar.xz";
};
};
kactivitymanagerd = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kactivitymanagerd-5.23.1.tar.xz";
sha256 = "02gaky1ibzfkv5gx6hpwksm06jb025k9hb7lqrbp5wbn2j5m3g7a";
name = "kactivitymanagerd-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kactivitymanagerd-5.23.2.tar.xz";
sha256 = "1y4bmwwakz9k9rkqslh1n9cnn4jvmrdc0hd760fqsf80z1v7k2dh";
name = "kactivitymanagerd-5.23.2.tar.xz";
};
};
kde-cli-tools = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kde-cli-tools-5.23.1.tar.xz";
sha256 = "1qm7s2zdvq4i8lry736npwfy95xkrhwi6zhmqlb5j21y9g2hh6ns";
name = "kde-cli-tools-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kde-cli-tools-5.23.2.tar.xz";
sha256 = "1zphp97g3mpz86h00d1blkj568dwfdgvl4jqx81v1s6p7dcr1wl7";
name = "kde-cli-tools-5.23.2.tar.xz";
};
};
kdecoration = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kdecoration-5.23.1.tar.xz";
sha256 = "09y3n2ifdkcpp21b15pw2k8jfqhwp19rwqyl31il5js36ymsx1qm";
name = "kdecoration-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kdecoration-5.23.2.tar.xz";
sha256 = "0p36grnjfnl71kqqrkvr18pr72mia81x8rnvnzb3r5abc5kbna6k";
name = "kdecoration-5.23.2.tar.xz";
};
};
kde-gtk-config = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kde-gtk-config-5.23.1.tar.xz";
sha256 = "0g2p6rnc6qij4mrbz955gpjsda6ck3g0y68rkkkm4849j72pinbx";
name = "kde-gtk-config-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kde-gtk-config-5.23.2.tar.xz";
sha256 = "0bwwlqnzdn2w9dsx64hlmy1rgc69549c89lqj0yj858prncb82d6";
name = "kde-gtk-config-5.23.2.tar.xz";
};
};
kdeplasma-addons = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kdeplasma-addons-5.23.1.tar.xz";
sha256 = "126rrj22431i1immbrvagndi36bfapxcyjrhy6q7qxlg8lwmmvl4";
name = "kdeplasma-addons-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kdeplasma-addons-5.23.2.tar.xz";
sha256 = "0jqbhkmq2w2q6my1vhw07j6lqxmcpb5cn5vaz7pl4ax8rqiy5i76";
name = "kdeplasma-addons-5.23.2.tar.xz";
};
};
kgamma5 = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kgamma5-5.23.1.tar.xz";
sha256 = "11d5qdhgxn51q7fs0jmaswxm68wygk7b38kj0f1h665fsc56sxfg";
name = "kgamma5-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kgamma5-5.23.2.tar.xz";
sha256 = "168pc6rnxbmwrkpsghfaqjvza0m3cnvzcvlr860lkp91vqqq32b6";
name = "kgamma5-5.23.2.tar.xz";
};
};
khotkeys = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/khotkeys-5.23.1.tar.xz";
sha256 = "0kz8pgwrcrsqf6zsb3zyx7a4g43svdm7iq6jm9p0ncfjnrl0ks6s";
name = "khotkeys-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/khotkeys-5.23.2.tar.xz";
sha256 = "1pd2p46cc955z1s34jccqw81ps07nl4q4s4qzra0i831j7xsa9ib";
name = "khotkeys-5.23.2.tar.xz";
};
};
kinfocenter = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kinfocenter-5.23.1.tar.xz";
sha256 = "01690mvak6i7c17ksfar8793c33y7x391pw5bfa0ggm428k8jbz1";
name = "kinfocenter-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kinfocenter-5.23.2.tar.xz";
sha256 = "0bgdgd0n68fb5kaqdqyng9fvf3mjparrnjdp246i68kkclci5nym";
name = "kinfocenter-5.23.2.tar.xz";
};
};
kmenuedit = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kmenuedit-5.23.1.tar.xz";
sha256 = "124imx7afbihdp3d10yap6ww9404b63va35h4hfsr5dglfmjfhpk";
name = "kmenuedit-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kmenuedit-5.23.2.tar.xz";
sha256 = "1jr25zdplndjhw8qb6c2xf255v73c85pcy7ps7x80g0y34pz2h1x";
name = "kmenuedit-5.23.2.tar.xz";
};
};
kscreen = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kscreen-5.23.1.tar.xz";
sha256 = "1j8z8dgp7l0iccyblnq5mf6xysaa17z0ljw9zwvq8ir57cnky55g";
name = "kscreen-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kscreen-5.23.2.tar.xz";
sha256 = "1wc0ydyi5vbm3mpjqrkcxjz22gsz2xzw3xw48161z9aikfhhn44v";
name = "kscreen-5.23.2.tar.xz";
};
};
kscreenlocker = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kscreenlocker-5.23.1.tar.xz";
sha256 = "0qxmmchl73s9ci0b8by5j6ik8aikwd1xcxyfxhp3fhav519i7i50";
name = "kscreenlocker-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kscreenlocker-5.23.2.tar.xz";
sha256 = "1yfqj5g7zvayah53pz0bgmmz8q8hd2rmk5ndzacfl7qrz3dxq2g6";
name = "kscreenlocker-5.23.2.tar.xz";
};
};
ksshaskpass = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/ksshaskpass-5.23.1.tar.xz";
sha256 = "0azb195s2f068k2vj9piby36lh786gvkzvnnajzs74pmqpl8kay1";
name = "ksshaskpass-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/ksshaskpass-5.23.2.tar.xz";
sha256 = "1icb5z7hnyrhh29krp5pgxm214w4lkq4k29laa8a1jryp3igqm1l";
name = "ksshaskpass-5.23.2.tar.xz";
};
};
ksystemstats = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/ksystemstats-5.23.1.tar.xz";
sha256 = "0zkag07lhrz5d7bwhl4lyj2cxh0is9z8z9lavl1dmwfnjs86a0z6";
name = "ksystemstats-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/ksystemstats-5.23.2.tar.xz";
sha256 = "0m1ijvqr5b09b4hmr81hi5wvf8d79vg36hkmq9r2digr76pf1ni4";
name = "ksystemstats-5.23.2.tar.xz";
};
};
kwallet-pam = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kwallet-pam-5.23.1.tar.xz";
sha256 = "02jycjh7l437f2r9a2861yd8j7ayy0f63qkda67703p4va412rk3";
name = "kwallet-pam-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kwallet-pam-5.23.2.tar.xz";
sha256 = "105dpcb6zskqkbnhd5sl4igb0r87dza383m0qqffqfriwvjf9v6z";
name = "kwallet-pam-5.23.2.tar.xz";
};
};
kwayland-integration = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kwayland-integration-5.23.1.tar.xz";
sha256 = "0shdq4wrb2p7agc1ds6vm49g75bsizsmlwdikq5sqpgzbgv10dgp";
name = "kwayland-integration-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kwayland-integration-5.23.2.tar.xz";
sha256 = "0fchl5bjyn9vkj2rzqhlg3jzi2gp993l3c6skviyfqkvp3fq91bl";
name = "kwayland-integration-5.23.2.tar.xz";
};
};
kwayland-server = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kwayland-server-5.23.1.tar.xz";
sha256 = "0mwxllkqgmvr7lq0kkikndn68y6mxl9hmfm8kjmnq95zq5nimbgb";
name = "kwayland-server-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kwayland-server-5.23.2.tar.xz";
sha256 = "03cc0hm99gyr07kbk6vkqxs3nngsnl51smbpwg5rb3lycij38f1j";
name = "kwayland-server-5.23.2.tar.xz";
};
};
kwin = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kwin-5.23.1.tar.xz";
sha256 = "0ccbb41xsa257vabd17m3fx9h760izizgy9xrg9mpg5shjmxff2q";
name = "kwin-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kwin-5.23.2.tar.xz";
sha256 = "1fpq3r93lk0wmzckd8jkw4fcdggl75mjyj59j9ivijnb8an7vfpz";
name = "kwin-5.23.2.tar.xz";
};
};
kwrited = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/kwrited-5.23.1.tar.xz";
sha256 = "16sg4mffwhpx5c2dp6zki9128zjpkcyjlm8nd8jdkcdq5ww4f4pk";
name = "kwrited-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/kwrited-5.23.2.tar.xz";
sha256 = "1czaq3gzyb5v153626rxb54512nkhlpsypf4aghdr9c32n12vgd4";
name = "kwrited-5.23.2.tar.xz";
};
};
layer-shell-qt = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/layer-shell-qt-5.23.1.tar.xz";
sha256 = "02lyzc93ymz5jr05sy5pf1aqyx098q3jhzxk28k6fslzxq327767";
name = "layer-shell-qt-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/layer-shell-qt-5.23.2.tar.xz";
sha256 = "0pw9k1g7g5fjq6hkmri546pph1rycyay97gvw8ngzx67v0n9phlg";
name = "layer-shell-qt-5.23.2.tar.xz";
};
};
libkscreen = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/libkscreen-5.23.1.tar.xz";
sha256 = "0hyh0j95i0xrbh07770axby3lqhmiclzxwx1bplmnpayymwdac1r";
name = "libkscreen-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/libkscreen-5.23.2.tar.xz";
sha256 = "1shlw9wa01ilfhh57i6752mm62qjhj0w0q5qz6kvga3gmzmwp6sf";
name = "libkscreen-5.23.2.tar.xz";
};
};
libksysguard = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/libksysguard-5.23.1.tar.xz";
sha256 = "12c1qy736036rfvk42pnb0z32sjqfk4x4069v7iycy4nd91xyg88";
name = "libksysguard-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/libksysguard-5.23.2.tar.xz";
sha256 = "1knbik3r2bv11vzc17k9971bgrd7dsk9d7j4s5323schymmbzypq";
name = "libksysguard-5.23.2.tar.xz";
};
};
milou = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/milou-5.23.1.tar.xz";
sha256 = "047z4dklk7hixk6m0xw2y2mhrdzmczz1ikhzvxnxhgmghm3w14cg";
name = "milou-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/milou-5.23.2.tar.xz";
sha256 = "0nshc6bbbjyrs2sah1q0y5msrdhhrzz24fbgqvh871csb9lh3idz";
name = "milou-5.23.2.tar.xz";
};
};
oxygen = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/oxygen-5.23.1.tar.xz";
sha256 = "0dxj1fr8p6dnlqwr5bs3f8s1g12vndapc8b07h6hzhcwi26wm81f";
name = "oxygen-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/oxygen-5.23.2.tar.xz";
sha256 = "1k2bibgwdzwad87xyr31231b5jfk2m2x348layz41f3zl33mj1cp";
name = "oxygen-5.23.2.tar.xz";
};
};
plasma-browser-integration = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-browser-integration-5.23.1.tar.xz";
sha256 = "1yaayy60dgj652rjzhh659anspw4cf7rqgmzdw471nzds3zpfr6x";
name = "plasma-browser-integration-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-browser-integration-5.23.2.tar.xz";
sha256 = "08zf8qjcq538fg7zpw73qdcvp4a88vxvvm297y7gch37h9nrbmgg";
name = "plasma-browser-integration-5.23.2.tar.xz";
};
};
plasma-desktop = {
version = "5.23.1";
version = "5.23.2.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-desktop-5.23.1.tar.xz";
sha256 = "102fkhmh33xw7w2sq20d5v4576apyqp9dwh8v3nwd8vfjbq6lv7f";
name = "plasma-desktop-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-desktop-5.23.2.1.tar.xz";
sha256 = "0d2r6bxj04078acdlv6dzvy4jamcj1d49bafa4430hcqrxjy8scg";
name = "plasma-desktop-5.23.2.1.tar.xz";
};
};
plasma-disks = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-disks-5.23.1.tar.xz";
sha256 = "11cssgdz4h9ln4738gphg544f9jmzmzax3chq1pp7dzk8cgh4fxq";
name = "plasma-disks-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-disks-5.23.2.tar.xz";
sha256 = "0phv135v4jav17nb2f7cwvmcxk6sqr582jvw1y34vfphjgg8z3kw";
name = "plasma-disks-5.23.2.tar.xz";
};
};
plasma-firewall = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-firewall-5.23.1.tar.xz";
sha256 = "066b36kxycffwmhgls51q8hpww06j2v2hcc9z4bzmix7jhpzkk0w";
name = "plasma-firewall-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-firewall-5.23.2.tar.xz";
sha256 = "1h0zjzx7anhsbpx64q6pg3nh3w329nap3d1sqz5jg2iishql8jnz";
name = "plasma-firewall-5.23.2.tar.xz";
};
};
plasma-integration = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-integration-5.23.1.tar.xz";
sha256 = "0wfbvp6r6nh7x8q4ddhf19bnkvlcspcxy2hjsb2nnr0nvs3k8aya";
name = "plasma-integration-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-integration-5.23.2.tar.xz";
sha256 = "116hnkfwh4q1ssmayqjx1slam3fmhmdqwd89bc5rzhw0amf1vvy8";
name = "plasma-integration-5.23.2.tar.xz";
};
};
plasma-nano = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-nano-5.23.1.tar.xz";
sha256 = "1ybd12jkw3sbcqzv8pqmkrvww1l73igb907zv457ha5rwy9hi60a";
name = "plasma-nano-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-nano-5.23.2.tar.xz";
sha256 = "110d5qwlfg6jngxf19kqgzj0j8izqyqid0pvd10dwahp7sbsrq3q";
name = "plasma-nano-5.23.2.tar.xz";
};
};
plasma-nm = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-nm-5.23.1.tar.xz";
sha256 = "0qsh5wrk97i9nxpp3la6fp6fvrk0f0gxh71nrzr0c9bc7307imfi";
name = "plasma-nm-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-nm-5.23.2.tar.xz";
sha256 = "0pphzdm5ccl045jvzp83lrcscrhrng12a7sl3mjqa1ghzfbyg2x0";
name = "plasma-nm-5.23.2.tar.xz";
};
};
plasma-pa = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-pa-5.23.1.tar.xz";
sha256 = "0zm5clsj9lfdv0v80g7bzb2cldcghaqn0d9nwywwrpmclmqik7x7";
name = "plasma-pa-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-pa-5.23.2.tar.xz";
sha256 = "05f3hfvp387l968w1h8mwydzvm4kdvyyz1zvphpws8x2izwgjksn";
name = "plasma-pa-5.23.2.tar.xz";
};
};
plasma-phone-components = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-phone-components-5.23.1.tar.xz";
sha256 = "174wvb5jrzsfmn09q4qspf3rdi5nr6faf2n1zc9p1dkwn67pkml2";
name = "plasma-phone-components-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-phone-components-5.23.2.tar.xz";
sha256 = "1rfkxs3v37768fw51wm850smj75c3bcyl3xxl256kqm9rcb4n1gk";
name = "plasma-phone-components-5.23.2.tar.xz";
};
};
plasma-sdk = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-sdk-5.23.1.tar.xz";
sha256 = "1sqywr9d6ghyyff713z1v45207ivddda5hxd7dzpxaf36nb3imq0";
name = "plasma-sdk-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-sdk-5.23.2.tar.xz";
sha256 = "043qpvx6kwzpm80cqvr40y5dhw45ivb5qzc902jfc1288l3qgh1s";
name = "plasma-sdk-5.23.2.tar.xz";
};
};
plasma-systemmonitor = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-systemmonitor-5.23.1.tar.xz";
sha256 = "1kqrkjz8iks5h737a6hpbb104gbaxangrwlzjfgi2h280j2288f8";
name = "plasma-systemmonitor-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-systemmonitor-5.23.2.tar.xz";
sha256 = "0nsva84h46kx7hyv3qz2jmqgiw9mdglyxlhz3x1ywl0m4g91mgq7";
name = "plasma-systemmonitor-5.23.2.tar.xz";
};
};
plasma-tests = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-tests-5.23.1.tar.xz";
sha256 = "1cnn9s9cw6p5aidbsj7ysarcp9jdlxpa54zm0gy9cxp5jbz4hypm";
name = "plasma-tests-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-tests-5.23.2.tar.xz";
sha256 = "0b8mb39vgxlrrsllyq8x83ny4i302w0hs9dgbjg909fmwddlz3k3";
name = "plasma-tests-5.23.2.tar.xz";
};
};
plasma-thunderbolt = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-thunderbolt-5.23.1.tar.xz";
sha256 = "138irsg1mqq31i9rn0ddrhbjym23c1r1w5y1mhrvaqwxqqd5yp0a";
name = "plasma-thunderbolt-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-thunderbolt-5.23.2.tar.xz";
sha256 = "13h5ai0bq3nafsaa2bmgdsy10ychlqm8rnvfqypkx9y52jy9jcwc";
name = "plasma-thunderbolt-5.23.2.tar.xz";
};
};
plasma-vault = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-vault-5.23.1.tar.xz";
sha256 = "0kwcbdm48pg907sah734xnknsa8azlpasxnj9xnagqi91kly5ay5";
name = "plasma-vault-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-vault-5.23.2.tar.xz";
sha256 = "0d9iynky3fxsd6lr7db51aynjz7yz51n21brgwghld4dyfyh0hsf";
name = "plasma-vault-5.23.2.tar.xz";
};
};
plasma-workspace = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-workspace-5.23.1.tar.xz";
sha256 = "1bggh6xrlcxa5yh5398a2bhrgqnzv6hw6ifwws7wrkdkazw7kygv";
name = "plasma-workspace-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-workspace-5.23.2.tar.xz";
sha256 = "0wivjcl5s6llsq8vhi2qiw6gj0a6vppaqvmd1qihpsxgrb763lnv";
name = "plasma-workspace-5.23.2.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plasma-workspace-wallpapers-5.23.1.tar.xz";
sha256 = "1aplxn4kd48rc5p7x5218iscwlp2sr2sh5qyyl43z28fns0bh9pv";
name = "plasma-workspace-wallpapers-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plasma-workspace-wallpapers-5.23.2.tar.xz";
sha256 = "00aam10k8zmlzw0v9jv5k0gwcjizrvpcyd3nx8m3zyiv6b2jw1g9";
name = "plasma-workspace-wallpapers-5.23.2.tar.xz";
};
};
plymouth-kcm = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/plymouth-kcm-5.23.1.tar.xz";
sha256 = "1fdsw7mfcfa90598981w2yb23nbwjqh9ncr8y0ab0l3i0qf8c727";
name = "plymouth-kcm-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/plymouth-kcm-5.23.2.tar.xz";
sha256 = "1qgg2d5lrnv5g42ikjnyby3lkxm6iaa1kxw13sdzyv5s6234q7qp";
name = "plymouth-kcm-5.23.2.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.23.1";
version = "1-5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/polkit-kde-agent-1-5.23.1.tar.xz";
sha256 = "0agmrd64jpvkiy4636hyi7cv9wrj7w6krqihz3d6fm84gqiifrj1";
name = "polkit-kde-agent-1-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/polkit-kde-agent-1-5.23.2.tar.xz";
sha256 = "1fldyflcpwhjym9z3rsi90mfjan15w28gwd1s53kiy2fzvmvj0a0";
name = "polkit-kde-agent-1-5.23.2.tar.xz";
};
};
powerdevil = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/powerdevil-5.23.1.tar.xz";
sha256 = "15n0xm2yzwinjs33iwgg3jln7ddrc3rvj4m97ya3j16bsqw5j6kj";
name = "powerdevil-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/powerdevil-5.23.2.tar.xz";
sha256 = "0f6nhla8gsxil4i0f6np9vjs7f4hgikfw0m6zwp67qqlh9n83mxi";
name = "powerdevil-5.23.2.tar.xz";
};
};
qqc2-breeze-style = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/qqc2-breeze-style-5.23.1.tar.xz";
sha256 = "087mqgs9gdrwykqncvm0vvwhrnl77qilp89gmcgkr44kdsnp5682";
name = "qqc2-breeze-style-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/qqc2-breeze-style-5.23.2.tar.xz";
sha256 = "09bpvydpinqhc5vrx92fzw9ga6xynpvzxhwrq95dwdp3801kwkgy";
name = "qqc2-breeze-style-5.23.2.tar.xz";
};
};
sddm-kcm = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/sddm-kcm-5.23.1.tar.xz";
sha256 = "0i40yj686dfrvkd78msczzh9ffslccnjgmwps29rz1fr8kvjj9mp";
name = "sddm-kcm-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/sddm-kcm-5.23.2.tar.xz";
sha256 = "0xq9qyy56vhrwa0m4yvhp0all8m13jzhyhflc2y0d82cb4sn10yh";
name = "sddm-kcm-5.23.2.tar.xz";
};
};
systemsettings = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/systemsettings-5.23.1.tar.xz";
sha256 = "0m3fvxr9l1whdgkd9i3wc2gw6yb12di59ihkdxnbbir5j4qm3m3w";
name = "systemsettings-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/systemsettings-5.23.2.tar.xz";
sha256 = "0vr22bj0nwp55qximbdn47y4208nhybqiz8pc6fqr2hdg9582s8i";
name = "systemsettings-5.23.2.tar.xz";
};
};
xdg-desktop-portal-kde = {
version = "5.23.1";
version = "5.23.2";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.1/xdg-desktop-portal-kde-5.23.1.tar.xz";
sha256 = "1bpjq6nd7yc3az9zl13jq088jp2zbdgzqdaxl69wszzaq324qrpp";
name = "xdg-desktop-portal-kde-5.23.1.tar.xz";
url = "${mirror}/stable/plasma/5.23.2/xdg-desktop-portal-kde-5.23.2.tar.xz";
sha256 = "0ji02bscvdjcifibrjx5mk1ga91892hj3f6jcyiycd2xj4sqbcnf";
name = "xdg-desktop-portal-kde-5.23.2.tar.xz";
};
};
}

2
pkgs/development/compilers/apache-flex-sdk/default.nix
View File

@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
version = "4.16.1";
src = fetchurl {
url = "https://www.apache.org/dist/flex/${version}/binaries/${pname}-${version}-bin.tar.gz";
url = "mirror://apache/flex/${version}/binaries/${pname}-${version}-bin.tar.gz";
sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p";
};

2
pkgs/development/compilers/closure/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "20210808";
src = fetchurl {
url = "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
sha256 = "1cvibvm8l4mp64ml6lpsh3w62bgbr42pi3i7ga8ss0prhr0dsk3y";
};

2
pkgs/development/compilers/go/1.17.nix
View File

@ -273,7 +273,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = teams.golang.members;
platforms = platforms.linux ++ platforms.darwin;
# requires >=10.13 stdenv on x86_64-darwin
badPlatforms = [ "x86_64-darwin" ];
};
}

11
pkgs/development/dhall-modules/dhall-grafana.nix Normal file
View File

@ -0,0 +1,11 @@
{ dhallPackages, buildDhallGitHubPackage }:
buildDhallGitHubPackage {
name = "grafana";
owner = "weeezes";
repo = "dhall-grafana";
# 2021-11-06
rev = "9ee0bb643f01db6d9935cf7df1914c32a92730b4";
sha256 = "0a123r5a33p8kaqs68rx2ycjr72xvxcpcmvpqxgb2jb05mnjj540";
dependencies = [ dhallPackages.Prelude ];
}

11
pkgs/development/libraries/arrow-cpp/default.nix
View File

@ -171,11 +171,18 @@ stdenv.mkDerivation rec {
"TestFilterKernelWithNumeric/7.CompareArrayAndFilterRandomNumeric"
"TestCompareKernel.PrimitiveRandomTests"
] ++ lib.optionals enableS3 [
"S3OptionsTest.FromUri"
"S3RegionResolutionTest.NonExistentBucket"
"S3RegionResolutionTest.PublicBucket"
"S3RegionResolutionTest.RestrictedBucket"
"S3RegionResolutionTest.NonExistentBucket"
"S3OptionsTest.FromUri"
"TestMinioServer.Connect"
"TestS3FS.OpenOutputStreamBackgroundWrites"
"TestS3FS.OpenOutputStreamDestructorBackgroundWrites"
"TestS3FS.OpenOutputStreamDestructorSyncWrite"
"TestS3FS.OpenOutputStreamDestructorSyncWrites"
"TestS3FS.OpenOutputStreamMetadata"
"TestS3FS.OpenOutputStreamSyncWrites"
"TestS3FSGeneric.*"
];
in
lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}";

3
pkgs/development/libraries/aws-sdk-cpp/default.nix
View File

@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
};
postPatch = ''
# Flaky on Hydra
rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
# Includes aws-c-auth private headers, so only works with submodule build
rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
@ -66,7 +68,6 @@ stdenv.mkDerivation rec {
# fix build with gcc9, can be removed after bumping to current version
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
# aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
# aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp
# seem to have a datarace
enableParallelChecking = false;

5
pkgs/development/libraries/glibc/common.nix
View File

@ -286,9 +286,4 @@ stdenv.mkDerivation ({
// lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
preInstall = null; # clobber the native hook
# To avoid a dependency on the build system 'bash'.
preFixup = ''
rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace}
'';
})

2
pkgs/development/libraries/libopus/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "1.3.1";
src = fetchurl {
url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";
url = "mirror://mozilla/opus/opus-${version}.tar.gz";
sha256 = "17gz8kxs4i7icsc1gj713gadiapyklynlwqlf0ai98dj4lg8xdb5";
};

2
pkgs/development/libraries/libopusenc/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.2.1";
src = fetchurl {
url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";
url = "mirror://mozilla/opus/libopusenc-${version}.tar.gz";
sha256 = "1ffb0vhlymlsq70pxsjj0ksz77yfm2x0a1x8q50kxmnkm1hxp642";
};

2
pkgs/development/libraries/libutempter/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "1.1.6";
src = fetchurl {
url = "http://archive.ubuntu.com/ubuntu/pool/main/libu/libutempter/libutempter_${version}.orig.tar.bz2";
url = "mirror://ubuntu/pool/main/libu/libutempter/libutempter_${version}.orig.tar.bz2";
sha256 = "15y3xbgznjxnfmix4xg3bwmqdvghdw7slbhazb0ybmyf65gmd65q";
};

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

@ -70,14 +70,14 @@ let
in
stdenv.mkDerivation rec {
pname = "libvirt";
version = "7.8.0";
version = "7.9.0";
src =
if buildFromTarball then
fetchurl
{
url = "https://libvirt.org/sources/${pname}-${version}.tar.xz";
sha256 = "sha256-pyfNCke/ok+n3ih00j86n58Czra0m6FSiPbZoJixmSE=";
sha256 = "sha256-gpzytfV0J5xA8ERuEWiBXT82uJcQVgJjyiznAlb3Low=";
}
else
fetchFromGitLab
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-/tSMJFgLPAiQXcZ2qZLM4XZqf96NtW3+zwKyrwGho2s=";
sha256 = "sha256-Ua6+EKLES3385fqhH2+qwnwE+X/nmWqIBxCXXE3SVhs=";
fetchSubmodules = true;
};

2
pkgs/development/libraries/plplot/default.nix
View File

@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
version = "5.15.0";
src = fetchurl {
url = "https://downloads.sourceforge.net/project/${pname}/${pname}/${version}%20Source/${pname}-${version}.tar.gz";
url = "mirror://sourceforge/project/${pname}/${pname}/${version}%20Source/${pname}-${version}.tar.gz";
sha256 = "0ywccb6bs1389zjfmc9zwdvdsvlpm7vg957whh6b5a96yvcf8bdr";
};

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "precice";
version = "2.2.1";
version = "2.3.0";
src = fetchFromGitHub {
owner = "precice";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XEdrKhxG0dhsfJH6glrzc+JZeCgPEVIswj0ofP838lg=";
sha256 = "sha256:0p8d2xf4bl41b30yp38sqyp4fipwgcdhl0khxcv5g69fxvz2i2il";
};
cmakeFlags = [

2
pkgs/development/libraries/serf/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "1.3.9";
src = fetchurl {
url = "https://www.apache.org/dist/serf/${pname}-${version}.tar.bz2";
url = "mirror://apache/serf/${pname}-${version}.tar.bz2";
sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
};

2
pkgs/development/libraries/simgear/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Simulation construction toolkit";
homepage = "https://gitorious.org/fg/simgear";
homepage = "https://wiki.flightgear.org/SimGear";
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
license = licenses.lgpl2;

2
pkgs/development/libraries/unixODBCDrivers/default.nix
View File

@ -8,7 +8,7 @@
version = "10.01.0000";
src = fetchurl {
url = "http://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz";
url = "mirror://postgresql/odbc/versions/src/${pname}-${version}.tar.gz";
sha256 = "1cyams7157f3gry86x64xrplqi2vyqrq3rqka59gv4lb4rpl7jl7";
};

2
pkgs/development/libraries/xalanc/default.nix
View File

@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
version = "1.11";
src = fetchurl {
url = "http://www.eu.apache.org/dist/xalan/xalan-c/sources/xalan_c-${version}-src.tar.gz";
url = "mirror://apache/xalan/xalan-c/sources/xalan_c-${version}-src.tar.gz";
sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg";
};

2
pkgs/development/libraries/xml-security-c/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "2.0.2";
src = fetchurl {
url = "https://www.apache.org/dist/santuario/c-library/${pname}-${version}.tar.gz";
url = "mirror://apache/santuario/c-library/${pname}-${version}.tar.gz";
sha256 = "1prh5sxzipkqglpsh53iblbr7rxi54wbijxdjiahzjmrijqa40y3";
};

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