mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 04:31:52 +00:00
Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
80d069b157
9
.github/CONTRIBUTING.md
vendored
9
.github/CONTRIBUTING.md
vendored
|
|
@ -50,12 +50,13 @@ For package version upgrades and such a one-line commit message is usually suffi
|
|||
|
||||
## Backporting changes
|
||||
|
||||
To [backport a change into a release branch](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches):
|
||||
Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).
|
||||
|
||||
1. Take note of the commit in which the change was introduced into `master`.
|
||||
1. Take note of the commits in which the change was introduced into `master` branch.
|
||||
2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`.
|
||||
3. Use `git cherry-pick -x <original commit>`.
|
||||
4. Open your backport PR. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the PR, and link to the PR in which the original change was made to `master`.
|
||||
3. Create a branch for your change, e.g. `git checkout -b backport`.
|
||||
4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar.
|
||||
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.03]`.
|
||||
|
||||
## Reviewing contributions
|
||||
|
||||
|
|
|
|||
|
|
@ -407,23 +407,47 @@ Additional information.
|
|||
<section xml:id="submitting-changes-stable-release-branches">
|
||||
<title>Stable release branches</title>
|
||||
|
||||
<itemizedlist>
|
||||
<para>
|
||||
For cherry-picking a commit to a stable release branch (<quote>backporting</quote>), use <literal>git cherry-pick -x <original commit></literal> so that the original commit id is included in the commit.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
Add a reason for the backport by using <literal>git cherry-pick -xe <original commit></literal> instead when it is not obvious from the original commit message. It is not needed when it’s a minor version update that includes security and bug fixes but don’t add new features or when the commit fixes an otherwise broken package.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
Here is an example of a cherry-picked commit message with good reason description:
|
||||
</para>
|
||||
|
||||
<screen>
|
||||
zfs: Keep trying root import until it works
|
||||
|
||||
Works around #11003.
|
||||
|
||||
(cherry picked from commit 98b213a11041af39b39473906b595290e2a4e2f9)
|
||||
|
||||
Reason: several people cannot boot with ZFS on NVMe
|
||||
</screen>
|
||||
|
||||
<para>
|
||||
Other examples of reasons are:
|
||||
</para>
|
||||
|
||||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
If you're cherry-picking a commit to a stable release branch (“backporting”), always use <command>git cherry-pick -xe</command> and ensure the message contains a clear description about why this needs to be included in the stable branch.
|
||||
Previously the build would fail due to, e.g., <literal>getaddrinfo</literal> not being defined
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
An example of a cherry-picked commit would look like this:
|
||||
The previous download links were all broken
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Crash when starting on some X11 systems
|
||||
</para>
|
||||
<screen>
|
||||
nixos: Refactor the world.
|
||||
|
||||
The original commit message describing the reason why the world was torn apart.
|
||||
|
||||
(cherry picked from commit abcdef)
|
||||
Reason: I just had a gut feeling that this would also be wanted by people from
|
||||
the stone age.
|
||||
</screen>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -5608,6 +5608,12 @@
|
|||
githubId = 369111;
|
||||
name = "Morgan Jones";
|
||||
};
|
||||
numkem = {
|
||||
name = "Sebastien Bariteau";
|
||||
email = "numkem@numkem.org";
|
||||
github = "numkem";
|
||||
githubId = 332423;
|
||||
};
|
||||
nyanloutre = {
|
||||
email = "paul@nyanlout.re";
|
||||
github = "nyanloutre";
|
||||
|
|
|
|||
|
|
@ -266,6 +266,25 @@ environment.systemPackages = [
|
|||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The httpd web server previously started its main process as root
|
||||
privileged, then ran worker processes as a less privileged identity user.
|
||||
This was changed to start all of httpd as a less privileged user (defined by
|
||||
<xref linkend="opt-services.httpd.user"/> and
|
||||
<xref linkend="opt-services.httpd.group"/>). As a consequence, all files that
|
||||
are needed for httpd to run (included configuration fragments, SSL
|
||||
certificates and keys, etc.) must now be readable by this less privileged
|
||||
user/group.
|
||||
</para>
|
||||
<para>
|
||||
The default value for <xref linkend="opt-services.httpd.mpm"/>
|
||||
has been changed from <literal>prefork</literal> to <literal>event</literal>. Along with
|
||||
this change the default value for
|
||||
<link linkend="opt-services.httpd.virtualHosts">services.httpd.virtualHosts.<name>.http2</link>
|
||||
has been set to <literal>true</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
let
|
||||
pkgs = (import <nixpkgs> {});
|
||||
pkgs = (import ../../../../../../default.nix {});
|
||||
machine = import "${pkgs.path}/nixos/lib/eval-config.nix" {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ in
|
|||
fonts = {
|
||||
|
||||
enableFontDir = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to create a directory with links to all fonts in
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ with lib;
|
|||
fonts = {
|
||||
|
||||
enableGhostscriptFonts = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to add the fonts provided by Ghostscript (such as
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ in
|
|||
};
|
||||
|
||||
useTLS = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
If enabled, use TLS (encryption) over an LDAP (port 389)
|
||||
|
|
@ -109,6 +110,7 @@ in
|
|||
|
||||
daemon = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to let the nslcd daemon (nss-pam-ldapd) handle the
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
with lib;
|
||||
|
||||
let inherit (pkgs) writeScript; in
|
||||
|
||||
let
|
||||
pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
|
||||
|
||||
|
|
@ -30,7 +32,12 @@ in {
|
|||
];
|
||||
|
||||
# Some container managers like lxc need these
|
||||
extraCommands = "mkdir -p proc sys dev";
|
||||
extraCommands =
|
||||
let script = writeScript "extra-commands.sh" ''
|
||||
rm etc
|
||||
mkdir -p proc sys dev etc
|
||||
'';
|
||||
in script;
|
||||
};
|
||||
|
||||
boot.isContainer = true;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ with lib;
|
|||
];
|
||||
|
||||
options.security.apparmor.confineSUIDApplications = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Install AppArmor profiles for commonly-used SUID application
|
||||
|
|
|
|||
|
|
@ -545,6 +545,7 @@ in
|
|||
};
|
||||
|
||||
security.pam.enableSSHAgentAuth = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description =
|
||||
''
|
||||
|
|
@ -555,12 +556,7 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
security.pam.enableOTPW = mkOption {
|
||||
default = false;
|
||||
description = ''
|
||||
Enable the OTPW (one-time password) PAM module.
|
||||
'';
|
||||
};
|
||||
security.pam.enableOTPW = mkEnableOption "the OTPW (one-time password) PAM module";
|
||||
|
||||
security.pam.u2f = {
|
||||
enable = mkOption {
|
||||
|
|
@ -719,12 +715,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
security.pam.enableEcryptfs = mkOption {
|
||||
default = false;
|
||||
description = ''
|
||||
Enable eCryptfs PAM module (mounting ecryptfs home directory on login).
|
||||
'';
|
||||
};
|
||||
security.pam.enableEcryptfs = mkEnableOption "eCryptfs PAM module (mounting ecryptfs home directory on login)";
|
||||
|
||||
users.motd = mkOption {
|
||||
default = null;
|
||||
|
|
|
|||
|
|
@ -81,8 +81,8 @@ in
|
|||
after = mkIf cfg.docker [ "docker.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
# Taken from https://github.com/rancher/k3s/blob/v1.17.4+k3s1/contrib/ansible/roles/k3s/node/templates/k3s.service.j2
|
||||
Type = "notify";
|
||||
# See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197
|
||||
Type = if cfg.role == "agent" then "exec" else "notify";
|
||||
KillMode = "process";
|
||||
Delegate = "yes";
|
||||
Restart = "always";
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ in
|
|||
};
|
||||
|
||||
enableSmtp = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to enable smtp in master.cf.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ in
|
|||
enable = mkEnableOption "the SpamAssassin daemon";
|
||||
|
||||
debug = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to run the SpamAssassin daemon in debug mode";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ in
|
|||
};
|
||||
|
||||
debug = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Pass -d and -7 to automount and write log to the system journal.
|
||||
|
|
|
|||
|
|
@ -25,10 +25,7 @@ in
|
|||
description = "Whether to support multi-user mode by enabling the Disnix D-Bus service";
|
||||
};
|
||||
|
||||
useWebServiceInterface = mkOption {
|
||||
default = false;
|
||||
description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
|
||||
};
|
||||
useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat";
|
||||
|
||||
package = mkOption {
|
||||
type = types.path;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ in
|
|||
'';
|
||||
};
|
||||
autorun = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to automatically start the tunnel.
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ in
|
|||
};
|
||||
|
||||
noScan = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Do not scan for overlapping BSSs in HT40+/- mode.
|
||||
|
|
@ -127,6 +128,7 @@ in
|
|||
};
|
||||
|
||||
wpa = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Enable WPA (IEEE 802.11i/D3.0) to authenticate with the access point.
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ with lib;
|
|||
enable = mkEnableOption "OpenFire XMPP server";
|
||||
|
||||
usePostgreSQL = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "
|
||||
Whether you use PostgreSQL service for your storage back-end.
|
||||
|
|
|
|||
|
|
@ -54,21 +54,25 @@ in
|
|||
};
|
||||
|
||||
syslog = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''Whether to enable syslog output.'';
|
||||
};
|
||||
|
||||
passwordAuthentication = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''Whether to enable password authentication.'';
|
||||
};
|
||||
|
||||
publicKeyAuthentication = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''Whether to enable public key authentication.'';
|
||||
};
|
||||
|
||||
rootLogin = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''Whether to enable remote root login.'';
|
||||
};
|
||||
|
|
@ -90,11 +94,13 @@ in
|
|||
};
|
||||
|
||||
tcpForwarding = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''Whether to enable TCP/IP forwarding.'';
|
||||
};
|
||||
|
||||
x11Forwarding = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''Whether to enable X11 forwarding.'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ in
|
|||
options = {
|
||||
|
||||
networking.tcpcrypt.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable opportunistic TCP encryption. If the other end
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ with lib;
|
|||
options = {
|
||||
|
||||
networking.wicd.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to start <command>wicd</command>. Wired and
|
||||
|
|
|
|||
|
|
@ -24,7 +24,11 @@ in
|
|||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to enable the Name Service Cache Daemon.";
|
||||
description = ''
|
||||
Whether to enable the Name Service Cache Daemon.
|
||||
Disabling this is strongly discouraged, as this effectively disables NSS Lookups
|
||||
from all non-glibc NSS modules, including the ones provided by systemd.
|
||||
'';
|
||||
};
|
||||
|
||||
config = mkOption {
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@ let
|
|||
"mime" "autoindex" "negotiation" "dir"
|
||||
"alias" "rewrite"
|
||||
"unixd" "slotmem_shm" "socache_shmcb"
|
||||
"mpm_${cfg.multiProcessingModule}"
|
||||
"mpm_${cfg.mpm}"
|
||||
]
|
||||
++ (if cfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
|
||||
++ (if cfg.mpm == "prefork" then [ "cgi" ] else [ "cgid" ])
|
||||
++ optional enableHttp2 "http2"
|
||||
++ optional enableSSL "ssl"
|
||||
++ optional enableUserDir "userdir"
|
||||
|
|
@ -264,7 +264,7 @@ let
|
|||
|
||||
PidFile ${runtimeDir}/httpd.pid
|
||||
|
||||
${optionalString (cfg.multiProcessingModule != "prefork") ''
|
||||
${optionalString (cfg.mpm != "prefork") ''
|
||||
# mod_cgid requires this.
|
||||
ScriptSock ${runtimeDir}/cgisock
|
||||
''}
|
||||
|
|
@ -350,6 +350,7 @@ in
|
|||
imports = [
|
||||
(mkRemovedOptionModule [ "services" "httpd" "extraSubservices" ] "Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.")
|
||||
(mkRemovedOptionModule [ "services" "httpd" "stateDir" ] "The httpd module now uses /run/httpd as a runtime directory.")
|
||||
(mkRenamedOptionModule [ "services" "httpd" "multiProcessingModule" ] [ "services" "httpd" "mpm" ])
|
||||
|
||||
# virtualHosts options
|
||||
(mkRemovedOptionModule [ "services" "httpd" "documentRoot" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
|
||||
|
|
@ -454,7 +455,13 @@ in
|
|||
type = types.str;
|
||||
default = "wwwrun";
|
||||
description = ''
|
||||
User account under which httpd runs.
|
||||
User account under which httpd children processes run.
|
||||
|
||||
If you require the main httpd process to run as
|
||||
<literal>root</literal> add the following configuration:
|
||||
<programlisting>
|
||||
systemd.services.httpd.serviceConfig.User = lib.mkForce "root";
|
||||
</programlisting>
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -462,7 +469,7 @@ in
|
|||
type = types.str;
|
||||
default = "wwwrun";
|
||||
description = ''
|
||||
Group under which httpd runs.
|
||||
Group under which httpd children processes run.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -539,20 +546,19 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
multiProcessingModule = mkOption {
|
||||
mpm = mkOption {
|
||||
type = types.enum [ "event" "prefork" "worker" ];
|
||||
default = "prefork";
|
||||
default = "event";
|
||||
example = "worker";
|
||||
description =
|
||||
''
|
||||
Multi-processing module to be used by Apache. Available
|
||||
modules are <literal>prefork</literal> (the default;
|
||||
handles each request in a separate child process),
|
||||
<literal>worker</literal> (hybrid approach that starts a
|
||||
number of child processes each running a number of
|
||||
threads) and <literal>event</literal> (a recent variant of
|
||||
<literal>worker</literal> that handles persistent
|
||||
connections more efficiently).
|
||||
modules are <literal>prefork</literal> (handles each
|
||||
request in a separate child process), <literal>worker</literal>
|
||||
(hybrid approach that starts a number of child processes
|
||||
each running a number of threads) and <literal>event</literal>
|
||||
(the default; a recent variant of <literal>worker</literal>
|
||||
that handles persistent connections more efficiently).
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -652,7 +658,7 @@ in
|
|||
services.httpd.phpOptions =
|
||||
''
|
||||
; Needed for PHP's mail() function.
|
||||
sendmail_path = sendmail -t -i
|
||||
sendmail_path = ${pkgs.system-sendmail}/bin/sendmail -t -i
|
||||
|
||||
; Don't advertise PHP
|
||||
expose_php = off
|
||||
|
|
@ -703,9 +709,7 @@ in
|
|||
wants = concatLists (map (hostOpts: [ "acme-${hostOpts.hostName}.service" "acme-selfsigned-${hostOpts.hostName}.service" ]) vhostsACME);
|
||||
after = [ "network.target" "fs.target" ] ++ map (hostOpts: "acme-selfsigned-${hostOpts.hostName}.service") vhostsACME;
|
||||
|
||||
path =
|
||||
[ pkg pkgs.coreutils pkgs.gnugrep ]
|
||||
++ optional cfg.enablePHP pkgs.system-sendmail; # Needed for PHP's mail() function.
|
||||
path = [ pkg pkgs.coreutils pkgs.gnugrep ];
|
||||
|
||||
environment =
|
||||
optionalAttrs cfg.enablePHP { PHPRC = phpIni; }
|
||||
|
|
@ -725,7 +729,7 @@ in
|
|||
ExecStart = "@${pkg}/bin/httpd httpd -f ${httpdConf}";
|
||||
ExecStop = "${pkg}/bin/httpd -f ${httpdConf} -k graceful-stop";
|
||||
ExecReload = "${pkg}/bin/httpd -f ${httpdConf} -k graceful";
|
||||
User = "root";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
Type = "forking";
|
||||
PIDFile = "${runtimeDir}/httpd.pid";
|
||||
|
|
@ -733,6 +737,7 @@ in
|
|||
RestartSec = "5s";
|
||||
RuntimeDirectory = "httpd httpd/runtime";
|
||||
RuntimeDirectoryMode = "0750";
|
||||
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ in
|
|||
|
||||
http2 = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to enable HTTP 2. HTTP/2 is supported in all multi-processing modules that come with httpd. <emphasis>However, if you use the prefork mpm, there will
|
||||
be severe restrictions.</emphasis> Refer to <link xlink:href="https://httpd.apache.org/docs/2.4/howto/http2.html#mpm-config"/> for details.
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ in
|
|||
};
|
||||
|
||||
useJK = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to use to connector to the Apache HTTP server";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -93,16 +93,17 @@ in
|
|||
};
|
||||
|
||||
wayland = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Allow GDM to run on Wayland instead of Xserver.
|
||||
Note to enable Wayland with Nvidia you need to
|
||||
enable the <option>nvidiaWayland</option>.
|
||||
'';
|
||||
type = types.bool;
|
||||
};
|
||||
|
||||
nvidiaWayland = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to allow wayland to be used with the proprietary
|
||||
|
|
|
|||
|
|
@ -16,12 +16,7 @@ in
|
|||
|
||||
services.xserver.digimend = {
|
||||
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable the digimend drivers for Huion/XP-Pen/etc. tablets.
|
||||
'';
|
||||
};
|
||||
enable = mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets";
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -291,21 +291,43 @@ let self = {
|
|||
"19.03".sa-east-1.hvm-ebs = "ami-0c6a43c6e0ad1f4e2";
|
||||
"19.03".ap-south-1.hvm-ebs = "ami-0303deb1b5890f878";
|
||||
|
||||
# 19.09.981.205691b7cbe
|
||||
"19.09".eu-west-1.hvm-ebs = "ami-0ebd3156e21e9642f";
|
||||
"19.09".eu-west-2.hvm-ebs = "ami-02a2b5480a79084b7";
|
||||
"19.09".eu-west-3.hvm-ebs = "ami-09aa175c7588734f7";
|
||||
"19.09".eu-central-1.hvm-ebs = "ami-00a7fafd7e237a330";
|
||||
"19.09".us-east-1.hvm-ebs = "ami-00a8eeaf232a74f84";
|
||||
"19.09".us-east-2.hvm-ebs = "ami-093efd3a57a1e03a8";
|
||||
"19.09".us-west-1.hvm-ebs = "ami-0913e9a2b677fac30";
|
||||
"19.09".us-west-2.hvm-ebs = "ami-02d9a19f77b47882a";
|
||||
"19.09".ca-central-1.hvm-ebs = "ami-0627dd3f7b3627a29";
|
||||
"19.09".ap-southeast-1.hvm-ebs = "ami-083614e4d08f2164d";
|
||||
"19.09".ap-southeast-2.hvm-ebs = "ami-0048c704185ded6dc";
|
||||
"19.09".ap-northeast-1.hvm-ebs = "ami-0329e7fc2d7f60bd0";
|
||||
"19.09".ap-northeast-2.hvm-ebs = "ami-03d4ae7d0b5fc364f";
|
||||
"19.09".ap-south-1.hvm-ebs = "ami-0b599690b35aeef23";
|
||||
# 19.09.2243.84af403f54f
|
||||
"19.09".eu-west-1.hvm-ebs = "ami-071082f0fa035374f";
|
||||
"19.09".eu-west-2.hvm-ebs = "ami-0d9dc33c54d1dc4c3";
|
||||
"19.09".eu-west-3.hvm-ebs = "ami-09566799591d1bfed";
|
||||
"19.09".eu-central-1.hvm-ebs = "ami-015f8efc2be419b79";
|
||||
"19.09".eu-north-1.hvm-ebs = "ami-07fc0a32d885e01ed";
|
||||
"19.09".us-east-1.hvm-ebs = "ami-03330d8b51287412f";
|
||||
"19.09".us-east-2.hvm-ebs = "ami-0518b4c84972e967f";
|
||||
"19.09".us-west-1.hvm-ebs = "ami-06ad07e61a353b4a6";
|
||||
"19.09".us-west-2.hvm-ebs = "ami-0e31e30925cf3ce4e";
|
||||
"19.09".ca-central-1.hvm-ebs = "ami-07df50fc76702a36d";
|
||||
"19.09".ap-southeast-1.hvm-ebs = "ami-0f71ae5d4b0b78d95";
|
||||
"19.09".ap-southeast-2.hvm-ebs = "ami-057bbf2b4bd62d210";
|
||||
"19.09".ap-northeast-1.hvm-ebs = "ami-02a62555ca182fb5b";
|
||||
"19.09".ap-northeast-2.hvm-ebs = "ami-0219dde0e6b7b7b93";
|
||||
"19.09".ap-south-1.hvm-ebs = "ami-066f7f2a895c821a1";
|
||||
"19.09".ap-east-1.hvm-ebs = "ami-055b2348db2827ff1";
|
||||
"19.09".sa-east-1.hvm-ebs = "ami-018aab68377227e06";
|
||||
|
||||
latest = self."19.09";
|
||||
# 20.03.1554.94e39623a49
|
||||
"20.03".eu-west-1.hvm-ebs = "ami-02c34db5766cc7013";
|
||||
"20.03".eu-west-2.hvm-ebs = "ami-0e32bd8c7853883f1";
|
||||
"20.03".eu-west-3.hvm-ebs = "ami-061edb1356c1d69fd";
|
||||
"20.03".eu-central-1.hvm-ebs = "ami-0a1a94722dcbff94c";
|
||||
"20.03".eu-north-1.hvm-ebs = "ami-02699abfacbb6464b";
|
||||
"20.03".us-east-1.hvm-ebs = "ami-0c5e7760748b74e85";
|
||||
"20.03".us-east-2.hvm-ebs = "ami-030296bb256764655";
|
||||
"20.03".us-west-1.hvm-ebs = "ami-050be818e0266b741";
|
||||
"20.03".us-west-2.hvm-ebs = "ami-06562f78dca68eda2";
|
||||
"20.03".ca-central-1.hvm-ebs = "ami-02365684a173255c7";
|
||||
"20.03".ap-southeast-1.hvm-ebs = "ami-0dbf353e168d155f7";
|
||||
"20.03".ap-southeast-2.hvm-ebs = "ami-04c0f3a75f63daddd";
|
||||
"20.03".ap-northeast-1.hvm-ebs = "ami-093d9cc49c191eb6c";
|
||||
"20.03".ap-northeast-2.hvm-ebs = "ami-0087df91a7b6ebd45";
|
||||
"20.03".ap-south-1.hvm-ebs = "ami-0a1a6b569af04af9d";
|
||||
"20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86";
|
||||
"20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d";
|
||||
|
||||
latest = self."20.03";
|
||||
}; in self
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@ in
|
|||
};
|
||||
|
||||
forwardDns = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
If set to <literal>true</literal>, the DNS queries from the
|
||||
|
|
@ -135,14 +136,8 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
virtualisation.xen.trace =
|
||||
mkOption {
|
||||
default = false;
|
||||
description =
|
||||
''
|
||||
Enable Xen tracing.
|
||||
'';
|
||||
};
|
||||
virtualisation.xen.trace = mkEnableOption "Xen tracing";
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -287,6 +287,7 @@ in
|
|||
snapper = handleTest ./snapper.nix {};
|
||||
solr = handleTest ./solr.nix {};
|
||||
spacecookie = handleTest ./spacecookie.nix {};
|
||||
spike = handleTest ./spike.nix {};
|
||||
sonarr = handleTest ./sonarr.nix {};
|
||||
strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
|
||||
sudo = handleTest ./sudo.nix {};
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "puredata";
|
||||
version = "0.49-0";
|
||||
version = "0.50-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
|
||||
sha256 = "18rzqbpgnnvyslap7k0ly87aw1bbxkb0rk5agpr423ibs9slxq6j";
|
||||
sha256 = "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@ let
|
|||
sha256Hash = "0apxmp341m7mbpm2df3qvsbaifwy6yqq746kbhbwlw8bn9hrzv1k";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "4.0.0.13"; # "Android Studio 4.0 Beta 4"
|
||||
build = "193.6348893";
|
||||
sha256Hash = "0lchi3l50826n1af1z24yclpf27v2q5p1zjbvcmn37wz46d4s4g2";
|
||||
version = "4.0.0.14"; # "Android Studio 4.0 Beta 5"
|
||||
build = "193.6401094";
|
||||
sha256Hash = "11fmpf58z44i78ldkapzivz6md65744vqczzbwv8mkjkv9nz95rs";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "4.1.0.6"; # "Android Studio 4.1 Canary 6"
|
||||
build = "193.6381907";
|
||||
sha256Hash = "0sa5plr96m90wv5hi9bqwa11j6k8k9wa0ji8qmlimdhnpyzhsdrx";
|
||||
version = "4.1.0.7"; # "Android Studio 4.1 Canary 7"
|
||||
build = "193.6401718";
|
||||
sha256Hash = "1xa61rhi7dgxm0y6yl5dxd09x530mzyxvx9bp1jprzfwvc7s0byh";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
|
|
|||
|
|
@ -925,10 +925,10 @@
|
|||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
ename = "ebdb";
|
||||
version = "0.6.13";
|
||||
version = "0.6.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.6.13.tar";
|
||||
sha256 = "1nxbp7w4xxij07q8manc15b896sl10yh2h1cg88prdqbw1wk62qr";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.6.16.tar";
|
||||
sha256 = "0yn0nqjp68kwlrd4qs9fg3xizm9jnddkkyw25l0llq04b53zgjdl";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs seq ];
|
||||
meta = {
|
||||
|
|
@ -1005,10 +1005,10 @@
|
|||
elpaBuild {
|
||||
pname = "eglot";
|
||||
ename = "eglot";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eglot-1.5.tar";
|
||||
sha256 = "00ifgz9r9xvy19zsz1yfls6n1acvms14p86nbw0x6ldjgvpf279i";
|
||||
url = "https://elpa.gnu.org/packages/eglot-1.6.tar";
|
||||
sha256 = "15hd6sx7qrpvlvhwwkcgdiki8pswwf4mm7hkm0xvznskfcp44spx";
|
||||
};
|
||||
packageRequires = [ emacs flymake jsonrpc ];
|
||||
meta = {
|
||||
|
|
@ -1367,10 +1367,10 @@
|
|||
elpaBuild {
|
||||
pname = "gnorb";
|
||||
ename = "gnorb";
|
||||
version = "1.6.5";
|
||||
version = "1.6.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gnorb-1.6.5.tar";
|
||||
sha256 = "1har3j8gb65mawrwn93939jg157wbap138qa1z1myznrrish6vzc";
|
||||
url = "https://elpa.gnu.org/packages/gnorb-1.6.6.tar";
|
||||
sha256 = "1vlb9q7a622qylrgip5ld2yrzp4l58gl543i2jdxr7jxvamy22bp";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
|
|
@ -2011,10 +2011,10 @@
|
|||
elpaBuild {
|
||||
pname = "modus-operandi-theme";
|
||||
ename = "modus-operandi-theme";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.6.0.el";
|
||||
sha256 = "10smvzaxp90lsg0g61s2nzmfxwnlrxq9dv4rn771vlhra249y08v";
|
||||
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.7.0.el";
|
||||
sha256 = "17zvcqplbl3rk39k61v43ganzv06j49rlyickanwll5m1a3iibw2";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2026,10 +2026,10 @@
|
|||
elpaBuild {
|
||||
pname = "modus-vivendi-theme";
|
||||
ename = "modus-vivendi-theme";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.6.0.el";
|
||||
sha256 = "1b7wkz779f020gpil4spbdzmg2fx6l48wk1138564cv9kx3nkkz2";
|
||||
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.7.0.el";
|
||||
sha256 = "1w4vrg39dghghkvll3h4kmzykc3zpp6pbychb39gcc13z2b06v8g";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2215,10 +2215,10 @@
|
|||
elpaBuild {
|
||||
pname = "oauth2";
|
||||
ename = "oauth2";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/oauth2-0.12.el";
|
||||
sha256 = "1rfyfy0h7shr3fmd8lh6s2i3ahfh28wb5fqiqlsjwspn5h77ll29";
|
||||
url = "https://elpa.gnu.org/packages/oauth2-0.13.el";
|
||||
sha256 = "0y5nbdwxz2hfr09xgsqgyv60vgx0rsaisibcpkz00klvgg26w33r";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -2320,10 +2320,10 @@
|
|||
elpaBuild {
|
||||
pname = "orgalist";
|
||||
ename = "orgalist";
|
||||
version = "1.11";
|
||||
version = "1.12";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/orgalist-1.11.el";
|
||||
sha256 = "0zbqkk540rax32s8szp5zgz3a02zw88fc1dmjmyw6h3ls04m91kl";
|
||||
url = "https://elpa.gnu.org/packages/orgalist-1.12.el";
|
||||
sha256 = "1hwm7j0hbv2pg9w885ky1c9qga3grcfq8v216jv2ivkw8xzavysd";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2455,10 +2455,10 @@
|
|||
elpaBuild {
|
||||
pname = "phps-mode";
|
||||
ename = "phps-mode";
|
||||
version = "0.3.38";
|
||||
version = "0.3.43";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.3.38.tar";
|
||||
sha256 = "1m8f1z259c66k0hf0cfjqidfd0cra2c2mb7k5lj71v1kfckwj6bh";
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.3.43.tar";
|
||||
sha256 = "099s7c0ll8bbfgynijjaciv2qnyg4r2akajkhlmchh7y10kp5ii4";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2500,10 +2500,10 @@
|
|||
elpaBuild {
|
||||
pname = "posframe";
|
||||
ename = "posframe";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/posframe-0.6.0.el";
|
||||
sha256 = "14x2jgjn8di03rrad4x4mn8fhcqibk1j5c0ya0vmv8648fki6i9d";
|
||||
url = "https://elpa.gnu.org/packages/posframe-0.7.0.el";
|
||||
sha256 = "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2575,10 +2575,10 @@
|
|||
elpaBuild {
|
||||
pname = "rainbow-mode";
|
||||
ename = "rainbow-mode";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.3.el";
|
||||
sha256 = "0cpwqllhv3cb0gii22cj9i731rk3sbf2drm5m52w5yclm8sfr339";
|
||||
url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.4.el";
|
||||
sha256 = "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -2857,6 +2857,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "scanner";
|
||||
ename = "scanner";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/scanner-0.1.tar";
|
||||
sha256 = "0hv4w7yzfdnz8vrfhw6i6agj9hs09vzsqr63nrp6dd93q0gk71mw";
|
||||
};
|
||||
packageRequires = [ dash emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/scanner.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "scroll-restore";
|
||||
|
|
@ -2947,6 +2962,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "sm-c-mode";
|
||||
ename = "sm-c-mode";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/sm-c-mode-1.0.el";
|
||||
sha256 = "1lq65dhcvrh6ybla37lvni7wmbjb5nhm75ja9cl79148da1zrg91";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/sm-c-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "smalltalk-mode";
|
||||
|
|
@ -3539,10 +3569,10 @@
|
|||
elpaBuild {
|
||||
pname = "web-server";
|
||||
ename = "web-server";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/web-server-0.1.1.tar";
|
||||
sha256 = "1q51fhqw5al4iycdlighwv7jqgdpjb1a66glwd5jnc9b651yk42n";
|
||||
url = "https://elpa.gnu.org/packages/web-server-0.1.2.tar";
|
||||
sha256 = "10lcsl4dg2yr9zjd99gq9jz150wvvh6r5y9pd88l8y9vz16f2lim";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -105,6 +105,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
|
|||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
eopengrok = super.eopengrok.overrideAttrs (attrs: {
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
ess-R-data-view = super.ess-R-data-view.override {
|
||||
inherit (self.melpaPackages) ess ctable popup;
|
||||
};
|
||||
|
|
@ -164,36 +169,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
|
|||
|
||||
ivy-rtags = fix-rtags super.ivy-rtags;
|
||||
|
||||
mandoku = super.mandoku.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit = super.magit.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-circleci = super.magit-circleci.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-find-file = super.magit-find-file.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
|
|
@ -224,30 +205,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
|
|||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-p4 = super.magit-p4.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-rbr = super.magit-rbr.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-stgit = super.magit-stgit.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
|
|
@ -314,12 +271,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
|
|||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
kapacitor = super.kapacitor.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
kubernetes = super.kubernetes.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
|
|
@ -478,14 +429,88 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
|
|||
packageRequires = with self; [ evil highlight ];
|
||||
});
|
||||
|
||||
kapacitor = super.kapacitor.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
forge = super.forge.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
gerrit = super.gerrit.overrideAttrs (attrs: {
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
gerrit-download = super.gerrit-download.overrideAttrs (attrs: {
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: {
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
helm-rtags = fix-rtags super.helm-rtags;
|
||||
|
||||
jist = super.jist.overrideAttrs (attrs: {
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
mandoku = super.mandoku.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-p4 = super.magit-p4.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-rbr = super.magit-rbr.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
magit-circleci = super.magit-circleci.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
nativeBuildInputs =
|
||||
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
||||
});
|
||||
|
||||
orgit =
|
||||
(super.orgit.overrideAttrs (attrs: {
|
||||
# searches for Git at build time
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -19,7 +19,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
|
|||
comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
|
||||
desktopName = product;
|
||||
genericName = meta.description;
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
icon = execName;
|
||||
extraEntries = ''
|
||||
StartupWMClass=${wmClass}
|
||||
|
|
|
|||
|
|
@ -250,12 +250,12 @@ in
|
|||
|
||||
clion = buildClion rec {
|
||||
name = "clion-${version}";
|
||||
version = "2019.3.5"; /* updated by script */
|
||||
version = "2020.1"; /* updated by script */
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
||||
sha256 = "0qmhp0sqcknwgsirnbi6461lzr7mxgrgjsd0q5cxnhscbbczl7pk"; /* updated by script */
|
||||
sha256 = "18mbw72vgrzkvjykc23h17qxrxfvhjzhy9rxpi2asw196qalavzp"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||
|
|
@ -276,12 +276,12 @@ in
|
|||
|
||||
goland = buildGoland rec {
|
||||
name = "goland-${version}";
|
||||
version = "2019.3.4"; /* updated by script */
|
||||
version = "2020.1"; /* updated by script */
|
||||
description = "Up and Coming Go IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/go/${name}.tar.gz";
|
||||
sha256 = "01dik4ppn4a6m1bmz6cmdnyrilh2v190lrys65n4nps03sjy2v0b"; /* updated by script */
|
||||
sha256 = "1qlpx3vfqwpyyxjsknhxvbdhyciwihhl0hkinrpdky6bza1yfgf6"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-goland";
|
||||
update-channel = "GoLand RELEASE";
|
||||
|
|
@ -315,12 +315,12 @@ in
|
|||
|
||||
phpstorm = buildPhpStorm rec {
|
||||
name = "phpstorm-${version}";
|
||||
version = "2019.3.4"; /* updated by script */
|
||||
version = "2020.1"; /* updated by script */
|
||||
description = "Professional IDE for Web and PHP developers";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
||||
sha256 = "1bxi2i6vxpw8x4mvb4d5plqy4r938xjf8nkimfg0sspramcc4r5m"; /* updated by script */
|
||||
sha256 = "1yvqljjv6004kw2nkpddrsgnigb56rapgs3f1pcvl20h6hj08qj8"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-phpstorm";
|
||||
update-channel = "PhpStorm RELEASE";
|
||||
|
|
@ -354,12 +354,12 @@ in
|
|||
|
||||
rider = buildRider rec {
|
||||
name = "rider-${version}";
|
||||
version = "2019.3.4"; /* updated by script */
|
||||
version = "2020.1.0"; /* updated by script */
|
||||
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
|
||||
sha256 = "17axv0v31dpmjcaij5qpqqm071mwhmf1ahy0y0h96limq8cw9872"; /* updated by script */
|
||||
sha256 = "1allpdr7k48nvl8vbvzyn6h81jpklzaqdqivrqqyh8hy9l98w4ws"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-rider";
|
||||
update-channel = "Rider RELEASE";
|
||||
|
|
@ -367,12 +367,12 @@ in
|
|||
|
||||
ruby-mine = buildRubyMine rec {
|
||||
name = "ruby-mine-${version}";
|
||||
version = "2019.3.4"; /* updated by script */
|
||||
version = "2020.1"; /* updated by script */
|
||||
description = "The Most Intelligent Ruby and Rails IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
|
||||
sha256 = "13lwrqrkg5vk0azqfhr67psgv1idvkxwjxly2xawr6cy5vnrcd8s"; /* updated by script */
|
||||
sha256 = "1hk6k4f24infw9qj9mxp305nl0bxif6ymdsqg005pskvnyi8v5fi"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-rubymine";
|
||||
update-channel = "RubyMine RELEASE";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook
|
||||
{ stdenv, fetchFromGitHub
|
||||
, libX11, libXext, libXi
|
||||
, freetype, fontconfig
|
||||
, libpng, libjpeg
|
||||
|
|
@ -7,17 +7,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "azpainter";
|
||||
version = "2.1.5";
|
||||
version = "2.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Symbian9";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "0x5jmsprjissqcvwq75pqq9wgv4k9b7cy507hai8xk6xs3vxwgba";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-al87Rnf4HkKdmtN3EqxC0zEHgVWwnVi7WttqT/Qxr0Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [
|
||||
libX11 libXext libXi
|
||||
freetype fontconfig
|
||||
|
|
@ -25,14 +23,11 @@ stdenv.mkDerivation rec {
|
|||
zlib
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-freetype-dir=${stdenv.lib.getDev freetype}/include/freetype2"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Full color painting software for illustration drawing";
|
||||
homepage = "https://osdn.net/projects/azpainter";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dmenu-wayland-unstable";
|
||||
version = "2020-02-28";
|
||||
version = "2020-04-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nyyManni";
|
||||
repo = "dmenu-wayland";
|
||||
rev = "68e08e8bcde10a10ac3290431f173c6c7fce4238";
|
||||
sha256 = "10b1v2brgpgb6wkzn62haj56zmkf3aq6fs3p9rp6bxiw8bs2nvlm";
|
||||
rev = "550a7c39f3f925b803d51c616609c8cb6c0ea543";
|
||||
sha256 = "0az3w1csn4x6mjyacg6lf70kykdfqamic3hbr57mj83i5jjv0jlv";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "gpxsee";
|
||||
version = "7.28";
|
||||
version = "7.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "0077y5az3hb46rvkqrpl4zxga5wnm85ca6rz1rdpwiwhq4ch9q8y";
|
||||
sha256 = "sha256-OTKyxEu7RZZy3JBHTM7YoH+G4lhoRfb1INLtQEKC5p4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
||||
preConfigure = ''
|
||||
lrelease lang/*.ts
|
||||
lrelease gpxsee.pro
|
||||
'';
|
||||
|
||||
postInstall = with stdenv; lib.optionalString isDarwin ''
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, imagemagick
|
||||
, netcat-gnu
|
||||
, p7zip
|
||||
, python2Packages
|
||||
, python2
|
||||
, unzip
|
||||
, wget
|
||||
, wine
|
||||
|
|
@ -27,25 +27,25 @@
|
|||
let
|
||||
version = "4.3.4";
|
||||
|
||||
binpath = stdenv.lib.makeBinPath
|
||||
[ cabextract
|
||||
python2Packages.python
|
||||
gettext
|
||||
glxinfo
|
||||
gnupg
|
||||
icoutils
|
||||
imagemagick
|
||||
netcat-gnu
|
||||
p7zip
|
||||
unzip
|
||||
wget
|
||||
wine
|
||||
xdg-user-dirs
|
||||
xterm
|
||||
which
|
||||
curl
|
||||
jq
|
||||
];
|
||||
binpath = stdenv.lib.makeBinPath [
|
||||
cabextract
|
||||
python
|
||||
gettext
|
||||
glxinfo
|
||||
gnupg
|
||||
icoutils
|
||||
imagemagick
|
||||
netcat-gnu
|
||||
p7zip
|
||||
unzip
|
||||
wget
|
||||
wine
|
||||
xdg-user-dirs
|
||||
xterm
|
||||
which
|
||||
curl
|
||||
jq
|
||||
];
|
||||
|
||||
ld32 =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
|
||||
|
|
@ -54,6 +54,11 @@ let
|
|||
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
|
||||
libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ];
|
||||
|
||||
python = python2.withPackages(ps: with ps; [
|
||||
wxPython
|
||||
setuptools
|
||||
]);
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "playonlinux";
|
||||
inherit version;
|
||||
|
|
@ -65,15 +70,13 @@ in stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs =
|
||||
[ python2Packages.python
|
||||
python2Packages.wxPython
|
||||
python2Packages.setuptools
|
||||
xorg.libX11
|
||||
libGL
|
||||
];
|
||||
buildInputs = [
|
||||
xorg.libX11
|
||||
libGL
|
||||
python
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
patchShebangs python tests/python
|
||||
sed -i "s/ %F//g" etc/PlayOnLinux.desktop
|
||||
'';
|
||||
|
|
@ -85,7 +88,6 @@ in stdenv.mkDerivation {
|
|||
install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop
|
||||
|
||||
makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \
|
||||
--prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
|
||||
--prefix PATH : ${binpath}
|
||||
|
||||
bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@ let
|
|||
if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
|
||||
name = "rescuetime-installer.deb";
|
||||
url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
|
||||
sha256 = "0mw8dh9z7pqan0yrhycmv39h5c1sc4mbw5l02cfnn17cy75xdiay";
|
||||
sha256 = "1yzbs2lg04bq0clkr6gfkx3j6wrahpnxqfiq4askk9k76y4ncd4m";
|
||||
} else fetchurl {
|
||||
name = "rescuetime-installer.deb";
|
||||
url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
|
||||
sha256 = "1a6pc8vi2ab721kzyhvg6bmw24dr85dgmx2m9j9vbf3jyr85fv10";
|
||||
sha256 = "1njxsh601d0p6n0hxv44gcg8gd43xwym83xwqba26vj6xw82bknv";
|
||||
};
|
||||
in mkDerivation {
|
||||
# https://www.rescuetime.com/updates/linux_release_notes.html
|
||||
name = "rescuetime-2.14.5.2";
|
||||
name = "rescuetime-2.15.0.1";
|
||||
inherit src;
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
# avoid https://github.com/NixOS/patchelf/issues/99
|
||||
|
|
|
|||
34
pkgs/applications/misc/rofi-file-browser/default.nix
Normal file
34
pkgs/applications/misc/rofi-file-browser/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, rofi, gtk3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rofi-file-browser-extended";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marvinkreis";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "10wk5sif3bmvsgyk2gdy0qhpv1b37zgzf89n3h0yh7pg195fi2gn";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace ./CMakeLists.txt \
|
||||
--replace ' ''${ROFI_PLUGINS_DIR}' " $out/lib/rofi" \
|
||||
--replace "/usr/share/" "$out/share/"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ rofi gtk3 ];
|
||||
|
||||
ROFI_PLUGINS_DIR = "$out/lib/rofi";
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Use rofi to quickly open files";
|
||||
homepage = "https://github.com/marvinkreis/rofi-file-browser-extended";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "tut";
|
||||
version = "0.0.2";
|
||||
version = "0.0.7";
|
||||
|
||||
goPackagePath = "github.com/RasmusLindroth/tut";
|
||||
goDeps = ./deps.nix;
|
||||
|
|
@ -11,7 +11,7 @@ buildGoPackage rec {
|
|||
owner = "RasmusLindroth";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0c44mgkmjnfpf06cj63i6mscxcsm5cipm0l4n6pjxhc7k3qhgsfw";
|
||||
sha256 = "1v1cvdsrxz1yj2vibx3iapw17ngfihjkr62zhxsn1msb77xyd7lb";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
69
pkgs/applications/misc/tut/deps.nix
generated
69
pkgs/applications/misc/tut/deps.nix
generated
|
|
@ -72,6 +72,15 @@
|
|||
sha256 = "1csg9qkmbg4ksj5247kgqcy7bxvqgz6b98r0rv2s4c1mkc99gx2r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gopherjs/gopherjs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gopherjs/gopherjs";
|
||||
rev = "0766667cb4d1";
|
||||
sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gorilla/websocket";
|
||||
fetch = {
|
||||
|
|
@ -81,6 +90,15 @@
|
|||
sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/jtolds/gls";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jtolds/gls";
|
||||
rev = "v4.20.0";
|
||||
sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kyoh86/xdg";
|
||||
fetch = {
|
||||
|
|
@ -158,8 +176,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pelletier/go-toml";
|
||||
rev = "v1.6.0";
|
||||
sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq";
|
||||
rev = "v1.7.0";
|
||||
sha256 = "0sqrwldjj2qxrgjz1diw1ffviya4ma7mz7nhdgydbisi2h55lqla";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -167,8 +185,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/rivo/tview";
|
||||
rev = "cd38d7432498";
|
||||
sha256 = "1rs048gf1jip0p20qir99vy5k0f3m54h7bh56l1sh8lxij5qj406";
|
||||
rev = "ca37f83cb2e7";
|
||||
sha256 = "05nifgrxv6aib8f20mhs9m0grdfdyyg5vyhk6zgwsxjlwbzaj021";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -180,6 +198,24 @@
|
|||
sha256 = "0flpc1px1l6b1lxzhdxi0mvpkkjchppvgxshxxnlmm40s76i9ww5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/smartystreets/assertions";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/smartystreets/assertions";
|
||||
rev = "b2de0cb4f26d";
|
||||
sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/smartystreets/goconvey";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/smartystreets/goconvey";
|
||||
rev = "v1.6.4";
|
||||
sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/tomnomnom/linkheader";
|
||||
fetch = {
|
||||
|
|
@ -212,8 +248,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "118fecf932d8";
|
||||
sha256 = "1rwrqfwh2yhnnhy7x0mbmlmk0rg1mi2jjad476y45i259a0c2ym6";
|
||||
rev = "d3edc9973b7e";
|
||||
sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -230,8 +266,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "12a6c2dcc1e4";
|
||||
sha256 = "0z1g49d36kh459dz0xhnss2f88vw7n5b3l3637v46f7daddvln67";
|
||||
rev = "85ca7c5b95cd";
|
||||
sha256 = "1504qkgbhhm4f0bhk77v2r1lj6x171ay5m79alkg78wjb5cign5l";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -248,8 +284,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/tools";
|
||||
rev = "90fa682c2a6e";
|
||||
sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
|
||||
rev = "ab21143f2384";
|
||||
sha256 = "15fk0psk53pplpyghz55bhay0kvsv5rikmn5hwgjnnyxq9vfy178";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -261,13 +297,22 @@
|
|||
sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/ini.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/ini.v1";
|
||||
rev = "v1.55.0";
|
||||
sha256 = "1b7wsfal3b3pl5pv5n2qix09b3imh0zhirrphlsg5p2rb8fk0d0j";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/yaml.v2";
|
||||
rev = "v2.2.4";
|
||||
sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2";
|
||||
rev = "v2.2.8";
|
||||
sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# This file was generated by go2nix.
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "machine";
|
||||
|
|
@ -14,13 +14,13 @@ buildGoPackage rec {
|
|||
sha256 = "0xxzxi5v7ji9j2k7kxhi0ah91lfa7b9rg3nywgx0lkv8dlgp8kmy";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p \
|
||||
$bin/share/bash-completion/completions/ \
|
||||
$bin/share/zsh/site-functions/
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/
|
||||
cp go/src/github.com/docker/machine/contrib/completion/zsh/* $bin/share/zsh/site-functions/
|
||||
postInstall = ''
|
||||
pushd go/src/${goPackagePath}/contrib/completion
|
||||
installShellCompletion --bash bash/*
|
||||
installShellCompletion --zsh zsh/*
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helm";
|
||||
version = "3.1.3";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = "helm";
|
||||
rev = "v${version}";
|
||||
sha256 = "1j6pr1a9ff32bnjq9rncllmfpraip5r2fj3zsljw5jq68x5wamdc";
|
||||
sha256 = "1x05xnc3czk7vpn9qnfdavdjy5agv800nh7jyqczpiw125l9jfyd";
|
||||
};
|
||||
modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8";
|
||||
modSha256 = "000knqwsajlqika4abp3fh721mn1vykcsnv3c1qw0mzffkmzwsqd";
|
||||
|
||||
subPackages = [ "cmd/helm" ];
|
||||
buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ buildGoPackage rec {
|
|||
sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv";
|
||||
};
|
||||
|
||||
postInstall = "rm $bin/bin/issue-template-gen";
|
||||
excludedPackages = [ "issue-template-gen" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes";
|
||||
|
|
|
|||
|
|
@ -15,9 +15,10 @@ buildGoPackage rec {
|
|||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
$bin/bin/kompose completion bash > kompose.bash
|
||||
$bin/bin/kompose completion zsh > kompose.zsh
|
||||
installShellCompletion kompose.{bash,zsh}
|
||||
for shell in bash zsh; do
|
||||
$bin/bin/kompose completion $shell > kompose.$shell
|
||||
installShellCompletion kompose.$shell
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }:
|
||||
{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }:
|
||||
|
||||
let
|
||||
goPackagePath = "k8s.io/kops";
|
||||
|
|
@ -18,7 +18,7 @@ let
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go-bindata ];
|
||||
nativeBuildInputs = [ go-bindata installShellFiles ];
|
||||
subPackages = [ "cmd/kops" ];
|
||||
|
||||
buildFlagsArray = ''
|
||||
|
|
@ -33,10 +33,10 @@ let
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $bin/share/bash-completion/completions
|
||||
mkdir -p $bin/share/zsh/site-functions
|
||||
$bin/bin/kops completion bash > $bin/share/bash-completion/completions/kops
|
||||
$bin/bin/kops completion zsh > $bin/share/zsh/site-functions/_kops
|
||||
for shell in bash zsh; do
|
||||
$bin/bin/kops completion $shell > kops.$shell
|
||||
installShellCompletion kops.$shell
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -51,28 +51,13 @@ in rec {
|
|||
|
||||
mkKops = generic;
|
||||
|
||||
kops_1_12 = mkKops {
|
||||
version = "1.12.3";
|
||||
sha256 = "0rpbaz54l5v1z7ab5kpxcb4jyakkl5ysgz1sxajqmw2d6dvf7xly";
|
||||
};
|
||||
|
||||
kops_1_13 = mkKops {
|
||||
version = "1.13.2";
|
||||
sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng";
|
||||
};
|
||||
|
||||
kops_1_14 = mkKops {
|
||||
version = "1.14.1";
|
||||
sha256 = "0ikd8qwrjh8s1sc95g18sm0q6p33swz2m1rjd8zw34mb2w9jv76n";
|
||||
};
|
||||
|
||||
kops_1_15 = mkKops {
|
||||
version = "1.15.2";
|
||||
sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3";
|
||||
};
|
||||
|
||||
kops_1_16 = mkKops {
|
||||
version = "1.16.0";
|
||||
sha256 = "1b2lzf6b29rs5imbpqp8gnp3b511lk7jrm2f62y32gmx0gyjws6a";
|
||||
version = "1.16.1";
|
||||
sha256 = "08vy57ln0qar961sf9vbrh29f04qj5siqsfim1kqwvj5xrvwa39i";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux
|
||||
, coreutils, kerberos, clang
|
||||
, coreutils, kerberos, clang, installShellFiles
|
||||
, components ? [
|
||||
"cmd/oc"
|
||||
"cmd/openshift"
|
||||
|
|
@ -35,7 +35,7 @@ in buildGoPackage rec {
|
|||
|
||||
buildInputs = [ kerberos ];
|
||||
|
||||
nativeBuildInputs = [ which rsync go-bindata clang ];
|
||||
nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ];
|
||||
|
||||
patchPhase = ''
|
||||
patchShebangs ./hack
|
||||
|
|
@ -74,8 +74,8 @@ in buildGoPackage rec {
|
|||
installPhase = ''
|
||||
mkdir -p $bin/bin
|
||||
cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/"
|
||||
install -D -t "$bin/etc/bash_completion.d" contrib/completions/bash/*
|
||||
install -D -t "$bin/share/zsh/site-functions" contrib/completions/zsh/*
|
||||
installShellCompletion --bash contrib/completions/bash/*
|
||||
installShellCompletion --zsh contrib/completions/zsh/*
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub }:
|
||||
{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in
|
||||
|
||||
|
|
@ -17,13 +17,15 @@ buildGoPackage rec {
|
|||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall =
|
||||
let stern = if isCrossBuild then buildPackages.stern else "$bin"; in
|
||||
''
|
||||
mkdir -p $bin/share/bash-completion/completions
|
||||
${stern}/bin/stern --completion bash > $bin/share/bash-completion/completions/stern
|
||||
mkdir -p $bin/share/zsh/site-functions
|
||||
${stern}/bin/stern --completion zsh > $bin/share/zsh/site-functions/_stern
|
||||
for shell in bash zsh; do
|
||||
${stern}/bin/stern --completion $shell > stern.$shell
|
||||
installShellCompletion stern.$shell
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils
|
||||
, runCommand, writeText, terraform-providers }:
|
||||
, runCommand, writeText, terraform-providers, fetchpatch }:
|
||||
|
||||
let
|
||||
goPackagePath = "github.com/hashicorp/terraform";
|
||||
|
|
@ -120,7 +120,13 @@ in rec {
|
|||
terraform_0_12 = pluggable (generic {
|
||||
version = "0.12.24";
|
||||
sha256 = "1rjihp6qcaizp2nnv4z20kpmjnqcw95pq5rnhq381a3pdzr0cd0z";
|
||||
patches = [ ./provider-path.patch ];
|
||||
patches = [
|
||||
./provider-path.patch
|
||||
(fetchpatch {
|
||||
name = "fix-mac-mojave-crashes.patch";
|
||||
url = "https://github.com/hashicorp/terraform/pull/24562.patch";
|
||||
sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs";
|
||||
}) ];
|
||||
passthru = { inherit plugins; };
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -4,19 +4,19 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07";
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "jackline";
|
||||
version = "unstable-2020-03-22";
|
||||
version = "unstable-2020-04-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hannesm";
|
||||
repo = "jackline";
|
||||
rev = "52f84525c74c43e8d03fb1e6ff025ccb2699e4aa";
|
||||
sha256 = "0wir573ah1w16xzdn9rfwk3569zq4ff5frp0ywq70va4gdlb679c";
|
||||
rev = "885b97b90d565f5f7c2b5f66f5edf14a82251b87";
|
||||
sha256 = "1mdn413ya2g0a1mrdbh1b65gnygrxb08k99z5lmidhh34kd1llsj";
|
||||
};
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_deriving
|
||||
erm_xmpp tls mirage-crypto mirage-crypto-pk x509 domain-name
|
||||
ocaml_lwt otr astring ptime mtime notty sexplib hex uutf
|
||||
ocaml_lwt otr astring ptime notty sexplib hex uutf
|
||||
dns-client base64
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -40,8 +40,13 @@ let
|
|||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
||||
sha256 = {
|
||||
x86_64-darwin = "05xsbiviikrwfayjr6rvvfkm70681x2an6mgcg1cxw1fsi4sr6fd";
|
||||
x86_64-linux = "0h2rfgx92yq9a6dqsv9a0r8a6m5xfrywkljjk5w9snw49b0r1p12";
|
||||
x86_64-darwin = "0z731q00bwljlcmbjwqphyys7skqms1vg87pyi4nsvjmc7kjx7qg";
|
||||
x86_64-linux = "0wrs0i2bqv21ivy8s88khbww28b3gsw4abbbbjc76mqma9b0bajs";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
version = {
|
||||
x86_64-darwin = "4.4.2";
|
||||
x86_64-linux = "4.4.2";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -53,8 +58,7 @@ let
|
|||
};
|
||||
|
||||
linux = stdenv.mkDerivation rec {
|
||||
inherit pname meta;
|
||||
version = "4.4.0";
|
||||
inherit pname meta version;
|
||||
src = fetchurl {
|
||||
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
|
||||
inherit sha256;
|
||||
|
|
@ -140,8 +144,7 @@ let
|
|||
};
|
||||
|
||||
darwin = stdenv.mkDerivation rec {
|
||||
inherit pname meta;
|
||||
version = "4.4.1";
|
||||
inherit pname meta version;
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,28 @@ stdenv.mkDerivation rec {
|
|||
ln -s $out/opt/teams/teams $out/bin/
|
||||
'';
|
||||
|
||||
dontAutoPatchelf = true;
|
||||
|
||||
# Includes runtimeDependencies in the RPATH of the included Node modules
|
||||
# so that dynamic loading works. We cannot use directly runtimeDependencies
|
||||
# here, since the libraries from runtimeDependencies are not propagated
|
||||
# to the dynamically loadable node modules because of a condition in
|
||||
# autoPatchElfHook since *.node modules have Type: DYN (Shared object file)
|
||||
# instead of EXEC or INTERP it expects.
|
||||
# Fixes: https://github.com/NixOS/nixpkgs/issues/85449
|
||||
postFixup = ''
|
||||
autoPatchelf "$out"
|
||||
|
||||
runtime_rpath="${lib.makeLibraryPath runtimeDependencies}"
|
||||
|
||||
for mod in $(find "$out/opt/teams" -name '*.node'); do
|
||||
mod_rpath="$(patchelf --print-rpath "$mod")"
|
||||
|
||||
echo "Adding runtime dependencies to RPATH of Node module $mod"
|
||||
patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod"
|
||||
done;
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Microsoft Teams";
|
||||
homepage = "https://teams.microsoft.com";
|
||||
|
|
|
|||
|
|
@ -1,29 +1,20 @@
|
|||
{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
|
||||
, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
|
||||
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib
|
||||
, fetchpatch
|
||||
, glibcLocales
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20200417";
|
||||
version = "20200424";
|
||||
pname = "neomutt";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neomutt";
|
||||
repo = "neomutt";
|
||||
rev = version;
|
||||
sha256 = "0s7943r2s14kavyjf7i70vca252l626539i09a9vk0i9sfi35vx5";
|
||||
sha256 = "055hxlfrpn5a50vnh31faskcdkcjyzzr02gj5x2dizpf7vd67162";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove on next release. Fixes the `change-folder`
|
||||
# macro (https://github.com/neomutt/neomutt/issues/2268)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/neomutt/neomutt/commit/9e7537caddb9c6adc720bb3322a7512cf51ab025.patch";
|
||||
sha256 = "1vmlvgnhx1ra3rnyjkpkv6lrqw8xfh2kkmqp43fqn9lnk3pkjxvv";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cyrus_sasl gss gpgme kerberos libidn ncurses
|
||||
notmuch openssl perl lmdb
|
||||
|
|
@ -95,8 +86,10 @@ stdenv.mkDerivation rec {
|
|||
(cd test-files && ./setup.sh)
|
||||
|
||||
export NEOMUTT_TEST_DIR=$(pwd)/test-files
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
'';
|
||||
|
||||
checkInputs = [ glibcLocales ];
|
||||
checkTarget = "test";
|
||||
postCheck = "unset NEOMUTT_TEST_DIR";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, pkgconfig, texinfo
|
||||
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo
|
||||
, netcat-gnu, gnutls, gsasl, libidn2, Security
|
||||
, withKeyring ? true, libsecret ? null
|
||||
, systemd ? null }:
|
||||
|
|
@ -9,20 +9,15 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "msmtp";
|
||||
version = "1.8.8";
|
||||
version = "1.8.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "1rarck61mz3mwg0l30vjj6j9fq6gc7gic0r1c1ppwpq2izj57jzc";
|
||||
sha256 = "041g921rdjiv8bapp61gp4rylq8cckfkcwzyh8bs7xwxs4wpzfna";
|
||||
};
|
||||
|
||||
# the 2nd patch should go when 1.8.9 is released
|
||||
patches = [
|
||||
./paths.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/marlam/msmtp-mirror/commit/c78f24347ec996c7a3830b48403bf3736afca071.patch";
|
||||
sha256 = "0d4sc2f5838jriv65wahpgvwckkzqhdk3hs660fyg80si2i0l1bx";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ gnutls gsasl libidn2 ]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages }:
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages, installShellFiles }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "rclone";
|
||||
|
|
@ -17,6 +17,8 @@ buildGoPackage rec {
|
|||
|
||||
outputs = [ "bin" "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
rcloneBin =
|
||||
|
|
@ -25,10 +27,11 @@ buildGoPackage rec {
|
|||
else stdenv.lib.getBin buildPackages.rclone;
|
||||
in
|
||||
''
|
||||
install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
|
||||
mkdir -p $bin/share/zsh/site-functions $bin/share/bash-completion/completions/
|
||||
${rcloneBin}/bin/rclone genautocomplete zsh $bin/share/zsh/site-functions/_rclone
|
||||
${rcloneBin}/bin/rclone genautocomplete bash $bin/share/bash-completion/completions/rclone.bash
|
||||
installManPage $src/rclone.1
|
||||
for shell in bash zsh; do
|
||||
${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell
|
||||
installShellCompletion rclone.$shell
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses
|
||||
{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep
|
||||
, enableX11 ? true}:
|
||||
|
||||
let inherit (ocamlPackages) ocaml lablgtk; in
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation (rec {
|
|||
postInstall = if enableX11 then ''
|
||||
for i in $(cd $out/bin && ls); do
|
||||
wrapProgram $out/bin/$i \
|
||||
--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
|
||||
--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
|
||||
done
|
||||
'' else "";
|
||||
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnucash";
|
||||
version = "3.9";
|
||||
version = "3.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1zxrgrjbs13vgr002rvl734w9f7zzxfq4xxmyhj777dwgkfds0ld";
|
||||
sha256 = "05kgg7mhizndwn7icnarqk3c19xrzfawf90y9nb3jdm6fv1741xn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];
|
||||
|
|
@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
# TODO: The following tests FAILED:
|
||||
# 61 - test-gnc-timezone (Failed)
|
||||
# 70 - test-load-c (Failed)
|
||||
# 71 - test-modsysver (Failed)
|
||||
# 72 - test-incompatdep (Failed)
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ledger-autosync";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
# no tests included in PyPI tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "egh";
|
||||
repo = "ledger-autosync";
|
||||
rev = "v${version}";
|
||||
sha256 = "1h5mjngdd3rmzwmy026xmas0491kxxi1vxkd5m1xii7y6j50z14q";
|
||||
sha256 = "0sh32jcf8iznnbg1kqlrswbzfmn4h3gkw32q20xwxzz4935pz1qk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p coreutils git nix curl
|
||||
|
||||
set -e
|
||||
|
||||
# this script will generate versions.nix in the right location
|
||||
# this should contain the versions' revs and hashes
|
||||
# the stable revs are stored only for ease of skipping
|
||||
|
|
@ -50,12 +52,11 @@ for arg in "$@"; do
|
|||
done
|
||||
|
||||
here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
now=$(date --iso-8601)
|
||||
now=$(date --iso-8601 --utc)
|
||||
|
||||
file="${here}/versions.nix"
|
||||
# just in case this runs in parallel
|
||||
rand="$(head -c 3 /dev/urandom | base64)"
|
||||
tmp="${here}/,versions.nix.${rand}"
|
||||
tmp="${here}/,versions.nix.${RANDOM}"
|
||||
|
||||
# libraries currently on github, move to $gitlab/libraries planned
|
||||
libs=( symbols templates footprints packages3d )
|
||||
|
|
@ -112,16 +113,16 @@ for version in "${all_versions[@]}"; do
|
|||
|
||||
echo "Checking src" >&2
|
||||
src_rev="$(${get_rev} "${gitlab}"/code/kicad.git "${version}" | cut -f1)"
|
||||
ret="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}")"
|
||||
has_rev="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}" || true)"
|
||||
has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256")"
|
||||
if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then
|
||||
if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
|
||||
echo "Reusing old ${pname}.src.sha256, already latest .rev" >&2
|
||||
grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "rev" -A 1
|
||||
else
|
||||
printf "%8srev =\t\t\t\"%s\";\n" "" "${src_rev}"
|
||||
printf "%8ssha256 =\t\t\"%s\";\n" \
|
||||
"" "$(${prefetch} "${gitlab_pre}${src_rev}")"
|
||||
(( count++ ))
|
||||
count=$((count+1))
|
||||
fi
|
||||
printf "%6s};\n" ""
|
||||
printf "%4s};\n" ""
|
||||
|
|
@ -132,25 +133,25 @@ for version in "${all_versions[@]}"; do
|
|||
|
||||
echo "Checking i18n" >&2
|
||||
i18n_rev="$(${get_rev} "${i18n}" "${version}" | cut -f1)"
|
||||
ret="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}")"
|
||||
has_rev="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}" || true)"
|
||||
has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256")"
|
||||
if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then
|
||||
if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
|
||||
echo "Reusing old kicad-i18n-${today}.src.sha256, already latest .rev" >&2
|
||||
grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n" -A 1
|
||||
else
|
||||
printf "%8si18n.rev =\t\t\"%s\";\n" "" "${i18n_rev}"
|
||||
printf "%8si18n.sha256 =\t\t\"%s\";\n" "" \
|
||||
"$(${prefetch} "${i18n_pre}${i18n_rev}")"
|
||||
(( count++ ))
|
||||
count=$((count+1))
|
||||
fi
|
||||
|
||||
for lib in "${libs[@]}"; do
|
||||
echo "Checking ${lib}" >&2
|
||||
url="${github}-${lib}.git"
|
||||
lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1)"
|
||||
ret="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" -A 1)"
|
||||
has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)"
|
||||
has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")"
|
||||
if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then
|
||||
if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
|
||||
echo "Reusing old kicad-${lib}-${today}.src.sha256, already latest .rev" >&2
|
||||
grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}" -A 1
|
||||
else
|
||||
|
|
@ -161,7 +162,7 @@ for version in "${all_versions[@]}"; do
|
|||
printf "\"%s\";\n" "${lib_rev}"
|
||||
printf "%8s%s.sha256 =\t\"%s\";\n" "" \
|
||||
"${lib}" "$(${prefetch} "${github}-${lib}/archive/${lib_rev}.tar.gz")"
|
||||
(( count++ ))
|
||||
count=$((count+1))
|
||||
fi
|
||||
done
|
||||
printf "%6s};\n" ""
|
||||
|
|
@ -175,6 +176,11 @@ done
|
|||
printf "}\n"
|
||||
} > "${tmp}"
|
||||
|
||||
if grep '""' "${tmp}"; then
|
||||
echo "empty value detected, out of space?" >&2
|
||||
exit "1"
|
||||
fi
|
||||
|
||||
mv "${tmp}" "${file}"
|
||||
|
||||
printf "\nFinished\nMoved output to %s\n\n" "${file}" >&2
|
||||
|
|
|
|||
|
|
@ -27,25 +27,25 @@
|
|||
};
|
||||
"kicad-unstable" = {
|
||||
kicadVersion = {
|
||||
version = "2020-02-10";
|
||||
version = "2020-04-25";
|
||||
src = {
|
||||
rev = "1190e60dd426d246661e478db3287f266ec6cda2";
|
||||
sha256 = "0cgfad07j69cks97llj4hf3kga0d5qf728s89xwxrzcwm06k62bi";
|
||||
rev = "3759799d1e03b2da6a0dcd72273e4978880fc8f1";
|
||||
sha256 = "0ba14fla8m5zli68wfjkfc4ymvj4j8z92y3jigxs8hys0450bybi";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "2020-02-10";
|
||||
version = "2020-04-25";
|
||||
libSources = {
|
||||
i18n.rev = "26786c4ca804bad7eb072f1ef381f00b5a2ff3ee";
|
||||
i18n.sha256 = "0iqr1xfw4s677afjy9bn5y41z4isp327f9y90wypkxiwwq3dfkfl";
|
||||
symbols.rev = "35b7da2d211d7cc036b37ad7f5e40ef03faa1bc7";
|
||||
symbols.sha256 = "0wbfw1swbfvfp47cn48pxpqlygjs3xh568ydrrs51v3w102x8y64";
|
||||
templates.rev = "0c0490897f803ab8b7c3dad438b7eb1f80e0417c";
|
||||
templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g";
|
||||
footprints.rev = "9357b6f09312966c57fec9f66a516941d79c3038";
|
||||
footprints.sha256 = "0cgah1q0h012ffwfl220k7qb6hgbs0i91spq2j4v3lgpfr4g638d";
|
||||
packages3d.rev = "de368eb739abe41dfc3163e0e370477e857f9cc1";
|
||||
packages3d.sha256 = "0b3p5v8g24h6l7q3sbqz7ns0gnrf9l89glj86m5ybhizvls9vrrs";
|
||||
i18n.rev = "fc14baa52ca56a58b0048ab860bf31887d3cf8eb";
|
||||
i18n.sha256 = "05nayab7dkjyq7g3i9q7k55hcckpc0cmq4bbklmxx16rx4rbhzc6";
|
||||
symbols.rev = "0f9ff2d17237f90bb649bf0a52b6d454f68197e8";
|
||||
symbols.sha256 = "1a54428syn2xksc00n2bvh1alrx2vrqmp7cg7d2rn8nlq8yk4qd5";
|
||||
templates.rev = "7db8d4d0ea0711f1961d117853547fb3edbc3857";
|
||||
templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg";
|
||||
footprints.rev = "61df6d8853b4c68cca0ac87784c0a33cff9394d3";
|
||||
footprints.sha256 = "0blmhk8pwd4mi6rlsr4lf4lq7j01h6xbpbvr3pm8pmw8zylhi54v";
|
||||
packages3d.rev = "88bcf2e817fe000bb2c05e14489afc3b1a4e10ed";
|
||||
packages3d.sha256 = "0z9p1fn5xbz940kr5jz2ibzf09hpdi1c9izmabkffvrnfy6408x6";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "5.13.0";
|
||||
version = "5.15.0";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
appdirs
|
||||
|
|
@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "11snr7sgv70d3y63s5svijfx8f4xpggh96g8chr6lccl4mi1s9x9";
|
||||
sha256 = "10cd1k5vg8ra5fnpqpdbl04qwx6h2mmmqbn71pl8j69w9110dkys";
|
||||
};
|
||||
|
||||
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://snakemake.bitbucket.io";
|
||||
homepage = "https://snakemake.readthedocs.io";
|
||||
license = licenses.mit;
|
||||
description = "Python-based execution environment for make-like workflows";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -1,18 +1,19 @@
|
|||
{ stdenv, fetchurl, which, diffutils, gnupatch, gnutar }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tla-1.3.5";
|
||||
|
||||
pname = "tla";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.gnu.org/old-gnu/gnu-arch/" + name + ".tar.gz";
|
||||
url = "https://ftp.gnu.org/old-gnu/gnu-arch/tla-${version}.tar.gz";
|
||||
sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0";
|
||||
};
|
||||
|
||||
patches = [ ./configure-tmpdir.patch ];
|
||||
|
||||
buildInputs = [which];
|
||||
|
||||
propagatedBuildInputs = [diffutils gnupatch gnutar];
|
||||
buildInputs = [ which ];
|
||||
|
||||
propagatedBuildInputs = [ diffutils gnupatch gnutar ];
|
||||
|
||||
# Instead of GNU Autoconf, tla uses Tom Lord's now
|
||||
# defunct `package-framework'.
|
||||
|
|
|
|||
|
|
@ -1,20 +1,26 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, llvmPackages }:
|
||||
{ lib, fetchFromGitHub, rustPlatform, llvmPackages, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.0.18";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0cpd60861k9nd2gbzyb2hg5npnkgvsnyrvv7mlm30vb1833gz94z";
|
||||
sha256 = "1b5ap468d0gvgwkx6wqxvayzda2xw95lymd0kl38nq1fc0ica6hk";
|
||||
};
|
||||
|
||||
LLVM_CONFIG_PATH = "${llvmPackages.llvm}/bin/llvm-config";
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
cargoSha256 = "12gl50q5hf6nq571fqxfv61z4mwfjyw4jb2yqyqbsinwj2frwaxn";
|
||||
cargoSha256 = "07mjl751r9d88fnmnan0ip0m3vxqf51vq2y7k3g3yywcgasj9jgr";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name delta.bash completion/bash/completion.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dandavison/delta";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "gitstatus";
|
||||
version = "unstable-2020-03-15";
|
||||
version = "unstable-2020-04-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "gitstatus";
|
||||
rev = "c07996bc3ea1912652f52a816b830a5a3ee9b49c";
|
||||
sha256 = "07s8hwx3i5mnafi2xfim44z3q2nsvlcibfdxj17w8mkjhfpywi00";
|
||||
rev = "3494f25b0b3b2eac241cf669d1fea2b49ea42fb3";
|
||||
sha256 = "0b4g14dkkgih6zps2w1krl9xf44ysj02617zj1k51z127v2lpm1f";
|
||||
};
|
||||
|
||||
buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub, groff, utillinux }:
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, utillinux }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "hub";
|
||||
|
|
@ -16,7 +16,7 @@ buildGoPackage rec {
|
|||
sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ groff utillinux ];
|
||||
nativeBuildInputs = [ groff installShellFiles utillinux ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
|
@ -24,13 +24,13 @@ buildGoPackage rec {
|
|||
|
||||
postInstall = ''
|
||||
cd go/src/${goPackagePath}
|
||||
install -D etc/hub.zsh_completion "$bin/share/zsh/site-functions/_hub"
|
||||
install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub"
|
||||
install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish"
|
||||
installShellCompletion --zsh --name _hub etc/hub.zsh_completion
|
||||
installShellCompletion --bash --name hub etc/hub.bash_completion.sh
|
||||
installShellCompletion --fish --name hub.fish etc/hub.fish_completion
|
||||
|
||||
LC_ALL=C.UTF8 \
|
||||
make man-pages
|
||||
cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/
|
||||
installManPage share/man/man[1-9]/*.[1-9]
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ buildGoPackage rec {
|
|||
pname = "git-lfs";
|
||||
version = "1.5.6";
|
||||
rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0";
|
||||
|
||||
|
||||
goPackagePath = "github.com/git-lfs/git-lfs";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -14,8 +14,7 @@ buildGoPackage rec {
|
|||
sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d";
|
||||
};
|
||||
|
||||
# Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
|
||||
excludedPackages = [ "test" ];
|
||||
subPackages = [ "." ];
|
||||
|
||||
preBuild = ''
|
||||
pushd go/src/github.com/git-lfs/git-lfs
|
||||
|
|
@ -23,9 +22,6 @@ buildGoPackage rec {
|
|||
popd
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
rm -v $bin/bin/{man,script}
|
||||
'';
|
||||
meta = with stdenv.lib; {
|
||||
description = "Git extension for versioning large files";
|
||||
homepage = "https://git-lfs.github.com/";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"version": "12.8.8",
|
||||
"repo_hash": "1y8flmssz8bp07v7x9gxazqn5889hvkxk0k6py773gdnna5fd5fb",
|
||||
"version": "12.8.9",
|
||||
"repo_hash": "07vayjy3020hapbdx2wiv91g9xrfmvngbyj05hs2p0p3gwj6g2a4",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v12.8.8-ee",
|
||||
"rev": "v12.8.9-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "12.8.8",
|
||||
"GITALY_SERVER_VERSION": "12.8.9",
|
||||
"GITLAB_PAGES_VERSION": "1.16.0",
|
||||
"GITLAB_SHELL_VERSION": "11.0.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "8.21.1"
|
||||
"GITLAB_WORKHORSE_VERSION": "8.21.2"
|
||||
}
|
||||
}
|
||||
|
|
@ -242,4 +242,4 @@ DEPENDENCIES
|
|||
webmock (~> 3.4.0)
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
1.17.3
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@ let
|
|||
};
|
||||
});
|
||||
in buildGoPackage rec {
|
||||
version = "12.8.8";
|
||||
version = "12.8.9";
|
||||
pname = "gitaly";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "182jqglzbzq8jnlq6l634125jkvi67pfr1xck68n4k09gyzqllxv";
|
||||
sha256 = "06q1km2pigpl4yxl8pkzdy2yxzvsfm6n5r3kmd8h19j3sc6imbmh";
|
||||
};
|
||||
|
||||
# Fix a check which assumes that hook files are writeable by their
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
buildGoPackage rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "8.21.1";
|
||||
version = "8.21.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-workhorse";
|
||||
rev = "v${version}";
|
||||
sha256 = "1d384xw7hfrph4i61z9z315sik7ja9hgrvmhljirwxrch1fyx3m4";
|
||||
sha256 = "065yy8zfxahpybk3mbvc492by1lvssqcbqm8i4yp09m669rk239w";
|
||||
};
|
||||
|
||||
goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ gem 'diffy', '~> 3.1.0'
|
|||
gem 'diff_match_patch', '~> 0.1.0'
|
||||
|
||||
# Application server
|
||||
gem 'rack', '~> 2.0.7'
|
||||
gem 'rack', '~> 2.0.9'
|
||||
|
||||
group :unicorn do
|
||||
gem 'unicorn', '~> 5.4.1'
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ GEM
|
|||
concord (0.1.5)
|
||||
adamantium (~> 0.2.0)
|
||||
equalizer (~> 0.0.9)
|
||||
concurrent-ruby (1.1.5)
|
||||
concurrent-ruby (1.1.6)
|
||||
connection_pool (2.2.2)
|
||||
contracts (0.11.0)
|
||||
cork (0.3.0)
|
||||
|
|
@ -783,7 +783,7 @@ GEM
|
|||
public_suffix (4.0.3)
|
||||
pyu-ruby-sasl (0.0.3.3)
|
||||
raabro (1.1.6)
|
||||
rack (2.0.7)
|
||||
rack (2.0.9)
|
||||
rack-accept (0.4.5)
|
||||
rack (>= 0.4)
|
||||
rack-attack (6.2.0)
|
||||
|
|
@ -854,17 +854,17 @@ GEM
|
|||
json
|
||||
recursive-open-struct (1.1.0)
|
||||
redis (4.1.3)
|
||||
redis-actionpack (5.1.0)
|
||||
actionpack (>= 4.0, < 7)
|
||||
redis-rack (>= 1, < 3)
|
||||
redis-actionpack (5.2.0)
|
||||
actionpack (>= 5, < 7)
|
||||
redis-rack (>= 2.1.0, < 3)
|
||||
redis-store (>= 1.1.0, < 2)
|
||||
redis-activesupport (5.2.0)
|
||||
activesupport (>= 3, < 7)
|
||||
redis-store (>= 1.3, < 2)
|
||||
redis-namespace (1.6.0)
|
||||
redis (>= 3.0.4)
|
||||
redis-rack (2.0.6)
|
||||
rack (>= 1.5, < 3)
|
||||
redis-rack (2.1.2)
|
||||
rack (>= 2.0.8, < 3)
|
||||
redis-store (>= 1.2, < 2)
|
||||
redis-rails (5.0.2)
|
||||
redis-actionpack (>= 5.0, < 6)
|
||||
|
|
@ -1325,7 +1325,7 @@ DEPENDENCIES
|
|||
prometheus-client-mmap (~> 0.10.0)
|
||||
pry-byebug (~> 3.5.1)
|
||||
pry-rails (~> 0.3.9)
|
||||
rack (~> 2.0.7)
|
||||
rack (~> 2.0.9)
|
||||
rack-attack (~> 6.2.0)
|
||||
rack-cors (~> 1.0.6)
|
||||
rack-oauth2 (~> 1.9.3)
|
||||
|
|
|
|||
|
|
@ -763,10 +763,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
|
||||
sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.5";
|
||||
version = "1.1.6";
|
||||
};
|
||||
connection_pool = {
|
||||
groups = ["default"];
|
||||
|
|
@ -3501,10 +3501,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
|
||||
sha256 = "1mxzk12xylrz6d4n9jj5jasfscbf1pbk4idrb0nlf327lx9rwfkk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.7";
|
||||
version = "2.0.9";
|
||||
};
|
||||
rack-accept = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -3803,10 +3803,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hvai5ygkyii9wq8h98wim8shgrm7vkv0js62zpm85vdl1xzvphz";
|
||||
sha256 = "0c2276zzc0044zh37a8frx1v7hnra7z7k126154ps7njbqngfdv3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
};
|
||||
redis-activesupport = {
|
||||
dependencies = ["activesupport" "redis-store"];
|
||||
|
|
@ -3836,10 +3836,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pa19ydbk0l6wilwbxcjn6knfs4ffgj0rhaaldrlhf76pjgkaiqb";
|
||||
sha256 = "0ldw5sxyd80pv0gr89kvn6ziszlbs8lv1a573fkm6d0f11fps413";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.6";
|
||||
version = "2.1.2";
|
||||
};
|
||||
redis-rails = {
|
||||
dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix
|
||||
#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix
|
||||
|
||||
import click
|
||||
import click_log
|
||||
|
|
@ -100,7 +100,7 @@ def cli():
|
|||
|
||||
|
||||
@cli.command('update-data')
|
||||
@click.option('--rev', default='latest', help='The rev to use, \'latest\' points to the latest (stable) tag')
|
||||
@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'')
|
||||
def update_data(rev: str):
|
||||
"""Update data.nix"""
|
||||
repo = GitLabRepo()
|
||||
|
|
@ -135,6 +135,7 @@ def update_rubyenv():
|
|||
with open(rubyenv_dir / fn, 'w') as f:
|
||||
f.write(repo.get_file(fn, rev))
|
||||
|
||||
subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir)
|
||||
subprocess.check_output(['bundix'], cwd=rubyenv_dir)
|
||||
|
||||
|
||||
|
|
@ -174,6 +175,7 @@ def update_gitaly():
|
|||
with open(gitaly_dir / fn, 'w') as f:
|
||||
f.write(repo.get_file(fn, f"v{gitaly_server_version}"))
|
||||
|
||||
subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir)
|
||||
subprocess.check_output(['bundix'], cwd=gitaly_dir)
|
||||
|
||||
os.environ['GOROOT'] = ""
|
||||
|
|
@ -227,10 +229,11 @@ def update_gitlab_workhorse():
|
|||
os.unlink(gitlab_workhorse_dir / fn)
|
||||
|
||||
@cli.command('update-all')
|
||||
@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'')
|
||||
@click.pass_context
|
||||
def update_all(ctx):
|
||||
def update_all(ctx, rev: str):
|
||||
"""Update all gitlab components to the latest stable release"""
|
||||
ctx.invoke(update_data, rev='latest')
|
||||
ctx.invoke(update_data, rev=rev)
|
||||
ctx.invoke(update_rubyenv)
|
||||
ctx.invoke(update_yarnpkgs)
|
||||
ctx.invoke(update_gitaly)
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
From 5798a2691467604e89fd9fb1cd5289ebd1b1d7b8 Mon Sep 17 00:00:00 2001
|
||||
From: Graham Christensen <graham@grahamc.com>
|
||||
Date: Fri, 20 Mar 2020 22:32:02 -0400
|
||||
Subject: [PATCH] find ObsPluginHelpers.cmake in the obs src
|
||||
|
||||
---
|
||||
external/FindLibObs.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/external/FindLibObs.cmake b/external/FindLibObs.cmake
|
||||
index ab0a3de..53a46b8 100644
|
||||
--- a/external/FindLibObs.cmake
|
||||
+++ b/external/FindLibObs.cmake
|
||||
@@ -95,7 +95,7 @@ if(LIBOBS_FOUND)
|
||||
|
||||
set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR})
|
||||
set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB})
|
||||
- include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake)
|
||||
+ include(${OBS_SRC}/cmake/external/ObsPluginHelpers.cmake)
|
||||
|
||||
# allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg)
|
||||
if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES)
|
||||
--
|
||||
2.25.0
|
||||
|
||||
|
|
@ -1,42 +1,55 @@
|
|||
{ stdenv, fetchFromGitHub
|
||||
, cmake, pkgconfig, wrapQtAppsHook
|
||||
, obs-studio }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, qtbase
|
||||
, obs-studio
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "obs-v4l2sink-unstable";
|
||||
version = "20181012";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-v4l2sink";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CatxFish";
|
||||
repo = "obs-v4l2sink";
|
||||
rev = "1ec3c8ada0e1040d867ce567f177be55cd278378";
|
||||
sha256 = "03ah91cm1qz26k90mfx51l0d598i9bcmw39lkikjs1msm4c9dfxx";
|
||||
rev = version;
|
||||
sha256 = "0l4lavaywih5lzwgxcbnvdrxhpvkrmh56li06s3aryikngxwsk3z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
|
||||
buildInputs = [ obs-studio ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ qtbase obs-studio ];
|
||||
|
||||
patches = [
|
||||
./0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch
|
||||
# Fixes the segfault when stopping the plugin
|
||||
(fetchpatch {
|
||||
url = "https://github.com/CatxFish/obs-v4l2sink/commit/6604f01796d1b84a95714730ea51a6b8ac0e450b.diff";
|
||||
sha256 = "0crcvw02dj0aqy7hnhizjdsnhiw03zmg6cbdkasxz2mrrbyc3s88";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs"
|
||||
"-DLIBOBS_LIBRARIES=${obs-studio}/lib"
|
||||
"-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api"
|
||||
"-DOBS_SRC=${obs-studio.src}"
|
||||
cmakeFlags = with lib; [
|
||||
"-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/obs/obs-plugins/v4l2sink/bin/64bit
|
||||
cp ./v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/bin/64bit/
|
||||
# obs-studio expects the shared object to be located in bin/32bit or bin/64bit
|
||||
# https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48
|
||||
postInstall = let
|
||||
pluginPath = {
|
||||
i686-linux = "bin/32bit";
|
||||
x86_64-linux = "bin/64bit";
|
||||
}.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}");
|
||||
in ''
|
||||
mkdir -p $out/share/obs/obs-plugins/v4l2sink/${pluginPath}
|
||||
ln -s $out/lib/obs-plugins/v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/${pluginPath}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "obs studio output plugin for Video4Linux2 device";
|
||||
homepage = "https://github.com/CatxFish/obs-v4l2sink";
|
||||
maintainers = with maintainers; [ colemickens ];
|
||||
maintainers = with maintainers; [ colemickens peelz ];
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
68
pkgs/applications/video/tartube/default.nix
Normal file
68
pkgs/applications/video/tartube/default.nix
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, gdk-pixbuf
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, libnotify
|
||||
, pango
|
||||
, python3Packages
|
||||
, wrapGAppsHook
|
||||
, youtube-dl
|
||||
, glib
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tartube";
|
||||
version = "2.0.016";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axcore";
|
||||
repo = "tartube";
|
||||
rev = "v${version}";
|
||||
sha256 = "1y77ykihyi4v6xlsm5xldbs9lzq229l574rxz6qfvrjcbbwajfj9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
strictDeps = false;
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
moviepy
|
||||
pygobject3
|
||||
pyxdg
|
||||
requests
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gdk-pixbuf
|
||||
gtk3
|
||||
glib
|
||||
libnotify
|
||||
pango
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{man/man1,applications,pixmaps}
|
||||
cp pack/tartube.1 $out/share/man/man1
|
||||
cp pack/tartube.desktop $out/share/applications
|
||||
cp pack/tartube.{png,xpm} $out/share/pixmaps
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix PATH : ${stdenv.lib.makeBinPath [ youtube-dl ]}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GUI front-end for youtube-dl";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mkg20001 luc65r ];
|
||||
homepage = "https://tartube.sourceforge.io/";
|
||||
};
|
||||
}
|
||||
|
|
@ -24,8 +24,6 @@ buildGoPackage rec {
|
|||
goPackagePath = "github.com/opencontainers/runc";
|
||||
outputs = [ "bin" "out" "man" ];
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ];
|
||||
buildInputs = [ libseccomp libapparmor apparmor-parser ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit, dtc }:
|
||||
{ stdenv, fetchgit, dtc, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spike";
|
||||
|
|
@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
can-run-hello-world = nixosTests.spike;
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A RISC-V ISA Simulator";
|
||||
homepage = "https://github.com/riscv/riscv-isa-sim";
|
||||
|
|
|
|||
|
|
@ -54,10 +54,6 @@ stdenv.mkDerivation {
|
|||
'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then ''
|
||||
patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension}
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider}/lib" $out/lib/liblapack${canonicalExtension}
|
||||
'' else if stdenv.hostPlatform.isDarwin then ''
|
||||
install_name_tool -id liblapack${canonicalExtension} \
|
||||
-add_rpath ${lib.getLib lapackProvider}/lib \
|
||||
$out/lib/liblapack${canonicalExtension}
|
||||
'' else "") + ''
|
||||
|
||||
if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then
|
||||
|
|
@ -87,10 +83,6 @@ EOF
|
|||
'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then ''
|
||||
patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension}
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider}/lib" $out/lib/liblapacke${canonicalExtension}
|
||||
'' else if stdenv.hostPlatform.isDarwin then ''
|
||||
install_name_tool -id liblapacke${canonicalExtension} \
|
||||
-add_rpath ${lib.getLib lapackProvider}/lib \
|
||||
$out/lib/liblapacke${canonicalExtension}
|
||||
'' else "") + ''
|
||||
|
||||
if [ -f "$out/lib/liblapacke.so.3" ]; then
|
||||
|
|
|
|||
|
|
@ -1,6 +1,31 @@
|
|||
{stdenv, name, src, patches ? [], buildInputs ? [], ...}:
|
||||
{ stdenv }@orig:
|
||||
# srcOnly is a utility builder that only fetches and unpacks the given `src`,
|
||||
# maybe pathings it in the process with the optional `patches` and
|
||||
# `buildInputs` attributes.
|
||||
#
|
||||
# It can be invoked directly, or be used to wrap an existing derivation. Eg:
|
||||
#
|
||||
# > srcOnly pkgs.hello
|
||||
#
|
||||
{ name
|
||||
, src
|
||||
, stdenv ? orig.stdenv
|
||||
, patches ? []
|
||||
, # deprecated, use the nativeBuildInputs
|
||||
buildInputs ? []
|
||||
, # used to pass extra unpackers
|
||||
nativeBuildInputs ? []
|
||||
, # needed when passing an existing derivation
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
inherit src buildInputs patches name;
|
||||
inherit
|
||||
buildInputs
|
||||
name
|
||||
nativeBuildInputs
|
||||
patches
|
||||
src
|
||||
;
|
||||
installPhase = "cp -r . $out";
|
||||
phases = ["unpackPhase" "patchPhase" "installPhase"];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arc-theme";
|
||||
version = "20190917";
|
||||
version = "20200416";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arc-design";
|
||||
owner = "jnsh";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1qgpk4p2hi5hd4yy0hj93kq1vs0b32wb8qkaj1wi90c8gwddq5wa";
|
||||
rev = "0779e1ca84141d8b443cf3e60b85307a145169b6";
|
||||
sha256 = "1ddyi8g4rkd4mxadjvl66wc0lxpa4qdr98nbbhm5abaqfs2yldd4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [
|
||||
"--disable-gnome-shell" # 3.36 not supported
|
||||
"--disable-cinnamon" # not equipped to test
|
||||
"--disable-unity"
|
||||
];
|
||||
|
||||
|
|
@ -44,10 +45,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell";
|
||||
homepage = "https://github.com/arc-design/arc-theme";
|
||||
homepage = "https://github.com/jnsh/arc-theme";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ simonvandel romildo ];
|
||||
platforms = platforms.linux;
|
||||
broken = true; # since libsass 3.6.3
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yaru";
|
||||
version = "20.04.1";
|
||||
version = "20.04.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu";
|
||||
repo = "yaru";
|
||||
rev = version;
|
||||
sha256 = "0c9az0bmnrnkgxfifp6nkan5bvjrkqrpg38zsp2vg493bm3bpbg1";
|
||||
sha256 = "04z16bcv1xdq4acnchd6cq9a8j46zl2bjp50cj90qmd6plpiiz50";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
|
||||
|
|
@ -28,6 +28,5 @@ stdenv.mkDerivation rec {
|
|||
license = with licenses; [ cc-by-sa-40 gpl3 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.jD91mZM2 ];
|
||||
broken = true; # since libsass 3.6.3
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,13 +43,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutter";
|
||||
version = "3.34.4";
|
||||
version = "3.34.5";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01";
|
||||
sha256 = "1i3r51ghfld1rf1rczzi3jhybz3mhywqcj2jyiqhfcyp1svlklfi";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
@ -111,6 +111,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd";
|
||||
})
|
||||
|
||||
# gnome-3-34 2020-04-24
|
||||
# also fixes https://mail.gnome.org/archives/distributor-list/2020-April/msg00001.html
|
||||
(fetchpatch {
|
||||
url = "https://github.com/GNOME/mutter/compare/3.34.5..3bafd234248fdcd84bc62fef5e31c29fbb613909.patch";
|
||||
sha256 = "1a7krbdfmvx204p6av44rbp4ckp6ddg1mms8wkixxh2p871zq1pi";
|
||||
})
|
||||
|
||||
# Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
|
||||
# from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
|
||||
./drop-inheritable.patch
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@ let
|
|||
python = python3.withPackages (p: [ p.requests ]);
|
||||
upperBoundFlag =
|
||||
let
|
||||
package = lib.getAttrFromPath (lib.splitString "." attrPath) pkgs;
|
||||
package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs;
|
||||
packageVersion = lib.getVersion package;
|
||||
versionComponents = lib.versions.splitVersion packageVersion;
|
||||
minorVersion = lib.versions.minor packageVersion;
|
||||
minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null;
|
||||
nextMinor = builtins.fromJSON minorVersion + 1;
|
||||
upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}";
|
||||
in lib.optionalString (minorAvailable && freeze) ''--upper-bound="${upperBound}"'';
|
||||
in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"'';
|
||||
updateScript = writeScript "gnome-update-script" ''
|
||||
#!${stdenv.shell}
|
||||
set -o errexit
|
||||
|
|
|
|||
|
|
@ -1,15 +1,20 @@
|
|||
{ mkXfceDerivation, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
|
||||
{ mkXfceDerivation, gettext, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-whiskermenu-plugin";
|
||||
version = "2.4.3";
|
||||
version = "2.4.4";
|
||||
rev-prefix = "v";
|
||||
sha256 = "1cs3fps1bj0dd5az7fwrvw1xl3y621qk4dma3n73p7rr19j7fpsn";
|
||||
sha256 = "08b82j9xp3vzjlc740s9svcjkbsal71ggp23y7dvjqppch7sdxzw";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ];
|
||||
buildInputs = [ gettext exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace panel-plugin/xfce4-popup-whiskermenu.in \
|
||||
--replace gettext ${gettext}/bin/gettext
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/bin/xfce4-popup-whiskermenu \
|
||||
|
|
|
|||
|
|
@ -1,244 +0,0 @@
|
|||
{ stdenv, fetchurl, tzdata, iana-etc, runCommand
|
||||
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
|
||||
, mailcap, runtimeShell
|
||||
, buildPackages, pkgsTargetTarget
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
inherit (stdenv.lib) optionals optionalString;
|
||||
|
||||
goBootstrap = runCommand "go-bootstrap" {} ''
|
||||
mkdir $out
|
||||
cp -rf ${buildPackages.go_bootstrap}/* $out/
|
||||
chmod -R u+w $out
|
||||
find $out -name "*.c" -delete
|
||||
cp -rf $out/bin/* $out/share/go/bin/
|
||||
'';
|
||||
|
||||
goarch = platform: {
|
||||
"i686" = "386";
|
||||
"x86_64" = "amd64";
|
||||
"aarch64" = "arm64";
|
||||
"arm" = "arm";
|
||||
"armv5tel" = "arm";
|
||||
"armv6l" = "arm";
|
||||
"armv7l" = "arm";
|
||||
}.${platform.parsed.cpu.name} or (throw "Unsupported system");
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.13.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
nativeBuildInputs = [ perl which pkgconfig patch procps ];
|
||||
buildInputs = [ cacert pcre ]
|
||||
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
|
||||
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
|
||||
|
||||
depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ];
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs ./ # replace /bin/bash
|
||||
|
||||
# This source produces shell script at run time,
|
||||
# and thus it is not corrected by patchShebangs.
|
||||
substituteInPlace misc/cgo/testcarchive/carchive_test.go \
|
||||
--replace '#!/usr/bin/env bash' '#!${runtimeShell}'
|
||||
|
||||
# Patch the mimetype database location which is missing on NixOS.
|
||||
# but also allow static binaries built with NixOS to run outside nix
|
||||
sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go
|
||||
|
||||
# Disabling the 'os/http/net' tests (they want files not available in
|
||||
# chroot builds)
|
||||
rm src/net/{listen,parse}_test.go
|
||||
rm src/syscall/exec_linux_test.go
|
||||
|
||||
# !!! substituteInPlace does not seems to be effective.
|
||||
# The os test wants to read files in an existing path. Just don't let it be /usr/bin.
|
||||
sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
|
||||
sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
|
||||
# Disable the unix socket test
|
||||
sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go
|
||||
# Disable the hostname test
|
||||
sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go
|
||||
# ParseInLocation fails the test
|
||||
sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go
|
||||
# Remove the api check as it never worked
|
||||
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
|
||||
# Remove the coverage test as we have removed this utility
|
||||
sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go
|
||||
# Remove the timezone naming test
|
||||
sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go
|
||||
# Remove disable setgid test
|
||||
sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go
|
||||
# Remove cert tests that conflict with NixOS's cert resolution
|
||||
sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go
|
||||
# TestWritevError hangs sometimes
|
||||
sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go
|
||||
# TestVariousDeadlines fails sometimes
|
||||
sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go
|
||||
|
||||
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
|
||||
sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
|
||||
|
||||
# Disable cgo lookup tests not works, they depend on resolver
|
||||
rm src/net/cgo_unix_test.go
|
||||
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
|
||||
# that run outside a nix server
|
||||
sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
|
||||
|
||||
'' + optionalString stdenv.isAarch32 ''
|
||||
echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/race.bash --replace \
|
||||
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
|
||||
sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
|
||||
sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
|
||||
sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
|
||||
|
||||
sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go
|
||||
sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go
|
||||
sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go
|
||||
sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go
|
||||
|
||||
sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go
|
||||
sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go
|
||||
|
||||
sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go
|
||||
|
||||
sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
|
||||
|
||||
# TestCurrent fails because Current is not implemented on Darwin
|
||||
sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go
|
||||
sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go
|
||||
|
||||
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./remove-tools-1.11.patch
|
||||
./ssl-cert-file-1.13.patch
|
||||
./remove-test-pie-1.13.patch
|
||||
./creds-test.patch
|
||||
./go-1.9-skip-flaky-19608.patch
|
||||
./go-1.9-skip-flaky-20072.patch
|
||||
./skip-external-network-tests.patch
|
||||
./skip-nohup-tests.patch
|
||||
] ++ [
|
||||
# breaks under load: https://github.com/golang/go/issues/25628
|
||||
(if stdenv.isAarch32
|
||||
then ./skip-test-extra-files-on-aarch32.patch
|
||||
else ./skip-test-extra-files-on-386.patch)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
find . -name '*.orig' -exec rm {} ';'
|
||||
'';
|
||||
|
||||
GOOS = stdenv.targetPlatform.parsed.kernel.name;
|
||||
GOARCH = goarch stdenv.targetPlatform;
|
||||
# GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
|
||||
# Go will nevertheless build a for host system that we will copy over in
|
||||
# the install phase.
|
||||
GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
|
||||
GOHOSTARCH = goarch stdenv.buildPlatform;
|
||||
|
||||
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
|
||||
# to be different from CC/CXX
|
||||
CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
|
||||
"${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"
|
||||
else
|
||||
null;
|
||||
CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
|
||||
"${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++"
|
||||
else
|
||||
null;
|
||||
|
||||
GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
|
||||
GO386 = 387; # from Arch: don't assume sse2 on i686
|
||||
CGO_ENABLED = 1;
|
||||
# Hopefully avoids test timeouts on Hydra
|
||||
GO_TEST_TIMEOUT_SCALE = 3;
|
||||
|
||||
# Indicate that we are running on build infrastructure
|
||||
# Some tests assume things like home directories and users exists
|
||||
GO_BUILDER_NAME = "nix";
|
||||
|
||||
GOROOT_BOOTSTRAP="${goBootstrap}/share/go";
|
||||
|
||||
postConfigure = ''
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
# this is compiled into the binary
|
||||
export GOROOT_FINAL=$out/share/go
|
||||
|
||||
export PATH=$(pwd)/bin:$PATH
|
||||
|
||||
# Independent from host/target, CC should produce code for the building system.
|
||||
export CC=${buildPackages.stdenv.cc}/bin/cc
|
||||
ulimit -a
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
(cd src && ./make.bash)
|
||||
'';
|
||||
|
||||
doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
(cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild)
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
rm -r pkg/obj
|
||||
# Contains the wrong perl shebang when cross compiling,
|
||||
# since it is not used for anything we can deleted as well.
|
||||
rm src/regexp/syntax/make_perl_groups.pl
|
||||
'' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
|
||||
mv bin/*_*/* bin
|
||||
rmdir bin/*_*
|
||||
${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||
rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
|
||||
''}
|
||||
'' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
|
||||
rm -rf bin/*_*
|
||||
${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||
rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
|
||||
''}
|
||||
'' else "");
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $GOROOT_FINAL
|
||||
cp -a bin pkg src lib misc api doc $GOROOT_FINAL
|
||||
ln -s $GOROOT_FINAL/bin $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
branch = "1.13";
|
||||
homepage = "http://golang.org/";
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -4,18 +4,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unison-code-manager";
|
||||
milestone_id = "M1h";
|
||||
milestone_id = "M1j";
|
||||
version = "1.0.${milestone_id}-alpha";
|
||||
|
||||
src = if (stdenv.isDarwin) then
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
|
||||
sha256 = "0iivm5gmbk0fq0zr3lvck6p1c2i7i54l3rf70z677529w9irzchp";
|
||||
sha256 = "1pvdjmasgl22inbr8nlizsg8s5zagn8bzwhaxqmwafkpsskz0hsg";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
|
||||
sha256 = "0fb84c1yn8pidflh7kq696j3v4blkvbk1fsqp36h30p7vv676yci";
|
||||
sha256 = "1xpblx405cp3mv0vrhcqwjlxvrhgmc77mxbvcy93srxja3qai1af";
|
||||
};
|
||||
|
||||
# The tarball is just the prebuilt binary, in the archive root.
|
||||
|
|
|
|||
|
|
@ -13,8 +13,12 @@ let
|
|||
buildInputs = [ coq.ocamlPackages.camlp5 ];
|
||||
};
|
||||
"8.10" = {
|
||||
version = "1.1.1";
|
||||
sha256 = "0b6r7bsygl1axbqybkhkr7zlwcd51ski5ql52994klrrxvjd58df";
|
||||
version = "1.2";
|
||||
sha256 = "1ir313mmkgp2c65wgw8c681a15clvri1wb1hyjqmj7ymx4shkl56";
|
||||
};
|
||||
"8.11" = {
|
||||
version = "1.2";
|
||||
sha256 = "1w317h7r5llyamzn1kqb8j6p5sxks2j8vq8wnpzrx01jqbyibxgy";
|
||||
};
|
||||
};
|
||||
param = params.${coq.coq-version};
|
||||
|
|
|
|||
|
|
@ -21,15 +21,21 @@ let
|
|||
};
|
||||
|
||||
"8.9" = {
|
||||
version = "1.2";
|
||||
rev = "v1.2-8.9";
|
||||
sha256 = "1q3wvicr43bgy7xn1diwh4j43mnrhprrc2xd22qlbz9cl6bhf8bj";
|
||||
version = "1.2.1";
|
||||
rev = "v1.2.1-8.9";
|
||||
sha256 = "0d8ddj6nc6p0k25cd8fs17cq427zhzbc3v9pk2wd2fnvk70nlfij";
|
||||
};
|
||||
|
||||
"8.10" = {
|
||||
version = "1.2";
|
||||
rev = "v1.2-8.10";
|
||||
sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd";
|
||||
version = "1.2.1";
|
||||
rev = "v1.2.1-8.10-2";
|
||||
sha256 = "0j3z4l5nrbyi9zbbyqkc6kassjanwld2188mwmrbqspaypm2ys68";
|
||||
};
|
||||
|
||||
"8.11" = {
|
||||
version = "1.2.1";
|
||||
rev = "v1.2.1-8.11";
|
||||
sha256 = "06k0h7lansxs479is3vj5ikg8s5k4c6svnqcwmxbni4wx8bhmg17";
|
||||
};
|
||||
};
|
||||
param = params.${coq.coq-version};
|
||||
|
|
|
|||
|
|
@ -242,11 +242,7 @@ let
|
|||
# Add default meta information
|
||||
homepage = "https://${goPackagePath}";
|
||||
platforms = go.meta.platforms or lib.platforms.all;
|
||||
} // meta // {
|
||||
# add an extra maintainer to every package
|
||||
maintainers = (meta.maintainers or []) ++
|
||||
[ lib.maintainers.lethalman ];
|
||||
};
|
||||
} // meta;
|
||||
});
|
||||
in if disabled then
|
||||
throw "${package.name} not supported for go ${go.meta.branch}"
|
||||
|
|
|
|||
|
|
@ -1457,11 +1457,8 @@ self: super: {
|
|||
cryptonite = dontCheck super.cryptonite;
|
||||
|
||||
# The test suite depends on an impure cabal-install installation in
|
||||
# $HOME, which we don't have in our build sandbox, and it is keeping
|
||||
# up with the most recent Cabal version.
|
||||
cabal-install-parsers = dontCheck (super.cabal-install-parsers.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_2_0_0;
|
||||
}));
|
||||
# $HOME, which we don't have in our build sandbox.
|
||||
cabal-install-parsers = dontCheck super.cabal-install-parsers;
|
||||
|
||||
# haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2.
|
||||
haskell-ci = doJailbreak super.haskell-ci;
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ self: super: {
|
|||
async = doJailbreak super.async;
|
||||
ChasingBottoms = doJailbreak super.ChasingBottoms;
|
||||
hashable = doJailbreak super.hashable;
|
||||
pandoc = doJailbreak super.pandoc;
|
||||
parallel = doJailbreak super.parallel;
|
||||
regex-base = doJailbreak super.regex-base;
|
||||
regex-compat = doJailbreak super.regex-compat;
|
||||
|
|
@ -56,6 +57,7 @@ self: super: {
|
|||
regex-posix = doJailbreak super.regex-posix;
|
||||
regex-tdfa = doJailbreak super.regex-tdfa;
|
||||
split = doJailbreak super.split;
|
||||
system-fileio = doJailbreak super.system-fileio;
|
||||
tar = doJailbreak super.tar;
|
||||
tasty-expected-failure = doJailbreak super.tasty-expected-failure;
|
||||
unliftio-core = doJailbreak super.unliftio-core;
|
||||
|
|
@ -63,9 +65,12 @@ self: super: {
|
|||
zlib = doJailbreak super.zlib;
|
||||
|
||||
# Use the latest version to fix the build.
|
||||
dhall = self.dhall_1_31_1;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4;
|
||||
lens = self.lens_4_19_2;
|
||||
optics-core = self.optics-core_0_3;
|
||||
repline = self.repline_0_3_0_0;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4;
|
||||
singletons = self.singletons_2_7;
|
||||
th-desugar = self.th-desugar_1_11;
|
||||
|
||||
# `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need
|
||||
|
|
@ -77,14 +82,17 @@ self: super: {
|
|||
|
||||
# Jailbreak to fix the build.
|
||||
aeson-diff = doJailbreak super.aeson-diff;
|
||||
brick = doJailbreak super.brick;
|
||||
cborg = doJailbreak super.cborg;
|
||||
cborg-json = doJailbreak super.cborg-json;
|
||||
exact-pi = doJailbreak super.exact-pi;
|
||||
policeman = doJailbreak super.policeman;
|
||||
relude = dontCheck (doJailbreak super.relude);
|
||||
serialise = doJailbreak super.serialise;
|
||||
setlocale = doJailbreak super.setlocale;
|
||||
shellmet = doJailbreak super.shellmet;
|
||||
brick = doJailbreak super.brick;
|
||||
weeder = doJailbreak super.weeder; # https://github.com/ocharles/weeder/issues/15
|
||||
xmobar = doJailbreak super.xmobar;
|
||||
|
||||
# The shipped Setup.hs file is broken.
|
||||
csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; });
|
||||
|
|
@ -98,4 +106,18 @@ self: super: {
|
|||
|
||||
# Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog
|
||||
apply-refact = super.apply-refact_0_8_0_0;
|
||||
|
||||
# Apply patch to fix the build.
|
||||
cabal-plan = appendPatch super.cabal-plan (pkgs.fetchpatch {
|
||||
name = "cabal-plan-fix-for-ghc-8.10.x.patch";
|
||||
url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch";
|
||||
sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8";
|
||||
});
|
||||
dbus = appendPatch super.dbus ./patches/fix-dbus-for-ghc-8.10.x.patch;
|
||||
|
||||
# https://github.com/ndmitchell/hlint/issues/959
|
||||
hlint = super.hlint.override {
|
||||
ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex super.ghc-lib-parser;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,4 +102,8 @@ self: super: {
|
|||
|
||||
# Only 0.7 is compatible with ghc 8.7 https://hackage.haskell.org/package/apply-refact/changelog
|
||||
apply-refact = super.apply-refact_0_7_0_0;
|
||||
|
||||
# The package needs the latest Cabal version.
|
||||
cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -720,10 +720,9 @@ self: super: builtins.intersectAttrs super {
|
|||
# break infinite recursion with base-orphans
|
||||
primitive = dontCheck super.primitive;
|
||||
|
||||
# dhall-1.29.0 tests access the network. This override can be removed when
|
||||
# dhall_1_29_0 is no longer used, since more recent versions of dhall don't
|
||||
# access the network in checks.
|
||||
# dhall's tests access the network.
|
||||
dhall_1_29_0 = dontCheck super.dhall_1_29_0;
|
||||
dhall_1_31_1 = dontCheck super.dhall_1_31_1;
|
||||
|
||||
cut-the-crap =
|
||||
let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue