Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
03b81d1bef
101 changed files with 717 additions and 326 deletions
|
|
@ -3741,6 +3741,12 @@
|
|||
githubId = 130903;
|
||||
name = "Ana Hobden";
|
||||
};
|
||||
holgerpeters = {
|
||||
name = "Holger Peters";
|
||||
email = "holger.peters@posteo.de";
|
||||
github = "HolgerPeters";
|
||||
githubId = 4097049;
|
||||
};
|
||||
hrdinka = {
|
||||
email = "c.nix@hrdinka.at";
|
||||
github = "hrdinka";
|
||||
|
|
@ -8655,6 +8661,12 @@
|
|||
githubId = 7669898;
|
||||
name = "Katharina Fey";
|
||||
};
|
||||
spease = {
|
||||
email = "peasteven@gmail.com";
|
||||
github = "spease";
|
||||
githubId = 2825204;
|
||||
name = "Steven Pease";
|
||||
};
|
||||
spencerjanssen = {
|
||||
email = "spencerjanssen@gmail.com";
|
||||
github = "spencerjanssen";
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ in
|
|||
|
||||
extraFlags = mkOption {
|
||||
description = "Extra flags to pass to the k3s command.";
|
||||
type = types.str;
|
||||
default = "";
|
||||
example = "--no-deploy traefik --cluster-cidr 10.24.0.0/16";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -560,6 +560,7 @@ in
|
|||
|
||||
transport = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = "
|
||||
Entries for the transport map, cf. man-page transport(8).
|
||||
";
|
||||
|
|
@ -573,6 +574,7 @@ in
|
|||
|
||||
dnsBlacklistOverrides = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = "contents of check_client_access for overriding dnsBlacklists";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -389,6 +389,7 @@ in
|
|||
|
||||
extraConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Extra lines to be added verbatim to the rippled.cfg configuration file.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ in
|
|||
};
|
||||
|
||||
svnBaseDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/repos";
|
||||
description = "Base directory from which Subversion repositories are accessed.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,12 +23,14 @@ in
|
|||
|
||||
screenName = mkOption {
|
||||
default = "";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Use the given name instead of the hostname to identify
|
||||
ourselves to the server.
|
||||
'';
|
||||
};
|
||||
serverAddress = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
The server address is of the form: [hostname][:port]. The
|
||||
hostname must be the address or hostname of the server. The
|
||||
|
|
@ -46,10 +48,12 @@ in
|
|||
enable = mkEnableOption "the Synergy server (send keyboard and mouse events)";
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.path;
|
||||
default = "/etc/synergy-server.conf";
|
||||
description = "The Synergy server configuration file.";
|
||||
};
|
||||
screenName = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
Use the given name instead of the hostname to identify
|
||||
|
|
@ -57,6 +61,7 @@ in
|
|||
'';
|
||||
};
|
||||
address = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = "Address on which to listen for clients.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ in
|
|||
type = types.str;
|
||||
};
|
||||
binary = mkOption {
|
||||
type = types.path;
|
||||
description = "Binary to execute (by default \${weechat}/bin/weechat).";
|
||||
example = literalExample ''
|
||||
''${pkgs.weechat}/bin/weechat-headless
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ in
|
|||
enable = mkEnableOption "the Netatalk AFP fileserver";
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 548;
|
||||
description = "TCP port to be used for AFP.";
|
||||
};
|
||||
|
|
@ -68,6 +69,7 @@ in
|
|||
};
|
||||
|
||||
path = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
example = "afp-data";
|
||||
description = "Share not the whole user home but this subdirectory path.";
|
||||
|
|
@ -75,6 +77,7 @@ in
|
|||
|
||||
basedirRegex = mkOption {
|
||||
example = "/home";
|
||||
type = types.str;
|
||||
description = "Regex which matches the parent directory of the user homes.";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ in {
|
|||
};
|
||||
|
||||
advertisedAddresses = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = "List of IP addresses this server is advertised under. See NetInfo(5)";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ in
|
|||
enable = mkEnableOption "XtreemFS";
|
||||
|
||||
homeDir = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/lib/xtreemfs";
|
||||
description = ''
|
||||
XtreemFS home dir for the xtreemfs user.
|
||||
|
|
@ -109,6 +110,7 @@ in
|
|||
|
||||
uuid = mkOption {
|
||||
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Must be set to a unique identifier, preferably a UUID according to
|
||||
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
|
||||
|
|
@ -117,11 +119,13 @@ in
|
|||
};
|
||||
port = mkOption {
|
||||
default = 32638;
|
||||
type = types.port;
|
||||
description = ''
|
||||
The port to listen on for incoming connections (TCP).
|
||||
'';
|
||||
};
|
||||
address = mkOption {
|
||||
type = types.str;
|
||||
example = "127.0.0.1";
|
||||
default = "";
|
||||
description = ''
|
||||
|
|
@ -131,12 +135,14 @@ in
|
|||
};
|
||||
httpPort = mkOption {
|
||||
default = 30638;
|
||||
type = types.port;
|
||||
description = ''
|
||||
Specifies the listen port for the HTTP service that returns the
|
||||
status page.
|
||||
'';
|
||||
};
|
||||
syncMode = mkOption {
|
||||
type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "ASYNC" ];
|
||||
default = "FSYNC";
|
||||
example = "FDATASYNC";
|
||||
description = ''
|
||||
|
|
@ -229,6 +235,7 @@ in
|
|||
|
||||
uuid = mkOption {
|
||||
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Must be set to a unique identifier, preferably a UUID according to
|
||||
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
|
||||
|
|
@ -237,12 +244,14 @@ in
|
|||
};
|
||||
port = mkOption {
|
||||
default = 32636;
|
||||
type = types.port;
|
||||
description = ''
|
||||
The port to listen on for incoming connections (TCP).
|
||||
'';
|
||||
};
|
||||
address = mkOption {
|
||||
example = "127.0.0.1";
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
If specified, it defines the interface to listen on. If not
|
||||
|
|
@ -251,6 +260,7 @@ in
|
|||
};
|
||||
httpPort = mkOption {
|
||||
default = 30636;
|
||||
type = types.port;
|
||||
description = ''
|
||||
Specifies the listen port for the HTTP service that returns the
|
||||
status page.
|
||||
|
|
@ -258,6 +268,7 @@ in
|
|||
};
|
||||
syncMode = mkOption {
|
||||
default = "FSYNC";
|
||||
type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "ASYNC" ];
|
||||
example = "FDATASYNC";
|
||||
description = ''
|
||||
The sync mode influences how operations are committed to the disk
|
||||
|
|
@ -367,6 +378,7 @@ in
|
|||
|
||||
uuid = mkOption {
|
||||
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Must be set to a unique identifier, preferably a UUID according to
|
||||
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
|
||||
|
|
@ -375,12 +387,14 @@ in
|
|||
};
|
||||
port = mkOption {
|
||||
default = 32640;
|
||||
type = types.port;
|
||||
description = ''
|
||||
The port to listen on for incoming connections (TCP and UDP).
|
||||
'';
|
||||
};
|
||||
address = mkOption {
|
||||
example = "127.0.0.1";
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
If specified, it defines the interface to listen on. If not
|
||||
|
|
@ -389,6 +403,7 @@ in
|
|||
};
|
||||
httpPort = mkOption {
|
||||
default = 30640;
|
||||
type = types.port;
|
||||
description = ''
|
||||
Specifies the listen port for the HTTP service that returns the
|
||||
status page.
|
||||
|
|
|
|||
|
|
@ -46,12 +46,14 @@ in
|
|||
|
||||
user = mkOption {
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
description = ''
|
||||
The user the yandex-disk daemon should run as.
|
||||
'';
|
||||
};
|
||||
|
||||
directory = mkOption {
|
||||
type = types.path;
|
||||
default = "/home/Yandex.Disk";
|
||||
description = "The directory to use for Yandex.Disk storage";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,6 +8,35 @@ let
|
|||
|
||||
bindUser = "named";
|
||||
|
||||
bindZoneOptions = {
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
description = "Name of the zone.";
|
||||
};
|
||||
master = mkOption {
|
||||
description = "Master=false means slave server";
|
||||
type = types.bool;
|
||||
};
|
||||
file = mkOption {
|
||||
type = types.either types.str types.path;
|
||||
description = "Zone file resource records contain columns of data, separated by whitespace, that define the record.";
|
||||
};
|
||||
masters = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = "List of servers for inclusion in stub and secondary zones.";
|
||||
};
|
||||
slaves = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = "Addresses who may request zone transfers.";
|
||||
default = [];
|
||||
};
|
||||
extraConfig = mkOption {
|
||||
type = types.str;
|
||||
description = "Extra zone config to be appended at the end of the zone section.";
|
||||
default = "";
|
||||
};
|
||||
};
|
||||
|
||||
confFile = pkgs.writeText "named.conf"
|
||||
''
|
||||
include "/etc/bind/rndc.key";
|
||||
|
|
@ -72,6 +101,7 @@ in
|
|||
|
||||
cacheNetworks = mkOption {
|
||||
default = ["127.0.0.0/24"];
|
||||
type = types.listOf types.str;
|
||||
description = "
|
||||
What networks are allowed to use us as a resolver. Note
|
||||
that this is for recursive queries -- all networks are
|
||||
|
|
@ -83,6 +113,7 @@ in
|
|||
|
||||
blockedNetworks = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.str;
|
||||
description = "
|
||||
What networks are just blocked.
|
||||
";
|
||||
|
|
@ -90,6 +121,7 @@ in
|
|||
|
||||
ipv4Only = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = "
|
||||
Only use ipv4, even if the host supports ipv6.
|
||||
";
|
||||
|
|
@ -97,6 +129,7 @@ in
|
|||
|
||||
forwarders = mkOption {
|
||||
default = config.networking.nameservers;
|
||||
type = types.listOf types.str;
|
||||
description = "
|
||||
List of servers we should forward requests to.
|
||||
";
|
||||
|
|
@ -120,10 +153,9 @@ in
|
|||
|
||||
zones = mkOption {
|
||||
default = [];
|
||||
type = types.listOf (types.submodule [ { options = bindZoneOptions; } ]);
|
||||
description = "
|
||||
List of zones we claim authority over.
|
||||
master=false means slave server; slaves means addresses
|
||||
who may request zone transfer.
|
||||
";
|
||||
example = [{
|
||||
name = "example.com";
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ in
|
|||
|
||||
serverName = mkOption {
|
||||
default = "hades.arpa";
|
||||
type = types.str;
|
||||
description = "
|
||||
IRCD server name.
|
||||
";
|
||||
|
|
@ -47,6 +48,7 @@ in
|
|||
|
||||
sid = mkOption {
|
||||
default = "0NL";
|
||||
type = types.str;
|
||||
description = "
|
||||
IRCD server unique ID in a net of servers.
|
||||
";
|
||||
|
|
@ -54,6 +56,7 @@ in
|
|||
|
||||
description = mkOption {
|
||||
default = "Hybrid-7 IRC server.";
|
||||
type = types.str;
|
||||
description = "
|
||||
IRCD server description.
|
||||
";
|
||||
|
|
@ -62,6 +65,7 @@ in
|
|||
rsaKey = mkOption {
|
||||
default = null;
|
||||
example = literalExample "/root/certificates/irc.key";
|
||||
type = types.nullOr types.path;
|
||||
description = "
|
||||
IRCD server RSA key.
|
||||
";
|
||||
|
|
@ -70,6 +74,7 @@ in
|
|||
certificate = mkOption {
|
||||
default = null;
|
||||
example = literalExample "/root/certificates/irc.pem";
|
||||
type = types.nullOr types.path;
|
||||
description = "
|
||||
IRCD server SSL certificate. There are some limitations - read manual.
|
||||
";
|
||||
|
|
@ -77,6 +82,7 @@ in
|
|||
|
||||
adminEmail = mkOption {
|
||||
default = "<bit-bucket@example.com>";
|
||||
type = types.str;
|
||||
example = "<name@domain.tld>";
|
||||
description = "
|
||||
IRCD server administrator e-mail.
|
||||
|
|
@ -86,6 +92,7 @@ in
|
|||
extraIPs = mkOption {
|
||||
default = [];
|
||||
example = ["127.0.0.1"];
|
||||
type = types.listOf types.str;
|
||||
description = "
|
||||
Extra IP's to bind.
|
||||
";
|
||||
|
|
@ -93,6 +100,7 @@ in
|
|||
|
||||
extraPort = mkOption {
|
||||
default = "7117";
|
||||
type = types.str;
|
||||
description = "
|
||||
Extra port to avoid filtering.
|
||||
";
|
||||
|
|
|
|||
|
|
@ -21,11 +21,13 @@ in
|
|||
enable = mkEnableOption "Mailpile the mail client";
|
||||
|
||||
hostname = mkOption {
|
||||
type = types.str;
|
||||
default = "localhost";
|
||||
description = "Listen to this hostname or ip.";
|
||||
};
|
||||
port = mkOption {
|
||||
default = "33411";
|
||||
type = types.port;
|
||||
default = 33411;
|
||||
description = "Listen on this port.";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -44,7 +44,8 @@ in
|
|||
enable = mkEnableOption "the prayer webmail http server";
|
||||
|
||||
port = mkOption {
|
||||
default = "2080";
|
||||
default = 2080;
|
||||
type = types.port;
|
||||
description = ''
|
||||
Port the prayer http server is listening to.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ in
|
|||
};
|
||||
|
||||
interfaces = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ "127.0.0.1" ];
|
||||
description = ''
|
||||
The interfaces the Quassel daemon will be listening to. If `[ 127.0.0.1 ]',
|
||||
|
|
@ -54,6 +55,7 @@ in
|
|||
};
|
||||
|
||||
portNumber = mkOption {
|
||||
type = types.port;
|
||||
default = 4242;
|
||||
description = ''
|
||||
The port number the Quassel daemon will be listening to.
|
||||
|
|
@ -62,6 +64,7 @@ in
|
|||
|
||||
dataDir = mkOption {
|
||||
default = "/home/${user}/.config/quassel-irc.org";
|
||||
type = types.str;
|
||||
description = ''
|
||||
The directory holding configuration files, the SQlite database and the SSL Cert.
|
||||
'';
|
||||
|
|
@ -69,6 +72,7 @@ in
|
|||
|
||||
user = mkOption {
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
description = ''
|
||||
The existing user the Quassel daemon should run as. If left empty, a default "quassel" user will be created.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ in
|
|||
};
|
||||
|
||||
services.radvd.config = mkOption {
|
||||
type = types.lines;
|
||||
example =
|
||||
''
|
||||
interface eth0 {
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ in
|
|||
};
|
||||
|
||||
arguments = mkOption {
|
||||
type = types.str;
|
||||
default = "-v -o pa";
|
||||
description = ''
|
||||
Arguments to pass to the daemon. Defaults to a local pulseaudio
|
||||
|
|
@ -36,6 +37,7 @@ in
|
|||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "shairport";
|
||||
description = ''
|
||||
User account name under which to run shairport-sync. The account
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ in
|
|||
|
||||
portNumber = mkOption {
|
||||
default = 22;
|
||||
type = types.port;
|
||||
description = ''
|
||||
The port on which to listen for connections.
|
||||
'';
|
||||
|
|
@ -36,6 +37,7 @@ in
|
|||
|
||||
interfaces = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
List of network interfaces where listening for connections.
|
||||
When providing the empty list, `[]', lshd listens on all
|
||||
|
|
@ -46,6 +48,7 @@ in
|
|||
|
||||
hostKey = mkOption {
|
||||
default = "/etc/lsh/host-key";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Path to the server's private key. Note that this key must
|
||||
have been created, e.g., using "lsh-keygen --server |
|
||||
|
|
@ -79,6 +82,7 @@ in
|
|||
|
||||
loginShell = mkOption {
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
description = ''
|
||||
If non-null, override the default login shell with the
|
||||
specified value.
|
||||
|
|
@ -88,6 +92,7 @@ in
|
|||
|
||||
srpKeyExchange = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Whether to enable SRP key exchange and user authentication.
|
||||
'';
|
||||
|
|
@ -106,6 +111,7 @@ in
|
|||
};
|
||||
|
||||
subsystems = mkOption {
|
||||
type = types.listOf types.path;
|
||||
description = ''
|
||||
List of subsystem-path pairs, where the head of the pair
|
||||
denotes the subsystem name, and the tail denotes the path to
|
||||
|
|
|
|||
|
|
@ -180,6 +180,7 @@ in
|
|||
};
|
||||
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
default = "MediaWiki";
|
||||
example = "Foobar Wiki";
|
||||
description = "Name of the wiki.";
|
||||
|
|
|
|||
|
|
@ -404,6 +404,7 @@ in
|
|||
|
||||
logError = mkOption {
|
||||
default = "stderr";
|
||||
type = types.str;
|
||||
description = "
|
||||
Configures logging.
|
||||
The first parameter defines a file that will store the log. The
|
||||
|
|
|
|||
|
|
@ -28,10 +28,12 @@ in {
|
|||
description = "Group account under which unit runs.";
|
||||
};
|
||||
stateDir = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/spool/unit";
|
||||
description = "Unit data directory.";
|
||||
};
|
||||
logDir = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/log/unit";
|
||||
description = "Unit log directory.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ in
|
|||
|
||||
sessionPath = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.package;
|
||||
example = literalExample "[ pkgs.gnome3.gpaste ]";
|
||||
description = ''
|
||||
Additional list of packages to be added to the session search path.
|
||||
|
|
|
|||
|
|
@ -118,6 +118,7 @@ in
|
|||
|
||||
sessionPath = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.package;
|
||||
example = literalExample "[ pkgs.gnome3.gpaste ]";
|
||||
description = ''
|
||||
Additional list of packages to be added to the session search path.
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ in
|
|||
|
||||
sessionPath = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.package;
|
||||
example = literalExample "[ pkgs.gnome3.gpaste ]";
|
||||
description = ''
|
||||
Additional list of packages to be added to the session search path.
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ in
|
|||
cursorTheme = {
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.gnome3.adwaita-icon-theme;
|
||||
defaultText = "pkgs.gnome3.adwaita-icon-theme";
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ in
|
|||
enable = mkEnableOption "exwm";
|
||||
loadScript = mkOption {
|
||||
default = "(require 'exwm)";
|
||||
type = types.lines;
|
||||
example = literalExample ''
|
||||
(require 'exwm)
|
||||
(exwm-enable)
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ in {
|
|||
haskellPackages = mkOption {
|
||||
default = pkgs.haskellPackages;
|
||||
defaultText = "pkgs.haskellPackages";
|
||||
type = types.package;
|
||||
example = literalExample "pkgs.haskell.packages.ghc784";
|
||||
description = ''
|
||||
haskellPackages used to build Xmonad and other packages.
|
||||
|
|
|
|||
|
|
@ -441,6 +441,7 @@ in
|
|||
|
||||
serverFlagsSection = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
example =
|
||||
''
|
||||
Option "BlankTime" "0"
|
||||
|
|
|
|||
|
|
@ -57,7 +57,8 @@ in
|
|||
|
||||
virtualisation.xen.bootParams =
|
||||
mkOption {
|
||||
default = "";
|
||||
default = [];
|
||||
type = types.listOf types.str;
|
||||
description =
|
||||
''
|
||||
Parameters passed to the Xen hypervisor at boot time.
|
||||
|
|
@ -68,6 +69,7 @@ in
|
|||
mkOption {
|
||||
default = 0;
|
||||
example = 512;
|
||||
type = types.addCheck types.int (n: n >= 0);
|
||||
description =
|
||||
''
|
||||
Amount of memory (in MiB) allocated to Domain 0 on boot.
|
||||
|
|
@ -78,6 +80,7 @@ in
|
|||
virtualisation.xen.bridge = {
|
||||
name = mkOption {
|
||||
default = "xenbr0";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Name of bridge the Xen domUs connect to.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -190,6 +190,7 @@ in
|
|||
kernel-latest = handleTest ./kernel-latest.nix {};
|
||||
kernel-lts = handleTest ./kernel-lts.nix {};
|
||||
kernel-testing = handleTest ./kernel-testing.nix {};
|
||||
kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix {};
|
||||
keycloak = discoverTests (import ./keycloak.nix);
|
||||
keymap = handleTest ./keymap.nix {};
|
||||
knot = handleTest ./knot.nix {};
|
||||
|
|
|
|||
17
nixos/tests/kernel-latest-ath-user-regd.nix
Normal file
17
nixos/tests/kernel-latest-ath-user-regd.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
name = "kernel-latest-ath-user-regd";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ veehaitch ];
|
||||
};
|
||||
|
||||
machine = { pkgs, ... }:
|
||||
{
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
networking.wireless.athUserRegulatoryDomain = true;
|
||||
};
|
||||
|
||||
testScript =
|
||||
''
|
||||
assert "CONFIG_ATH_USER_REGD=y" in machine.succeed("zcat /proc/config.gz")
|
||||
'';
|
||||
})
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, libtool
|
||||
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
|
||||
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265
|
||||
, ApplicationServices
|
||||
|
|
@ -12,39 +12,19 @@ let
|
|||
else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64"
|
||||
else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le"
|
||||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "6.9.11-29";
|
||||
sha256 = "0adjdpi91ya0g3v7y503n95833m25aibkim5swg5lnwjrba407hg";
|
||||
patches = [];
|
||||
}
|
||||
# Freeze version on mingw so we don't need to port the patch too often.
|
||||
# FIXME: This version has multiple security vulnerabilities
|
||||
// lib.optionalAttrs (stdenv.hostPlatform.isMinGW) {
|
||||
version = "6.9.2-0";
|
||||
sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7";
|
||||
patches = [(fetchpatch {
|
||||
name = "mingw-build.patch";
|
||||
url = "https://raw.githubusercontent.com/Alexpux/MINGW-packages/"
|
||||
+ "01ca03b2a4ef/mingw-w64-imagemagick/002-build-fixes.patch";
|
||||
sha256 = "1pypszlcx2sf7wfi4p37w1y58ck2r8cd5b2wrrwr9rh87p7fy1c0";
|
||||
})];
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
inherit (cfg) version;
|
||||
version = "6.9.11-60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick6";
|
||||
rev = cfg.version;
|
||||
inherit (cfg) sha256;
|
||||
rev = version;
|
||||
sha256 = "12810882a0kf4zlgyi290z9bjs921m05njbljkjfw6s1hf0mncl0";
|
||||
};
|
||||
|
||||
patches = cfg.patches;
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
outputMan = "out"; # it's tiny
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfsam-basic";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
|
||||
sha256 = "0d7pvl87ybkvcxk69fr35fz0w447hy2pm65bhvlril16ljm2izja";
|
||||
sha256 = "sha256-fbcU3NZdQ8NR5tLjEJyOPneVWNMBddLdttLeVwIUtpg=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ buildGoPackage, fetchurl, fetchFromGitHub, lib }:
|
||||
{ buildGoModule, fetchurl, fetchFromGitHub, lib }:
|
||||
|
||||
let
|
||||
gouiJS = fetchurl {
|
||||
|
|
@ -11,41 +11,49 @@ let
|
|||
sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2";
|
||||
};
|
||||
|
||||
in buildGoPackage rec {
|
||||
name = "perkeep-${version}";
|
||||
version = "unstable-2020-03-23";
|
||||
packages = [
|
||||
"perkeep.org/server/perkeepd"
|
||||
"perkeep.org/cmd/pk"
|
||||
"perkeep.org/cmd/pk-get"
|
||||
"perkeep.org/cmd/pk-put"
|
||||
"perkeep.org/cmd/pk-mount"
|
||||
];
|
||||
|
||||
in buildGoModule rec {
|
||||
pname = "perkeep";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "perkeep";
|
||||
repo = "perkeep";
|
||||
rev = "c2e31370ddefd86b6112a5d891100ea3382a4254";
|
||||
sha256 = "0jf02k20ms7h60wglcq6dj3vqi9rlfww7db5iplgwznbij70c1i4";
|
||||
rev = version;
|
||||
sha256 = "07j5gplk4kcrbazyg4m4bwggzlz5gk89h90r14jvfcpms7v5nrll";
|
||||
};
|
||||
|
||||
goPackagePath = "perkeep.org";
|
||||
vendorSha256 = "1af9a6r9qfrak0n5xyv9z8n7gn7xw2sdjn4s9bwwidkrdm81iq6b";
|
||||
deleteVendor = true; # Vendor is out of sync with go.mod
|
||||
|
||||
buildPhase = ''
|
||||
cd "$NIX_BUILD_TOP/go/src/$goPackagePath"
|
||||
cd "$NIX_BUILD_TOP/source"
|
||||
|
||||
# Skip network fetches
|
||||
sed -i '/fetchAllJS/a if true { return nil }' make.go
|
||||
cp ${publisherJS} app/publisher/publisher.js
|
||||
cp ${gouiJS} server/perkeepd/ui/goui.js
|
||||
|
||||
go run make.go
|
||||
go run make.go -offline=true -targets=${lib.concatStringsSep "," packages}
|
||||
'';
|
||||
|
||||
# devcam is only useful when developing perkeep, we should not install it as
|
||||
# part of this derivation.
|
||||
# genfileembed gets built regardless of -targets, to embed static
|
||||
# content into the Perkeep binaries. Remove it in post-install to
|
||||
# avoid polluting paths.
|
||||
postInstall = ''
|
||||
rm -f $out/bin/devcam
|
||||
rm -f $out/bin/genfileembed
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)";
|
||||
homepage = "https://perkeep.org";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cstrahan kalbasit ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ cstrahan danderson kalbasit ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
set -eu -o pipefail
|
||||
|
||||
version="$(curl -Ls https://zoom.us/download\?os\=linux | pup '.linux-ver-text text{}' | cut -d' ' -f2)"
|
||||
version="$(curl -Ls https://zoom.us/download\?os\=linux | \
|
||||
pup '.linux-ver-text text{}' | \
|
||||
awk -F'[ ().]' '{printf $2"."$3"."$6"."$7"\n"}')"
|
||||
|
||||
update-source-version zoom-us "$version"
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@ let
|
|||
in
|
||||
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0";
|
||||
version = "3.0.1";
|
||||
pname = "weechat";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
|
||||
sha256 = "0ciddvyhyp38fnfsi1plj3z8d76f28lbzbxib2857vw7rzyqfcky";
|
||||
sha256 = "0f50kib8l99vlp9wqszq2r2g5panzphsgs7viga8lyc83v229b33";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
|
||||
|
|
|
|||
|
|
@ -1,24 +1,56 @@
|
|||
{ lib, stdenv, buildFHSUserEnv, fetchurl, makeWrapper, makeDesktopItem, libxslt, atk
|
||||
, fontconfig, freetype, gdk-pixbuf, glib, gtk2, libudev0-shim, libxml2
|
||||
, pango, pixman, libX11, libXext, libXinerama, libXrandr , libXrender
|
||||
, libXtst, libXcursor, libXi, libxkbfile , libXScrnSaver, zlib, liberation_ttf
|
||||
, libtiff, dbus, at-spi2-atk, harfbuzz, gtk3-x11, libuuid, pcsclite
|
||||
{ stdenv
|
||||
, lib
|
||||
, at-spi2-atk
|
||||
, atk
|
||||
, buildFHSUserEnv
|
||||
, dbus
|
||||
, fetchurl
|
||||
, fontconfig
|
||||
, freetype
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
, gtk2
|
||||
, gtk3-x11
|
||||
, harfbuzz
|
||||
, liberation_ttf
|
||||
, libjpeg
|
||||
, libtiff
|
||||
, libudev0-shim
|
||||
, libuuid
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libxkbfile
|
||||
, libxml2
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libXScrnSaver
|
||||
, libxslt
|
||||
, libXtst
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, pango
|
||||
, pcsclite
|
||||
, pixman
|
||||
, zlib
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2006";
|
||||
version = "2012";
|
||||
|
||||
sysArch =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
|
||||
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
# The downloaded archive also contains i386 and ARM binaries, but these have not been tested.
|
||||
# The downloaded archive also contains i386 and ARM binaries, but these have not been tested.
|
||||
|
||||
vmwareHorizonClientFiles = stdenv.mkDerivation {
|
||||
name = "vmwareHorizonClientFiles";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = https://download3.vmware.com/software/view/viewclients/CART21FQ2/vmware-view-client-linux-2006-8.0.0-16522670.tar.gz;
|
||||
sha256 = "8c46d49fea42f8c1f7cf32a5f038f5a47d2b304743b1e4f4c68c658621b0e79c";
|
||||
url = "https://download3.vmware.com/software/view/viewclients/CART21FQ4/VMware-Horizon-Client-Linux-2012-8.1.0-17349998.tar.gz";
|
||||
sha256 = "0afda1f3116e75a4e7f89990d8ee60ccea5f3bb8a2360652162fa11c795724ce";
|
||||
};
|
||||
buildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
|
|
@ -30,12 +62,16 @@ let
|
|||
# when it cannot detect a new enough version already present on the system.
|
||||
# The checks are distribution-specific and do not function correctly on NixOS.
|
||||
# Deleting the bundled library is the simplest way to force it to use our version.
|
||||
rm -f "$out/lib/vmware/gcc/libstdc++.so.6"
|
||||
rm "$out/lib/vmware/gcc/libstdc++.so.6"
|
||||
|
||||
# This libjpeg library interferes with Chromium, so we will be using ours instead.
|
||||
rm $out/lib/vmware/libjpeg.*
|
||||
|
||||
# Force the default GTK theme (Adwaita) because Horizon is prone to
|
||||
# UI usability issues when using non-default themes, such as Adwaita-dark.
|
||||
makeWrapper "$out/bin/vmware-view" "$out/bin/vmware-view_wrapper" \
|
||||
--set GTK_THEME Adwaita \
|
||||
--suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
|
||||
--suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware"
|
||||
'';
|
||||
};
|
||||
|
|
@ -46,10 +82,37 @@ let
|
|||
runScript = "${vmwareHorizonClientFiles}/bin/vmware-view_wrapper";
|
||||
|
||||
targetPkgs = pkgs: [
|
||||
pcsclite dbus vmwareHorizonClientFiles atk fontconfig freetype gdk-pixbuf glib gtk2
|
||||
libudev0-shim libxml2 pango pixman liberation_ttf libX11 libXext libXinerama
|
||||
libXrandr libXrender libXtst libXcursor libXi libxkbfile at-spi2-atk libXScrnSaver
|
||||
zlib libtiff harfbuzz gtk3-x11 libuuid
|
||||
at-spi2-atk
|
||||
atk
|
||||
dbus
|
||||
fontconfig
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk2
|
||||
gtk3-x11
|
||||
harfbuzz
|
||||
liberation_ttf
|
||||
libjpeg
|
||||
libtiff
|
||||
libudev0-shim
|
||||
libuuid
|
||||
libX11
|
||||
libXcursor
|
||||
libXext
|
||||
libXi
|
||||
libXinerama
|
||||
libxkbfile
|
||||
libxml2
|
||||
libXrandr
|
||||
libXrender
|
||||
libXScrnSaver
|
||||
libXtst
|
||||
pango
|
||||
pcsclite
|
||||
pixman
|
||||
vmwareHorizonClientFiles
|
||||
zlib
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -61,15 +124,22 @@ let
|
|||
mimeType = "x-scheme-handler/vmware-view";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "vmware-view";
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/applications
|
||||
cp "${desktopItem}"/share/applications/* $out/share/applications/
|
||||
ln -s "${vmwareFHSUserEnv}/bin/vmware-view" "$out/bin/"
|
||||
'';
|
||||
|
||||
unwrapped = vmwareHorizonClientFiles;
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allows you to connect to your VMware Horizon virtual desktop";
|
||||
homepage = "https://www.vmware.com/go/viewclients";
|
||||
|
|
|
|||
27
pkgs/applications/networking/remote/vmware-horizon-client/update.sh
Executable file
27
pkgs/applications/networking/remote/vmware-horizon-client/update.sh
Executable file
|
|
@ -0,0 +1,27 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -p curl -p jq -p common-updater-scripts -i bash
|
||||
set -e
|
||||
|
||||
entryPointURL='https://my.vmware.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY'
|
||||
|
||||
function getTarballMetaUrl {
|
||||
curl "$entryPointURL" | jq -r '
|
||||
.dlgEditionsLists | .[] | select(.name | contains("Client for Linux")) |
|
||||
.dlgList | .[] | select(.name | contains("tarball version")) |
|
||||
@uri "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=\(.code)&productId=\(.productId)&rPId=\(.releasePackageId)"
|
||||
'
|
||||
}
|
||||
|
||||
meta="$( curl "$(getTarballMetaUrl)" | jq ".downloadFiles | .[]" )"
|
||||
|
||||
ver="$( echo "$meta" | jq -r .version )"
|
||||
url="$( echo "$meta" | jq -r .thirdPartyDownloadUrl )"
|
||||
sum="$( echo "$meta" | jq -r .sha256checksum )"
|
||||
|
||||
echo
|
||||
echo "version: $ver"
|
||||
echo "tar url: $url"
|
||||
echo " sha256: $sum"
|
||||
|
||||
cd "$(dirname "$0")/../../../../.."
|
||||
update-source-version vmware-horizon-client.unwrapped "$ver" "$sum" "$url"
|
||||
|
|
@ -24,11 +24,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.50.2";
|
||||
version = "0.50.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "sha256-n5tLYrqqM0KUQrlJWZtKGClKONAz3EXBAlEqIrdPBpI=";
|
||||
sha256 = "sha256-8sFBxcs3tnIQQ4S39aF8r9SGm9VOHPpgQYyLkUaOscw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
pname = "molden";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
|
||||
url = "ftp://ftp.cmbi.umcn.nl/pub/molgraph/molden/molden${version}.tar.gz";
|
||||
sha256 = "02qi16pz2wffn3cc47dpjqhfafzwfmb79waw4nnhfyir8a4h3cq1";
|
||||
};
|
||||
|
||||
|
|
@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Display and manipulate molecular structures";
|
||||
homepage = "http://www.cmbi.ru.nl/molden/";
|
||||
homepage = "http://www3.cmbi.umcn.nl/molden/";
|
||||
license = {
|
||||
fullName = "Free for academic/non-profit use";
|
||||
url = "http://www.cmbi.ru.nl/molden/CopyRight.html";
|
||||
url = "http://www3.cmbi.umcn.nl/molden/CopyRight.html";
|
||||
free = false;
|
||||
};
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -96,9 +96,9 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
#### ART
|
||||
|
||||
xfce4-icon-theme = callPackage ./art/xfce4-icon-theme.nix { };
|
||||
xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { };
|
||||
|
||||
xfwm4-themes = callPackage ./art/xfwm4-themes.nix { };
|
||||
xfwm4-themes = callPackage ./art/xfwm4-themes { };
|
||||
|
||||
#### PANEL PLUGINS
|
||||
|
||||
|
|
@ -110,49 +110,49 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { };
|
||||
|
||||
xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { };
|
||||
xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { };
|
||||
|
||||
xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { };
|
||||
|
||||
xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { };
|
||||
xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { };
|
||||
|
||||
xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { };
|
||||
xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { };
|
||||
|
||||
xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { };
|
||||
xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { };
|
||||
|
||||
xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { };
|
||||
xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { };
|
||||
|
||||
xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { };
|
||||
xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { };
|
||||
|
||||
xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { };
|
||||
xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { };
|
||||
|
||||
xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin.nix { };
|
||||
xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { };
|
||||
|
||||
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { };
|
||||
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { };
|
||||
|
||||
xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { };
|
||||
|
||||
xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { };
|
||||
xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { };
|
||||
|
||||
xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { };
|
||||
xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin { };
|
||||
|
||||
xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin.nix { };
|
||||
xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { };
|
||||
|
||||
xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { };
|
||||
xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { };
|
||||
|
||||
xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
|
||||
xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { };
|
||||
|
||||
xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { };
|
||||
xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin { };
|
||||
|
||||
xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { };
|
||||
|
||||
xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { };
|
||||
|
||||
xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { };
|
||||
xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin { };
|
||||
|
||||
xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { };
|
||||
|
||||
xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { };
|
||||
xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin { };
|
||||
|
||||
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,30 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, glib
|
||||
, exo
|
||||
, libXtst
|
||||
, xorgproto
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, libxfce4ui
|
||||
, xfconf
|
||||
, gtk3
|
||||
, hicolor-icon-theme
|
||||
, xfce
|
||||
}:
|
||||
|
||||
let
|
||||
category = "panel-plugins";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xfce4-cpugraph-plugin";
|
||||
version = "1.1.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy";
|
||||
sha256 = "YVrfmr2RQXpEMZ2OTa3GAS+iKjd48vN5cXUS3Lfvkko=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,6 +56,6 @@ stdenv.mkDerivation rec {
|
|||
description = "CPU graph show for Xfce panel";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,18 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, libxfce4ui
|
||||
, gtk2
|
||||
, xfce
|
||||
}:
|
||||
|
||||
let
|
||||
category = "panel-plugins";
|
||||
in
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xfce4-embed-plugin";
|
||||
version = "1.6.0";
|
||||
|
||||
|
|
@ -32,11 +39,11 @@ stdenv.mkDerivation rec {
|
|||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib;{
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin";
|
||||
description = "Embed arbitrary app windows on Xfce panel";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,10 +1,19 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, libxfce4ui
|
||||
, xfconf
|
||||
, gtk3
|
||||
, xfce
|
||||
}:
|
||||
|
||||
let
|
||||
category = "panel-plugins";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xfce4-eyes-plugin";
|
||||
version = "4.5.1";
|
||||
|
||||
|
|
@ -37,6 +46,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,25 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, libxfce4ui
|
||||
, xfconf
|
||||
, gtk3
|
||||
, xfce
|
||||
}:
|
||||
|
||||
let
|
||||
category = "panel-plugins";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xfce4-fsguard-plugin";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n";
|
||||
sha256 = "Z9jmohmnEXxZaTrbxZw5puujHj8YpUmRie9O8otVQQU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -37,6 +46,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Filesystem usage monitor plugin for the Xfce panel";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,24 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, libxfce4ui
|
||||
, gtk3
|
||||
, xfce
|
||||
}:
|
||||
|
||||
let
|
||||
category = "panel-plugins";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xfce4-genmon-plugin";
|
||||
version = "4.0.2";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15";
|
||||
sha256 = "shGf0P8Z+ik7l+yXsN6OJBeZ4IuGIYUVFnxWi9m1ATU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -36,6 +44,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Generic monitor plugin for the Xfce panel";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,27 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, intltool
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, libxfce4ui
|
||||
, xfconf
|
||||
, gtk2
|
||||
, libunique
|
||||
, xfce
|
||||
}:
|
||||
|
||||
let
|
||||
category = "panel-plugins";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xfce4-notes-plugin";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1cjlvvcsigyh40xa26b2vc5zylgss0nlaw72sablzhii2kkw7907";
|
||||
sha256 = "E/kJyUi2Oflt5kz3k+t0yxd5WJIB05M+/yFO6PNasIg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -40,6 +51,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Sticky notes plugin for Xfce panel";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,24 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, libxfce4ui
|
||||
, gtk3
|
||||
, xfce
|
||||
}:
|
||||
|
||||
let
|
||||
category = "panel-plugins";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xfce4-systemload-plugin";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905";
|
||||
sha256 = "BTG435I8ujvo0GTLi2OLlU33SRXlpEciiZlReEd4mDU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -36,6 +44,6 @@ stdenv.mkDerivation rec {
|
|||
description = "System load plugin for Xfce panel";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,18 +1,26 @@
|
|||
{ lib, mkXfceDerivation, gtk3, libxfce4ui, pcre, libxfce4util, xfce4-panel, xfconf }:
|
||||
{ lib
|
||||
, mkXfceDerivation
|
||||
, gtk3
|
||||
, libxfce4ui
|
||||
, pcre
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, xfconf
|
||||
}:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-verve-plugin";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
rev-prefix = "";
|
||||
sha256 = "09vpa6m0ah7pgmra094c16vb79xrcwva808g6zpawwrhcwz85lcz";
|
||||
sha256 = "YwUOSTZMoHsWWmi/ajQv/fX8a0IJoc3re3laVEmnX/M=";
|
||||
|
||||
buildInputs = [ gtk3 libxfce4ui pcre libxfce4util xfce4-panel ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A command-line plugin";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,37 @@
|
|||
{ lib, mkXfceDerivation, gtk3, librsvg, libwnck3, libxklavier, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
|
||||
{ lib
|
||||
, mkXfceDerivation
|
||||
, gtk3
|
||||
, librsvg
|
||||
, libwnck3
|
||||
, libxklavier
|
||||
, garcon
|
||||
, libxfce4ui
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, xfconf
|
||||
}:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-xkb-plugin";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
rev-prefix = "";
|
||||
sha256 = "1gyky4raynp2ggdnq0g96c6646fjm679fzipcsmf1q0aymr8d5ky";
|
||||
sha256 = "xmCoNMxykeaThYEJo6BcbraFo9CruFZL6YPjovzb6hg=";
|
||||
|
||||
buildInputs = [ garcon gtk3 librsvg libxfce4ui libxfce4util libxklavier libwnck3 xfce4-panel xfconf ];
|
||||
buildInputs = [
|
||||
garcon
|
||||
gtk3
|
||||
librsvg
|
||||
libxfce4ui
|
||||
libxfce4util
|
||||
libxklavier
|
||||
libwnck3
|
||||
xfce4-panel
|
||||
xfconf
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allows you to setup and use multiple keyboard layouts";
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -255,7 +255,13 @@ in rec {
|
|||
extraBuildInputs = [ git ];
|
||||
};
|
||||
|
||||
crystal = crystal_0_35;
|
||||
crystal_0_36 = generic {
|
||||
version = "0.36.0";
|
||||
sha256 = "0s7g13mrh2jrxxrrrg4hy3gi49rp7fmpn9zg9kj4nbc8w8yir20r";
|
||||
binary = crystal_0_35;
|
||||
};
|
||||
|
||||
crystal = crystal_0_36;
|
||||
|
||||
crystal2nix = callPackage ./crystal2nix.nix {};
|
||||
}
|
||||
|
|
|
|||
27
pkgs/development/libraries/cxxopts/default.nix
Normal file
27
pkgs/development/libraries/cxxopts/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ cmake, fetchFromGitHub, icu, lib, pkg-config, stdenv, enableUnicodeHelp ? true }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cxxopts";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarro2783";
|
||||
repo = name;
|
||||
rev = "v${version}";
|
||||
sha256 = "0d3y747lsh1wkalc39nxd088rbypxigm991lk3j91zpn56whrpha";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional enableUnicodeHelp [ icu.dev ];
|
||||
cmakeFlags = lib.optional enableUnicodeHelp [ "-DCXXOPTS_USE_UNICODE_HELP=TRUE" ];
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optional enableUnicodeHelp [ pkg-config ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jarro2783/cxxopts";
|
||||
description = "Lightweight C++ GNU-style option parser library";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.spease ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
|
||||
{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
|
||||
, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
|
||||
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
|
||||
, libiconv, libxml2
|
||||
|
|
@ -9,22 +9,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdal";
|
||||
version = "2.4.0";
|
||||
version = "2.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3";
|
||||
sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2019-17545.patch";
|
||||
url = "https://github.com/OSGeo/gdal/commit/8cd2d2eb6327cf782a74dae263ffa6f89f46c93d.patch";
|
||||
stripLen = 1;
|
||||
sha256 = "06h88a659jcqf6ps1m91qy78s6s9krbkwnz28f5qh7032vlp6qpw";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
|
||||
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
|
||||
++ (with pythonPackages; [ python numpy wrapPython ])
|
||||
|
|
@ -60,19 +51,6 @@ stdenv.mkDerivation rec {
|
|||
#ifdef swap\
|
||||
#undef swap\
|
||||
#endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h
|
||||
# poppler 0.73.0 support
|
||||
patch -lp2 <${
|
||||
fetchpatch {
|
||||
url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff";
|
||||
sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734";
|
||||
}
|
||||
} || true
|
||||
patch -p2 <${
|
||||
fetchpatch {
|
||||
url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff";
|
||||
sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj";
|
||||
}
|
||||
}
|
||||
'';
|
||||
|
||||
# - Unset CC and CXX as they confuse libtool.
|
||||
|
|
@ -32,7 +32,9 @@ let
|
|||
throughput in both directions.
|
||||
'';
|
||||
homepage = "https://libwebsockets.org/";
|
||||
license = licenses.lgpl21;
|
||||
# Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation
|
||||
# is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE
|
||||
license = with licenses; [ mit publicDomain bsd3 asl20 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
|
@ -50,7 +52,12 @@ rec {
|
|||
};
|
||||
|
||||
libwebsockets_4_0 = generic {
|
||||
version = "4.0.1";
|
||||
sha256 = "1pf7km0w5q7dqlwcwqizdpfqgg10prfq8g2c093f5nghwsfv8mmf";
|
||||
version = "4.0.21";
|
||||
sha256 = "01k05x4711ngin598jr9dag4ml3m7hi6pkgr4dsb02ryh1kc6146";
|
||||
};
|
||||
|
||||
libwebsockets_4_1 = generic {
|
||||
version = "4.1.6";
|
||||
sha256 = "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libbsd, openssl, libmilter
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, libbsd, openssl, libmilter
|
||||
, autoreconfHook, perl, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opendkim";
|
||||
version = "2.10.3";
|
||||
version = "2.11.0-Beta2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/opendkim/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823";
|
||||
src = fetchFromGitHub {
|
||||
owner = "trusteddomainproject";
|
||||
repo = "OpenDKIM";
|
||||
rev = "rel-opendkim-${lib.replaceChars ["."] ["-"] version}";
|
||||
sha256 = "0nx3in8sa6xna4vfacj8g60hfzk61jpj2ldag80xzxip9c3rd2pw";
|
||||
};
|
||||
|
||||
configureFlags= [
|
||||
|
|
@ -20,8 +22,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ libbsd openssl libmilter perl ];
|
||||
|
||||
patches = [ ./openssl-1.1.patch ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/sbin/opendkim-genkey \
|
||||
--prefix PATH : ${openssl.bin}/bin
|
||||
|
|
|
|||
|
|
@ -1,81 +0,0 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -864,26 +864,28 @@
|
||||
AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
|
||||
AC_MSG_ERROR([libcrypto not found]))
|
||||
|
||||
- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
|
||||
- [
|
||||
- if test x"$enable_shared" = x"yes"
|
||||
- then
|
||||
- AC_MSG_ERROR([Cannot build shared opendkim
|
||||
- against static openssl libraries.
|
||||
- Configure with --disable-shared
|
||||
- to get this working or obtain a
|
||||
- shared libssl library for
|
||||
- opendkim to use.])
|
||||
- fi
|
||||
-
|
||||
- # avoid caching issue - last result of SSL_library_init
|
||||
- # shouldn't be cached for this next check
|
||||
- unset ac_cv_search_SSL_library_init
|
||||
- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
|
||||
- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
|
||||
- AC_MSG_ERROR([libssl not found]), [-ldl])
|
||||
- ]
|
||||
- )
|
||||
+
|
||||
+ AC_LINK_IFELSE(
|
||||
+ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
|
||||
+ [[SSL_library_init();]])],
|
||||
+ [od_have_ossl="yes";],
|
||||
+ [od_have_ossl="no";])
|
||||
+ if test x"$od_have_ossl" = x"no"
|
||||
+ then
|
||||
+ if test x"$enable_shared" = x"yes"
|
||||
+ then
|
||||
+ AC_MSG_ERROR([Cannot build shared opendkim
|
||||
+ against static openssl libraries.
|
||||
+ Configure with --disable-shared
|
||||
+ to get this working or obtain a
|
||||
+ shared libssl library for
|
||||
+ opendkim to use.])
|
||||
+ fi
|
||||
+
|
||||
+ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
|
||||
+ AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
|
||||
+ AC_MSG_ERROR([libssl not found]), [-ldl])
|
||||
+ fi
|
||||
|
||||
AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
|
||||
AC_DEFINE([HAVE_SHA256], 1,
|
||||
--- a/opendkim/opendkim-crypto.c
|
||||
+++ b/opendkim/opendkim-crypto.c
|
||||
@@ -222,7 +222,11 @@
|
||||
{
|
||||
assert(pthread_setspecific(id_key, ptr) == 0);
|
||||
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
|
||||
+ OPENSSL_thread_stop();
|
||||
+#else
|
||||
ERR_remove_state(0);
|
||||
+#endif
|
||||
|
||||
free(ptr);
|
||||
|
||||
@@ -392,11 +396,15 @@
|
||||
{
|
||||
if (crypto_init_done)
|
||||
{
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
|
||||
+ OPENSSL_thread_stop();
|
||||
+#else
|
||||
CRYPTO_cleanup_all_ex_data();
|
||||
CONF_modules_free();
|
||||
EVP_cleanup();
|
||||
ERR_free_strings();
|
||||
ERR_remove_state(0);
|
||||
+#endif
|
||||
|
||||
if (nmutexes > 0)
|
||||
{
|
||||
|
|
@ -17,9 +17,9 @@ buildDunePackage rec {
|
|||
|
||||
minimumOCamlVersion = "4.04";
|
||||
|
||||
buildInputs = [ perl ncurses ppxlib ];
|
||||
buildInputs = [ perl ncurses ];
|
||||
|
||||
propagatedBuildInputs = [ camlp5 ppx_deriving re ];
|
||||
propagatedBuildInputs = [ camlp5 ppxlib ppx_deriving re ];
|
||||
|
||||
meta = {
|
||||
description = "Embeddable λProlog Interpreter";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub
|
||||
, menhir, ppx_deriving, re, uutf, uucp, ounit2 }:
|
||||
, menhir, ppxlib, ppx_deriving, re, uutf, uucp, ounit2 }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "jingoo";
|
||||
|
|
@ -17,7 +17,7 @@ buildDunePackage rec {
|
|||
};
|
||||
|
||||
buildInputs = [ menhir ];
|
||||
propagatedBuildInputs = [ ppx_deriving re uutf uucp ];
|
||||
propagatedBuildInputs = [ ppxlib ppx_deriving re uutf uucp ];
|
||||
checkInputs = [ ounit2 ];
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub, alcotest, cryptokit, fmt, yojson
|
||||
, ppxlib
|
||||
, base64, re, ppx_deriving }:
|
||||
|
||||
buildDunePackage rec {
|
||||
|
|
@ -16,6 +17,8 @@ buildDunePackage rec {
|
|||
sha256 = "1p799zk8j9c0002xzi2x7ndj1bzqf14744ampcqndrjnsi7mq71s";
|
||||
};
|
||||
|
||||
buildInputs = [ ppxlib ];
|
||||
|
||||
propagatedBuildInputs =
|
||||
[ cryptokit fmt yojson base64 re ppx_deriving ];
|
||||
|
||||
|
|
|
|||
|
|
@ -24,5 +24,6 @@ buildDunePackage rec {
|
|||
maintainers = with maintainers; [
|
||||
kazcw
|
||||
];
|
||||
broken = true; # Not compatible with ppx_deriving ≥ 5.0
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, ipaddr, cstruct, lwt, rresult, logs, lru
|
||||
, tcpip, ethernet, stdlib-shims
|
||||
, alcotest, mirage-clock-unix
|
||||
, ppx_deriving
|
||||
, ppxlib, ppx_deriving
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
|
|
@ -19,8 +19,8 @@ buildDunePackage rec {
|
|||
sha256 = "0cy95j184hi8fm1h6z6x1brjfrmbq3zjy2mqz99m8ys9vwkb63ma";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
ppx_deriving
|
||||
buildInputs = [
|
||||
ppxlib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -33,6 +33,7 @@ buildDunePackage rec {
|
|||
tcpip
|
||||
ethernet
|
||||
stdlib-shims
|
||||
ppx_deriving
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@ let
|
|||
'';
|
||||
in
|
||||
|
||||
if !versionAtLeast ocaml.version "4.08"
|
||||
then throw "nocrypto is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-nocrypto-${version}";
|
||||
version = "0.5.4";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ buildDunePackage rec {
|
|||
sha256 = "1rdypc83nap9j2ml9r6n1pzgf79gk1yffwyi6fmcrl7zmy01cg0n";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
minimumOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ];
|
||||
|
|
|
|||
|
|
@ -1,20 +1,34 @@
|
|||
{ lib, fetchzip, buildDunePackage
|
||||
, cppo, ppxfind, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree
|
||||
{ lib, fetchurl, buildDunePackage
|
||||
, cppo, ppxlib, ppx_derivers, result, ounit, ocaml-migrate-parsetree
|
||||
}:
|
||||
|
||||
let params =
|
||||
if lib.versionAtLeast ppxlib.version "0.15"
|
||||
then {
|
||||
version = "5.1";
|
||||
sha256 = "1i64fd7qrfzbam5hfbl01r0sx4iihsahcwqj13smmrjlnwi3nkxh";
|
||||
} else {
|
||||
version = "5.0";
|
||||
sha256 = "0fkzrn4pdyvf1kl0nwvhqidq01pnq3ql8zk1jd56hb0cxaw851w3";
|
||||
}
|
||||
; in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ppx_deriving";
|
||||
version = "4.5";
|
||||
inherit (params) version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz";
|
||||
sha256 = "1v2xldag54n0xk69vv3j4nln9bzkkpq3rildq118sydzsc9v239z";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-v${version}.tbz";
|
||||
inherit (params) sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ ppxfind cppo ounit ];
|
||||
propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ppx_tools result ];
|
||||
buildInputs = [ ppxlib cppo ];
|
||||
propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers result ];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ ounit ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02.";
|
||||
|
|
|
|||
|
|
@ -23,5 +23,6 @@ buildDunePackage rec {
|
|||
description = "A Protocol Buffers codec generator for OCaml";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.vyorkin ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,26 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub, ppxfind, ounit
|
||||
{ lib, buildDunePackage, fetchFromGitHub, ppxlib, ounit
|
||||
, ppx_deriving, yojson
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ppx_deriving_yojson";
|
||||
version = "3.5.3";
|
||||
version = "3.6.1";
|
||||
|
||||
minimumOCamlVersion = "4.04";
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml-ppx";
|
||||
repo = "ppx_deriving_yojson";
|
||||
rev = "v${version}";
|
||||
sha256 = "030638gp39mr4hkilrjhd98q4s8gjqxifm6fy6bwqrg74hmrl2y5";
|
||||
sha256 = "1icz5h6p3pfj7my5gi7wxpflrb8c902dqa17f9w424njilnpyrbk";
|
||||
};
|
||||
|
||||
buildInputs = [ ppxfind ounit ];
|
||||
|
||||
propagatedBuildInputs = [ ppx_deriving yojson ];
|
||||
propagatedBuildInputs = [ ppxlib ppx_deriving yojson ];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ ounit ];
|
||||
|
||||
meta = {
|
||||
description = "A Yojson codec generator for OCaml >= 4.04";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ let param =
|
|||
let v6_3 = {
|
||||
version = "6.3";
|
||||
sha256 = "1skf4njvkifwx0qlsrc0jn891gvvcp5ryd6kkpx56hck7nnxv8x6";
|
||||
useDune2 = lib.versionAtLeast ocaml.version "4.12";
|
||||
useDune2 = true;
|
||||
buildInputs = [cppo];
|
||||
}; in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,24 +1,22 @@
|
|||
{ lib, buildDunePackage, fetchFromGitLab, ppx_tools, ppx_deriving, result, cppo }:
|
||||
{ lib, buildDunePackage, fetchFromGitLab, ppxlib, ppx_deriving, result }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "visitors";
|
||||
version = "20200210";
|
||||
version = "20210127";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.02.3";
|
||||
minimumOCamlVersion = "4.07";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "fpottier";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
domain = "gitlab.inria.fr";
|
||||
sha256 = "12i099h1hc1walabiwqbinnpgcxkc1wn72913v7v6vvyif21rb5a";
|
||||
sha256 = "0b73h7d4yv04a0b5x2i222jknbcgf9vvxzfjxzy2jwanxz9d873z";
|
||||
};
|
||||
|
||||
buildInputs = [ cppo ];
|
||||
|
||||
propagatedBuildInputs = [ ppx_tools ppx_deriving result ];
|
||||
propagatedBuildInputs = [ ppxlib ppx_deriving result ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.inria.fr/fpottier/visitors";
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
buildPecl {
|
||||
pname = "pdo_sqlsrv";
|
||||
|
||||
version = "5.8.1";
|
||||
sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0";
|
||||
version = "5.9.0";
|
||||
sha256 = "0n4cnkldvyp1lrpj18ky2ii2dcaa51dsmh8cspixm7w76dxl3khg";
|
||||
|
||||
internalDeps = [ php.extensions.pdo ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
buildPecl {
|
||||
pname = "sqlsrv";
|
||||
|
||||
version = "5.8.1";
|
||||
sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r";
|
||||
version = "5.9.0";
|
||||
sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a";
|
||||
|
||||
buildInputs = [
|
||||
pkgs.unixODBC
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
version = "2.27.1";
|
||||
version = "2.28.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0rnmy74rjjcyni5sr8h1djffpj7wngn2wqckl5vknp2smaihp34l";
|
||||
sha256 = "aa272605fd8a2ddcc6e5dd8151d628f76a9468c97ba7e4e315d6bc78b9bfb8f8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Deprecated";
|
||||
version = "1.2.10";
|
||||
version = "1.2.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0x3zkmykcyjn8k57g8lcf89fxw8q7hvvcj6xkwb0f2zrnmpscnsj";
|
||||
sha256 = "471ec32b2755172046e28102cd46c481f21c6036a0ec027521eba8521aa4ef35";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ wrapt ];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-reversion";
|
||||
version = "3.0.8";
|
||||
version = "3.0.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "49e9930f90322dc6a2754dd26144285cfcc1c5bd0c1c39ca95d5602c5054ae32";
|
||||
sha256 = "a5af55f086a3f9c38be2f049c251e06005b9ed48ba7a109473736b1fc95a066f";
|
||||
};
|
||||
|
||||
# tests assume the availability of a mysql/postgresql database
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dufte";
|
||||
version = "0.2.9";
|
||||
version = "0.2.12";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0nkaczipbsm8c14j9svxry2wigmn5iharibb6b8g062sjaph8x17";
|
||||
sha256 = "0ag1d7h1wijkc7v2vpgkbqjlnpiwd4nh8zhxiby0989bpmlp3jr3";
|
||||
};
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -34,6 +34,10 @@ buildPythonPackage rec {
|
|||
'';
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
pythonImportsCheck = [ "dufte" ];
|
||||
pytestFlagsArray = [
|
||||
# we don't have the "exdown" package (yet)
|
||||
"--ignore=test/test_readme.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Clean matplotlib plots";
|
||||
|
|
|
|||
42
pkgs/development/python-modules/imap-tools/default.nix
Normal file
42
pkgs/development/python-modules/imap-tools/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imap-tools";
|
||||
version = "0.37.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikvk";
|
||||
repo = "imap_tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "1501lk3fjxqmzxffahbj33y795gwl96yqvk3fs86cchm6vz2gnkk";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# tests require a network connection
|
||||
"test_action"
|
||||
"test_folders"
|
||||
"test_connectio"
|
||||
"test_attributes"
|
||||
"test_live"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "imap_tools" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Work with email and mailbox by IMAP";
|
||||
homepage = "https://github.com/ikvk/imap_tools";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.8.9";
|
||||
version = "0.8.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "13669a0150370c96cabcff859fb4d17f4a539dc7c707ff0c99c00612e24f5447";
|
||||
sha256 = "d1958b9bd8c2631ccd6ebd4a54e35e5190dae2c0daeb786aec02f263b2c2e0b1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
21
pkgs/development/python-modules/npyscreen/default.nix
Normal file
21
pkgs/development/python-modules/npyscreen/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "npyscreen";
|
||||
version = "4.10.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0vhjwn0dan3zmffvh80dxb4x67jysvvf1imp6pk4dsfslpwy0bk2";
|
||||
};
|
||||
|
||||
# Tests are outdated
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Framework for developing console applications using Python and curses";
|
||||
homepage = "http://www.npcole.com/npyscreen/";
|
||||
maintainers = with maintainers; [ dump_stack ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
30
pkgs/development/python-modules/sphinx-autobuild/default.nix
Normal file
30
pkgs/development/python-modules/sphinx-autobuild/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, sphinx
|
||||
, livereload
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-autobuild";
|
||||
version = "2020.9.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1vbaf4vrxahylyp8zrlw5dx1d2faajp926c3pl5i1wlkp1yll62b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx livereload ];
|
||||
|
||||
# No tests included.
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "sphinx_autobuild" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rebuild Sphinx documentation on changes, with live-reload in the browser";
|
||||
homepage = "https://github.com/executablebooks/sphinx-autobuild";
|
||||
license = with licenses; [ mit ];
|
||||
maintainer = with maintainers; [holgerpeters];
|
||||
};
|
||||
}
|
||||
|
|
@ -2194,6 +2194,18 @@ let
|
|||
meta.homepage = "https://github.com/junegunn/limelight.vim/";
|
||||
};
|
||||
|
||||
lispdocs-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lispdocs-nvim";
|
||||
version = "2021-01-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tami5";
|
||||
repo = "lispdocs.nvim";
|
||||
rev = "3c506bbffb2608f3671f0c41c28fb9f6626353d5";
|
||||
sha256 = "0m4iscxwdglvlkxhzs9gzx1iqvnvgknqxgss5k00wr0nrax8q3pl";
|
||||
};
|
||||
meta.homepage = "https://github.com/tami5/lispdocs.nvim/";
|
||||
};
|
||||
|
||||
lsp-status-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp-status-nvim";
|
||||
version = "2021-01-05";
|
||||
|
|
|
|||
|
|
@ -543,6 +543,7 @@ svermeulen/vim-subversive
|
|||
t9md/vim-choosewin
|
||||
t9md/vim-smalls
|
||||
takac/vim-hardtime
|
||||
tami5/lispdocs.nvim
|
||||
tami5/sql.nvim
|
||||
tbodt/deoplete-tabnine
|
||||
ternjs/tern_for_vim
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki";
|
||||
description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ fpletz ];
|
||||
maintainers = with lib.maintainers; [ fpletz hexa ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
version = "2020.4";
|
||||
version = "2021.0";
|
||||
|
||||
sha256 = {
|
||||
batman-adv = "1cxr0zmn9nzisawkrfk0gzd9fx0pg6261c889kz47hwp4f545v6d";
|
||||
alfred = "1ay69nifzghpbvy11fdca5cllkn852h6rg045lci4vzgqf7b2bd2";
|
||||
batctl = "05rrpfbpdhxn5zgdps849qls2ifis6a94cjryb60d4y1nc2n0d7w";
|
||||
batman-adv = "1898y0m8sgca0dmhyfkpmx2g6qc0b1xvh5nm7cvnhwl9h2jrp62s";
|
||||
alfred = "0jr4wbz81ijd03ssfxb9mqlj3zbx2k495lsl0np262hyla6w0qm0";
|
||||
batctl = "1r01a8zxivq4slwc81dgg9qknqsli8qw17csfj95321gjpqqpv4w";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.17.0";
|
||||
version = "1.17.2";
|
||||
|
||||
excludedPackages = "test";
|
||||
|
||||
|
|
@ -12,10 +12,10 @@ buildGoModule rec {
|
|||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
sha256 = "1j3wi398vcvlnf1q335hhbw6bq69qclak92sg2na05cl4snw68y0";
|
||||
sha256 = "sha256-R0RYiVVS1ce2xabPBTEmOxBNlknP4iXkbVy412whrFw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0vb1gvmj7pmz4dljyk91smkn8japmv7mc3mgb0s1imvxala8qq83";
|
||||
vendorSha256 = "sha256-3cELah9i2rY563QQOYt7ke0HEUR1By74vTgl+UbOHwc=";
|
||||
|
||||
buildFlagsArray = [ ''-ldflags=
|
||||
-w -s -X main.version=${version}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ccid";
|
||||
version = "1.4.33";
|
||||
version = "1.4.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0974h2v9wq0j0ajw3c7yckaw8wqcppb2npfhfhmv9phijy9xlmjj";
|
||||
sha256 = "sha256-5vdkW1mpooROtLGn7/USlg1/BKRlSvAvf9L4re1dtAo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5954,7 +5954,8 @@ in
|
|||
inherit (callPackages ../development/libraries/libwebsockets { })
|
||||
libwebsockets_3_1
|
||||
libwebsockets_3_2
|
||||
libwebsockets_4_0;
|
||||
libwebsockets_4_0
|
||||
libwebsockets_4_1;
|
||||
libwebsockets = libwebsockets_3_2;
|
||||
|
||||
licensee = callPackage ../tools/package-management/licensee { };
|
||||
|
|
@ -9562,6 +9563,7 @@ in
|
|||
crystal_0_33
|
||||
crystal_0_34
|
||||
crystal_0_35
|
||||
crystal_0_36
|
||||
crystal;
|
||||
|
||||
crystal2nix = callPackage ../development/compilers/crystal2nix { };
|
||||
|
|
@ -13336,6 +13338,8 @@ in
|
|||
|
||||
cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { };
|
||||
|
||||
cxxopts = callPackage ../development/libraries/cxxopts { };
|
||||
|
||||
cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { };
|
||||
|
||||
cypress = callPackage ../development/web/cypress { };
|
||||
|
|
@ -13689,7 +13693,7 @@ in
|
|||
|
||||
gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { };
|
||||
|
||||
gdal_2 = callPackage ../development/libraries/gdal/2.4.0.nix { };
|
||||
gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { };
|
||||
|
||||
gdcm = callPackage ../development/libraries/gdcm { };
|
||||
|
||||
|
|
|
|||
|
|
@ -979,10 +979,7 @@ let
|
|||
|
||||
ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {};
|
||||
|
||||
ppx_deriving =
|
||||
if lib.versionAtLeast ocaml.version "4.02"
|
||||
then callPackage ../development/ocaml-modules/ppx_deriving {}
|
||||
else null;
|
||||
ppx_deriving = callPackage ../development/ocaml-modules/ppx_deriving {};
|
||||
|
||||
ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {};
|
||||
|
||||
|
|
|
|||
|
|
@ -12220,7 +12220,7 @@ let
|
|||
url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.19.tar.gz";
|
||||
sha256 = "06hm4vgihxr7m4jrq558phnnxy4am6ifba447j0h4p6jym5h7xih";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ MathBigInt ];
|
||||
meta = {
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue