Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
9776723357
181 changed files with 679 additions and 494 deletions
|
|
@ -353,7 +353,7 @@ In a case a contributor definitively leaves the Nix community, they should creat
|
|||
# Flow of merged pull requests
|
||||
|
||||
After a pull request is merged, it eventually makes it to the [official Hydra CI](https://hydra.nixos.org/).
|
||||
Hydra regularly evaluates and builds Nixpkgs, updating [the official channels](http://channels.nixos.org/) when specific Hydra jobs succeeded.
|
||||
Hydra regularly evaluates and builds Nixpkgs, updating [the official channels](https://channels.nixos.org/) when specific Hydra jobs succeeded.
|
||||
See [Nix Channel Status](https://status.nixos.org/) for the current channels and their state.
|
||||
Here's a brief overview of the main Git branches and what channels they're used for:
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ buildPhase = ''
|
|||
To save some work of writing Nix expressions, there is a script that imports all
|
||||
the packages distributed by Quicklisp into `imported.nix`. This works by parsing
|
||||
its `releases.txt` and `systems.txt` files, which are published every couple of
|
||||
months on [quicklisp.org](http://beta.quicklisp.org/dist/quicklisp.txt).
|
||||
months on [quicklisp.org](https://beta.quicklisp.org/dist/quicklisp.txt).
|
||||
|
||||
The import process is implemented in the `import` directory as Common Lisp
|
||||
code in the `org.lispbuilds.nix` ASDF system. To run the script, one can
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ Nix problems and constraints:
|
|||
- The `steam.sh` script in `$HOME` cannot be patched, as it is checked and rewritten by steam.
|
||||
- The steam binary cannot be patched, it's also checked.
|
||||
|
||||
The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment.
|
||||
The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](https://sandervanderburg.blogspot.com/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment.
|
||||
|
||||
## How to play {#sec-steam-play}
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ In Nixpkgs, we have multiple implementations of the BLAS/LAPACK numerical linear
|
|||
|
||||
The Nixpkgs attribute is `openblas` for ILP64 (integer width = 64 bits) and `openblasCompat` for LP64 (integer width = 32 bits). `openblasCompat` is the default.
|
||||
|
||||
- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS and CBLAS)
|
||||
- [LAPACK reference](https://www.netlib.org/lapack/) (also provides BLAS and CBLAS)
|
||||
|
||||
The Nixpkgs attribute is `lapack-reference`.
|
||||
|
||||
|
|
|
|||
|
|
@ -516,17 +516,17 @@ in mkLicense lset) ({
|
|||
|
||||
generaluser = {
|
||||
fullName = "GeneralUser GS License v2.0";
|
||||
url = "http://www.schristiancollins.com/generaluser.php"; # license included in sources
|
||||
url = "https://www.schristiancollins.com/generaluser.php"; # license included in sources
|
||||
};
|
||||
|
||||
gfl = {
|
||||
fullName = "GUST Font License";
|
||||
url = "http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt";
|
||||
url = "https://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-LICENSE.txt";
|
||||
};
|
||||
|
||||
gfsl = {
|
||||
fullName = "GUST Font Source License";
|
||||
url = "http://www.gust.org.pl/fonts/licenses/GUST-FONT-SOURCE-LICENSE.txt";
|
||||
url = "https://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-SOURCE-LICENSE.txt";
|
||||
};
|
||||
|
||||
gpl1Only = {
|
||||
|
|
@ -613,7 +613,7 @@ in mkLicense lset) ({
|
|||
info-zip = {
|
||||
spdxId = "Info-ZIP";
|
||||
fullName = "Info-ZIP License";
|
||||
url = "http://www.info-zip.org/pub/infozip/license.html";
|
||||
url = "https://infozip.sourceforge.net/license.html";
|
||||
};
|
||||
|
||||
inria-compcert = {
|
||||
|
|
@ -1182,7 +1182,7 @@ in mkLicense lset) ({
|
|||
|
||||
xfig = {
|
||||
fullName = "xfig";
|
||||
url = "http://mcj.sourceforge.net/authors.html#xfig"; # https is broken
|
||||
url = "https://mcj.sourceforge.net/authors.html#xfig";
|
||||
};
|
||||
|
||||
zlib = {
|
||||
|
|
|
|||
|
|
@ -12478,6 +12478,11 @@
|
|||
githubId = 6709831;
|
||||
name = "Jake Hill";
|
||||
};
|
||||
nasageek = {
|
||||
github = "NasaGeek";
|
||||
githubId = 474937;
|
||||
name = "Chris Roberts";
|
||||
};
|
||||
nasirhm = {
|
||||
email = "nasirhussainm14@gmail.com";
|
||||
github = "nasirhm";
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ fi
|
|||
package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv"
|
||||
username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //")
|
||||
password_command=$(grep "^password-command:" "$CABAL_DIR/config" | sed "s/^password-command: //")
|
||||
curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv
|
||||
curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" https://hackage.haskell.org/distro/NixOS/packages.csv
|
||||
echo
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
[Subversion](https://subversion.apache.org/) is a centralized
|
||||
version-control system. It can use a [variety of
|
||||
protocols](http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing)
|
||||
protocols](https://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing)
|
||||
for communication between client and server.
|
||||
|
||||
## Subversion inside Apache HTTP {#module-services-subversion-apache-httpd}
|
||||
|
|
@ -14,7 +14,7 @@ for communication.
|
|||
|
||||
For more information on the general setup, please refer to the [the
|
||||
appropriate section of the Subversion
|
||||
book](http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd).
|
||||
book](https://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd).
|
||||
|
||||
To configure, include in `/etc/nixos/configuration.nix` code to activate
|
||||
Apache HTTP, setting [](#opt-services.httpd.adminAddr)
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ where socat is running.
|
|||
If your test has only a single VM, you may use e.g.
|
||||
|
||||
```ShellSession
|
||||
$ QEMU_NET_OPTS="hostfwd=tcp:127.0.0.1:2222-127.0.0.1:22" ./result/bin/nixos-test-driver
|
||||
$ QEMU_NET_OPTS="hostfwd=tcp:127.0.0.1:2222-:22" ./result/bin/nixos-test-driver
|
||||
```
|
||||
|
||||
to port-forward a port in the VM (here `22`) to the host machine (here port `2222`).
|
||||
|
|
@ -73,6 +73,11 @@ since a single port on the host cannot forward to multiple VMs.
|
|||
If the test defines multiple machines, you may opt to _temporarily_ set
|
||||
`virtualisation.forwardPorts` in the test definition for debugging.
|
||||
|
||||
Such port forwardings connect via the VM's virtual network interface.
|
||||
Thus they cannot connect to ports that are only bound to the VM's
|
||||
loopback interface (`127.0.0.1`), and the VM's NixOS firewall
|
||||
must be configured to allow these connections.
|
||||
|
||||
## Reuse VM state {#sec-nixos-test-reuse-vm-state}
|
||||
|
||||
You can re-use the VM states coming from a previous run by setting the
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@ symlink at `./result/share/doc/nixos/index.html`.
|
|||
## Editing DocBook XML {#sec-writing-docs-editing-docbook-xml}
|
||||
|
||||
For general information on how to write in DocBook, see [DocBook 5: The
|
||||
Definitive Guide](http://www.docbook.org/tdg5/en/html/docbook.html).
|
||||
Definitive Guide](https://tdg.docbook.org/tdg/5.1/).
|
||||
|
||||
Emacs nXML Mode is very helpful for editing DocBook XML because it
|
||||
validates the document as you write, and precisely locates errors. To
|
||||
use it, see [](#sec-emacs-docbook-xml).
|
||||
|
||||
[Pandoc](http://pandoc.org) can generate DocBook XML from a multitude of
|
||||
[Pandoc](https://pandoc.org/) can generate DocBook XML from a multitude of
|
||||
formats, which makes a good starting point. Here is an example of Pandoc
|
||||
invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML:
|
||||
|
||||
|
|
@ -62,9 +62,9 @@ topic from scratch.
|
|||
|
||||
Keep the following guidelines in mind when you create and add a topic:
|
||||
|
||||
- The NixOS [`book`](http://www.docbook.org/tdg5/en/html/book.html)
|
||||
- The NixOS [`book`](https://tdg.docbook.org/tdg/5.0/book.html)
|
||||
element is in `nixos/doc/manual/manual.xml`. It includes several
|
||||
[`parts`](http://www.docbook.org/tdg5/en/html/book.html) which are in
|
||||
[`parts`](https://tdg.docbook.org/tdg/5.0/book.html) which are in
|
||||
subdirectories.
|
||||
|
||||
- Store the topic file in the same directory as the `part` to which it
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ guest. For instance, the following will forward host port 2222 to guest
|
|||
port 22 (SSH):
|
||||
|
||||
```ShellSession
|
||||
$ QEMU_NET_OPTS="hostfwd=tcp:127.0.0.1:2222-127.0.0.1:22" ./result/bin/run-*-vm
|
||||
$ QEMU_NET_OPTS="hostfwd=tcp:127.0.0.1:2222-:22" ./result/bin/run-*-vm
|
||||
```
|
||||
|
||||
allowing you to log in via SSH (assuming you have set the appropriate
|
||||
|
|
@ -98,3 +98,8 @@ passwords or SSH authorized keys):
|
|||
```ShellSession
|
||||
$ ssh -p 2222 localhost
|
||||
```
|
||||
|
||||
Such port forwardings connect via the VM's virtual network interface.
|
||||
Thus they cannot connect to ports that are only bound to the VM's
|
||||
loopback interface (`127.0.0.1`), and the VM's NixOS firewall
|
||||
must be configured to allow these connections.
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ let
|
|||
{file}`pam_mount.conf.xml`.
|
||||
Useful attributes might include `path`,
|
||||
`options`, `fstype`, and `server`.
|
||||
See <http://pam-mount.sourceforge.net/pam_mount.conf.5.html>
|
||||
See <https://pam-mount.sourceforge.net/pam_mount.conf.5.html>
|
||||
for more information.
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ sub pciCheck {
|
|||
debug "\n";
|
||||
|
||||
if (defined $module) {
|
||||
# See the bottom of http://pciids.sourceforge.net/pci.ids for
|
||||
# See the bottom of https://pciids.sourceforge.net/pci.ids for
|
||||
# device classes.
|
||||
if (# Mass-storage controller. Definitely important.
|
||||
$class =~ /^0x01/ ||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ in
|
|||
prefix = ''${HOME}/.npm
|
||||
https-proxy=proxy.example.com
|
||||
init-license=MIT
|
||||
init-author-url=http://npmjs.org
|
||||
init-author-url=https://www.npmjs.com/
|
||||
color=true
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ If third-party customizations (e.g. new themes) are supposed to be added to
|
|||
|
||||
- Completion scripts are supposed to be stored at
|
||||
`$out/share/zsh/site-functions`. This directory is part of the
|
||||
[`fpath`](http://zsh.sourceforge.net/Doc/Release/Functions.html)
|
||||
[`fpath`](https://zsh.sourceforge.io/Doc/Release/Functions.html)
|
||||
and the package should be compatible with pure `ZSH`
|
||||
setups. The module will automatically link the contents of
|
||||
`site-functions` to completions directory in the proper
|
||||
|
|
|
|||
|
|
@ -42,6 +42,10 @@ in
|
|||
security.sudo.extraConfig = ''
|
||||
#includedir /run/google-sudoers.d
|
||||
'';
|
||||
security.sudo-rs.extraConfig = ''
|
||||
#includedir /run/google-sudoers.d
|
||||
'';
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /run/google-sudoers.d 750 root root -"
|
||||
"d /var/google-users.d 750 root root -"
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ in
|
|||
default = [];
|
||||
description = lib.mdDoc ''
|
||||
List of volume definitions for pam_mount.
|
||||
For more information, visit <http://pam-mount.sourceforge.net/pam_mount.conf.5.html>.
|
||||
For more information, visit <https://pam-mount.sourceforge.net/pam_mount.conf.5.html>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ in
|
|||
description = lib.mdDoc ''
|
||||
Sets the Debug-Level. 0 disables debugging, 1 enables pam_mount tracing,
|
||||
and 2 additionally enables tracing in mount.crypt. The default is 0.
|
||||
For more information, visit <http://pam-mount.sourceforge.net/pam_mount.conf.5.html>.
|
||||
For more information, visit <https://pam-mount.sourceforge.net/pam_mount.conf.5.html>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ in
|
|||
description = lib.mdDoc ''
|
||||
Amount of microseconds to wait until killing remaining processes after
|
||||
final logout.
|
||||
For more information, visit <http://pam-mount.sourceforge.net/pam_mount.conf.5.html>.
|
||||
For more information, visit <https://pam-mount.sourceforge.net/pam_mount.conf.5.html>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ in
|
|||
description = lib.mdDoc
|
||||
''
|
||||
Any polkit rules to be added to config (in JavaScript ;-). See:
|
||||
http://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html#polkit-rules
|
||||
<https://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html#polkit-rules>
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -117,4 +117,3 @@ in
|
|||
};
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ in {
|
|||
description = "JACK Audio system service user";
|
||||
isSystemUser = true;
|
||||
};
|
||||
# http://jackaudio.org/faq/linux_rt_config.html
|
||||
# https://jackaudio.org/faq/linux_rt_config.html
|
||||
security.pam.loginLimits = [
|
||||
{ domain = "@jackaudio"; type = "-"; item = "rtprio"; value = "99"; }
|
||||
{ domain = "@jackaudio"; type = "-"; item = "memlock"; value = "unlimited"; }
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ in
|
|||
only the hosts listed in {var}`dataDir`/remote_hosts.cfg will be allowed to
|
||||
connect.
|
||||
|
||||
See also: <http://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely#Remote_access>
|
||||
See also: <https://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely#Remote_access>
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let
|
|||
|
||||
cfg = config.services.slurm;
|
||||
opt = options.services.slurm;
|
||||
# configuration file can be generated by http://slurm.schedmd.com/configurator.html
|
||||
# configuration file can be generated by https://slurm.schedmd.com/configurator.html
|
||||
|
||||
defaultUser = "slurm";
|
||||
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
# couchdb options: http://docs.couchdb.org/en/latest/config/index.html
|
||||
# couchdb options: https://docs.couchdb.org/en/latest/config/index.html
|
||||
|
||||
databaseDir = mkOption {
|
||||
type = types.path;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
# There are at least two ways to run firebird. superserver has been chosen
|
||||
# however there are no strong reasons to prefer this or the other one AFAIK
|
||||
# Eg superserver is said to be most efficiently using resources according to
|
||||
# http://www.firebirdsql.org/manual/qsg25-classic-or-super.html
|
||||
# https://www.firebirdsql.org/manual/qsg25-classic-or-super.html
|
||||
|
||||
with lib;
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ in {
|
|||
pgmanage requires at least one PostgreSQL server be defined.
|
||||
|
||||
Detailed information about PostgreSQL connection strings is available at:
|
||||
<http://www.postgresql.org/docs/current/static/libpq-connect.html>
|
||||
<https://www.postgresql.org/docs/current/libpq-connect.html>
|
||||
|
||||
Note that you should not specify your user name or password. That
|
||||
information will be entered on the login screen. If you specify a
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
*Source:* {file}`modules/services/databases/postgresql.nix`
|
||||
|
||||
*Upstream documentation:* <http://www.postgresql.org/docs/>
|
||||
*Upstream documentation:* <https://www.postgresql.org/docs/>
|
||||
|
||||
<!-- FIXME: more stuff, like maintainer? -->
|
||||
|
||||
|
|
|
|||
|
|
@ -588,7 +588,7 @@ in
|
|||
else "simple";
|
||||
|
||||
# Shut down Postgres using SIGINT ("Fast Shutdown mode"). See
|
||||
# http://www.postgresql.org/docs/current/static/server-shutdown.html
|
||||
# https://www.postgresql.org/docs/current/server-shutdown.html
|
||||
KillSignal = "SIGINT";
|
||||
KillMode = "mixed";
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ in {
|
|||
|
||||
vmOverCommit = mkEnableOption (lib.mdDoc ''
|
||||
setting of vm.overcommit_memory to 1
|
||||
(Suggested for Background Saving: http://redis.io/topics/faq)
|
||||
(Suggested for Background Saving: <https://redis.io/docs/get-started/faq/>)
|
||||
'');
|
||||
|
||||
servers = mkOption {
|
||||
|
|
|
|||
|
|
@ -279,7 +279,7 @@ in
|
|||
default = true;
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Whether to assign [predictable names to network interfaces](http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames).
|
||||
Whether to assign [predictable names to network interfaces](https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/).
|
||||
If enabled, interfaces
|
||||
are assigned names that contain topology information
|
||||
(e.g. `wlp3s0`) and thus should be stable
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ in
|
|||
example = ''
|
||||
if [type] == "syslog" {
|
||||
# Keep only relevant systemd fields
|
||||
# http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
|
||||
# https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
|
||||
prune {
|
||||
whitelist_names => [
|
||||
"type", "@timestamp", "@version",
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ let
|
|||
defaultFirewallRules = {
|
||||
# udp 1900 port needs to be opened for SSDP (not configurable within
|
||||
# mediatomb/gerbera) cf.
|
||||
# http://docs.gerbera.io/en/latest/run.html?highlight=udp%20port#network-setup
|
||||
# https://docs.gerbera.io/en/latest/run.html?highlight=udp%20port#network-setup
|
||||
allowedUDPPorts = [ 1900 cfg.port ];
|
||||
allowedTCPPorts = [ cfg.port ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ in {
|
|||
option.
|
||||
|
||||
A detailed description of the supported syntax can be found at-spi2-atk
|
||||
http://bosun.org/configuration.html
|
||||
https://bosun.org/configuration.html
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ let
|
|||
# Get a submodule without any embedded metadata:
|
||||
_filter = x: filterAttrs (k: v: k != "_module") x;
|
||||
|
||||
# http://docs.grafana.org/administration/provisioning/#datasources
|
||||
# https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources
|
||||
grafanaTypes.datasourceConfig = types.submodule {
|
||||
freeformType = provisioningSettingsFormat.type;
|
||||
|
||||
|
|
@ -140,7 +140,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
# http://docs.grafana.org/administration/provisioning/#dashboards
|
||||
# https://grafana.com/docs/grafana/latest/administration/provisioning/#dashboards
|
||||
grafanaTypes.dashboardConfig = types.submodule {
|
||||
freeformType = provisioningSettingsFormat.type;
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ in {
|
|||
default = "";
|
||||
description = lib.mdDoc ''
|
||||
Graphite webapp settings. See:
|
||||
<http://graphite.readthedocs.io/en/latest/config-local-settings.html>
|
||||
<https://graphite.readthedocs.io/en/latest/config-local-settings.html>
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# TODO: LWP/Pg perl libs aren't recognized
|
||||
|
||||
# TODO: support fastcgi
|
||||
# http://guide.munin-monitoring.org/en/latest/example/webserver/apache-cgi.html
|
||||
# https://guide.munin-monitoring.org/en/latest/example/webserver/apache-cgi.html
|
||||
# spawn-fcgi -s /run/munin/fastcgi-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph
|
||||
# spawn-fcgi -s /run/munin/fastcgi-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html
|
||||
# https://paste.sh/vofcctHP#-KbDSXVeWoifYncZmLfZzgum
|
||||
|
|
@ -147,7 +147,7 @@ in
|
|||
Enable Munin Node agent. Munin node listens on 0.0.0.0 and
|
||||
by default accepts connections only from 127.0.0.1 for security reasons.
|
||||
|
||||
See <http://guide.munin-monitoring.org/en/latest/architecture/index.html>.
|
||||
See <https://guide.munin-monitoring.org/en/latest/architecture/index.html>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -156,7 +156,7 @@ in
|
|||
type = types.lines;
|
||||
description = lib.mdDoc ''
|
||||
{file}`munin-node.conf` extra configuration. See
|
||||
<http://guide.munin-monitoring.org/en/latest/reference/munin-node.conf.html>
|
||||
<https://guide.munin-monitoring.org/en/latest/reference/munin-node.conf.html>
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -165,7 +165,7 @@ in
|
|||
type = types.lines;
|
||||
description = lib.mdDoc ''
|
||||
{file}`plugin-conf.d` extra plugin configuration. See
|
||||
<http://guide.munin-monitoring.org/en/latest/plugin/use.html>
|
||||
<https://guide.munin-monitoring.org/en/latest/plugin/use.html>
|
||||
'';
|
||||
example = ''
|
||||
[fail2ban_*]
|
||||
|
|
@ -273,9 +273,9 @@ in
|
|||
type = types.lines;
|
||||
description = lib.mdDoc ''
|
||||
{file}`munin.conf` extra global configuration.
|
||||
See <http://guide.munin-monitoring.org/en/latest/reference/munin.conf.html>.
|
||||
See <https://guide.munin-monitoring.org/en/latest/reference/munin.conf.html>.
|
||||
Useful to setup notifications, see
|
||||
<http://guide.munin-monitoring.org/en/latest/tutorial/alert.html>
|
||||
<https://guide.munin-monitoring.org/en/latest/tutorial/alert.html>
|
||||
'';
|
||||
example = ''
|
||||
contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com
|
||||
|
|
@ -288,7 +288,7 @@ in
|
|||
description = lib.mdDoc ''
|
||||
Definitions of hosts of nodes to collect data from. Needs at least one
|
||||
host for cron to succeed. See
|
||||
<http://guide.munin-monitoring.org/en/latest/reference/munin.conf.html>
|
||||
<https://guide.munin-monitoring.org/en/latest/reference/munin.conf.html>
|
||||
'';
|
||||
example = literalExpression ''
|
||||
'''
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ in
|
|||
|
||||
options = {
|
||||
services.nagios = {
|
||||
enable = mkEnableOption (lib.mdDoc ''[Nagios](http://www.nagios.org/) to monitor your system or network.'');
|
||||
enable = mkEnableOption (lib.mdDoc ''[Nagios](https://www.nagios.org/) to monitor your system or network.'');
|
||||
|
||||
objectDefs = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ in
|
|||
description = lib.mdDoc ''
|
||||
Configuration of XtreemFS DIR service.
|
||||
WARNING: configuration is saved as plaintext inside nix store.
|
||||
For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
|
||||
For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
|
||||
'';
|
||||
};
|
||||
replication = {
|
||||
|
|
@ -218,7 +218,7 @@ in
|
|||
description = lib.mdDoc ''
|
||||
Configuration of XtreemFS DIR replication plugin.
|
||||
WARNING: configuration is saved as plaintext inside nix store.
|
||||
For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
|
||||
For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
@ -319,7 +319,7 @@ in
|
|||
description = lib.mdDoc ''
|
||||
Configuration of XtreemFS MRC service.
|
||||
WARNING: configuration is saved as plaintext inside nix store.
|
||||
For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
|
||||
For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
|
||||
'';
|
||||
};
|
||||
replication = {
|
||||
|
|
@ -361,7 +361,7 @@ in
|
|||
description = lib.mdDoc ''
|
||||
Configuration of XtreemFS MRC replication plugin.
|
||||
WARNING: configuration is saved as plaintext inside nix store.
|
||||
For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
|
||||
For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
@ -438,7 +438,7 @@ in
|
|||
description = lib.mdDoc ''
|
||||
Configuration of XtreemFS OSD service.
|
||||
WARNING: configuration is saved as plaintext inside nix store.
|
||||
For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
|
||||
For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ in
|
|||
path.
|
||||
|
||||
See
|
||||
<http://www.asterisk.org/community/documentation>
|
||||
<https://www.asterisk.org/community/documentation/>
|
||||
for more examples of what is possible here.
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@ in
|
|||
enable = mkEnableOption (lib.mdDoc "I2Pd daemon") // {
|
||||
description = lib.mdDoc ''
|
||||
Enables I2Pd as a running service upon activation.
|
||||
Please read http://i2pd.readthedocs.io/en/latest/ for further
|
||||
Please read <https://i2pd.readthedocs.io/en/latest/> for further
|
||||
configuration help.
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ in
|
|||
The default flags prevent external hosts from using ntpd as a DDoS
|
||||
reflector, setting system time, and querying OS/ntpd version. As
|
||||
recommended in section 6.5.1.1.3, answer "No" of
|
||||
http://support.ntp.org/bin/view/Support/AccessRestrictions
|
||||
https://support.ntp.org/Support/AccessRestrictions
|
||||
'';
|
||||
default = [ "limited" "kod" "nomodify" "notrap" "noquery" "nopeer" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ in
|
|||
lib.mdDoc ''
|
||||
Configuration for bootstrap daemon.
|
||||
See <https://github.com/irungentoo/toxcore/blob/master/other/bootstrap_daemon/tox-bootstrapd.conf>
|
||||
and <http://wiki.tox.im/Nodes>.
|
||||
and <https://wiki.tox.chat/users/nodes>.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ in
|
|||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable [Micro Transport Protocol (µTP)](http://en.wikipedia.org/wiki/Micro_Transport_Protocol).
|
||||
Whether to enable [Micro Transport Protocol (µTP)](https://en.wikipedia.org/wiki/Micro_Transport_Protocol).
|
||||
'';
|
||||
};
|
||||
options.watch-dir = mkOption {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ let
|
|||
name = "mongo.conf";
|
||||
executable = false;
|
||||
text = ''
|
||||
# for documentation of all options, see http://docs.mongodb.org/manual/reference/configuration-options/
|
||||
# for documentation of all options, see https://www.mongodb.com/docs/manual/reference/configuration-options/
|
||||
|
||||
storage:
|
||||
dbPath: ${cfg.dataDir}/db
|
||||
|
|
@ -63,7 +63,7 @@ let
|
|||
executable = false;
|
||||
text = ''
|
||||
# for documentation of all options, see:
|
||||
# http://docs.mongodb.org/manual/reference/configuration-options/
|
||||
# https://www.mongodb.com/docs/manual/reference/configuration-options/
|
||||
|
||||
storage:
|
||||
dbPath: ${cfg.dataDir}/db-wt
|
||||
|
|
|
|||
|
|
@ -909,7 +909,7 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
warnings = optionals (!config.security.sudo.enable) [''
|
||||
warnings = optionals (with config.security; (!sudo.enable) && (!sudo-rs.enable)) [''
|
||||
The pleroma_ctl wrapper enabled by the installWrapper option relies on
|
||||
sudo, which appears to have been disabled through security.sudo.enable.
|
||||
''];
|
||||
|
|
|
|||
|
|
@ -407,7 +407,7 @@ in
|
|||
type = with lib.types; nullOr (enum ["plain" "login" "cram_md5"]);
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Authentication type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html
|
||||
Authentication type to use, see https://api.rubyonrails.org/classes/ActionMailer/Base.html
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -423,7 +423,7 @@ in
|
|||
type = lib.types.str;
|
||||
default = "peer";
|
||||
description = lib.mdDoc ''
|
||||
How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html
|
||||
How OpenSSL checks the certificate, see https://api.rubyonrails.org/classes/ActionMailer/Base.html
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ used by the imperative installer and all values are written to an additional fil
|
|||
to ensure that changes can be applied by changing the module's options.
|
||||
|
||||
In case the application serves multiple domains (those are checked with
|
||||
[`$_SERVER['HTTP_HOST']`](http://php.net/manual/en/reserved.variables.server.php))
|
||||
[`$_SERVER['HTTP_HOST']`](https://www.php.net/manual/en/reserved.variables.server.php))
|
||||
it's needed to add them to
|
||||
[`services.nextcloud.config.extraTrustedDomains`](#opt-services.nextcloud.config.extraTrustedDomains).
|
||||
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@ let
|
|||
background processes while not running tt-rss, this method is generally
|
||||
viable to keep your feeds up to date.
|
||||
Still, there are more robust (and recommended) updating methods
|
||||
available, you can read about them here: http://tt-rss.org/wiki/UpdatingFeeds
|
||||
available, you can read about them here: <https://tt-rss.org/wiki/UpdatingFeeds>
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
|
||||
# List of known lighttpd modules, ordered by how the lighttpd documentation
|
||||
# recommends them being imported:
|
||||
# http://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails
|
||||
# https://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails
|
||||
#
|
||||
# Some modules are always imported and should not appear in the config:
|
||||
# disallowedModules = [ "mod_indexfile" "mod_dirlisting" "mod_staticfile" ];
|
||||
|
|
@ -84,8 +84,8 @@ let
|
|||
# server.modules += () entries in each sub-service extraConfig snippet,
|
||||
# read this:
|
||||
#
|
||||
# http://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails
|
||||
# http://redmine.lighttpd.net/issues/2337
|
||||
# https://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails
|
||||
# https://redmine.lighttpd.net/issues/2337
|
||||
#
|
||||
# Basically, lighttpd doesn't want to load (or even silently ignore) a
|
||||
# module for a second time, and there is no way to check if a module has
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ in {
|
|||
type = types.lines;
|
||||
description = lib.mdDoc ''
|
||||
Verbatim config file to use
|
||||
(see http://www.mew.org/~kazu/proj/mighttpd/en/config.html)
|
||||
(see https://kazu-yamamoto.github.io/mighttpd2/config.html)
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ in {
|
|||
type = types.lines;
|
||||
description = lib.mdDoc ''
|
||||
Verbatim routing file to use
|
||||
(see http://www.mew.org/~kazu/proj/mighttpd/en/config.html)
|
||||
(see https://kazu-yamamoto.github.io/mighttpd2/config.html)
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -955,7 +955,7 @@ in
|
|||
default = {};
|
||||
description = lib.mdDoc ''
|
||||
Configure a proxy cache path entry.
|
||||
See <http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_cache_path> for documentation.
|
||||
See <https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_cache_path> for documentation.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ in
|
|||
# make available for D-BUS user services
|
||||
#export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}:${config.system.path}/share:${e.efl}/share
|
||||
|
||||
# Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
# Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
|
||||
fi
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ in
|
|||
pkgs.glib # for gsettings program
|
||||
pkgs.gnome-menus
|
||||
pkgs.gtk3.out # for gtk-launch program
|
||||
pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
];
|
||||
in
|
||||
mandatoryPackages
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ in
|
|||
onboard
|
||||
orca # elementary/greeter#668
|
||||
sound-theme-freedesktop
|
||||
xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
]) ++ (with pkgs.pantheon; [
|
||||
# Artwork
|
||||
elementary-gtk-theme
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ let
|
|||
)}
|
||||
|
||||
# Speed up application start by 50-150ms according to
|
||||
# http://kdemonkey.blogspot.nl/2008/04/magic-trick.html
|
||||
# https://kdemonkey.blogspot.com/2008/04/magic-trick.html
|
||||
compose_cache="''${XCOMPOSECACHE:-$HOME/.compose-cache}"
|
||||
mkdir -p "$compose_cache"
|
||||
# To avoid accidentally deleting a wrongly set up XCOMPOSECACHE directory,
|
||||
|
|
|
|||
|
|
@ -60,11 +60,11 @@ in
|
|||
VertRefresh 1.0 - 200.0
|
||||
#To add your own modes here, use a modeline calculator, like:
|
||||
# cvt:
|
||||
# http://www.x.org/archive/X11R7.5/doc/man/man1/cvt.1.html
|
||||
# https://www.x.org/archive/X11R7.5/doc/man/man1/cvt.1.html
|
||||
# xtiming:
|
||||
# http://xtiming.sourceforge.net/cgi-bin/xtiming.pl
|
||||
# https://xtiming.sourceforge.net/cgi-bin/xtiming.pl
|
||||
# gtf:
|
||||
# http://gtf.sourceforge.net/
|
||||
# https://gtf.sourceforge.net/
|
||||
#This can be used to get a specific DPI, but only for the default resolution:
|
||||
#DisplaySize 508 317
|
||||
#NOTE: the highest modes will not work without increasing the VideoRam
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ in
|
|||
Window class translation rules.
|
||||
/etc/X11/imwheelrc is generated based on this config
|
||||
which means this config is global for all users.
|
||||
See [official man pages](http://imwheel.sourceforge.net/imwheel.1.html)
|
||||
See [official man pages](https://imwheel.sourceforge.net/imwheel.1.html)
|
||||
for more information.
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ in
|
|||
under `/boot/extlinux.conf`. For instance,
|
||||
U-Boot's generic distro boot support uses this file format.
|
||||
|
||||
See [U-boot's documentation](http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.distro;hb=refs/heads/master)
|
||||
See [U-boot's documentation](https://u-boot.readthedocs.io/en/latest/develop/distro.html)
|
||||
for more information.
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -339,7 +339,7 @@ in
|
|||
See the
|
||||
[
|
||||
GRUB source code
|
||||
](http://git.savannah.gnu.org/cgit/grub.git/tree/grub-core/commands/nativedisk.c?h=grub-2.04#n326)
|
||||
](https://git.savannah.gnu.org/cgit/grub.git/tree/grub-core/commands/nativedisk.c?h=grub-2.04#n326)
|
||||
for which disk modules are available.
|
||||
|
||||
The list elements are passed directly as `argv`
|
||||
|
|
|
|||
|
|
@ -537,7 +537,7 @@ in
|
|||
description = lib.mdDoc ''
|
||||
Unless enabled, encryption keys can be easily recovered by an attacker with physical
|
||||
access to any machine with PCMCIA, ExpressCard, ThunderBolt or FireWire port.
|
||||
More information is available at <http://en.wikipedia.org/wiki/DMA_attack>.
|
||||
More information is available at <https://en.wikipedia.org/wiki/DMA_attack>.
|
||||
|
||||
This option blacklists FireWire drivers, but doesn't remove them. You can manually
|
||||
load the drivers if you need to use a FireWire device, but don't forget to unload them!
|
||||
|
|
|
|||
|
|
@ -284,7 +284,7 @@ let
|
|||
# in the NixOS installation CD, so use ID_CDROM_MEDIA in the
|
||||
# corresponding udev rules for now. This was the behaviour in
|
||||
# udev <= 154. See also
|
||||
# http://www.spinics.net/lists/hotplug/msg03935.html
|
||||
# https://www.spinics.net/lists/hotplug/msg03935.html
|
||||
substituteInPlace $out/60-persistent-storage.rules \
|
||||
--replace ID_CDROM_MEDIA_TRACK_COUNT_DATA ID_CDROM_MEDIA
|
||||
''; # */
|
||||
|
|
|
|||
|
|
@ -84,6 +84,10 @@ in
|
|||
{ groups = [ "google-sudoers" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; }
|
||||
];
|
||||
|
||||
security.sudo-rs.extraRules = mkIf config.users.mutableUsers [
|
||||
{ groups = [ "google-sudoers" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; }
|
||||
];
|
||||
|
||||
users.groups.google-sudoers = mkIf config.users.mutableUsers { };
|
||||
|
||||
boot.extraModprobeConfig = readFile "${pkgs.google-guest-configs}/etc/modprobe.d/gce-blacklist.conf";
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pbpctrl";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qzed";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-91sdlnffL/HX+Y8e6T+ZCa7MAcf4fWE0NJGLgmK47o8=";
|
||||
hash = "sha256-tOdKXYfeO+HsYIDDU3fDb76ytRHVOcIqffEjFnLwOTI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-U4//GvAEhrfOrivwW/6PbKHdWXGIuilPl7Zo17wnwDY=";
|
||||
cargoHash = "sha256-yP4tsXCAPE1KUDU5oBIejL4kACK1dNXK7Kmw37VMexM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config protobuf ];
|
||||
buildInputs = [ dbus ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
version = "0.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gavare.se/gxemul/src/${pname}-${version}.tar.gz";
|
||||
url = "https://gavare.se/gxemul/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-ecRDfG+MqQT0bTOsNgYqZf3PSpKiSEeOQIqxEpXPjoM=";
|
||||
};
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://gavare.se/gxemul/";
|
||||
homepage = "https://gavare.se/gxemul/";
|
||||
description = "Gavare's experimental emulator";
|
||||
longDescription = ''
|
||||
GXemul is a framework for full-system computer architecture
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ mkDerivation {
|
|||
cmakeFlags = [ "-DQT5BUILD=true" ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://dfilemanager.sourceforge.net/";
|
||||
homepage = "https://github.com/probonopd/dfilemanager";
|
||||
description = "File manager written in Qt/C++";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -24,12 +24,13 @@ diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp
|
|||
index 52c47168af..9966bd0013 100644
|
||||
--- a/src/Base/Interpreter.cpp
|
||||
+++ b/src/Base/Interpreter.cpp
|
||||
@@ -554,7 +554,7 @@ void initInterpreter(int argc,char *argv[])
|
||||
@@ -554,7 +554,9 @@ void initInterpreter(int argc,char *argv[])
|
||||
{
|
||||
PyStatus status;
|
||||
PyConfig config;
|
||||
- PyConfig_InitIsolatedConfig(&config);
|
||||
+ PyConfig_InitPythonConfig(&config);
|
||||
PyConfig_InitIsolatedConfig(&config);
|
||||
+ config.isolated = 0;
|
||||
+ config.use_environment = 1;
|
||||
|
||||
status = PyConfig_SetBytesArgv(&config, argc, argv);
|
||||
if (PyStatus_Exception(status)) {
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, boost
|
||||
, coin3d
|
||||
, eigen
|
||||
, freecad # for passthru.tests
|
||||
, gfortran
|
||||
, gts
|
||||
, hdf5
|
||||
|
|
@ -35,6 +36,7 @@
|
|||
, qtwebengine
|
||||
, qtx11extras
|
||||
, qtxmlpatterns
|
||||
, runCommand # for passthru.tests
|
||||
, scipy
|
||||
, shiboken2
|
||||
, soqt
|
||||
|
|
@ -147,6 +149,21 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
# Check that things such as argument parsing still work correctly with
|
||||
# the above PYTHONPATH patch. Previously the patch used above changed
|
||||
# the `PyConfig_InitIsolatedConfig` to `PyConfig_InitPythonConfig`,
|
||||
# which caused the built-in interpreter to attempt (and fail) to doubly
|
||||
# parse argv. This should catch if that ever regresses and also ensures
|
||||
# that PYTHONPATH is still respected enough for the FreeCAD console to
|
||||
# successfully run and check that it was included in `sys.path`.
|
||||
python-path = runCommand "freecad-test-console" {
|
||||
nativeBuildInputs = [ freecad ];
|
||||
} ''
|
||||
HOME="$(mktemp -d)" PYTHONPATH="$(pwd)/test" FreeCADCmd --log-file $out -c "if not '$(pwd)/test' in sys.path: sys.exit(1)" </dev/null
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.freecad.org";
|
||||
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ mkDerivation rec {
|
|||
machine parts but pretty sure is not what you are looking for when you are more
|
||||
interested in creating computer-animated movies.
|
||||
'';
|
||||
homepage = "http://openscad.org/";
|
||||
homepage = "https://openscad.org/";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ bjornfor raskin gebner ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ in gnustep'.gsmakeDerivation rec {
|
|||
version = "1.0-b10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://twilightedge.com/downloads/PikoPixel.Sources.${version}.tar.gz";
|
||||
url = "https://twilightedge.com/downloads/PikoPixel.Sources.${version}.tar.gz";
|
||||
sha256 = "1b27npgsan2nx1p581b9q2krx4506yyd6s34r4sf1r9x9adshm77";
|
||||
};
|
||||
|
||||
|
|
@ -38,8 +38,8 @@ in gnustep'.gsmakeDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Application for drawing and editing pixel-art images";
|
||||
homepage = "http://twilightedge.com/mac/pikopixel/";
|
||||
downloadPage = "http://twilightedge.com/mac/pikopixel/";
|
||||
homepage = "https://twilightedge.com/mac/pikopixel/";
|
||||
downloadPage = "https://twilightedge.com/mac/pikopixel/";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
in mind (follows Gnome HIG2).
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
homepage = "http://siyanpanayotov.com/project/viewnior/";
|
||||
homepage = "https://siyanpanayotov.com/project/viewnior/";
|
||||
maintainers = with maintainers; [ smironov artturin ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -33,14 +33,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.4.7";
|
||||
version = "1.4.8";
|
||||
pname = "syncthingtray";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "syncthingtray";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-ddOyAyvFifsdNMbwcMZTyhA+5pvz6/Eu/VoBmdsHi54=";
|
||||
sha256 = "sha256-Fy3cy6c36Qsi8F7cC/MI8g6tdfkn8fDBncL+ZOoiGcs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "Yet another telephony engine";
|
||||
homepage = "http://yate.ro/";
|
||||
homepage = "https://yate.ro/";
|
||||
# Yate's license is GPL with an exception for linking with
|
||||
# OpenH323 and PWlib (licensed under MPL).
|
||||
license = lib.licenses.gpl2Only;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
, dpkg
|
||||
, wrapGAppsHook
|
||||
, autoPatchelfHook
|
||||
, clash
|
||||
, clash-meta
|
||||
, openssl
|
||||
, webkitgtk
|
||||
|
|
@ -49,7 +48,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
postFixup = ''
|
||||
ln -s ${lib.getExe clash} $out/bin/clash
|
||||
ln -s ${lib.getExe clash-meta} $out/bin/clash-meta
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.26";
|
||||
version = "0.6.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-Tj64/8uYEy4qZISjmtpOGTMzgSkBB516/Dej6/biYRY=";
|
||||
hash = "sha256-/ifr/sSaChZKRe9wCcjURhqZl2/JhIMewZSlJiit/7w=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -14,15 +14,15 @@
|
|||
let
|
||||
package = buildGoModule rec {
|
||||
pname = "opentofu";
|
||||
version = "1.6.0-alpha3";
|
||||
version = "1.6.0-alpha4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "opentofu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D95YzliadhhcOx8gW+lhECiYBtezsS8rj0Tz/29azlA=";
|
||||
hash = "sha256-JkYMGD6hNMcMYPXnFUm/6T0EfzeAfG4oQuyqcNv3hVE=";
|
||||
};
|
||||
vendorHash = "sha256-SbGdmPTJRSMDhqg0GEfdiQ+2Uw7xmz0Kcyrr1ANlKo4=";
|
||||
vendorHash = "sha256-kE61inSQ8aCFnPf8plVRUJgruSFVOsogJAbI1zvJdb4=";
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
postConfigure = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pluto";
|
||||
version = "5.18.5";
|
||||
version = "5.18.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = "pluto";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zdfzGmEL1ZsU3g3jmkgOfxcIGyffkC9UeiU18jPOr7Y=";
|
||||
hash = "sha256-PQf1gEFlZ6Y9KMQjKeXAZy/OfxCbiKfST3pr9xp0/vg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8ZOYp/vM16PugmE+3QK7ZRDwIwRCMEwD0NRyiOBlh14=";
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://kirc.io/";
|
||||
homepage = "https://mcpcpc.github.io/kirc/";
|
||||
description = "Tiny IRC client written in C99";
|
||||
longDescription = ''
|
||||
kirc is a tiny open-source Internet Relay Chat (IRC) client designed with
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Advanced IRC Client";
|
||||
homepage = "http://www.kvirc.net/";
|
||||
homepage = "https://www.kvirc.net/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.suhr ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Client for many p2p networks, with multiple frontends";
|
||||
homepage = "http://mldonkey.sourceforge.net/";
|
||||
homepage = "https://github.com/ygrek/mldonkey";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Convert ebooks to Morse MP3s/OGGs";
|
||||
homepage = "http://fkurz.net/ham/ebook2cw.html";
|
||||
homepage = "https://fkurz.net/ham/ebook2cw.html";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ earldouglas ];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
version = "1.9.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://fmv.jku.at/aiger/${pname}-${version}.tar.gz";
|
||||
url = "https://fmv.jku.at/aiger/${pname}-${version}.tar.gz";
|
||||
sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y";
|
||||
};
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "And-Inverter Graph (AIG) utilities";
|
||||
homepage = "http://fmv.jku.at/aiger/";
|
||||
homepage = "https://fmv.jku.at/aiger/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ thoughtpolice ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ shnarazk ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
homepage = "http://fmv.jku.at/cadical";
|
||||
homepage = "https://fmv.jku.at/cadical/";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
version = "2.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz";
|
||||
url = "https://cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym";
|
||||
};
|
||||
|
||||
|
|
@ -32,11 +32,11 @@ stdenv.mkDerivation rec {
|
|||
[ raskin ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.free;
|
||||
homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html";
|
||||
homepage = "https://cs.nyu.edu/acsys/cvc3/index.html";
|
||||
};
|
||||
passthru = {
|
||||
updateInfo = {
|
||||
downloadPage = "http://www.cs.nyu.edu/acsys/cvc3/download.html";
|
||||
downloadPage = "https://cs.nyu.edu/acsys/cvc3/download.html";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ shnarazk ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
homepage = "http://fmv.jku.at/kissat";
|
||||
homepage = "https://fmv.jku.at/kissat";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
version = "965";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://fmv.jku.at/picosat/${pname}-${version}.tar.gz";
|
||||
url = "https://fmv.jku.at/picosat/${pname}-${version}.tar.gz";
|
||||
sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm";
|
||||
};
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "SAT solver with proof and core support";
|
||||
homepage = "http://fmv.jku.at/picosat/";
|
||||
homepage = "https://fmv.jku.at/picosat/";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ roconnor thoughtpolice ];
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A package comprising of implementations of algorithms for
|
||||
vertex coloring and derivative computation";
|
||||
homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities";
|
||||
homepage = "https://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities";
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@ in lib.recurseIntoAttrs
|
|||
convert = callPackage ./convert.nix { };
|
||||
inhibit-gnome = callPackage ./inhibit-gnome.nix { };
|
||||
mpris = callPackage ./mpris.nix { };
|
||||
mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { };
|
||||
mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; };
|
||||
mpv-webm = callPackage ./mpv-webm.nix { };
|
||||
mpvacious = callPackage ./mpvacious.nix { };
|
||||
quality-menu = callPackage ./quality-menu.nix { };
|
||||
quality-menu = callPackage ./quality-menu.nix { inherit buildLua; };
|
||||
simple-mpv-webui = callPackage ./simple-mpv-webui.nix { };
|
||||
sponsorblock = callPackage ./sponsorblock.nix { };
|
||||
thumbfast = callPackage ./thumbfast.nix { };
|
||||
thumbnail = callPackage ./thumbnail.nix { };
|
||||
thumbnail = callPackage ./thumbnail.nix { inherit buildLua; };
|
||||
uosc = callPackage ./uosc.nix { };
|
||||
visualizer = callPackage ./visualizer.nix { };
|
||||
vr-reversal = callPackage ./vr-reversal.nix { };
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub, yt-dlp }:
|
||||
{ lib, buildLua, fetchFromGitHub, yt-dlp }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
buildLua rec {
|
||||
pname = "mpv-playlistmanager";
|
||||
version = "unstable-2023-08-09";
|
||||
|
||||
|
|
@ -17,21 +17,12 @@ stdenvNoCC.mkDerivation rec {
|
|||
'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"',
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D -t $out/share/mpv/scripts playlistmanager.lua
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "playlistmanager.lua";
|
||||
scriptPath = "playlistmanager.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mpv lua script to create and manage playlists";
|
||||
homepage = "https://github.com/jonniek/mpv-playlistmanager";
|
||||
license = licenses.unlicense;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ lunik1 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,22 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, buildLua
|
||||
, fetchFromGitHub
|
||||
, oscSupport ? false
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
buildLua rec {
|
||||
pname = "mpv-quality-menu";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "christoph-heinrich";
|
||||
repo = "mpv-quality-menu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-93WoTeX61xzbjx/tgBgUVuwyR9MkAUzCfVSrbAC7Ddc=";
|
||||
hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp quality-menu.lua $out/share/mpv/scripts
|
||||
'' + lib.optionalString oscSupport ''
|
||||
cp quality-menu-osc.lua $out/share/mpv/scripts
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "quality-menu.lua";
|
||||
scriptPath = if oscSupport then "*.lua" else passthru.scriptName;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub, python3 }:
|
||||
{ lib, buildLua, fetchFromGitHub, python3 }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
buildLua rec {
|
||||
pname = "mpv-thumbnail-script";
|
||||
version = "0.5.3";
|
||||
|
||||
|
|
@ -12,19 +12,10 @@ stdenvNoCC.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
postPatch = "patchShebangs concat_files.py";
|
||||
dontBuild = false;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs concat_files.py
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp mpv_thumbnail_script_{client_osc,server}.lua $out/share/mpv/scripts
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "mpv_thumbnail_script_{client_osc,server}.lua";
|
||||
scriptPath = "mpv_thumbnail_script_{client_osc,server}.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lua script to show preview thumbnails in mpv's OSC seekbar";
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "obs-vkcapture";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nowrep";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-sDgYHa6zwUsGAinWptFeeaTG5n9t7SCLYgjDurdMT6g=";
|
||||
hash = "sha256-C5dMDfCFkUNENA4qQlmGeavKqYpbRHkUz79LVM5aVao=";
|
||||
};
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.isi686 [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner
|
||||
{ lib, rustPlatform, fetchgit, fetchpatch
|
||||
, pkg-config, protobuf, python3, wayland-scanner
|
||||
, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
|
||||
}:
|
||||
|
||||
|
|
@ -13,6 +14,16 @@ rustPlatform.buildRustPackage rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "test-page-size-fix.patch";
|
||||
url = "https://chromium.googlesource.com/crosvm/crosvm/+/d9bc6e99ff5ac31d7d88b684c938af01a0872fc1%5E%21/?format=TEXT";
|
||||
decode = "base64 -d";
|
||||
includes = [ "src/crosvm/config.rs" ];
|
||||
hash = "sha256-3gfNzp0WhtNr+8CWSISCJau208EMIo3RJhM+4SyeV3o=";
|
||||
})
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoHash = "sha256-yRujLgPaoKx/wkG3yMwQ5ndy9X5xDWSKtCr8DypXvEA=";
|
||||
|
|
|
|||
|
|
@ -266,11 +266,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.qemu.org/";
|
||||
description =
|
||||
if toolsOnly
|
||||
then "Support tools for qemu, a machine emulator and virtualizer"
|
||||
else "A generic and open source machine emulator and virtualizer";
|
||||
homepage = "https://www.qemu.org/";
|
||||
description = "A generic and open source machine emulator and virtualizer";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ eelco qyliss ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://virt-manager.org";
|
||||
homepage = "https://virt-manager.org";
|
||||
description = "Desktop user interface for managing virtual machines";
|
||||
longDescription = ''
|
||||
The virt-manager application is a desktop user interface for managing
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
passthru = {
|
||||
updateInfo = {
|
||||
downloadPage = "http://virt-manager.org/download.html";
|
||||
downloadPage = "https://virt-manager.org/download.html";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
40
pkgs/by-name/si/signal-export/package.nix
Normal file
40
pkgs/by-name/si/signal-export/package.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchPypi
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "signal-export";
|
||||
version = "1.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-1efc8jclXE4PQ/K9q1GC0mGqYo5lXXOIYEzz3RDNBGA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
typer
|
||||
beautifulsoup4
|
||||
emoji
|
||||
markdown
|
||||
pysqlcipher3
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "sigexport";
|
||||
homepage = "https://github.com/carderne/signal-export";
|
||||
description = "Export your Signal chats to markdown files with attachments.";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ phaer picnoir ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zpaqfranz";
|
||||
version = "58.10";
|
||||
version = "58.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcorbelli";
|
||||
repo = "zpaqfranz";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-eBokpah7j3QQChprvjeigt2/sEpkq6ZS4rQhIP5cAYo=";
|
||||
hash = "sha256-XewHMsHF65LvoRzPFiDQcClVSTfSCn69iDRjwKTLpRs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# we can't use fetchurl since stdenv does not handle unpacking *.zip's by default.
|
||||
src = fetchzip {
|
||||
# Linked on http://www.schristiancollins.com/generaluser.php:
|
||||
# Linked on https://www.schristiancollins.com/generaluser.php:
|
||||
url = "https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_${version}.zip";
|
||||
sha256 = "sha256-lwUlWubXiVZ8fijKuNF54YQjT0uigjNAbjKaNjmC51s=";
|
||||
};
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "a SoundFont bank featuring 259 instrument presets and 11 drum kits";
|
||||
homepage = "http://www.schristiancollins.com/generaluser.php";
|
||||
homepage = "https://www.schristiancollins.com/generaluser.php";
|
||||
license = licenses.generaluser;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,19 @@
|
|||
{ stdenv, lib, elixir, erlang, findutils, hex, rebar, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }@inputs:
|
||||
{ stdenv
|
||||
, lib
|
||||
, elixir
|
||||
, erlang
|
||||
, hex
|
||||
, git
|
||||
, rebar
|
||||
, rebar3
|
||||
, fetchMixDeps
|
||||
, findutils
|
||||
, makeWrapper
|
||||
, coreutils
|
||||
, gnused
|
||||
, gnugrep
|
||||
, gawk
|
||||
}@inputs:
|
||||
|
||||
{ pname
|
||||
, version
|
||||
|
|
@ -10,80 +25,104 @@
|
|||
, mixEnv ? "prod"
|
||||
, compileFlags ? [ ]
|
||||
|
||||
# mix fixed output derivation dependencies
|
||||
# Mix dependencies provided as a fixed output derivation
|
||||
, mixFodDeps ? null
|
||||
|
||||
# mix dependencies generated by mix2nix
|
||||
# this assumes each dependency is built by buildMix or buildRebar3
|
||||
# each dependency needs to have a setup hook to add the lib path to $ERL_LIBS
|
||||
# this is how mix will find dependencies
|
||||
# Mix dependencies generated by mix2nix
|
||||
#
|
||||
# This assumes each dependency is built by buildMix or buildRebar3. Each
|
||||
# dependency needs to have a setup hook to add the lib path to $ERL_LIBS.
|
||||
# This is how Mix finds dependencies.
|
||||
, mixNixDeps ? { }
|
||||
|
||||
, elixir ? inputs.elixir
|
||||
, hex ? inputs.hex.override { inherit elixir; }
|
||||
|
||||
# This reduces closure size, but can lead to some hard to understand runtime
|
||||
# errors, so use with caution. See e.g.
|
||||
# https://github.com/whitfin/cachex/issues/205
|
||||
# https://framagit.org/framasoft/mobilizon/-/issues/1169
|
||||
# Remove releases/COOKIE
|
||||
#
|
||||
# People have different views on the nature of cookies. Some believe that they are
|
||||
# secrets, while others believe they are just ids for clustering nodes instead of
|
||||
# secrets.
|
||||
#
|
||||
# If you think cookie is secret, you can set this attr to true, then it will be
|
||||
# removed from nix store. If not, you can set it to false.
|
||||
#
|
||||
# For backward compatibility, it is set to true by default.
|
||||
#
|
||||
# You can always specify a custom cookie by using RELEASE_COOKIE environment
|
||||
# variable, regardless of the value of this attr.
|
||||
, removeCookie ? true
|
||||
|
||||
# This reduces closure size, but can lead to some hard to understand runtime
|
||||
# errors, so use with caution. See e.g.
|
||||
# https://github.com/whitfin/cachex/issues/205
|
||||
# https://framagit.org/framasoft/mobilizon/-/issues/1169
|
||||
, stripDebug ? false
|
||||
|
||||
, ...
|
||||
}@attrs:
|
||||
let
|
||||
# remove non standard attributes that cannot be coerced to strings
|
||||
# Remove non standard attributes that cannot be coerced to strings
|
||||
overridable = builtins.removeAttrs attrs [ "compileFlags" "mixNixDeps" ];
|
||||
in
|
||||
assert mixNixDeps != { } -> mixFodDeps == null;
|
||||
assert stripDebug -> !enableDebugInfo;
|
||||
|
||||
stdenv.mkDerivation (overridable // {
|
||||
# rg is used as a better grep to search for erlang references in the final release
|
||||
nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ripgrep ];
|
||||
buildInputs = buildInputs ++ builtins.attrValues mixNixDeps;
|
||||
nativeBuildInputs = nativeBuildInputs ++
|
||||
# Erlang/Elixir deps
|
||||
[ erlang elixir hex git ] ++
|
||||
# Mix deps
|
||||
(builtins.attrValues mixNixDeps) ++
|
||||
# other compile-time deps
|
||||
[ findutils makeWrapper ];
|
||||
|
||||
buildInputs = buildInputs;
|
||||
|
||||
MIX_ENV = mixEnv;
|
||||
MIX_DEBUG = if enableDebugInfo then 1 else 0;
|
||||
HEX_OFFLINE = 1;
|
||||
|
||||
DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation
|
||||
# the api with `mix local.rebar rebar path` makes a copy of the binary
|
||||
# some older dependencies still use rebar
|
||||
# The API with `mix local.rebar rebar path` makes a copy of the binary
|
||||
# some older dependencies still use rebar.
|
||||
MIX_REBAR = "${rebar}/bin/rebar";
|
||||
MIX_REBAR3 = "${rebar3}/bin/rebar3";
|
||||
|
||||
LC_ALL = "C.UTF-8";
|
||||
|
||||
postUnpack = ''
|
||||
export HEX_HOME="$TEMPDIR/hex"
|
||||
# Mix and Hex
|
||||
export MIX_HOME="$TEMPDIR/mix"
|
||||
export HEX_HOME="$TEMPDIR/hex"
|
||||
|
||||
# Rebar
|
||||
export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3"
|
||||
export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache"
|
||||
|
||||
${lib.optionalString (mixFodDeps != null) ''
|
||||
# compilation of the dependencies will require
|
||||
# that the dependency path is writable
|
||||
# thus a copy to the TEMPDIR is inevitable here
|
||||
# Compilation of the dependencies will require that the dependency path is
|
||||
# writable, thus a copy to the $TEMPDIR is inevitable here.
|
||||
export MIX_DEPS_PATH="$TEMPDIR/deps"
|
||||
cp --no-preserve=mode -R "${mixFodDeps}" "$MIX_DEPS_PATH"
|
||||
''
|
||||
}
|
||||
|
||||
''}
|
||||
'' + (attrs.postUnpack or "");
|
||||
|
||||
configurePhase = attrs.configurePhase or ''
|
||||
runHook preConfigure
|
||||
|
||||
${./mix-configure-hook.sh}
|
||||
# this is needed for projects that have a specific compile step
|
||||
|
||||
# This is needed for projects that have a specific compile step
|
||||
# the dependency needs to be compiled in order for the task
|
||||
# to be available
|
||||
# Phoenix projects for example will need compile.phoenix
|
||||
# to be available.
|
||||
#
|
||||
# Phoenix projects for example will need compile.phoenix.
|
||||
mix deps.compile --no-deps-check --skip-umbrella-children
|
||||
|
||||
# Symlink dependency sources. This is needed for projects that require
|
||||
# access to the source of their dependencies. For example, Phoenix
|
||||
# applications need javascript assets to build asset bundles.
|
||||
# projects need javascript assets to build asset bundles.
|
||||
${lib.optionalString (mixNixDeps != { }) ''
|
||||
mkdir -p deps
|
||||
|
||||
|
|
@ -113,7 +152,6 @@ stdenv.mkDerivation (overridable // {
|
|||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
||||
installPhase = attrs.installPhase or ''
|
||||
runHook preInstall
|
||||
|
||||
|
|
@ -122,42 +160,50 @@ stdenv.mkDerivation (overridable // {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Stripping of the binary is intentional
|
||||
# even though it does not affect beam files
|
||||
# it is necessary for NIFs binaries
|
||||
postFixup = ''
|
||||
if [ -e "$out/bin/${pname}.bat" ]; then # absent in special cases, i.e. elixir-ls
|
||||
rm "$out/bin/${pname}.bat" # windows file
|
||||
fi
|
||||
# contains secrets and should not be in the nix store
|
||||
# TODO document how to handle RELEASE_COOKIE
|
||||
# secrets should not be in the nix store.
|
||||
# This is only used for connecting multiple nodes
|
||||
if [ -e $out/releases/COOKIE ]; then # absent in special cases, i.e. elixir-ls
|
||||
# Remove files for Microsoft Windows
|
||||
rm -f "$out"/bin/*.bat
|
||||
|
||||
# Wrap programs in $out/bin with their runtime deps
|
||||
for f in $(find $out/bin/ -type f -executable); do
|
||||
wrapProgram "$f" \
|
||||
--prefix PATH : ${lib.makeBinPath [
|
||||
coreutils
|
||||
gnused
|
||||
gnugrep
|
||||
gawk
|
||||
]}
|
||||
done
|
||||
'' + lib.optionalString removeCookie ''
|
||||
if [ -e $out/releases/COOKIE ]; then
|
||||
rm $out/releases/COOKIE
|
||||
fi
|
||||
# removing unused erlang reference from resulting derivation to reduce
|
||||
# closure size
|
||||
if [ -e $out/erts-* ]; then
|
||||
echo "ERTS found in $out - removing references to erlang to reduce closure size"
|
||||
# there is a link in $out/erts-*/bin/start always
|
||||
# TODO:
|
||||
# sometimes there are links in dependencies like bcrypt compiled binaries
|
||||
# at the moment those are not removed since substituteInPlace will
|
||||
# error on binaries
|
||||
for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches); do
|
||||
echo "removing reference to erlang in $file"
|
||||
substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out"
|
||||
done
|
||||
fi
|
||||
'' + lib.optionalString stripDebug ''
|
||||
# strip debug symbols to avoid hardreferences to "foreign" closures actually
|
||||
# Strip debug symbols to avoid hardreferences to "foreign" closures actually
|
||||
# not needed at runtime, while at the same time reduce size of BEAM files.
|
||||
erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop
|
||||
'';
|
||||
|
||||
# TODO investigate why the resulting closure still has
|
||||
# a reference to erlang.
|
||||
# uncommenting the following will fail the build
|
||||
# disallowedReferences = [ erlang ];
|
||||
# TODO: remove erlang references in resulting derivation
|
||||
#
|
||||
# # Step 1 - investigate why the resulting derivation still has references to erlang.
|
||||
#
|
||||
# The reason is that the generated binaries contains erlang reference. Here's a repo to
|
||||
# demonstrate the problem - <https://github.com/plastic-gun/nix-mix-release-unwanted-references>.
|
||||
#
|
||||
#
|
||||
# # Step 2 - remove erlang references from the binaries
|
||||
#
|
||||
# As said in above repo, it's hard to remove erlang references from `.beam` binaries.
|
||||
#
|
||||
# We need more experienced developers to resolve this issue.
|
||||
#
|
||||
#
|
||||
# # Tips
|
||||
#
|
||||
# When resolving this issue, it is convenient to fail the build when erlang is referenced,
|
||||
# which can be achieved by using:
|
||||
#
|
||||
# disallowedReferences = [ erlang ];
|
||||
#
|
||||
})
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.softsynth.com/pforth/";
|
||||
homepage = "https://www.softsynth.com/pforth/";
|
||||
description = "Portable Portable ANS-like Forth written in ANSI 'C'";
|
||||
changelog = "https://github.com/philburk/pforth/blob/v${finalAttrs.version}/RELEASES.md";
|
||||
license = lib.licenses.bsd0;
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.terraspace.co.uk/uasm.html";
|
||||
homepage = "https://www.terraspace.co.uk/uasm.html";
|
||||
description = "A free MASM-compatible assembler based on JWasm";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ thiagokokada ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luau";
|
||||
version = "0.601";
|
||||
version = "0.603";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roblox";
|
||||
owner = "luau-lang";
|
||||
repo = "luau";
|
||||
rev = version;
|
||||
hash = "sha256-RkclNY5ZDP0Urht/JBx00SbeQ958CJCTIru2YUIYFa4=";
|
||||
hash = "sha256-8jm58F2AQcmjy19fydGLOD5fehaaNHGqXtDPu121jmw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A fast, small, safe, gradually typed embeddable scripting language derived from Lua";
|
||||
homepage = "https://luau-lang.org/";
|
||||
changelog = "https://github.com/Roblox/luau/releases/tag/${version}";
|
||||
changelog = "https://github.com/luau-lang/luau/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue